@safe-global/protocol-kit 0.1.1 → 1.0.1

package/dist/src/utils/index.d.ts

@@ -1,5 +1,6 @@
+export * from './address';
 export * from './eip-3770';
 export * from './eip-712';
 export * from './safeVersions';
-export * from './address';
+export * from './signatures';
 export * from './transactions';

package/dist/src/utils/index.js

@@ -14,9 +14,10 @@ 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("./address"), exports);
 __exportStar(require("./eip-3770"), exports);
 __exportStar(require("./eip-712"), exports);
 __exportStar(require("./safeVersions"), exports);
-__exportStar(require("./address"), exports);
+__exportStar(require("./signatures"), exports);
 __exportStar(require("./transactions"), exports);
 //# sourceMappingURL=index.js.map

package/dist/src/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA0B;AAC1B,4CAAyB;AACzB,iDAA8B;AAC9B,4CAAyB;AACzB,iDAA8B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAAyB;AACzB,6CAA0B;AAC1B,4CAAyB;AACzB,iDAA8B;AAC9B,+CAA4B;AAC5B,iDAA8B"}

package/dist/src/utils/safeVersions.d.ts

@@ -2,6 +2,7 @@ export declare enum SAFE_FEATURES {
     SAFE_TX_GAS_OPTIONAL = "SAFE_TX_GAS_OPTIONAL",
     SAFE_TX_GUARDS = "SAFE_TX_GUARDS",
     SAFE_FALLBACK_HANDLER = "SAFE_FALLBACK_HANDLER",
-    ETH_SIGN = "ETH_SIGN"
+    ETH_SIGN = "ETH_SIGN",
+    ACCOUNT_ABSTRACTION = "ACCOUNT_ABSTRACTION"
 }
 export declare const hasSafeFeature: (feature: SAFE_FEATURES, version: string) => boolean;

package/dist/src/utils/safeVersions.js

@@ -11,12 +11,14 @@ var SAFE_FEATURES;
     SAFE_FEATURES["SAFE_TX_GUARDS"] = "SAFE_TX_GUARDS";
     SAFE_FEATURES["SAFE_FALLBACK_HANDLER"] = "SAFE_FALLBACK_HANDLER";
     SAFE_FEATURES["ETH_SIGN"] = "ETH_SIGN";
