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

Allow JsonRpcSigner to override from if it matches Signer (#862).

Browse Source
This commit is contained in:
Richard Moore 2020-06-03 03:17:42 -04:00
parent 2bc7bb6e61
commit 1a89c591c2
No known key found for this signature in database
GPG Key ID: 665176BE8E9DC651
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
packages/providers/src.ts/json-rpc-provider.ts
View File

@ -27,7 +27,7 @@ function timer(timeout: number): Promise<any> {
function getResult(payload: { error?: { code?: number, data?: any, message?: string }, result?: any }): any { function getResult(payload: { error?: { code?: number, data?: any, message?: string }, result?: any }): any {
if (payload.error) { if (payload.error) {
// @TODO: not any // @TODO: not any
let error: any = new Error(payload.error.message); const error: any = new Error(payload.error.message);
error.code = payload.error.code; error.code = payload.error.code;
error.data = payload.error.data; error.data = payload.error.data;
throw error; throw error;
@ -102,7 +102,7 @@ export class JsonRpcSigner extends Signer {
sendUncheckedTransaction(transaction: Deferrable<TransactionRequest>): Promise<string> { sendUncheckedTransaction(transaction: Deferrable<TransactionRequest>): Promise<string> {
transaction = shallowCopy(transaction); transaction = shallowCopy(transaction);
let fromAddress = this.getAddress().then((address) => { const fromAddress = this.getAddress().then((address) => {
if (address) { address = address.toLowerCase(); } if (address) { address = address.toLowerCase(); }
return address; return address;
}); });
@ -111,18 +111,25 @@ export class JsonRpcSigner extends Signer {
// wishes to use this, it is easy to specify explicitly, otherwise // wishes to use this, it is easy to specify explicitly, otherwise
// we look it up for them. // we look it up for them.
if (transaction.gasLimit == null) { if (transaction.gasLimit == null) {
let estimate = shallowCopy(transaction); const estimate = shallowCopy(transaction);
estimate.from = fromAddress; estimate.from = fromAddress;
transaction.gasLimit = this.provider.estimateGas(estimate); transaction.gasLimit = this.provider.estimateGas(estimate);
} }
return Promise.all([ return resolveProperties({
resolveProperties(transaction), tx: resolveProperties(transaction),
fromAddress sender: fromAddress
]).then((results) => { }).then(({ tx, sender }) => {
let tx = results[0]; if (tx.from != null) {
let hexTx = (<any>this.provider.constructor).hexlifyTransaction(tx); if (tx.from.toLowerCase() !== sender) {
hexTx.from = results[1]; logger.throwArgumentError("from address mismatch", "transaction", transaction);
}
} else {
tx.from = sender;
}
const hexTx = (<any>this.provider.constructor).hexlifyTransaction(tx, { from: true });
return this.provider.send("eth_sendTransaction", [ hexTx ]).then((hash) => { return this.provider.send("eth_sendTransaction", [ hexTx ]).then((hash) => {
return hash; return hash;
}, (error) => { }, (error) => {
@ -170,7 +177,7 @@ export class JsonRpcSigner extends Signer {
} }
signMessage(message: Bytes | string): Promise<string> { signMessage(message: Bytes | string): Promise<string> {
let data = ((typeof(message) === "string") ? toUtf8Bytes(message): message); const data = ((typeof(message) === "string") ? toUtf8Bytes(message): message);
return this.getAddress().then((address) => { return this.getAddress().then((address) => {
// https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_sign // https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_sign
@ -179,7 +186,7 @@ export class JsonRpcSigner extends Signer {
} }
unlock(password: string): Promise<boolean> { unlock(password: string): Promise<boolean> {
let provider = this.provider; const provider = this.provider;
return this.getAddress().then(function(address) { return this.getAddress().then(function(address) {
return provider.send("personal_unlockAccount", [ address.toLowerCase(), password, null ]); return provider.send("personal_unlockAccount", [ address.toLowerCase(), password, null ]);
@ -296,7 +303,7 @@ export class JsonRpcProvider extends BaseProvider {
} }
send(method: string, params: Array<any>): Promise<any> { send(method: string, params: Array<any>): Promise<any> {
let request = { const request = {
method: method, method: method,
params: params, params: params,
id: (this._nextId++), id: (this._nextId++),
@ -429,9 +436,9 @@ export class JsonRpcProvider extends BaseProvider {
_startPending(): void { _startPending(): void {
if (this._pendingFilter != null) { return; } if (this._pendingFilter != null) { return; }
let self = this; const self = this;
let pendingFilter: Promise<number> = this.send("eth_newPendingTransactionFilter", []); const pendingFilter: Promise<number> = this.send("eth_newPendingTransactionFilter", []);
this._pendingFilter = pendingFilter; this._pendingFilter = pendingFilter;
pendingFilter.then(function(filterId) { pendingFilter.then(function(filterId) {
@ -491,7 +498,7 @@ export class JsonRpcProvider extends BaseProvider {
// Check only allowed properties are given // Check only allowed properties are given
const allowed = shallowCopy(allowedTransactionKeys); const allowed = shallowCopy(allowedTransactionKeys);
if (allowExtra) { if (allowExtra) {
for (let key in allowExtra) { for (const key in allowExtra) {
if (allowExtra[key]) { allowed[key] = true; } if (allowExtra[key]) { allowed[key] = true; }
} }
} }