@socket.tech/dl-common 1.0.4 → 1.0.5

package/dist/constants/types.d.ts

@@ -27,6 +27,13 @@ export declare const ErrorReasons: {
     INBOUND_FAILURE: string;
     LOW_GAS_LIMIT: string;
 };
+export declare enum SigPendingReason {
+    INVALID_MESSAGE_OUTBOUND_TX = "INVALID_MESSAGE_OUTBOUND_TX",
+    MISSING_SEAL_EVENT = "MISSING_SEAL_EVENT",
+    PENDING_CONFIRMATIONS = "PENDING_CONFIRMATIONS",
+    INALID_SEAL_TX = "INALID_SEAL_TX",
+    NO = "NO"
+}
 export declare class ServerError {
     code: Omit<StatusCodes, StatusCodes.SUCCESS>;
     message?: string;
@@ -97,6 +104,8 @@ export interface AttestRequest {
     packetId: string;
     root: string;
     proposalCount: number;
+    outboundTxHash: string;
+    sealTxHash: string;
 }
 export interface AttestSuccess {
     proposalValid: true;
@@ -110,7 +119,8 @@ export interface AttestFailure {
     proposalValid: false;
     packetId: string;
     proposalCount: number;
-    reason: TripReason;
+    tripReason: TripReason;
+    sigPendingReason: SigPendingReason;
 }
 export type AttestResponse = AttestSuccess | AttestFailure;
 export type MessageData = {

package/dist/constants/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InternalServerError = exports.BadRequestError = exports.ServerError = exports.ErrorReasons = exports.RelayerAPIStatus = exports.InboundStatus = void 0;
+exports.InternalServerError = exports.BadRequestError = exports.ServerError = exports.SigPendingReason = exports.ErrorReasons = exports.RelayerAPIStatus = exports.InboundStatus = void 0;
 const enums_1 = require("./enums");
 var InboundStatus;
 (function (InboundStatus) {
@@ -23,6 +23,14 @@ exports.ErrorReasons = {
     INBOUND_FAILURE: "INBOUND_FAILURE",
     LOW_GAS_LIMIT: "LOW_GAS_LIMIT",
 };
+var SigPendingReason;
+(function (SigPendingReason) {
+    SigPendingReason["INVALID_MESSAGE_OUTBOUND_TX"] = "INVALID_MESSAGE_OUTBOUND_TX";
+    SigPendingReason["MISSING_SEAL_EVENT"] = "MISSING_SEAL_EVENT";
+    SigPendingReason["PENDING_CONFIRMATIONS"] = "PENDING_CONFIRMATIONS";
+    SigPendingReason["INALID_SEAL_TX"] = "INALID_SEAL_TX";
+    SigPendingReason["NO"] = "NO";
+})(SigPendingReason || (exports.SigPendingReason = SigPendingReason = {}));
 class ServerError {
     constructor(code, message) {
         this.code = code;

package/dist/index.js

@@ -1,34 +1,18 @@
 "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/models/message.d.ts

@@ -42,6 +42,7 @@ export declare class Message extends Model {
     executeSignature: string;
     executeMsgGasLimit: string;
     executeRelayStatus: ExecutionRelayStatus;
+    executeData: string;
 }
 export declare const MessageModel: {
     id: {
@@ -60,6 +61,10 @@ export declare const MessageModel: {
     destPlug: {
         type: DataTypes.StringDataTypeConstructor;
     };
+    executeData: {
+        type: DataTypes.TextDataTypeConstructor;
+        defaultValue: string;
+    };
     messageId: {
         type: DataTypes.StringDataTypeConstructor;
         primaryKey: boolean;
@@ -159,7 +164,7 @@ export declare const MessageModel: {
         defaultValue: boolean;
     };
     inboundRevertString: {
-        type: DataTypes.StringDataTypeConstructor;
+        type: DataTypes.TextDataTypeConstructor;
         defaultValue: string;
     };
 };

package/dist/models/message.js

@@ -31,6 +31,10 @@ exports.MessageModel = {
     destPlug: {
         type: sequelize_1.DataTypes.STRING,
     },
+    executeData: {
+        type: sequelize_1.DataTypes.TEXT,
+        defaultValue: "",
+    },
     messageId: {
         type: sequelize_1.DataTypes.STRING,
         primaryKey: true,
@@ -130,7 +134,7 @@ exports.MessageModel = {
         defaultValue: false,
     },
     inboundRevertString: {
-        type: sequelize_1.DataTypes.STRING,
+        type: sequelize_1.DataTypes.TEXT,
         defaultValue: "",
     },
 };
@@ -168,6 +172,12 @@ function processStrings(message) {
     }
     if (message.rootHash)
         message.rootHash = (0, utils_1.toLowerCase)(message.rootHash);
+    if (message.payload)
+        message.payload = message.payload.slice(0, 10004);
+    if (message.inboundRevertString)
+        message.inboundRevertString = message.inboundRevertString.slice(0, 1000);
+    if (message.executeData)
+        message.executeData = message.executeData.slice(0, 5000);
     return message;
 }
 const addMessageHooks = () => {

package/dist/models/packet.d.ts

@@ -29,7 +29,6 @@ export declare enum AttestRelayStatus {
 export declare enum TripReason {
     SWITCHBOARD_MISMATCHED = "SWITCHBOARD_MISMATCHED",
     ROOT_MISMATCHED = "ROOT_MISMATCHED",
-    MISSING_SEAL = "MISSING_SEAL",
     NO = "NO"
 }
 export declare class Packet extends Model {

package/dist/models/packet.js

@@ -38,7 +38,6 @@ var TripReason;
 (function (TripReason) {
     TripReason["SWITCHBOARD_MISMATCHED"] = "SWITCHBOARD_MISMATCHED";
     TripReason["ROOT_MISMATCHED"] = "ROOT_MISMATCHED";
-    TripReason["MISSING_SEAL"] = "MISSING_SEAL";
     TripReason["NO"] = "NO";
 })(TripReason || (exports.TripReason = TripReason = {}));
 class Packet extends sequelize_1.Model {

package/dist/utils/dataStructHelper.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.chunks = exports.MAX_PAYLOAD_SIZE = void 0;
+exports.MAX_PAYLOAD_SIZE = void 0;
+exports.chunks = chunks;
 exports.MAX_PAYLOAD_SIZE = 10 * 1024; // max is 24.5 kb, left some buffer for function and batch encoding
 function* chunks(arr, n) {
     for (let i = 0; i < arr.length; i += n) {
         yield arr.slice(i, i + n);
     }
 }
-exports.chunks = chunks;

package/dist/utils/idUtils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodePacketId = exports.packPacketId = exports.unpackMessageId = exports.unpackPacketId = void 0;
+exports.packPacketId = exports.unpackMessageId = exports.unpackPacketId = void 0;
+exports.encodePacketId = encodePacketId;
 const ethers_1 = require("ethers");
 const address_1 = require("./address");
 const utils_1 = require("ethers/lib/utils");
@@ -47,4 +48,3 @@ function encodePacketId(chainSlug, capacitorAddress, packetCount) {
     const resultHex = encodedValue.toString(16).padStart(64, "0");
     return "0x" + resultHex;
 }
-exports.encodePacketId = encodePacketId;

package/dist/utils/s3Service.js

@@ -35,9 +35,10 @@ const getFileFromS3 = async (bucket, filePath) => {
 };
 exports.getFileFromS3 = getFileFromS3;
 const getS3Config = async (deploymentMode, region = "us-east-1", account = __1.Accounts.dl) => {
-    const S3_BUCKET_NAME = deploymentMode == dl_core_1.DeploymentMode.PROD
-        ? `socket-${account}-` + deploymentMode
-        : `socket-ll-` + deploymentMode;
+    const S3_BUCKET_NAME = deploymentMode === dl_core_1.DeploymentMode.SURGE ||
+        deploymentMode == dl_core_1.DeploymentMode.PROD
+        ? `socket-${account}-prod`
+        : `socket-ll-${deploymentMode}`;
     const S3_RPC_CONFIG_FILE_PATH = deploymentMode + "RpcConfig.json";
     (0, exports.initS3Client)(region);
     return await (0, exports.getFileFromS3)(S3_BUCKET_NAME, S3_RPC_CONFIG_FILE_PATH);

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 export declare class Address {
     private readonly buffer;
     private constructor();

package/dist/utils/signer/asn1-parser.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 export declare function parsePublicKey(buf: Buffer): Buffer;
 /**
  * Parse signature from the given signature.

package/dist/utils/signer/asn1-parser.js

@@ -23,7 +23,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseSignature = exports.parsePublicKey = void 0;
+exports.parsePublicKey = parsePublicKey;
+exports.parseSignature = parseSignature;
 const asn1js = __importStar(require("asn1js"));
 function toArrayBuffer(buffer) {
     const ab = new ArrayBuffer(buffer.length);
@@ -47,7 +48,6 @@ function parsePublicKey(buf) {
     const value = values[1];
     return Buffer.from(value.valueBlock.valueHex.slice(1));
 }
-exports.parsePublicKey = parsePublicKey;
 /**
  * Parse signature from the given signature.
  * @param buf The buffer of the signature which following ASN.1 format.
@@ -77,4 +77,3 @@ function parseSignature(buf) {
     });
     return { r, s };
 }
-exports.parseSignature = parseSignature;

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 export type Hash = string;
 export type Address = string;
 export declare function removeHexadecimalPrefix(x: string): string;

package/dist/utils/signer/crypto.js

@@ -3,7 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.recover = exports.addHexadecimalPrefix = exports.removeHexadecimalPrefix = void 0;
+exports.removeHexadecimalPrefix = removeHexadecimalPrefix;
+exports.addHexadecimalPrefix = addHexadecimalPrefix;
+exports.recover = recover;
 const secp256k1_1 = __importDefault(require("secp256k1"));
 function removeHexadecimalPrefix(x) {
     if (x.startsWith("0x")) {
@@ -11,14 +13,12 @@ function removeHexadecimalPrefix(x) {
     }
     return x;
 }
-exports.removeHexadecimalPrefix = removeHexadecimalPrefix;
 function addHexadecimalPrefix(x) {
     if (x.startsWith("0x")) {
         return x;
     }
     return `0x${x}`;
 }
-exports.addHexadecimalPrefix = addHexadecimalPrefix;
 function recover(digest, r, s, v) {
     if (r.length !== 32) {
         throw new Error("invalid signature length");
@@ -31,4 +31,3 @@ function recover(digest, r, s, v) {
         .slice(1);
     return Buffer.from(publicKey);
 }
-exports.recover = recover;

package/dist/utils/signer/kms-signer.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { KMSClientConfig } from "@aws-sdk/client-kms";
 import { Signature } from "./signature";
 import { Address } from "./address";

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import BN from "bn.js";
 import { Address } from "./address";
 export declare const secp256k1N: BN;

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Address } from "./address";
 import { Signature } from "./signature";
 export interface Signer {

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

@@ -0,0 +1,32 @@
+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";
+export declare const EIP712_SAFE_TX_TYPE: {
+    SafeTx: {
+        type: string;
+        name: string;
+    }[];
+};
+export declare class SocketSigner extends SocketRelaySigner {
+    readonly provider: Provider;
+    readonly chainId: number;
+    readonly safeAddress: string;
+    readonly safeWrapperAddress: string;
+    readonly relayUrl: string;
+    readonly relayerAPIKey: string;
+    readonly signingWallet?: Wallet | undefined;
+    readonly useSafe: boolean;
+    readonly useEOA: boolean;
+    readonly sequential: boolean;
+    readonly isCritical: boolean;
+    readonly metadata: object;
+    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>;
+    sendTransaction(transaction: Deferrable<TransactionRequest>): Promise<TransactionResponse>;
+}

package/dist/utils/signer/socketSigner.js

@@ -0,0 +1,121 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+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"));
+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: [
+        { type: "address", name: "to" },
+        { type: "uint256", name: "value" },
+        { type: "bytes", name: "data" },
+        { type: "uint8", name: "operation" },
+        { type: "uint256", name: "safeTxGas" },
+        { type: "uint256", name: "baseGas" },
+        { type: "uint256", name: "gasPrice" },
+        { type: "address", name: "gasToken" },
+        { type: "address", name: "refundReceiver" },
+        { type: "uint256", name: "nonce" },
+    ],
+};
+class SocketSigner extends relaySigner_1.SocketRelaySigner {
+    constructor(provider, chainId, 
+    // address of safe
+    safeAddress, 
+    // address of safe wrapper to store sign
+    safeWrapperAddress, relayUrl, relayerAPIKey, 
+    // wallet for signing safe hash data
+    signingWallet, 
+    // if you want to relay tx to wrapper
+    useSafe = false, 
+    // if you want to relay tx using EOA, otherwise it will use relayer
+    useEOA = false, sequential = false, 
+    // if isCritical is set to true, will try multiple relayers
+    // to get the transaction included
+    isCritical = false, metadata = {}) {
+        super(provider, chainId, relayUrl, relayerAPIKey, sequential, isCritical, metadata);
+        this.provider = provider;
+        this.chainId = chainId;
+        this.safeAddress = safeAddress;
+        this.safeWrapperAddress = safeWrapperAddress;
+        this.relayUrl = relayUrl;
+        this.relayerAPIKey = relayerAPIKey;
+        this.signingWallet = signingWallet;
+        this.useSafe = useSafe;
+        this.useEOA = useEOA;
+        this.sequential = sequential;
+        this.isCritical = isCritical;
+        this.metadata = metadata;
+        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) {
+        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);
+    }
+    setSafeWrapperAddress(safeWrapperAddress) {
+        return new SocketSigner(this.provider, this.chainId, this.safeAddress, safeWrapperAddress, this.relayUrl, this.relayerAPIKey, this.signingWallet, this.useSafe, this.useEOA, this.sequential, this.isCritical, this.metadata);
+    }
+    setSafeAddress(safeAddress) {
+        return new SocketSigner(this.provider, this.chainId, safeAddress, this.safeWrapperAddress, this.relayUrl, this.relayerAPIKey, this.signingWallet, this.useSafe, this.useEOA, this.sequential, this.isCritical, this.metadata);
+    }
+    async getAddress() {
+        if (this.signingWallet != null)
+            return this.signingWallet.address;
+        return await super.getAddress();
+    }
+    async sendTransaction(transaction) {
+        var _a, _b;
+        if (this.useSafe) {
+            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 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,
+                data: (_b = transaction.data) !== null && _b !== void 0 ? _b : "0x",
+                operation: 0,
+                safeTxGas: 0,
+                baseGas: 0,
+                gasPrice: 0,
+                gasToken: ethers_1.constants.AddressZero,
+                refundReceiver: ethers_1.constants.AddressZero,
+                nonce,
+            };
+            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", [
+                this.signingWallet.address,
+                contractData.to,
+                nonce,
+                contractData.value,
+                contractData.data,
+                signature,
+            ]);
+            transaction.to = this.safeWrapperAddress;
+        }
+        if (this.useEOA) {
+            if (this.signingWallet == null)
+                throw new Error("signingWallet not provided");
+            return await this.signingWallet.sendTransaction(transaction);
+        }
+        return await super.sendTransaction(transaction);
+    }
+}
+exports.SocketSigner = SocketSigner;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@socket.tech/dl-common",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "description": "common utilities for socket data layer.",
@@ -19,7 +19,7 @@
   "scripts": {
     "start": "serverless offline start --reloadHandler -s dev",
     "start:dev": "serverless offline start -s dev",
-    "deploy": "npm run lint && npx sls deploy -s dev --verbose",
+    "deploy": "tsc && npm run lint && export AWS_PROFILE=lldev && npx sls deploy -s dev --verbose",
     "deploy:prod": "tsc && npm run lint && export AWS_PROFILE=llprod && npx sls deploy -s prod --verbose",
     "deploy:surge": "npx sls deploy -s surge --verbose",
     "build": "tsc --project lib.tsconfig.json",
@@ -51,7 +51,7 @@
     "@aws-sdk/client-secrets-manager": "^3.433.0",
     "@aws-sdk/client-sqs": "^3.421.0",
     "@ethersproject/providers": "^5.7.2",
-    "@smithy/smithy-client": "^3.1.4",
+    "@smithy/smithy-client": "^3.1.5",
     "@socket.tech/dl-core": "^2.7.0",
     "@socket.tech/ll-common": "^0.0.19",
     "async-redis": "^2.0.0",