tornado-packages/ethers.js
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed wrong hash computed with Transaction and added toJSON.

Browse Source
This commit is contained in:
Richard Moore 2022-10-20 04:48:52 -04:00
parent 45d29fd318
commit 22ebbf4e5c
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src.ts/transaction/transaction.ts
View File

@ -456,9 +456,7 @@ export class Transaction implements Freezable<Transaction>, TransactionLike<stri
}
get hash(): null | string {
if (this.signature == null) {
throw new Error("cannot hash unsigned transaction; maybe you meant .unsignedHash");
}
if (this.signature == null) { return null; }
return keccak256(this.serialized);
}
@ -468,11 +466,12 @@ export class Transaction implements Freezable<Transaction>, TransactionLike<stri
get from(): null | string {
if (this.signature == null) { return null; }
return recoverAddress(this.unsignedSerialized, this.signature);
return recoverAddress(this.unsignedHash, this.signature);
}
get fromPublicKey(): null | string {
if (this.signature == null) { return null; }
throw new Error("@TODO");
// use ecrecover
return "";
}
@ -612,6 +611,29 @@ export class Transaction implements Freezable<Transaction>, TransactionLike<stri
return Object.isFrozen(this.#props);
}
toJSON(): any {
const s = (v: null | bigint) => {
if (v == null) { return null; }
return v.toString();
};
return {
type: this.type,
to: this.to,
from: this.from,
data: this.data,
nonce: this.nonce,
gasLimit: s(this.gasLimit),
gasPrice: s(this.gasPrice),
maxPriorityFeePerGas: s(this.maxPriorityFeePerGas),
maxFeePerGas: s(this.maxFeePerGas),
value: s(this.value),
chainId: s(this.chainId),
sig: this.signature ? this.signature.toJSON(): null,
accessList: this.accessList
};
}
static from(tx: string | TransactionLike<string>): Transaction {
if (typeof(tx) === "string") {
const payload = getBytes(tx);