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

ricmoo · ricmoo · commit be5ec2d327a5 · 2024-02-01T03:19:20.000-05:00
diff --git a/src.ts/abi/fragments.ts b/src.ts/abi/fragments.ts
@@ -121,11 +121,11 @@ function setify(items: Array<string>): ReadonlySet<string> {
     return Object.freeze(result);
 }
 
-const _kwVisibDeploy = "external public payable";
+const _kwVisibDeploy = "external public payable override";
 const KwVisibDeploy = setify(_kwVisibDeploy.split(" "));
 
 // 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 _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
     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;
     }
 
@@ -471,7 +474,7 @@ function consumeGas(tokens: TokenString): null | bigint {
 
 function consumeEoi(tokens: TokenString): void {
     if (tokens.length) {
-        throw new Error(`unexpected tokens: ${ tokens.toString() }`);
+        throw new Error(`unexpected tokens at offset ${ tokens.offset }: ${ tokens.toString() }`);
     }
 }
 
diff --git a/src.ts/abi/interface.ts b/src.ts/abi/interface.ts
@@ -342,8 +342,8 @@ export class Interface {
         for (const a of abi) {
             try {
                 frags.push(Fragment.from(a));
-            } catch (error) {
-                console.log("EE", error);
+            } catch (error: any) {
+                console.log(`[Warning] Invalid Fragment ${ JSON.stringify(a) }:`, error.message);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -342,8 +342,8 @@ export class Interface {`
`342`	`342`	`for (const a of abi) {`
`343`	`343`	`try {`
`344`	`344`	`frags.push(Fragment.from(a));`
`345`		`- } catch (error) {`
`346`		`- console.log("EE", error);`
	`345`	`+ } catch (error: any) {`
	`346`	+ console.log(`[Warning] Invalid Fragment ${ JSON.stringify(a) }:`, error.message);
`347`	`347`	`}`
`348`	`348`	`}`
`349`	`349`