status-im/ethers.js
2
0
Fork 0
mirror of synced 2025-02-24 03:58:06 +00:00
Code Issues Projects Releases Wiki Activity

Prevent Signer.checkTransaction from creating conflicting from properties.

Browse Source
This commit is contained in:
Richard Moore 2020-02-01 03:38:19 -05:00
parent ba29618896
commit 1decb13799
No known key found for this signature in database
GPG Key ID: 665176BE8E9DC651
1 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
packages/abstract-signer/src.ts/index.ts
View File

@ -137,7 +137,22 @@ export abstract class Signer {
} }
const tx = shallowCopy(transaction); const tx = shallowCopy(transaction);
if (tx.from == null) { tx.from = this.getAddress(); }
if (tx.from == null) {
tx.from = this.getAddress();
} else {
// Make sure any provided address matches this signer
tx.from = Promise.all([
Promise.resolve(tx.from),
this.getAddress()
]).then((result) => {
if (result[0] !== result[1]) {
logger.throwArgumentError("from address mismatch", "transaction", transaction);
}
return result[0];
});
}
return tx; return tx;
} }
@ -152,7 +167,8 @@ export abstract class Signer {
if (tx.gasPrice == null) { tx.gasPrice = this.getGasPrice(); } if (tx.gasPrice == null) { tx.gasPrice = this.getGasPrice(); }
if (tx.nonce == null) { tx.nonce = this.getTransactionCount("pending"); } if (tx.nonce == null) { tx.nonce = this.getTransactionCount("pending"); }
// Make sure any provided address matches this signer /*
// checkTransaction does this...
if (tx.from == null) { if (tx.from == null) {
tx.from = this.getAddress(); tx.from = this.getAddress();
} else { } else {
@ -166,6 +182,7 @@ export abstract class Signer {
return results[0]; return results[0];
}); });
} }
*/
if (tx.gasLimit == null) { if (tx.gasLimit == null) {
tx.gasLimit = this.estimateGas(tx).catch((error) => { tx.gasLimit = this.estimateGas(tx).catch((error) => {
@ -174,7 +191,20 @@ export abstract class Signer {
}); });
}); });
} }
if (tx.chainId == null) { tx.chainId = this.getChainId(); }
if (tx.chainId == null) {
tx.chainId = this.getChainId();
} else {
tx.chainId = Promise.all([
Promise.resolve(tx.chainId),
this.getChainId()
]).then((results) => {
if (results[1] !== 0 && results[0] !== results[1]) {
logger.throwArgumentError("chainId address mismatch", "transaction", transaction);
}
return results[0];
});
}
return await resolveProperties(tx); return await resolveProperties(tx);
} }