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

Allow contract filters to include OR-ed values (#437).

Browse Source
This commit is contained in:
Richard Moore 2020-05-01 16:18:31 -04:00
parent 9f8025155c
commit 28800d7681
No known key found for this signature in database
GPG Key ID: 665176BE8E9DC651
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/abi/src.ts/interface.ts
View File

@ -352,9 +352,21 @@ export class Interface {
}) })
} }
let topics: Array<string> = []; let topics: Array<string | Array<string>> = [];
if (!eventFragment.anonymous) { topics.push(this.getEventTopic(eventFragment)); } if (!eventFragment.anonymous) { topics.push(this.getEventTopic(eventFragment)); }
const encodeTopic = (param: ParamType, value: any): string => {
if (param.type === "string") {
return id(value);
} else if (param.type === "bytes") {
return keccak256(hexlify(value));
}
// Check addresses are valid
if (param.type === "address") { this._abiCoder.encode( [ "address" ], [ value ]); }
return hexZeroPad(hexlify(value), 32);
};
values.forEach((value, index) => { values.forEach((value, index) => {
let param = eventFragment.inputs[index]; let param = eventFragment.inputs[index];
@ -368,16 +380,12 @@ export class Interface {
if (value == null) { if (value == null) {
topics.push(null); topics.push(null);
} else if (param.type === "string") { } else if (param.baseType === "array" || param.baseType === "tuple") {
topics.push(id(value));
} else if (param.type === "bytes") {
topics.push(keccak256(hexlify(value)));
} else if (param.type.indexOf("[") !== -1 || param.type.substring(0, 5) === "tuple") {
logger.throwArgumentError("filtering with tuples or arrays not supported", ("contract." + param.name), value); logger.throwArgumentError("filtering with tuples or arrays not supported", ("contract." + param.name), value);
} else if (Array.isArray(value)) {
topics.push(value.map((value) => encodeTopic(param, value)));
} else { } else {
// Check addresses are valid topics.push(encodeTopic(param, value));
if (param.type === "address") { this._abiCoder.encode( [ "address" ], [ value ]); }
topics.push(hexZeroPad(hexlify(value), 32));
} }
}); });