starknet 3.8.0 → 3.10.1

package/dist/contract/contractFactory.d.ts

@@ -1,13 +1,13 @@
-import { Account } from '../account';
-import { Provider } from '../provider';
+import { AccountInterface } from '../account';
+import { ProviderInterface } from '../provider';
 import { Abi, CompiledContract, RawCalldata } from '../types';
 import { BigNumberish } from '../utils/number';
 import { Contract } from './default';
 export declare class ContractFactory {
     abi: Abi;
     compiledContract: CompiledContract;
-    providerOrAccount: Provider | Account;
-    constructor(compiledContract: CompiledContract, providerOrAccount?: Provider | Account, abi?: Abi);
+    providerOrAccount: ProviderInterface | AccountInterface;
+    constructor(compiledContract: CompiledContract, providerOrAccount?: ProviderInterface | AccountInterface, abi?: Abi);
     /**
      * Deploys contract and returns new instance of the Contract
      *
@@ -21,7 +21,7 @@ export declare class ContractFactory {
      *
      * @param providerOrAccount - new Provider or Account to attach to
      */
-    connect(providerOrAccount: Provider | Account): ContractFactory;
+    connect(providerOrAccount: ProviderInterface | AccountInterface): ContractFactory;
     /**
      * Attaches current abi and provider or account to the new address
      *

package/dist/contract/default.js

@@ -116,8 +116,20 @@ function buildInvoke(contract, functionAbi) {
             args[_i] = arguments[_i];
         }
         return __awaiter(this, void 0, void 0, function () {
+            var inputs, inputsLength, options;
             return __generator(this, function (_a) {
-                return [2 /*return*/, contract.invoke(functionAbi.name, args)];
+                inputs = functionAbi.inputs;
+                inputsLength = inputs.reduce(function (acc, input) {
+                    if (!/_len$/.test(input.name)) {
+                        return acc + 1;
+                    }
+                    return acc;
+                }, 0);
+                options = {};
+                if (inputsLength + 1 === args.length && typeof args[args.length - 1] === 'object') {
+                    Object.assign(options, args.pop());
+                }
+                return [2 /*return*/, contract.invoke(functionAbi.name, args, options)];
             });
         });
     };
@@ -371,7 +383,7 @@ var Contract = /** @class */ (function () {
             if (member.type === 'felt') {
                 return acc + 1;
             }
-            return acc + _this.structMemberNum(member.type);
+            return acc + _this.calculateStructMembers(member.type);
         }, 0);
     };
     /**

package/dist/index.d.ts

@@ -14,6 +14,7 @@ export * as encode from './utils/encode';
 export * as hash from './utils/hash';
 export * as json from './utils/json';
 export * as number from './utils/number';
+export * as transaction from './utils/transaction';
 export * as stark from './utils/stark';
 export * as ec from './utils/ellipticCurve';
 export * as uint256 from './utils/uint256';

package/dist/index.js

@@ -22,7 +22,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.typedData = exports.shortString = exports.uint256 = exports.ec = exports.stark = exports.number = exports.json = exports.hash = exports.encode = exports.constants = void 0;
+exports.typedData = exports.shortString = exports.uint256 = exports.ec = exports.stark = exports.transaction = exports.number = exports.json = exports.hash = exports.encode = exports.constants = void 0;
 /**
  * Main
  */
@@ -39,6 +39,7 @@ exports.encode = __importStar(require("./utils/encode"));
 exports.hash = __importStar(require("./utils/hash"));
 exports.json = __importStar(require("./utils/json"));
 exports.number = __importStar(require("./utils/number"));
+exports.transaction = __importStar(require("./utils/transaction"));
 exports.stark = __importStar(require("./utils/stark"));
 exports.ec = __importStar(require("./utils/ellipticCurve"));
 exports.uint256 = __importStar(require("./utils/uint256"));

package/dist/provider/default.d.ts