+    SAFE_FEATURES["ACCOUNT_ABSTRACTION"] = "ACCOUNT_ABSTRACTION";
 })(SAFE_FEATURES = exports.SAFE_FEATURES || (exports.SAFE_FEATURES = {}));
 const SAFE_FEATURES_BY_VERSION = {
     [SAFE_FEATURES.SAFE_TX_GAS_OPTIONAL]: '>=1.3.0',
     [SAFE_FEATURES.SAFE_TX_GUARDS]: '>=1.3.0',
     [SAFE_FEATURES.SAFE_FALLBACK_HANDLER]: '>=1.1.1',
-    [SAFE_FEATURES.ETH_SIGN]: '>=1.1.0'
+    [SAFE_FEATURES.ETH_SIGN]: '>=1.1.0',
+    [SAFE_FEATURES.ACCOUNT_ABSTRACTION]: '>=1.3.0'
 };
 const hasSafeFeature = (feature, version) => {
     if (!(feature in SAFE_FEATURES_BY_VERSION)) {

package/dist/src/utils/safeVersions.js.map

@@ -1 +1 @@
-{"version":3,"file":"safeVersions.js","sourceRoot":"","sources":["../../../src/utils/safeVersions.ts"],"names":[],"mappings":";;;;;;AAAA,2EAAwD;AAExD,IAAY,aAKX;AALD,WAAY,aAAa;IACvB,8DAA6C,CAAA;IAC7C,kDAAiC,CAAA;IACjC,gEAA+C,CAAA;IAC/C,sCAAqB,CAAA;AACvB,CAAC,EALW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAKxB;AAED,MAAM,wBAAwB,GAAkC;IAC9D,CAAC,aAAa,CAAC,oBAAoB,CAAC,EAAE,SAAS;IAC/C,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE,SAAS;IACzC,CAAC,aAAa,CAAC,qBAAqB,CAAC,EAAE,SAAS;IAChD,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,SAAS;CACpC,CAAA;AAEM,MAAM,cAAc,GAAG,CAAC,OAAsB,EAAE,OAAe,EAAW,EAAE;IACjF,IAAI,CAAC,CAAC,OAAO,IAAI,wBAAwB,CAAC,EAAE;QAC1C,OAAO,KAAK,CAAA;KACb;IAED,OAAO,IAAA,mBAAe,EAAC,OAAO,EAAE,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAA;AACpE,CAAC,CAAA;AANY,QAAA,cAAc,kBAM1B"}
+{"version":3,"file":"safeVersions.js","sourceRoot":"","sources":["../../../src/utils/safeVersions.ts"],"names":[],"mappings":";;;;;;AAAA,2EAAwD;AAExD,IAAY,aAMX;AAND,WAAY,aAAa;IACvB,8DAA6C,CAAA;IAC7C,kDAAiC,CAAA;IACjC,gEAA+C,CAAA;IAC/C,sCAAqB,CAAA;IACrB,4DAA2C,CAAA;AAC7C,CAAC,EANW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAMxB;AAED,MAAM,wBAAwB,GAAkC;IAC9D,CAAC,aAAa,CAAC,oBAAoB,CAAC,EAAE,SAAS;IAC/C,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE,SAAS;IACzC,CAAC,aAAa,CAAC,qBAAqB,CAAC,EAAE,SAAS;IAChD,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,SAAS;IACnC,CAAC,aAAa,CAAC,mBAAmB,CAAC,EAAE,SAAS;CAC/C,CAAA;AAEM,MAAM,cAAc,GAAG,CAAC,OAAsB,EAAE,OAAe,EAAW,EAAE;IACjF,IAAI,CAAC,CAAC,OAAO,IAAI,wBAAwB,CAAC,EAAE;QAC1C,OAAO,KAAK,CAAA;KACb;IAED,OAAO,IAAA,mBAAe,EAAC,OAAO,EAAE,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAA;AACpE,CAAC,CAAA;AANY,QAAA,cAAc,kBAM1B"}

package/dist/src/utils/signatures/SafeSignature.d.ts

@@ -1,5 +1,5 @@
 import { SafeSignature } from '@safe-global/safe-core-sdk-types';
-declare class EthSignSignature implements SafeSignature {
+export declare class EthSafeSignature implements SafeSignature {
     signer: string;
     data: string;
     /**
@@ -23,4 +23,3 @@ declare class EthSignSignature implements SafeSignature {
      */
     dynamicPart(): string;
 }
-export default EthSignSignature;

package/dist/src/utils/signatures/SafeSignature.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-class EthSignSignature {
+exports.EthSafeSignature = void 0;
+class EthSafeSignature {
     /**
      * Creates an instance of a Safe signature.
      *
@@ -29,5 +30,5 @@ class EthSignSignature {
         return '';
     }
 }
-exports.default = EthSignSignature;
+exports.EthSafeSignature = EthSafeSignature;
 //# sourceMappingURL=SafeSignature.js.map

package/dist/src/utils/signatures/SafeSignature.js.map

@@ -1 +1 @@
-{"version":3,"file":"SafeSignature.js","sourceRoot":"","sources":["../../../../src/utils/signatures/SafeSignature.ts"],"names":[],"mappings":";;AAEA,MAAM,gBAAgB;IAIpB;;;;;;OAMG;IACH,YAAY,MAAc,EAAE,SAAiB;QAC3C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,SAAS,CAAA;IACvB,CAAC;IAED;;;;OAIG;IACH,UAAU,EAAC,2BAA2B;QACpC,OAAO,IAAI,CAAC,IAAI,CAAA;IAClB,CAAC;IAED;;;;OAIG;IACH,WAAW;QACT,OAAO,EAAE,CAAA;IACX,CAAC;CACF;AAED,kBAAe,gBAAgB,CAAA"}
+{"version":3,"file":"SafeSignature.js","sourceRoot":"","sources":["../../../../src/utils/signatures/SafeSignature.ts"],"names":[],"mappings":";;;AAEA,MAAa,gBAAgB;IAI3B;;;;;;OAMG;IACH,YAAY,MAAc,EAAE,SAAiB;QAC3C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,SAAS,CAAA;IACvB,CAAC;IAED;;;;OAIG;IACH,UAAU,EAAC,2BAA2B;QACpC,OAAO,IAAI,CAAC,IAAI,CAAA;IAClB,CAAC;IAED;;;;OAIG;IACH,WAAW;QACT,OAAO,EAAE,CAAA;IACX,CAAC;CACF;AAjCD,4CAiCC"}

package/dist/src/utils/signatures/index.d.ts

@@ -1,12 +1,2 @@
-import { EthAdapter, SafeSignature, SafeTransactionEIP712Args } from '@safe-global/safe-core-sdk-types';
-import EthSignSignature from './SafeSignature';
-export declare function generatePreValidatedSignature(ownerAddress: string): SafeSignature;
-export declare function isTxHashSignedWithPrefix(txHash: string, signature: string, ownerAddress: string): boolean;
-type AdjustVOverload = {
-    (signingMethod: 'eth_signTypedData', signature: string): string;
-    (signingMethod: 'eth_sign', signature: string, safeTxHash: string, sender: string): string;
-};
-export declare const adjustVInSignature: AdjustVOverload;
-export declare function generateSignature(ethAdapter: EthAdapter, hash: string): Promise<EthSignSignature>;
-export declare function generateEIP712Signature(ethAdapter: EthAdapter, safeTransactionEIP712Args: SafeTransactionEIP712Args, methodVersion?: 'v3' | 'v4'): Promise<EthSignSignature>;
-export {};
+export * from './SafeSignature';
+export * from './utils';

package/dist/src/utils/signatures/index.js

@@ -1,94 +1,19 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateEIP712Signature = exports.generateSignature = exports.adjustVInSignature = exports.isTxHashSignedWithPrefix = exports.generatePreValidatedSignature = void 0;
-const ethereumjs_util_1 = require("ethereumjs-util");
-const address_1 = require("../address");
-const SafeSignature_1 = __importDefault(require("./SafeSignature"));
-function generatePreValidatedSignature(ownerAddress) {
-    const signature = '0x000000000000000000000000' +
-        ownerAddress.slice(2) +
-        '0000000000000000000000000000000000000000000000000000000000000000' +
-        '01';
-    return new SafeSignature_1.default(ownerAddress, signature);
-}
-exports.generatePreValidatedSignature = generatePreValidatedSignature;
-function isTxHashSignedWithPrefix(txHash, signature, ownerAddress) {
-    let hasPrefix;
-    try {
-        const rsvSig = {
-            r: Buffer.from(signature.slice(2, 66), 'hex'),
-            s: Buffer.from(signature.slice(66, 130), 'hex'),
-            v: parseInt(signature.slice(130, 132), 16)
-        };
-        const recoveredData = (0, ethereumjs_util_1.ecrecover)(Buffer.from(txHash.slice(2), 'hex'), rsvSig.v, rsvSig.r, rsvSig.s);
-        const recoveredAddress = (0, ethereumjs_util_1.bufferToHex)((0, ethereumjs_util_1.pubToAddress)(recoveredData));
-        hasPrefix = !(0, address_1.sameString)(recoveredAddress, ownerAddress);
-    }
-    catch (e) {
-        hasPrefix = true;
-    }
-    return hasPrefix;
-}
-exports.isTxHashSignedWithPrefix = isTxHashSignedWithPrefix;
-const adjustVInSignature = (signingMethod, signature, safeTxHash, signerAddress) => {
-    const ETHEREUM_V_VALUES = [0, 1, 27, 28];
-    const MIN_VALID_V_VALUE_FOR_SAFE_ECDSA = 27;
-    let signatureV = parseInt(signature.slice(-2), 16);
-    if (!ETHEREUM_V_VALUES.includes(signatureV)) {
-        throw new Error('Invalid signature');
-    }
-    if (signingMethod === 'eth_sign') {
-        /*
-          The Safe's expected V value for ECDSA signature is:
-          - 27 or 28
-          - 31 or 32 if the message was signed with a EIP-191 prefix. Should be calculated as ECDSA V value + 4
-          Some wallets do that, some wallets don't, V > 30 is used by contracts to differentiate between
-          prefixed and non-prefixed messages. The only way to know if the message was signed with a
-          prefix is to check if the signer address is the same as the recovered address.
-    
-          More info:
-          https://docs.safe.global/learn/signatures
-        */
-        if (signatureV < MIN_VALID_V_VALUE_FOR_SAFE_ECDSA) {
-            signatureV += MIN_VALID_V_VALUE_FOR_SAFE_ECDSA;
-        }
-        const adjustedSignature = signature.slice(0, -2) + signatureV.toString(16);
-        const signatureHasPrefix = isTxHashSignedWithPrefix(safeTxHash, adjustedSignature, signerAddress);
-        if (signatureHasPrefix) {
-            signatureV += 4;
-        }
+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]; } };
     }
-    if (signingMethod === 'eth_signTypedData') {
-        // Metamask with ledger returns V=0/1 here too, we need to adjust it to be ethereum's valid value (27 or 28)
-        if (signatureV < MIN_VALID_V_VALUE_FOR_SAFE_ECDSA) {
-            signatureV += MIN_VALID_V_VALUE_FOR_SAFE_ECDSA;
-        }
-    }
-    signature = signature.slice(0, -2) + signatureV.toString(16);
-    return signature;
+    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);
 };
