@socket.tech/dl-common 1.0.4-test.10 → 1.0.4-test.11

package/dist/index.js

@@ -1,18 +1,34 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
+var __createBinding =
+  (this && this.__createBinding) ||
+  (Object.create
+    ? function (o, m, k, k2) {
+        if (k2 === undefined) k2 = k;
+        var desc = Object.getOwnPropertyDescriptor(m, k);
+        if (
+          !desc ||
+          ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)
+        ) {
+          desc = {
+            enumerable: true,
+            get: function () {
+              return m[k];
+            },
+          };
+        }
+        Object.defineProperty(o, k2, desc);
+      }
+    : function (o, m, k, k2) {
+        if (k2 === undefined) k2 = k;
+        o[k2] = m[k];
+      });
+var __exportStar =
+  (this && this.__exportStar) ||
+  function (m, exports) {
+    for (var p in m)
+      if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p))
+        __createBinding(exports, m, p);
+  };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./models"), exports);
 __exportStar(require("./services"), exports);

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

@@ -1,7 +1,7 @@
 import { type Provider, type TransactionRequest, type TransactionResponse } from "@ethersproject/abstract-provider";
 import { type Deferrable } from "@ethersproject/properties";
 import { SocketRelaySigner } from "../relaySigner";
-import { Contract, type Wallet } from "ethers";
+import { Contract, ethers, type Wallet } from "ethers";
 export declare const EIP712_SAFE_TX_TYPE: {
     SafeTx: {
         type: string;
@@ -22,6 +22,7 @@ export declare class SocketSigner extends SocketRelaySigner {
     readonly isCritical: boolean;
     readonly metadata: object;
     readonly safeWrapperContract: Contract;
+    readonly safeContract: 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;
@@ -29,4 +30,6 @@ export declare class SocketSigner extends SocketRelaySigner {
     setSafeAddress(safeAddress: string): SocketRelaySigner;
     getAddress(): Promise<string>;
     sendTransaction(transaction: Deferrable<TransactionRequest>): Promise<TransactionResponse>;
+    signMessage(message: ethers.utils.Bytes | string): Promise<string>;
+    isTxHashSubmitted(transaction: Deferrable<TransactionRequest>): Promise<boolean>;
 }

package/dist/utils/signer/socketSigner.js

@@ -7,6 +7,8 @@ exports.SocketSigner = exports.EIP712_SAFE_TX_TYPE = void 0;
 const relaySigner_1 = require("../relaySigner");
 const ethers_1 = require("ethers");
 const MultiSigWrapper_json_1 = __importDefault(require("@socket.tech/dl-core/artifacts/abi/MultiSigWrapper.json"));
+const Safe_json_1 = __importDefault(require("@socket.tech/dl-core/artifacts/abi/Safe.json"));
+const utils_1 = require("ethers/lib/utils");
 exports.EIP712_SAFE_TX_TYPE = {
     // "SafeTx(address to,uint256 value,bytes data,uint8 operation,uint256 safeTxGas,uint256 baseGas,uint256 gasPrice,address gasToken,address refundReceiver,uint256 nonce)"
     SafeTx: [
@@ -57,6 +59,9 @@ class SocketSigner extends relaySigner_1.SocketRelaySigner {
         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);
+        if (this.safeAddress.length !== 0 ||
+            this.safeAddress !== ethers_1.constants.AddressZero)
+            this.safeContract = new ethers_1.Contract(this.safeAddress, Safe_json_1.default, this.provider);
     }
     setSigningWallet(signingWallet) {
         return new SocketSigner(this.provider, this.chainId, this.safeAddress, this.safeWrapperAddress, this.relayUrl, this.relayerAPIKey, signingWallet, this.useSafe, this.useEOA, this.sequential, this.isCritical, this.metadata);
@@ -83,9 +88,15 @@ class SocketSigner extends relaySigner_1.SocketRelaySigner {
             if (this.signingWallet == null)
                 throw new Error("signingWallet not provided");
             const signerAddress = await this.getAddress();
-            let nonce = await this.safeWrapperContract.lastNonce(signerAddress);
-            if (Number(nonce) !== 0)
-                nonce = Number(nonce) + 1;
+            const safeNonce = Number(await this.safeContract.nonce());
+            let nonce = Number(await this.safeWrapperContract.lastNonce(signerAddress));
+            if (safeNonce != 0) {
+                nonce = safeNonce > nonce ? safeNonce : nonce + 1;
+            }
+            else if (nonce !== 0)
+                nonce++;
+            if (await this.isTxHashSubmitted(transaction))
+                throw new Error("tx already submitted!");
             const contractData = {
                 to: transaction.to,
                 value: (_a = transaction.value) !== null && _a !== void 0 ? _a : 0,
@@ -117,5 +128,19 @@ class SocketSigner extends relaySigner_1.SocketRelaySigner {
         }
         return await super.sendTransaction(transaction);
     }
+    async signMessage(message) {
+        if (!this.signingWallet)
+            throw Error("No Signing Wallet found!");
+        return await this.signingWallet.signMessage(message);
+    }
+    async isTxHashSubmitted(transaction) {
+        var _a, _b;
+        if (!this.signingWallet)
+            throw Error("No Signing Wallet found!");
+        const dataHash = (0, utils_1.keccak256)(utils_1.defaultAbiCoder.encode(["address", "uint256", "bytes"], [transaction.to, (_a = transaction.value) !== null && _a !== void 0 ? _a : 0, (_b = transaction.data) !== null && _b !== void 0 ? _b : "0x"]));
+        const safeParams = await this.safeWrapperContract.safeParams(dataHash, this.signingWallet.address);
+        console.log(safeParams, "isTxSubmitted");
+        return safeParams[1] !== "0x";
+    }
 }
 exports.SocketSigner = SocketSigner;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@socket.tech/dl-common",
-  "version": "1.0.4-test.10",
+  "version": "1.0.4-test.11",
   "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.1",
+    "@socket.tech/dl-core": "^2.17.0-test.3",
     "@socket.tech/ll-common": "^0.0.19",
     "async-redis": "^2.0.0",
     "aws-kms-ethers-signer": "^0.1.3",