@socket.tech/dl-common 1.0.4-test.7 → 1.0.4-test.9

package/dist/utils/signer/socketSigner.d.ts

@@ -21,12 +21,12 @@ export declare class SocketSigner extends SocketRelaySigner {
     readonly sequential: boolean;
     readonly isCritical: boolean;
     readonly metadata: object;
-    readonly safeWrapperContract: Contract | undefined;
+    readonly safeWrapperContract: Contract;
+    readonly address: string;
     constructor(provider: Provider, chainId: number, safeAddress: string, safeWrapperAddress: string, relayUrl: string, relayerAPIKey: string, signingWallet?: Wallet | undefined, useSafe?: boolean, useEOA?: boolean, sequential?: boolean, isCritical?: boolean, metadata?: object);
     setSigningWallet(signingWallet: Wallet): SocketRelaySigner;
     setSafeWrapperAddress(safeWrapperAddress: string): SocketRelaySigner;
     setSafeAddress(safeAddress: string): SocketRelaySigner;
     getAddress(): Promise<string>;
-    address(): Promise<string>;
     sendTransaction(transaction: Deferrable<TransactionRequest>): Promise<TransactionResponse>;
 }

package/dist/utils/signer/socketSigner.js

@@ -50,7 +50,12 @@ class SocketSigner extends relaySigner_1.SocketRelaySigner {
         this.sequential = sequential;
         this.isCritical = isCritical;
         this.metadata = metadata;
-        if (this.safeWrapperAddress.length !== 0)
+        this.address =
+            this.signingWallet != null
+                ? this.signingWallet.address
+                : "0x5367Efc17020Aa1CF0943bA7eD17f1D3e4c7d7EE";
+        if (this.safeWrapperAddress.length !== 0 ||
+            this.safeWrapperAddress !== ethers_1.constants.AddressZero)
             this.safeWrapperContract = new ethers_1.Contract(this.safeWrapperAddress, MultiSigWrapper_json_1.default, this.provider);
     }
     setSigningWallet(signingWallet) {
@@ -64,22 +69,23 @@ class SocketSigner extends relaySigner_1.SocketRelaySigner {
     }
     async getAddress() {
         if (this.signingWallet != null)
-            return await this.signingWallet.getAddress();
+            return this.signingWallet.address;
         return await super.getAddress();
     }
-    async address() {
-        return await this.getAddress();
-    }
     async sendTransaction(transaction) {
         var _a, _b;
         if (this.useSafe) {
-            if (this.safeAddress.length === 0 || this.safeAddress === ethers_1.constants.AddressZero)
+            if (this.safeAddress.length === 0 ||
+                this.safeAddress === ethers_1.constants.AddressZero)
                 throw new Error("safeAddress not provided");
             if (this.safeWrapperContract == null)
                 throw new Error("safe wrapper not provided");
             if (this.signingWallet == null)
                 throw new Error("signingWallet not provided");
-            const nonce = await this.safeWrapperContract.getNonce();
+            const signerAddress = await this.getAddress();
+            let nonce = await this.safeWrapperContract.lastNonce(signerAddress);
+            if (Number(nonce) !== 0)
+                nonce = Number(nonce) + 1;
             const contractData = {
                 to: transaction.to,
                 value: (_a = transaction.value) !== null && _a !== void 0 ? _a : 0,
@@ -94,14 +100,13 @@ class SocketSigner extends relaySigner_1.SocketRelaySigner {
             };
             const signature = await this.signingWallet._signTypedData({ verifyingContract: this.safeAddress, chainId: this.chainId }, exports.EIP712_SAFE_TX_TYPE, contractData);
             // update to & data
-            transaction.data =
-                this.safeWrapperContract.interface.encodeFunctionData("storeOrRelaySignatures", [
-                    contractData.to,
-                    nonce,
-                    contractData.value,
-                    contractData.data,
-                    signature,
-                ]);
+            transaction.data = this.safeWrapperContract.interface.encodeFunctionData("storeOrRelaySignatures", [
+                contractData.to,
+                nonce,
+                contractData.value,
+                contractData.data,
+                signature,
+            ]);
             transaction.to = this.safeWrapperAddress;
         }
         if (this.useEOA) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@socket.tech/dl-common",
-  "version": "1.0.4-test.7",
+  "version": "1.0.4-test.9",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "description": "common utilities for socket data layer.",
@@ -52,7 +52,7 @@
     "@aws-sdk/client-sqs": "^3.421.0",
     "@ethersproject/providers": "^5.7.2",
     "@smithy/smithy-client": "^3.1.5",
-    "@socket.tech/dl-core": "^2.17.0-test.0",
+    "@socket.tech/dl-core": "^2.17.0-test.1",
     "@socket.tech/ll-common": "^0.0.19",
     "async-redis": "^2.0.0",
     "aws-kms-ethers-signer": "^0.1.3",