-exports.adjustVInSignature = adjustVInSignature;
-async function generateSignature(ethAdapter, hash) {
-    const signerAddress = await ethAdapter.getSignerAddress();
-    if (!signerAddress) {
-        throw new Error('EthAdapter must be initialized with a signer to use this method');
-    }
-    let signature = await ethAdapter.signMessage(hash);
-    signature = (0, exports.adjustVInSignature)('eth_sign', signature, hash, signerAddress);
-    return new SafeSignature_1.default(signerAddress, signature);
-}
-exports.generateSignature = generateSignature;
-async function generateEIP712Signature(ethAdapter, safeTransactionEIP712Args, methodVersion) {
-    const signerAddress = await ethAdapter.getSignerAddress();
-    if (!signerAddress) {
-        throw new Error('EthAdapter must be initialized with a signer to use this method');
-    }
-    let signature = await ethAdapter.signTypedData(safeTransactionEIP712Args, methodVersion);
-    signature = (0, exports.adjustVInSignature)('eth_signTypedData', signature);
-    return new SafeSignature_1.default(signerAddress, signature);
-}
-exports.generateEIP712Signature = generateEIP712Signature;
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./SafeSignature"), exports);
+__exportStar(require("./utils"), exports);
 //# sourceMappingURL=index.js.map

