Prepare for Monorepo & Remove Ethers

BitteProtocol · Nov 18, 2024 · 5077122 · 5077122
1 parent aa267a5
commit 5077122
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 310 deletions.
diff --git a/examples/send-tx.ts b/examples/send-tx.ts
@@ -1,5 +1,4 @@
 import dotenv from "dotenv";
-import { ethers } from "ethers";
 import { formatEther, isAddress } from "viem";
 
 import { loadArgs, loadEnv } from "./cli";

diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
     "example": "tsx examples/send-tx.ts",
     "lint": "prettier --check '{src,examples,tests}/**/*.{js,jsx,ts,tsx}' && eslint . --ignore-pattern dist/",
     "fmt": "prettier --write '{src,examples,tests}/**/*.{js,jsx,ts,tsx}' && yarn lint --fix",
-    "test": "jest",
+    "test": "jest --passWithNoTests",
     "all": "yarn fmt && yarn lint && yarn build"
   },
   "dependencies": {
@@ -59,8 +59,6 @@
     "dotenv": "^16.4.5",
     "eslint": "^9.14.0",
     "eslint-plugin-import": "^2.31.0",
-    "ethers": "^6.13.4",
-    "ethers-multisend": "^3.1.0",
     "jest": "^29.7.0",
     "prettier": "^3.3.3",
     "ts-jest": "^29.2.5",

diff --git a/src/index.ts b/src/index.ts
@@ -8,13 +8,13 @@ export * from "./lib/safe-message";
 // TODO: Improve re-exports...
 export {
   Network,
-  BaseTx,
-  SignRequestData,
+  type BaseTx,
+  type SignRequestData,
   populateTx,
-  NetworkFields,
+  type NetworkFields,
   signatureFromOutcome,
   signatureFromTxHash,
   requestRouter as mpcRequestRouter,
-  EthTransactionParams,
+  type EthTransactionParams,
   isRlpHex,
 } from "near-ca";
diff --git a/src/lib/safe.ts b/src/lib/safe.ts
@@ -240,6 +240,6 @@ export class SafeContractSuite {
     if (ownerIndex === -1) {
       throw new Error(`Not a current owner: ${owner}`);
     }
-    return ownerIndex > 0 ? currentOwners[ownerIndex - 1] : SENTINEL_OWNERS;
+    return ownerIndex > 0 ? currentOwners[ownerIndex - 1]! : SENTINEL_OWNERS;
   }
 }
diff --git a/src/near-safe.ts b/src/near-safe.ts
@@ -405,7 +405,9 @@ export class NearSafe {
 
     // Assert uniqueness
     assertUnique(fromAddresses);
-
+    if (!fromAddresses[0]) {
+      throw new Error("No from address provided");
+    }
     // Early return with eoaEncoding if `from` is not the Safe
     if (!this.encodeForSafe(fromAddresses[0])) {
       // TODO: near-ca needs to update this for typed data like we did.

diff --git a/tests/e2e.spec.ts b/tests/e2e.spec.ts
@@ -123,7 +123,7 @@ describe("Near Safe Requests", () => {
       method: "eth_signTypedData_v4",
       params: [adapter.mpcAddress, typedDataString],
     });
-    expect(nearPayload.actions[0].params.args).toStrictEqual({
+    expect(nearPayload.actions[0]!.params.args).toStrictEqual({
       request: {
         path: "ethereum,1",
         payload: [

diff --git a/tests/unit/ethers-safe.ts b/tests/unit/ethers-safe.ts
diff --git a/tests/unit/lib/multisend.spec.ts b/tests/unit/lib/multisend.spec.ts
@@ -1,4 +1,3 @@
-import { decodeMulti as decodeMultiEthers } from "ethers-multisend";
 import { encodeFunctionData, erc20Abi, Hex, parseUnits, toHex } from "viem";
 
 import { OperationType } from "../../../src";
@@ -69,17 +68,17 @@ describe("Multisend", () => {
         operation: OperationType.Call,
         to: "0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984",
         value: toHex(BigInt(parseUnits("10", 18))),
-        data: "0x00",
+        data: "0x",
       },
       {
         operation: OperationType.Call,
         to: "0x36F4BFC9f49Dc5D4b2d10c4a48a6b30128BD79bC",
-        value: "0x00",
+        value: "0x0",
         data: ercTransferData,
       },
     ];
+
     const multiSendTx = encodeMulti(input);
-    const result = decodeMultiEthers(multiSendTx.data);
-    expect(result).toStrictEqual(input);
+    expect(decodeMultiViem(multiSendTx.data as Hex)).toStrictEqual(input);
   });
 });