Properly switch between read/write modes in waffle compat mode.

term-finance · Oct 25, 2024 · 00a5580 · 00a5580
1 parent df0c7d3
commit 00a5580
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/compat/waffle.ts b/src/compat/waffle.ts
@@ -131,8 +131,8 @@ class Stub<T extends AbiFunction> implements StubInterface {
   argsSet = false;
 
   constructor(
-    private mockContract: MockContractController,
-    private func: T,
+    private readonly mockContract: MockContractController,
+    private readonly func: T,
   ) {}
 
   private err(reason: string): never {
@@ -146,8 +146,14 @@ class Stub<T extends AbiFunction> implements StubInterface {
     if (!this.func.outputs)
       this.err("Cannot mock return values from a void function");
 
+    const kind =
+      this.func.stateMutability === "view" ||
+      this.func.stateMutability === "pure"
+        ? "read"
+        : "write";
+
     this.calls.push({
-      kind: "read",
+      kind,
       abi: this.func,
       inputs: this.inputs,
       outputs: args,
@@ -229,7 +235,7 @@ function createMock<T extends Abi>(
   mockContractInstance: MockContractController,
   // wallet: WalletClient,
 ): MockContract<T>["mock"] {
-  const functions = abi.filter((f) => f.type === "function") as AbiFunction[];
+  const functions = abi.filter((f) => f.type === "function");
   const mockedAbi = Object.values(functions).reduce(
     (acc, func) => {
       const stubbed = new Stub(mockContractInstance, func);

diff --git a/src/mock-contract.ts b/src/mock-contract.ts
@@ -51,7 +51,7 @@ export const calculateFnSigHash = (
     return toFunctionSelector(call.abi);
   }
   return encodeFunctionData({
-    abi: [call.abi as AbiFunction],
+    abi: [call.abi],
     args: call.inputs,
     functionName: call.abi.name,
   });
@@ -150,7 +150,7 @@ export const deployMock = async (
                 account: signer.account,
                 abi: abi,
                 functionName: "__doppelganger__mockReverts",
-                args: [fnSigHash, call.reason || ""],
+                args: [fnSigHash, call.reason ?? ""],
               });
               firstCall = false;
             } else {
@@ -160,7 +160,7 @@ export const deployMock = async (
                 account: signer.account,
                 abi: abi,
                 functionName: "__doppelganger__queueRevert",
-                args: [fnSigHash, call.reason || ""],
+                args: [fnSigHash, call.reason ?? ""],
               });
             }
             break;