package/dist/src/utils/signatures/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utils/signatures/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utils/signatures/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAA+B;AAC/B,0CAAuB"}

package/dist/src/utils/signatures/utils.d.ts

@@ -0,0 +1,11 @@
+import { EthAdapter, SafeSignature, SafeTransactionEIP712Args } from '@safe-global/safe-core-sdk-types';
+export declare function generatePreValidatedSignature(ownerAddress: string): SafeSignature;
+export declare function isTxHashSignedWithPrefix(txHash: string, signature: string, ownerAddress: string): boolean;
+type AdjustVOverload = {
+    (signingMethod: 'eth_signTypedData', signature: string): string;
+    (signingMethod: 'eth_sign', signature: string, safeTxHash: string, sender: string): string;
+};
+export declare const adjustVInSignature: AdjustVOverload;
+export declare function generateSignature(ethAdapter: EthAdapter, hash: string): Promise<SafeSignature>;
+export declare function generateEIP712Signature(ethAdapter: EthAdapter, safeTransactionEIP712Args: SafeTransactionEIP712Args, methodVersion?: 'v3' | 'v4'): Promise<SafeSignature>;
+export {};

package/dist/src/utils/signatures/utils.js

@@ -0,0 +1,91 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateEIP712Signature = exports.generateSignature = exports.adjustVInSignature = exports.isTxHashSignedWithPrefix = exports.generatePreValidatedSignature = void 0;
+const ethereumjs_util_1 = require("ethereumjs-util");
+const address_1 = require("../address");
+const SafeSignature_1 = require("./SafeSignature");
+function generatePreValidatedSignature(ownerAddress) {
+    const signature = '0x000000000000000000000000' +
+        ownerAddress.slice(2) +
+        '0000000000000000000000000000000000000000000000000000000000000000' +
+        '01';
+    return new SafeSignature_1.EthSafeSignature(ownerAddress, signature);
+}
+exports.generatePreValidatedSignature = generatePreValidatedSignature;
+function isTxHashSignedWithPrefix(txHash, signature, ownerAddress) {
+    let hasPrefix;
+    try {
+        const rsvSig = {
+            r: Buffer.from(signature.slice(2, 66), 'hex'),
+            s: Buffer.from(signature.slice(66, 130), 'hex'),
+            v: parseInt(signature.slice(130, 132), 16)
+        };
+        const recoveredData = (0, ethereumjs_util_1.ecrecover)(Buffer.from(txHash.slice(2), 'hex'), rsvSig.v, rsvSig.r, rsvSig.s);
+        const recoveredAddress = (0, ethereumjs_util_1.bufferToHex)((0, ethereumjs_util_1.pubToAddress)(recoveredData));
+        hasPrefix = !(0, address_1.sameString)(recoveredAddress, ownerAddress);
+    }
+    catch (e) {
+        hasPrefix = true;
+    }
+    return hasPrefix;
+}
+exports.isTxHashSignedWithPrefix = isTxHashSignedWithPrefix;
+const adjustVInSignature = (signingMethod, signature, safeTxHash, signerAddress) => {
+    const ETHEREUM_V_VALUES = [0, 1, 27, 28];
+    const MIN_VALID_V_VALUE_FOR_SAFE_ECDSA = 27;
+    let signatureV = parseInt(signature.slice(-2), 16);
+    if (!ETHEREUM_V_VALUES.includes(signatureV)) {
+        throw new Error('Invalid signature');
+    }
+    if (signingMethod === 'eth_sign') {
+        /*
+          The Safe's expected V value for ECDSA signature is:
+          - 27 or 28
+          - 31 or 32 if the message was signed with a EIP-191 prefix. Should be calculated as ECDSA V value + 4
+          Some wallets do that, some wallets don't, V > 30 is used by contracts to differentiate between
+          prefixed and non-prefixed messages. The only way to know if the message was signed with a
+          prefix is to check if the signer address is the same as the recovered address.
+    
+          More info:
+          https://docs.safe.global/learn/signatures
+        */
+        if (signatureV < MIN_VALID_V_VALUE_FOR_SAFE_ECDSA) {
+            signatureV += MIN_VALID_V_VALUE_FOR_SAFE_ECDSA;
+        }
+        const adjustedSignature = signature.slice(0, -2) + signatureV.toString(16);
+        const signatureHasPrefix = isTxHashSignedWithPrefix(safeTxHash, adjustedSignature, signerAddress);
+        if (signatureHasPrefix) {
+            signatureV += 4;
+        }
+    }
+    if (signingMethod === 'eth_signTypedData') {
+        // Metamask with ledger returns V=0/1 here too, we need to adjust it to be ethereum's valid value (27 or 28)
+        if (signatureV < MIN_VALID_V_VALUE_FOR_SAFE_ECDSA) {
+            signatureV += MIN_VALID_V_VALUE_FOR_SAFE_ECDSA;
+        }
+    }
+    signature = signature.slice(0, -2) + signatureV.toString(16);
+    return signature;
+};
+exports.adjustVInSignature = adjustVInSignature;
+async function generateSignature(ethAdapter, hash) {
+    const signerAddress = await ethAdapter.getSignerAddress();
+    if (!signerAddress) {
+        throw new Error('EthAdapter must be initialized with a signer to use this method');
+    }
+    let signature = await ethAdapter.signMessage(hash);
+    signature = (0, exports.adjustVInSignature)('eth_sign', signature, hash, signerAddress);
+    return new SafeSignature_1.EthSafeSignature(signerAddress, signature);
+}
+exports.generateSignature = generateSignature;
+async function generateEIP712Signature(ethAdapter, safeTransactionEIP712Args, methodVersion) {
+    const signerAddress = await ethAdapter.getSignerAddress();
+    if (!signerAddress) {
+        throw new Error('EthAdapter must be initialized with a signer to use this method');
+    }
+    let signature = await ethAdapter.signTypedData(safeTransactionEIP712Args, methodVersion);
+    signature = (0, exports.adjustVInSignature)('eth_signTypedData', signature);
+    return new SafeSignature_1.EthSafeSignature(signerAddress, signature);
+}
+exports.generateEIP712Signature = generateEIP712Signature;
+//# sourceMappingURL=utils.js.map

