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

Allow override keyword in human-readable ABI and improve error messages (#4514, #4548).

Browse Source
This commit is contained in:
Richard Moore 2024-02-01 03:19:20 -05:00
parent 98496bc48e
commit be5ec2d327
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src.ts/abi/fragments.ts
View File

@ -121,11 +121,11 @@ function setify(items: Array<string>): ReadonlySet<string> {
return Object.freeze(result); return Object.freeze(result);
} }
const _kwVisibDeploy = "external public payable"; const _kwVisibDeploy = "external public payable override";
const KwVisibDeploy = setify(_kwVisibDeploy.split(" ")); const KwVisibDeploy = setify(_kwVisibDeploy.split(" "));
// Visibility Keywords // Visibility Keywords
const _kwVisib = "constant external internal payable private public pure view"; const _kwVisib = "constant external internal payable private public pure view override";
const KwVisib = setify(_kwVisib.split(" ")); const KwVisib = setify(_kwVisib.split(" "));
const _kwTypes = "constructor error event fallback function receive struct"; const _kwTypes = "constructor error event fallback function receive struct";
@ -218,7 +218,10 @@ class TokenString {
// Pops and returns the value of the next token if it is `type`; throws if out of tokens // Pops and returns the value of the next token if it is `type`; throws if out of tokens
popType(type: string): string { popType(type: string): string {
if (this.peek().type !== type) { throw new Error(`expected ${ type }; got ${ JSON.stringify(this.peek()) }`); } if (this.peek().type !== type) {
const top = this.peek();
throw new Error(`expected ${ type }; got ${ top.type } ${ JSON.stringify(top.text) }`);
}
return this.pop().text; return this.pop().text;
} }
@ -471,7 +474,7 @@ function consumeGas(tokens: TokenString): null | bigint {
function consumeEoi(tokens: TokenString): void { function consumeEoi(tokens: TokenString): void {
if (tokens.length) { if (tokens.length) {
throw new Error(`unexpected tokens: ${ tokens.toString() }`); throw new Error(`unexpected tokens at offset ${ tokens.offset }: ${ tokens.toString() }`);
} }
} }

4
src.ts/abi/interface.ts
View File

@ -342,8 +342,8 @@ export class Interface {
for (const a of abi) { for (const a of abi) {
try { try {
frags.push(Fragment.from(a)); frags.push(Fragment.from(a));
} catch (error) { } catch (error: any) {
console.log("EE", error); console.log(`[Warning] Invalid Fragment ${ JSON.stringify(a) }:`, error.message);
} }
} }