@@ -1,3 +1,4 @@
+import { StarknetChainId } from '../constants';
 import { Abi, AddTransactionResponse, Call, CallContractResponse, DeployContractPayload, Endpoints, GetBlockResponse, GetCodeResponse, GetContractAddressesResponse, GetTransactionResponse, GetTransactionStatusResponse, GetTransactionTraceResponse, Invocation, TransactionReceipt } from '../types';
 import { BigNumberish } from '../utils/number';
 import { ProviderInterface } from './interface';
@@ -12,8 +13,10 @@ export declare class Provider implements ProviderInterface {
     baseUrl: string;
     feederGatewayUrl: string;
     gatewayUrl: string;
-    constructor(optionsOrProvider?: ProviderOptions | Provider);
+    chainId: StarknetChainId;
+    constructor(optionsOrProvider?: ProviderOptions | ProviderInterface);
     protected static getNetworkFromName(name: NetworkName): "https://alpha-mainnet.starknet.io" | "https://alpha4.starknet.io";
+    protected static getChainIdFromBaseUrl(baseUrl: string): StarknetChainId;
     private getFetchUrl;
     private getFetchMethod;
     private getQueryString;

package/dist/provider/default.js

@@ -69,10 +69,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Provider = void 0;
 var axios_1 = __importDefault(require("axios"));
 var url_join_1 = __importDefault(require("url-join"));
+var constants_1 = require("../constants");
 var hash_1 = require("../utils/hash");
 var json_1 = require("../utils/json");
 var number_1 = require("../utils/number");
 var stark_1 = require("../utils/stark");
+var interface_1 = require("./interface");
 var utils_1 = require("./utils");
 function wait(delay) {
     return new Promise(function (res) { return setTimeout(res, delay); });
@@ -89,16 +91,20 @@ function isEmptyQueryObject(obj) {
 var Provider = /** @class */ (function () {
     function Provider(optionsOrProvider) {
         if (optionsOrProvider === void 0) { optionsOrProvider = { network: 'goerli-alpha' }; }
-        if (optionsOrProvider instanceof Provider) {
+        var _a;
+        if (optionsOrProvider instanceof interface_1.ProviderInterface) {
             this.baseUrl = optionsOrProvider.baseUrl;
             this.feederGatewayUrl = optionsOrProvider.feederGatewayUrl;
             this.gatewayUrl = optionsOrProvider.gatewayUrl;
+            this.chainId =
+                (_a = optionsOrProvider.chainId) !== null && _a !== void 0 ? _a : Provider.getChainIdFromBaseUrl(optionsOrProvider.baseUrl);
         }
         else {
             var baseUrl = 'baseUrl' in optionsOrProvider
                 ? optionsOrProvider.baseUrl
                 : Provider.getNetworkFromName(optionsOrProvider.network);
             this.baseUrl = baseUrl;
+            this.chainId = Provider.getChainIdFromBaseUrl(baseUrl);
             this.feederGatewayUrl = (0, url_join_1.default)(baseUrl, 'feeder_gateway');
             this.gatewayUrl = (0, url_join_1.default)(baseUrl, 'gateway');
         }
@@ -112,6 +118,19 @@ var Provider = /** @class */ (function () {
                 return 'https://alpha4.starknet.io';
         }
     };
+    Provider.getChainIdFromBaseUrl = function (baseUrl) {
+        try {
+            var url = new URL(baseUrl);
+            if (url.host.includes('mainnet.starknet.io')) {
+                return constants_1.StarknetChainId.MAINNET;
+            }
+        }
+        catch (_a) {
+            // eslint-disable-next-line no-console
+            console.error("Could not parse baseUrl: " + baseUrl);
+        }
+        return constants_1.StarknetChainId.TESTNET;
+    };
     Provider.prototype.getFetchUrl = function (endpoint) {
         var gatewayUrlEndpoints = ['add_transaction'];
         return gatewayUrlEndpoints.includes(endpoint) ? this.gatewayUrl : this.feederGatewayUrl;

package/dist/provider/interface.d.ts

@@ -1,3 +1,4 @@
+import { StarknetChainId } from '../constants';
 import type { AddTransactionResponse, Call, CallContractResponse, DeployContractPayload, GetBlockResponse, GetCodeResponse, GetContractAddressesResponse, GetTransactionResponse, GetTransactionStatusResponse, Invocation, TransactionReceipt } from '../types';
 import type { BigNumberish } from '../utils/number';
 import { BlockIdentifier } from './utils';
@@ -5,6 +6,7 @@ export declare abstract class ProviderInterface {
     abstract baseUrl: string;
     abstract feederGatewayUrl: string;
     abstract gatewayUrl: string;
+    abstract chainId: StarknetChainId;
     /**
      * Gets the smart contract address on the goerli testnet.
      *

package/dist/signer/default.js

@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Signer = void 0;
 var ellipticCurve_1 = require("../utils/ellipticCurve");
 var hash_1 = require("../utils/hash");
+var transaction_1 = require("../utils/transaction");
 var typedData_1 = require("../utils/typedData");
 var Signer = /** @class */ (function () {
     function Signer(keyPair) {
@@ -53,12 +54,13 @@ var Signer = /** @class */ (function () {
     };
     Signer.prototype.signTransaction = function (transactions, transactionsDetail, abis) {
         return __awaiter(this, void 0, void 0, function () {
-            var msgHash;
+            var calldata, msgHash;
             return __generator(this, function (_a) {
                 if (abis && abis.length !== transactions.length) {
                     throw new Error('ABI must be provided for each transaction or no transaction');
                 }
-                msgHash = (0, hash_1.hashMulticall)(transactionsDetail.walletAddress, transactions, transactionsDetail.nonce.toString(), transactionsDetail.maxFee.toString());
+                calldata = (0, transaction_1.fromCallsToExecuteCalldataWithNonce)(transactions, transactionsDetail.nonce);
+                msgHash = (0, hash_1.calculcateTransactionHash)(transactionsDetail.walletAddress, transactionsDetail.version, (0, hash_1.getSelectorFromName)('__execute__'), calldata, transactionsDetail.maxFee, transactionsDetail.chainId);
                 return [2 /*return*/, (0, ellipticCurve_1.sign)(this.keyPair, msgHash)];
             });
         });

package/dist/signer/ledger.js

@@ -44,6 +44,7 @@ var hw_app_eth_1 = __importDefault(require("@ledgerhq/hw-app-eth"));
 var hw_transport_webhid_1 = __importDefault(require("@ledgerhq/hw-transport-webhid"));
 var encode_1 = require("../utils/encode");
 var hash_1 = require("../utils/hash");
+var transaction_1 = require("../utils/transaction");
 var typedData_1 = require("../utils/typedData");
 function hexZeroPad(hash, length) {
     var value = hash;
@@ -101,9 +102,10 @@ var LedgerBlindSigner = /** @class */ (function () {
     };
     LedgerBlindSigner.prototype.signTransaction = function (transactions, transactionsDetail) {
         return __awaiter(this, void 0, void 0, function () {
-            var msgHash;
+            var calldata, msgHash;
             return __generator(this, function (_a) {
-                msgHash = (0, hash_1.hashMulticall)(transactionsDetail.walletAddress, transactions, transactionsDetail.nonce.toString(), transactionsDetail.maxFee.toString());
+                calldata = (0, transaction_1.fromCallsToExecuteCalldataWithNonce)(transactions, transactionsDetail.nonce);
+                msgHash = (0, hash_1.calculcateTransactionHash)(transactionsDetail.walletAddress, transactionsDetail.version, (0, hash_1.getSelectorFromName)('__execute__'), calldata, transactionsDetail.maxFee, transactionsDetail.chainId);
                 return [2 /*return*/, this.sign(msgHash)];
             });
         });

package/dist/types/api.d.ts

@@ -92,6 +92,7 @@ export declare type InvokeFunctionTransaction = {
     calldata?: RawCalldata;
     nonce?: BigNumberish;
     max_fee?: BigNumberish;
+    version?: BigNumberish;
 };
 export declare type InvokeFunctionTrace = {
     caller_address: string;

package/dist/types/lib.d.ts

@@ -18,6 +18,7 @@ export declare type Call = Omit<Invocation, 'signature'>;
 export declare type InvocationsDetails = {
     nonce?: BigNumberish;
     maxFee?: BigNumberish;
+    version?: BigNumberish;
 };
 export declare type Status = 'NOT_RECEIVED' | 'RECEIVED' | 'PENDING' | 'ACCEPTED_ON_L2' | 'ACCEPTED_ON_L1' | 'REJECTED';
 export declare type TransactionStatus = 'TRANSACTION_RECEIVED';

package/dist/types/signer.d.ts

@@ -1,4 +1,6 @@
+import { StarknetChainId } from '../constants';
 import { InvocationsDetails } from './lib';
 export interface InvocationsSignerDetails extends Required<InvocationsDetails> {
     walletAddress: string;
+    chainId: StarknetChainId;
 }

package/dist/utils/hash.d.ts

@@ -1,8 +1,8 @@
 import BN from 'bn.js';
-import { Call } from '../types';
+import { StarknetChainId, TransactionHashPrefix } from '../constants';
 import { BigNumberish } from './number';
-export declare const transactionPrefix: string;
 export declare const transactionVersion = 0;
+export declare const feeTransactionVersion: BN;
 /**
  * Function to get the starknet keccak hash from a string
  *
@@ -21,4 +21,6 @@ export declare function starknetKeccak(value: string): BN;
 export declare function getSelectorFromName(funcName: string): string;
 export declare function pedersen(input: [BigNumberish, BigNumberish]): string;
 export declare function computeHashOnElements(data: BigNumberish[]): string;
-export declare function hashMulticall(account: string, transactions: Call[], nonce: string, maxFee: string): string;
+export declare function calculateTransactionHashCommon(txHashPrefix: TransactionHashPrefix, version: BigNumberish, contractAddress: BigNumberish, entryPointSelector: BigNumberish, calldata: BigNumberish[], maxFee: BigNumberish, chainId: StarknetChainId, additionalData?: BigNumberish[]): string;
+export declare function calculateDeployTransactionHash(contractAddress: BigNumberish, constructorCalldata: BigNumberish[], version: BigNumberish, chainId: StarknetChainId): string;
+export declare function calculcateTransactionHash(contractAddress: BigNumberish, version: BigNumberish, entryPointSelector: BigNumberish, calldata: BigNumberish[], maxFee: BigNumberish, chainId: StarknetChainId): string;

package/dist/utils/hash.js

@@ -28,16 +28,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hashMulticall = exports.computeHashOnElements = exports.pedersen = exports.getSelectorFromName = exports.starknetKeccak = exports.transactionVersion = exports.transactionPrefix = void 0;
+exports.calculcateTransactionHash = exports.calculateDeployTransactionHash = exports.calculateTransactionHashCommon = exports.computeHashOnElements = exports.pedersen = exports.getSelectorFromName = exports.starknetKeccak = exports.feeTransactionVersion = exports.transactionVersion = void 0;
 var keccak_1 = require("ethereum-cryptography/keccak");
 var minimalistic_assert_1 = __importDefault(require("minimalistic-assert"));
 var constants_1 = require("../constants");
 var ellipticCurve_1 = require("./ellipticCurve");
 var encode_1 = require("./encode");
 var number_1 = require("./number");
-var shortString_1 = require("./shortString");
-exports.transactionPrefix = (0, shortString_1.encodeShortString)('StarkNet Transaction');
 exports.transactionVersion = 0;
+exports.feeTransactionVersion = (0, number_1.toBN)(2).pow((0, number_1.toBN)(128)).add((0, number_1.toBN)(exports.transactionVersion));
 function keccakHex(value) {
     return (0, encode_1.addHexPrefix)((0, encode_1.buf2hex)((0, keccak_1.keccak256)((0, encode_1.utf8ToArray)(value))));
 }
@@ -88,25 +87,28 @@ function computeHashOnElements(data) {
     return __spreadArray(__spreadArray([], __read(data), false), [data.length], false).reduce(function (x, y) { return pedersen([x, y]); }, 0).toString();
 }
 exports.computeHashOnElements = computeHashOnElements;
-function hashMulticall(account, transactions, nonce, maxFee) {
-    var hashArray = transactions
-        .map(function (_a) {
-        var contractAddress = _a.contractAddress, entrypoint = _a.entrypoint, calldata = _a.calldata;
-        return [
-            contractAddress,
-            getSelectorFromName(entrypoint),
-            computeHashOnElements(calldata || []),
-        ];
-    })
-        .map(number_1.bigNumberishArrayToDecimalStringArray)
-        .map(computeHashOnElements);
-    return computeHashOnElements([
-        exports.transactionPrefix,
-        account,
-        computeHashOnElements(hashArray),
-        nonce,
+// following implementation is based on this python implementation:
+// https://github.com/starkware-libs/cairo-lang/blob/b614d1867c64f3fb2cf4a4879348cfcf87c3a5a7/src/starkware/starknet/core/os/transaction_hash/transaction_hash.py
+function calculateTransactionHashCommon(txHashPrefix, version, contractAddress, entryPointSelector, calldata, maxFee, chainId, additionalData) {
+    if (additionalData === void 0) { additionalData = []; }
+    var calldataHash = computeHashOnElements(calldata);
+    var dataToHash = __spreadArray([
+        txHashPrefix,
+        version,
+        contractAddress,
+        entryPointSelector,
+        calldataHash,
         maxFee,
-        exports.transactionVersion,
-    ]);
+        chainId
+    ], __read(additionalData), false);
+    return computeHashOnElements(dataToHash);
 }
-exports.hashMulticall = hashMulticall;
+exports.calculateTransactionHashCommon = calculateTransactionHashCommon;
+function calculateDeployTransactionHash(contractAddress, constructorCalldata, version, chainId) {
+    return calculateTransactionHashCommon(constants_1.TransactionHashPrefix.DEPLOY, version, contractAddress, getSelectorFromName('constructor'), constructorCalldata, constants_1.ZERO, chainId);
+}
+exports.calculateDeployTransactionHash = calculateDeployTransactionHash;
+function calculcateTransactionHash(contractAddress, version, entryPointSelector, calldata, maxFee, chainId) {
+    return calculateTransactionHashCommon(constants_1.TransactionHashPrefix.INVOKE, version, contractAddress, entryPointSelector, calldata, maxFee, chainId);
+}
+exports.calculcateTransactionHash = calculcateTransactionHash;

package/dist/utils/stark.d.ts

@@ -1,4 +1,6 @@
+import BN from 'bn.js';
 import { Calldata, CompressedProgram, Program, RawArgs, Signature } from '../types';
+import { BigNumberish } from './number';
 /**
  * Function to compress compiled cairo program
  *
@@ -11,3 +13,4 @@ export declare function randomAddress(): string;
 export declare function makeAddress(input: string): string;
 export declare function formatSignature(sig?: Signature): string[];
 export declare function compileCalldata(args: RawArgs): Calldata;
+export declare function estimatedFeeToMaxFee(estimatedFee: BigNumberish, overhead?: number): BN;

package/dist/utils/stark.js

@@ -25,7 +25,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compileCalldata = exports.formatSignature = exports.makeAddress = exports.randomAddress = exports.compressProgram = void 0;
+exports.estimatedFeeToMaxFee = exports.compileCalldata = exports.formatSignature = exports.makeAddress = exports.randomAddress = exports.compressProgram = void 0;
 var pako_1 = require("pako");
 var ellipticCurve_1 = require("./ellipticCurve");
 var encode_1 = require("./encode");
@@ -82,3 +82,10 @@ function compileCalldata(args) {
     });
 }
 exports.compileCalldata = compileCalldata;
+function estimatedFeeToMaxFee(estimatedFee, overhead) {
+    if (overhead === void 0) { overhead = 0.15; }
+    // BN can only handle Integers, so we need to do all calulations with integers
+    var overHeadPercent = Math.round((1 + overhead) * 100);
+    return (0, number_1.toBN)(estimatedFee).mul((0, number_1.toBN)(overHeadPercent)).div((0, number_1.toBN)(100));
+}
+exports.estimatedFeeToMaxFee = estimatedFeeToMaxFee;

package/dist/utils/transaction.d.ts

@@ -1,4 +1,5 @@
 import { Call, ParsedStruct } from '../types';
+import { BigNumberish } from './number';
 /**
  * Transforms a list of Calls, each with their own calldata, into
  * two arrays: one with the entrypoints, and one with the concatenated calldata.
@@ -16,3 +17,4 @@ export declare const transformCallsToMulticallArrays: (calls: Call[]) => {
  * @returns
  */
 export declare const fromCallsToExecuteCalldata: (calls: Call[]) => string[];
+export declare const fromCallsToExecuteCalldataWithNonce: (calls: Call[], nonce: BigNumberish) => string[];

package/dist/utils/transaction.js

@@ -25,7 +25,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fromCallsToExecuteCalldata = exports.transformCallsToMulticallArrays = void 0;
+exports.fromCallsToExecuteCalldataWithNonce = exports.fromCallsToExecuteCalldata = exports.transformCallsToMulticallArrays = void 0;
 var hash_1 = require("./hash");
 var number_1 = require("./number");
 /**
@@ -73,3 +73,7 @@ var fromCallsToExecuteCalldata = function (calls) {
     ], false), __read(calldata), false);
 };
 exports.fromCallsToExecuteCalldata = fromCallsToExecuteCalldata;
+var fromCallsToExecuteCalldataWithNonce = function (calls, nonce) {
+    return __spreadArray(__spreadArray([], __read((0, exports.fromCallsToExecuteCalldata)(calls)), false), [(0, number_1.toBN)(nonce).toString()], false);
+};
+exports.fromCallsToExecuteCalldataWithNonce = fromCallsToExecuteCalldataWithNonce;

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

@@ -47,9 +47,9 @@ export declare const encodeData: <T extends {
     }[]>;
     primaryType: string;
     domain: {
-        name?: string | undefined;
         version?: string | undefined;
         chainId?: string | number | undefined;
+        name?: string | undefined;
     };
     message: Record<string, unknown>;
 }>(typedData: T, type: string, data: T["message"]) => string[][];
@@ -74,9 +74,9 @@ export declare const getStructHash: <T extends {
     }[]>;
     primaryType: string;
     domain: {
-        name?: string | undefined;
         version?: string | undefined;
         chainId?: string | number | undefined;
+        name?: string | undefined;
     };
     message: Record<string, unknown>;
 }>(typedData: T, type: string, data: T["message"]) => string;

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

@@ -25,9 +25,9 @@ export declare const STARKNET_TYPE: import("superstruct").Struct<{
  */
 export declare type StarkNetType = Infer<typeof STARKNET_TYPE>;
 export declare const STARKNET_DOMAIN_TYPE: import("superstruct").Struct<{
-    name?: string | undefined;
     version?: string | undefined;
     chainId?: string | number | undefined;
+    name?: string | undefined;
 }, {
     name: import("superstruct").Struct<string | undefined, null>;
     version: import("superstruct").Struct<string | undefined, null>;
@@ -49,9 +49,9 @@ export declare const STARKNET_TYPED_DATA_TYPE: import("superstruct").Struct<{
     }[]>;
     primaryType: string;
     domain: {
-        name?: string | undefined;
         version?: string | undefined;
         chainId?: string | number | undefined;
+        name?: string | undefined;
     };
     message: Record<string, unknown>;
 }, {
@@ -66,9 +66,9 @@ export declare const STARKNET_TYPED_DATA_TYPE: import("superstruct").Struct<{
     }[]>, null>;
     primaryType: import("superstruct").Struct<string, null>;
     domain: import("superstruct").Struct<{
-        name?: string | undefined;
         version?: string | undefined;
         chainId?: string | number | undefined;
+        name?: string | undefined;
     }, {
         name: import("superstruct").Struct<string | undefined, null>;
         version: import("superstruct").Struct<string | undefined, null>;

package/dist/utils/typedData/utils.d.ts

@@ -16,9 +16,9 @@ export declare const validateTypedData: (data: unknown) => data is {
     }[]>;
     primaryType: string;
     domain: {
-        name?: string | undefined;
         version?: string | undefined;
         chainId?: string | number | undefined;
+        name?: string | undefined;
     };
     message: Record<string, unknown>;
 };

package/index.d.ts

@@ -14,6 +14,7 @@ export * as encode from './utils/encode';
 export * as hash from './utils/hash';
 export * as json from './utils/json';
 export * as number from './utils/number';
+export * as transaction from './utils/transaction';
 export * as stark from './utils/stark';
 export * as ec from './utils/ellipticCurve';
 export * as uint256 from './utils/uint256';

package/index.js

@@ -49,6 +49,7 @@ exports.typedData =
   exports.uint256 =
   exports.ec =
   exports.stark =
+  exports.transaction =
   exports.number =
   exports.json =
   exports.hash =
@@ -71,6 +72,7 @@ exports.encode = __importStar(require('./utils/encode'));
 exports.hash = __importStar(require('./utils/hash'));
 exports.json = __importStar(require('./utils/json'));
 exports.number = __importStar(require('./utils/number'));
+exports.transaction = __importStar(require('./utils/transaction'));
 exports.stark = __importStar(require('./utils/stark'));
 exports.ec = __importStar(require('./utils/ellipticCurve'));
 exports.uint256 = __importStar(require('./utils/uint256'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starknet",
-  "version": "3.8.0",
+  "version": "3.10.1",
   "description": "JavaScript library for StarkNet",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/provider/default.d.ts

@@ -1,3 +1,4 @@
+import { StarknetChainId } from '../constants';
 import {
   Abi,
   AddTransactionResponse,
@@ -29,10 +30,12 @@ export declare class Provider implements ProviderInterface {
   baseUrl: string;
   feederGatewayUrl: string;
   gatewayUrl: string;
-  constructor(optionsOrProvider?: ProviderOptions | Provider);
+  chainId: StarknetChainId;
+  constructor(optionsOrProvider?: ProviderOptions | ProviderInterface);
   protected static getNetworkFromName(
     name: NetworkName
   ): 'https://alpha-mainnet.starknet.io' | 'https://alpha4.starknet.io';
+  protected static getChainIdFromBaseUrl(baseUrl: string): StarknetChainId;
   private getFetchUrl;
   private getFetchMethod;
   private getQueryString;

package/provider/default.js

@@ -175,10 +175,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 exports.Provider = void 0;
 var axios_1 = __importDefault(require('axios'));
 var url_join_1 = __importDefault(require('url-join'));
+var constants_1 = require('../constants');
 var hash_1 = require('../utils/hash');
 var json_1 = require('../utils/json');
 var number_1 = require('../utils/number');
 var stark_1 = require('../utils/stark');
+var interface_1 = require('./interface');
 var utils_1 = require('./utils');
 function wait(delay) {
   return new Promise(function (res) {
@@ -203,16 +205,22 @@ var Provider = /** @class */ (function () {
     if (optionsOrProvider === void 0) {
       optionsOrProvider = { network: 'goerli-alpha' };
     }
-    if (optionsOrProvider instanceof Provider) {
+    var _a;
+    if (optionsOrProvider instanceof interface_1.ProviderInterface) {
       this.baseUrl = optionsOrProvider.baseUrl;
       this.feederGatewayUrl = optionsOrProvider.feederGatewayUrl;
       this.gatewayUrl = optionsOrProvider.gatewayUrl;
+      this.chainId =
+        (_a = optionsOrProvider.chainId) !== null && _a !== void 0
+          ? _a
+          : Provider.getChainIdFromBaseUrl(optionsOrProvider.baseUrl);
     } else {
       var baseUrl =
         'baseUrl' in optionsOrProvider
           ? optionsOrProvider.baseUrl
           : Provider.getNetworkFromName(optionsOrProvider.network);
       this.baseUrl = baseUrl;
+      this.chainId = Provider.getChainIdFromBaseUrl(baseUrl);
       this.feederGatewayUrl = (0, url_join_1.default)(baseUrl, 'feeder_gateway');
       this.gatewayUrl = (0, url_join_1.default)(baseUrl, 'gateway');
     }
@@ -226,6 +234,18 @@ var Provider = /** @class */ (function () {
         return 'https://alpha4.starknet.io';
     }
   };
+  Provider.getChainIdFromBaseUrl = function (baseUrl) {
+    try {
+      var url = new URL(baseUrl);
+      if (url.host.includes('mainnet.starknet.io')) {
+        return constants_1.StarknetChainId.MAINNET;
+      }
+    } catch (_a) {
+      // eslint-disable-next-line no-console
+      console.error('Could not parse baseUrl: ' + baseUrl);
+    }
+    return constants_1.StarknetChainId.TESTNET;
+  };
   Provider.prototype.getFetchUrl = function (endpoint) {
     var gatewayUrlEndpoints = ['add_transaction'];
     return gatewayUrlEndpoints.includes(endpoint) ? this.gatewayUrl : this.feederGatewayUrl;

package/provider/interface.d.ts

@@ -1,3 +1,4 @@
+import { StarknetChainId } from '../constants';
 import type {
   AddTransactionResponse,
   Call,
@@ -17,6 +18,7 @@ export declare abstract class ProviderInterface {
   abstract baseUrl: string;
   abstract feederGatewayUrl: string;
   abstract gatewayUrl: string;
+  abstract chainId: StarknetChainId;
   /**
    * Gets the smart contract address on the goerli testnet.
    *

package/signer/default.js

@@ -134,6 +134,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 exports.Signer = void 0;
 var ellipticCurve_1 = require('../utils/ellipticCurve');
 var hash_1 = require('../utils/hash');
+var transaction_1 = require('../utils/transaction');
 var typedData_1 = require('../utils/typedData');
 var Signer = /** @class */ (function () {
   function Signer(keyPair) {
@@ -148,16 +149,22 @@ var Signer = /** @class */ (function () {
   };
   Signer.prototype.signTransaction = function (transactions, transactionsDetail, abis) {
     return __awaiter(this, void 0, void 0, function () {
-      var msgHash;
+      var calldata, msgHash;
       return __generator(this, function (_a) {
         if (abis && abis.length !== transactions.length) {
           throw new Error('ABI must be provided for each transaction or no transaction');
         }
-        msgHash = (0, hash_1.hashMulticall)(
-          transactionsDetail.walletAddress,
+        calldata = (0, transaction_1.fromCallsToExecuteCalldataWithNonce)(
           transactions,
-          transactionsDetail.nonce.toString(),
-          transactionsDetail.maxFee.toString()
+          transactionsDetail.nonce
+        );
+        msgHash = (0, hash_1.calculcateTransactionHash)(
+          transactionsDetail.walletAddress,
+          transactionsDetail.version,
+          (0, hash_1.getSelectorFromName)('__execute__'),
+          calldata,
+          transactionsDetail.maxFee,
+          transactionsDetail.chainId
         );
         return [2 /*return*/, (0, ellipticCurve_1.sign)(this.keyPair, msgHash)];
       });