package/dist/src/utils/signatures/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/utils/signatures/utils.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/transactions/gas.d.ts

@@ -1,2 +1,2 @@
 import { EthAdapter, GnosisSafeContract, OperationType } from '@safe-global/safe-core-sdk-types';
-export declare function estimateTxGas(safeContract: GnosisSafeContract, ethAdapter: EthAdapter, to: string, valueInWei: string, data: string, operation: OperationType): Promise<number>;
+export declare function estimateTxGas(safeContract: GnosisSafeContract, ethAdapter: EthAdapter, to: string, valueInWei: string, data: string, operation: OperationType): Promise<string>;

package/dist/src/utils/transactions/gas.js

@@ -16,7 +16,7 @@ function estimateDataGasCosts(data) {
     return data.match(/.{2}/g).reduce(reducer, 0);
 }
 async function estimateTxGas(safeContract, ethAdapter, to, valueInWei, data, operation) {
-    let txGasEstimation = 0;
+    let txGasEstimation = bignumber_1.BigNumber.from(0);
     const safeAddress = safeContract.getAddress();
     const estimateData = safeContract.encode('requiredTxGas', [
         to,
@@ -25,15 +25,15 @@ async function estimateTxGas(safeContract, ethAdapter, to, valueInWei, data, ope
         operation
     ]);
     try {
-        const estimateResponse = (await ethAdapter.estimateGas({
+        const estimateResponse = await ethAdapter.estimateGas({
             to: safeAddress,
             from: safeAddress,
             data: estimateData
-        })).toString();
-        txGasEstimation = bignumber_1.BigNumber.from('0x' + estimateResponse.substring(138)).toNumber() + 10000;
+        });
+        txGasEstimation = bignumber_1.BigNumber.from('0x' + estimateResponse.substring(138)).add(10000);
     }
     catch (error) { }
-    if (txGasEstimation > 0) {
+    if (txGasEstimation.gt(0)) {
         const dataGasEstimation = estimateDataGasCosts(estimateData);
         let additionalGas = 10000;
         for (let i = 0; i < 10; i++) {
@@ -42,18 +42,18 @@ async function estimateTxGas(safeContract, ethAdapter, to, valueInWei, data, ope
                     to: safeAddress,
                     from: safeAddress,
                     data: estimateData,
-                    gasPrice: 0,
-                    gasLimit: txGasEstimation + dataGasEstimation + additionalGas
+                    gasPrice: '0',
+                    gasLimit: txGasEstimation.add(dataGasEstimation).add(additionalGas).toString()
                 });
                 if (estimateResponse !== '0x') {
                     break;
                 }
             }
             catch (error) { }
-            txGasEstimation += additionalGas;
+            txGasEstimation = txGasEstimation.add(additionalGas);
             additionalGas *= 2;
         }
-        return txGasEstimation + additionalGas;
+        return txGasEstimation.add(additionalGas).toString();
     }
     try {
         const estimateGas = await ethAdapter.estimateGas({
@@ -66,7 +66,7 @@ async function estimateTxGas(safeContract, ethAdapter, to, valueInWei, data, ope
     }
     catch (error) {
         if (operation === safe_core_sdk_types_1.OperationType.DelegateCall) {
-            return 0;
+            return '0';
         }
         return Promise.reject(error);
     }

package/dist/src/utils/transactions/gas.js.map

@@ -1 +1 @@
-{"version":3,"file":"gas.js","sourceRoot":"","sources":["../../../../src/utils/transactions/gas.ts"],"names":[],"mappings":";;;AAAA,wDAAoD;AACpD,0EAAgG;AAEhG,SAAS,oBAAoB,CAAC,IAAY;IACxC,MAAM,OAAO,GAAG,CAAC,WAAmB,EAAE,YAAoB,EAAE,EAAE;QAC5D,IAAI,YAAY,KAAK,IAAI,EAAE;YACzB,OAAO,WAAW,GAAG,CAAC,CAAA;SACvB;QACD,IAAI,YAAY,KAAK,IAAI,EAAE;YACzB,OAAO,WAAW,GAAG,CAAC,CAAA;SACvB;QACD,OAAO,WAAW,GAAG,EAAE,CAAA;IACzB,CAAC,CAAA;IACD,OAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAc,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;AAC7D,CAAC;AAEM,KAAK,UAAU,aAAa,CACjC,YAAgC,EAChC,UAAsB,EACtB,EAAU,EACV,UAAkB,EAClB,IAAY,EACZ,SAAwB;IAExB,IAAI,eAAe,GAAG,CAAC,CAAA;IACvB,MAAM,WAAW,GAAG,YAAY,CAAC,UAAU,EAAE,CAAA;IAE7C,MAAM,YAAY,GAAW,YAAY,CAAC,MAAM,CAAC,eAAe,EAAE;QAChE,EAAE;QACF,UAAU;QACV,IAAI;QACJ,SAAS;KACV,CAAC,CAAA;IACF,IAAI;QACF,MAAM,gBAAgB,GAAG,CACvB,MAAM,UAAU,CAAC,WAAW,CAAC;YAC3B,EAAE,EAAE,WAAW;YACf,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,YAAY;SACnB,CAAC,CACH,CAAC,QAAQ,EAAE,CAAA;QACZ,eAAe,GAAG,qBAAS,CAAC,IAAI,CAAC,IAAI,GAAG,gBAAgB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,GAAG,KAAK,CAAA;KAC5F;IAAC,OAAO,KAAK,EAAE,GAAE;IAElB,IAAI,eAAe,GAAG,CAAC,EAAE;QACvB,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,YAAY,CAAC,CAAA;QAC5D,IAAI,aAAa,GAAG,KAAK,CAAA;QACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE;YAC3B,IAAI;gBACF,MAAM,gBAAgB,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC;oBAC7C,EAAE,EAAE,WAAW;oBACf,IAAI,EAAE,WAAW;oBACjB,IAAI,EAAE,YAAY;oBAClB,QAAQ,EAAE,CAAC;oBACX,QAAQ,EAAE,eAAe,GAAG,iBAAiB,GAAG,aAAa;iBAC9D,CAAC,CAAA;gBACF,IAAI,gBAAgB,KAAK,IAAI,EAAE;oBAC7B,MAAK;iBACN;aACF;YAAC,OAAO,KAAK,EAAE,GAAE;YAClB,eAAe,IAAI,aAAa,CAAA;YAChC,aAAa,IAAI,CAAC,CAAA;SACnB;QACD,OAAO,eAAe,GAAG,aAAa,CAAA;KACvC;IAED,IAAI;QACF,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC;YAC/C,EAAE;YACF,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE,UAAU;YACjB,IAAI;SACL,CAAC,CAAA;QACF,OAAO,WAAW,CAAA;KACnB;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,SAAS,KAAK,mCAAa,CAAC,YAAY,EAAE;YAC5C,OAAO,CAAC,CAAA;SACT;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;KAC7B;AACH,CAAC;AAhED,sCAgEC"}
+{"version":3,"file":"gas.js","sourceRoot":"","sources":["../../../../src/utils/transactions/gas.ts"],"names":[],"mappings":";;;AAAA,wDAAoD;AACpD,0EAAgG;AAEhG,SAAS,oBAAoB,CAAC,IAAY;IACxC,MAAM,OAAO,GAAG,CAAC,WAAmB,EAAE,YAAoB,EAAE,EAAE;QAC5D,IAAI,YAAY,KAAK,IAAI,EAAE;YACzB,OAAO,WAAW,GAAG,CAAC,CAAA;SACvB;QACD,IAAI,YAAY,KAAK,IAAI,EAAE;YACzB,OAAO,WAAW,GAAG,CAAC,CAAA;SACvB;QACD,OAAO,WAAW,GAAG,EAAE,CAAA;IACzB,CAAC,CAAA;IACD,OAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAc,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;AAC7D,CAAC;AAEM,KAAK,UAAU,aAAa,CACjC,YAAgC,EAChC,UAAsB,EACtB,EAAU,EACV,UAAkB,EAClB,IAAY,EACZ,SAAwB;IAExB,IAAI,eAAe,GAAG,qBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACvC,MAAM,WAAW,GAAG,YAAY,CAAC,UAAU,EAAE,CAAA;IAE7C,MAAM,YAAY,GAAW,YAAY,CAAC,MAAM,CAAC,eAAe,EAAE;QAChE,EAAE;QACF,UAAU;QACV,IAAI;QACJ,SAAS;KACV,CAAC,CAAA;IACF,IAAI;QACF,MAAM,gBAAgB,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC;YACpD,EAAE,EAAE,WAAW;YACf,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,YAAY;SACnB,CAAC,CAAA;QACF,eAAe,GAAG,qBAAS,CAAC,IAAI,CAAC,IAAI,GAAG,gBAAgB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;KACpF;IAAC,OAAO,KAAK,EAAE,GAAE;IAElB,IAAI,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;QACzB,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,YAAY,CAAC,CAAA;QAC5D,IAAI,aAAa,GAAG,KAAK,CAAA;QACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE;YAC3B,IAAI;gBACF,MAAM,gBAAgB,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC;oBAC7C,EAAE,EAAE,WAAW;oBACf,IAAI,EAAE,WAAW;oBACjB,IAAI,EAAE,YAAY;oBAClB,QAAQ,EAAE,GAAG;oBACb,QAAQ,EAAE,eAAe,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE;iBAC/E,CAAC,CAAA;gBACF,IAAI,gBAAgB,KAAK,IAAI,EAAE;oBAC7B,MAAK;iBACN;aACF;YAAC,OAAO,KAAK,EAAE,GAAE;YAClB,eAAe,GAAG,eAAe,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;YACpD,aAAa,IAAI,CAAC,CAAA;SACnB;QACD,OAAO,eAAe,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAA;KACrD;IAED,IAAI;QACF,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC;YAC/C,EAAE;YACF,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE,UAAU;YACjB,IAAI;SACL,CAAC,CAAA;QACF,OAAO,WAAW,CAAA;KACnB;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,SAAS,KAAK,mCAAa,CAAC,YAAY,EAAE;YAC5C,OAAO,GAAG,CAAA;SACX;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;KAC7B;AACH,CAAC;AA9DD,sCA8DC"}

package/dist/src/utils/transactions/utils.d.ts

@@ -1,6 +1,7 @@
-import { EthAdapter, GnosisSafeContract, MetaTransactionData, SafeMultisigTransactionResponse, SafeTransaction, SafeTransactionData, SafeTransactionDataPartial } from '@safe-global/safe-core-sdk-types';
+import { StandardizeSafeTransactionDataProps } from '../../types';
+import { MetaTransactionData, SafeMultisigTransactionResponse, SafeTransaction, SafeTransactionData, SafeTransactionDataPartial } from '@safe-global/safe-core-sdk-types';
 export declare function standardizeMetaTransactionData(tx: SafeTransactionDataPartial): MetaTransactionData;
-export declare function standardizeSafeTransactionData(safeContract: GnosisSafeContract, ethAdapter: EthAdapter, tx: SafeTransactionDataPartial): Promise<SafeTransactionData>;
+export declare function standardizeSafeTransactionData({ safeContract, predictedSafe, ethAdapter, tx }: StandardizeSafeTransactionDataProps): Promise<SafeTransactionData>;
 export declare function encodeMultiSendData(txs: MetaTransactionData[]): string;
 export declare function decodeMultiSendData(encodedData: string): MetaTransactionData[];
 export declare function isMetaTransactionArray(safeTransactions: SafeTransactionDataPartial | MetaTransactionData[]): safeTransactions is MetaTransactionData[];

package/dist/src/utils/transactions/utils.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isSafeMultisigTransactionResponse = exports.isMetaTransactionArray = exports.decodeMultiSendData = exports.encodeMultiSendData = exports.standardizeSafeTransactionData = exports.standardizeMetaTransactionData = void 0;
+const abi_1 = require("@ethersproject/abi");
 const bytes_1 = require("@ethersproject/bytes");
 const solidity_1 = require("@ethersproject/solidity");
-const abi_1 = require("@ethersproject/abi");
-const web3_utils_1 = require("web3-utils");
-const safe_core_sdk_types_1 = require("@safe-global/safe-core-sdk-types");
 const utils_1 = require("../../utils");
 const constants_1 = require("../../utils/constants");
+const safe_core_sdk_types_1 = require("@safe-global/safe-core-sdk-types");
+const web3_utils_1 = require("web3-utils");
 const gas_1 = require("./gas");
 function standardizeMetaTransactionData(tx) {
     var _a;
@@ -18,34 +18,47 @@ function standardizeMetaTransactionData(tx) {
     return standardizedTxs;
 }
 exports.standardizeMetaTransactionData = standardizeMetaTransactionData;
-async function standardizeSafeTransactionData(safeContract, ethAdapter, tx) {
-    var _a, _b, _c, _d;
+async function standardizeSafeTransactionData({ safeContract, predictedSafe, ethAdapter, tx }) {
+    var _a, _b, _c, _d, _e;
     const standardizedTxs = {
         to: tx.to,
         value: tx.value,
         data: tx.data,
         operation: (_a = tx.operation) !== null && _a !== void 0 ? _a : safe_core_sdk_types_1.OperationType.Call,
-        baseGas: (_b = tx.baseGas) !== null && _b !== void 0 ? _b : 0,
-        gasPrice: (_c = tx.gasPrice) !== null && _c !== void 0 ? _c : 0,
+        baseGas: (_b = tx.baseGas) !== null && _b !== void 0 ? _b : '0',
+        gasPrice: (_c = tx.gasPrice) !== null && _c !== void 0 ? _c : '0',
         gasToken: tx.gasToken || constants_1.ZERO_ADDRESS,
         refundReceiver: tx.refundReceiver || constants_1.ZERO_ADDRESS,
-        nonce: (_d = tx.nonce) !== null && _d !== void 0 ? _d : (await safeContract.getNonce())
+        nonce: (_d = tx.nonce) !== null && _d !== void 0 ? _d : (safeContract ? await safeContract.getNonce() : 0)
     };
-    let safeTxGas;
     if (typeof tx.safeTxGas !== 'undefined') {
         return {
             ...standardizedTxs,
             safeTxGas: tx.safeTxGas
         };
     }
-    const safeVersion = await safeContract.getVersion();
-    if ((0, utils_1.hasSafeFeature)(utils_1.SAFE_FEATURES.SAFE_TX_GAS_OPTIONAL, safeVersion) &&
-        standardizedTxs.gasPrice === 0) {
-        safeTxGas = 0;
+    let safeVersion;
+    if ((_e = predictedSafe === null || predictedSafe === void 0 ? void 0 : predictedSafe.safeDeploymentConfig) === null || _e === void 0 ? void 0 : _e.safeVersion) {
+        safeVersion = predictedSafe === null || predictedSafe === void 0 ? void 0 : predictedSafe.safeDeploymentConfig.safeVersion;
     }
     else {
-        safeTxGas = await (0, gas_1.estimateTxGas)(safeContract, ethAdapter, standardizedTxs.to, standardizedTxs.value, standardizedTxs.data, standardizedTxs.operation);
+        if (!safeContract) {
+            throw new Error('Safe is not deployed');
+        }
+        safeVersion = await safeContract.getVersion();
+    }
+    const hasSafeTxGasOptional = (0, utils_1.hasSafeFeature)(utils_1.SAFE_FEATURES.SAFE_TX_GAS_OPTIONAL, safeVersion);
+    if ((hasSafeTxGasOptional && standardizedTxs.gasPrice === '0') ||
+        (hasSafeTxGasOptional && predictedSafe)) {
+        return {
+            ...standardizedTxs,
+            safeTxGas: '0'
+        };
+    }
+    if (!safeContract) {
+        throw new Error('Safe is not deployed');
     }
+    const safeTxGas = await (0, gas_1.estimateTxGas)(safeContract, ethAdapter, standardizedTxs.to, standardizedTxs.value, standardizedTxs.data, standardizedTxs.operation);
     return {
         ...standardizedTxs,
         safeTxGas

package/dist/src/utils/transactions/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/utils/transactions/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/utils/transactions/utils.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/types.d.ts

@@ -0,0 +1,2 @@
+import { SafeConfig, SafeConfigWithPredictedSafe } from '../types';
+export declare function isSafeConfigWithPredictedSafe(config: SafeConfig): config is SafeConfigWithPredictedSafe;

package/dist/src/utils/types.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isSafeConfigWithPredictedSafe = void 0;
+function isSafeConfigWithPredictedSafe(config) {
+    return config.predictedSafe !== undefined;
+}
+exports.isSafeConfigWithPredictedSafe = isSafeConfigWithPredictedSafe;
+//# sourceMappingURL=types.js.map

package/dist/src/utils/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/utils/types.ts"],"names":[],"mappings":";;;AAEA,SAAgB,6BAA6B,CAC3C,MAAkB;IAElB,OAAQ,MAAiD,CAAC,aAAa,KAAK,SAAS,CAAA;AACvF,CAAC;AAJD,sEAIC"}