@alephium/web3 1.2.4 → 1.4.0

package/dist/src/address/address.js

@@ -214,6 +214,12 @@ function subContractId(parentContractId, pathInHex, group) {
     if (group < 0 || group >= constants_1.TOTAL_NUMBER_OF_GROUPS) {
         throw new Error(`Invalid group ${group}`);
     }
+    if (!(0, utils_1.isHexString)(parentContractId)) {
+        throw new Error(`Invalid parent contract ID: ${parentContractId}, expected hex string`);
+    }
+    if (!(0, utils_1.isHexString)(pathInHex)) {
+        throw new Error(`Invalid path: ${pathInHex}, expected hex string`);
+    }
     const data = (0, utils_1.concatBytes)([(0, utils_1.hexToBinUnsafe)(parentContractId), (0, utils_1.hexToBinUnsafe)(pathInHex)]);
     const bytes = new Uint8Array([
         ...blakejs_1.default.blake2b(blakejs_1.default.blake2b(data, undefined, 32), undefined, 32).slice(0, -1),

package/dist/src/api/api-alephium.d.ts

@@ -10,7 +10,6 @@ export interface AddressBalance {
     lockedBalance: string;
     /** @format x.x ALPH */
     lockedBalanceHint: string;
-    warning?: string;
 }
 /** AddressInfo */
 export interface AddressInfo {
@@ -75,7 +74,6 @@ export interface Balance {
     lockedTokenBalances?: Token[];
     /** @format int32 */
     utxoNum: number;
-    warning?: string;
 }
 /** Balances */
 export interface Balances {
@@ -451,6 +449,9 @@ export interface CompileProjectResult {
     contracts: CompileContractResult[];
     scripts: CompileScriptResult[];
     structs?: StructSig[];
+    constants?: Constant[];
+    enums?: Enum[];
+    warnings?: string[];
 }
 /** CompileScriptResult */
 export interface CompileScriptResult {
@@ -470,6 +471,7 @@ export interface CompilerOptions {
     ignoreUnusedPrivateFunctionsWarnings?: boolean;
     ignoreUpdateFieldsCheckWarnings?: boolean;
     ignoreCheckExternalCallerWarnings?: boolean;
+    ignoreUnusedFunctionReturnWarnings?: boolean;
 }
 /** Confirmed */
 export interface Confirmed {
@@ -566,6 +568,11 @@ export interface ContractState {
     mutFields: Val[];
     asset: AssetState;
 }
+/** CurrentDifficulty */
+export interface CurrentDifficulty {
+    /** @format bigint */
+    difficulty: string;
+}
 /** DebugMessage */
 export interface DebugMessage {
     /** @format address */
@@ -659,6 +666,10 @@ export interface Group {
     /** @format int32 */
     group: number;
 }
+/** HashRateResponse */
+export interface HashRateResponse {
+    hashrate: string;
+}
 /** HashesAtHeight */
 export interface HashesAtHeight {
     headers: string[];
@@ -1003,7 +1014,6 @@ export interface UTXO {
 /** UTXOs */
 export interface UTXOs {
     utxos: UTXO[];
-    warning?: string;
 }
 /** Unauthorized */
 export interface Unauthorized {
@@ -1179,7 +1189,7 @@ export declare class HttpClient<SecurityDataType = unknown> {
 }
 /**
  * @title Alephium API
- * @version 3.3.0
+ * @version 3.5.0
  * @baseUrl ../
  */
 export declare class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {
@@ -1469,7 +1479,7 @@ export declare class Api<SecurityDataType extends unknown> extends HttpClient<Se
              * @min 0
              */
             toTs?: number;
-        }, params?: RequestParams) => Promise<string>;
+        }, params?: RequestParams) => Promise<HashRateResponse>;
         /**
          * No description
          *
@@ -1484,7 +1494,7 @@ export declare class Api<SecurityDataType extends unknown> extends HttpClient<Se
              * @min 1
              */
             timespan?: number;
-        }, params?: RequestParams) => Promise<string>;
+        }, params?: RequestParams) => Promise<HashRateResponse>;
         /**
          * No description
          *
@@ -1493,7 +1503,7 @@ export declare class Api<SecurityDataType extends unknown> extends HttpClient<Se
          * @summary Get the average difficulty of the latest blocks from all shards
          * @request GET:/infos/current-difficulty
          */
-        getInfosCurrentDifficulty: (params?: RequestParams) => Promise<string>;
+        getInfosCurrentDifficulty: (params?: RequestParams) => Promise<CurrentDifficulty>;
     };
     blockflow: {
         /**

package/dist/src/api/api-alephium.js

@@ -151,7 +151,7 @@ class HttpClient {
 exports.HttpClient = HttpClient;
 /**
  * @title Alephium API
- * @version 3.3.0
+ * @version 3.5.0
  * @baseUrl ../
  */
 class Api extends HttpClient {

package/dist/src/contract/contract.d.ts

@@ -182,6 +182,7 @@ export declare abstract class ContractFactory<I extends ContractInstance, F exte
     constructor(contract: Contract);
     abstract at(address: string): I;
     deploy(signer: SignerProvider, deployParams: DeployContractParams<F>): Promise<DeployContractResult<I>>;
+    deployTemplate(signer: SignerProvider): Promise<DeployContractResult<I>>;
     stateForTest(initFields: F, asset?: Asset, address?: string): ContractState<F>;
 }
 export declare class ExecutableScript<P extends Fields = Fields, R extends Val | null = null> {
@@ -288,7 +289,7 @@ export declare function subscribeContractEvent<F extends Fields, M extends Contr
 export declare function subscribeContractEvents(contract: Contract, instance: ContractInstance, options: EventSubscribeOptions<ContractEvent<any>>, fromCount?: number): EventSubscription;
 export declare function callMethod<I extends ContractInstance, F extends Fields, A extends Arguments, R>(contract: ContractFactory<I, F>, instance: ContractInstance, methodName: string, params: Optional<CallContractParams<A>, 'args'>, getContractByCodeHash: (codeHash: string) => Contract): Promise<CallContractResult<R>>;
 export declare function signExecuteMethod<I extends ContractInstance, F extends Fields, A extends Arguments, R>(contract: ContractFactory<I, F>, instance: ContractInstance, methodName: string, params: Optional<SignExecuteContractMethodParams<A>, 'args'>): Promise<SignExecuteScriptTxResult>;
-export declare function multicallMethods<I extends ContractInstance, F extends Fields>(contract: ContractFactory<I, F>, instance: ContractInstance, calls: Record<string, Optional<CallContractParams<any>, 'args'>>, getContractByCodeHash: (codeHash: string) => Contract): Promise<Record<string, CallContractResult<any>>>;
+export declare function multicallMethods<I extends ContractInstance, F extends Fields>(contract: ContractFactory<I, F>, instance: ContractInstance, callss: Record<string, Optional<CallContractParams<any>, 'args'>>[], getContractByCodeHash: (codeHash: string) => Contract): Promise<Record<string, CallContractResult<any>>[] | Record<string, CallContractResult<any>>>;
 export declare function getContractEventsCurrentCount(contractAddress: Address): Promise<number>;
 export declare const getContractIdFromUnsignedTx: (nodeProvider: NodeProvider, unsignedTx: string) => Promise<HexString>;
 export declare const getTokenIdFromUnsignedTx: (nodeProvider: NodeProvider, unsignedTx: string) => Promise<HexString>;

package/dist/src/contract/contract.js

@@ -60,7 +60,8 @@ exports.DEFAULT_NODE_COMPILER_OPTIONS = {
     ignoreUnusedFieldsWarnings: false,
     ignoreUnusedPrivateFunctionsWarnings: false,
     ignoreUpdateFieldsCheckWarnings: false,
-    ignoreCheckExternalCallerWarnings: false
+    ignoreCheckExternalCallerWarnings: false,
+    ignoreUnusedFunctionReturnWarnings: false
 };
 exports.DEFAULT_COMPILER_OPTIONS = { errorOnWarnings: true, ...exports.DEFAULT_NODE_COMPILER_OPTIONS };
 class Struct {
@@ -627,6 +628,11 @@ class ContractFactory {
             contractInstance: this.at(result.contractAddress)
         };
     }
+    async deployTemplate(signer) {
+        return this.deploy(signer, {
+            initialFields: this.contract.getInitialFieldsWithDefaultValues()
+        });
+    }
     // This is used for testing contract functions
     stateForTest(initFields, asset, address) {
         const newAsset = {
@@ -1068,8 +1074,8 @@ exports.callMethod = callMethod;
 async function signExecuteMethod(contract, instance, methodName, params) {
     const methodIndex = contract.contract.getMethodIndex(methodName);
     const functionSig = contract.contract.functions[methodIndex];
-    const usePreapprovedAssets = contract.contract.decodedMethods[methodIndex].usePreapprovedAssets;
-    const bytecodeTemplate = getBytecodeTemplate(methodIndex, usePreapprovedAssets, functionSig, contract.contract.structs, params.attoAlphAmount, params.tokens);
+    const methodUsePreapprovedAssets = contract.contract.decodedMethods[methodIndex].usePreapprovedAssets;
+    const bytecodeTemplate = getBytecodeTemplate(methodIndex, methodUsePreapprovedAssets, functionSig, contract.contract.structs, params.attoAlphAmount, params.tokens);
     const fieldsSig = toFieldsSig(contract.contract.name, functionSig);
     const bytecode = ralph.buildScriptByteCode(bytecodeTemplate, { __contract__: instance.contractId, ...params.args }, fieldsSig, contract.contract.structs);
     const signer = params.signer;
@@ -1086,16 +1092,17 @@ async function signExecuteMethod(contract, instance, methodName, params) {
     return await signer.signAndSubmitExecuteScriptTx(signerParams);
 }
 exports.signExecuteMethod = signExecuteMethod;
-function getBytecodeTemplate(methodIndex, usePreapprovedAssets, functionSig, structs, attoAlphAmount, tokens) {
+function getBytecodeTemplate(methodIndex, methodUsePreapprovedAssets, functionSig, structs, attoAlphAmount, tokens) {
     // For the default TxScript main function
     const numberOfMethods = '01';
     const isPublic = '01';
-    const modifier = usePreapprovedAssets ? '03' : '00';
+    const scriptUseApprovedAssets = attoAlphAmount !== undefined || tokens !== undefined;
+    const modifier = scriptUseApprovedAssets ? '03' : '00';
     const argsLength = '00';
     const returnsLength = '00';
     const [templateVarStoreLocalInstrs, templateVarsLength] = getTemplateVarStoreLocalInstrs(functionSig, structs);
-    const approveAlphInstrs = getApproveAlphInstrs(usePreapprovedAssets ? attoAlphAmount : undefined);
-    const approveTokensInstrs = getApproveTokensInstrs(usePreapprovedAssets ? tokens : undefined);
+    const approveAlphInstrs = getApproveAlphInstrs(methodUsePreapprovedAssets ? attoAlphAmount : undefined);
+    const approveTokensInstrs = getApproveTokensInstrs(methodUsePreapprovedAssets ? tokens : undefined);
     const callerInstrs = getCallAddressInstrs(approveAlphInstrs.length / 2 + approveTokensInstrs.length / 3);
     // First template var is the contract
     const functionArgsNum = encodeU256Const(BigInt(templateVarsLength - 1));
@@ -1241,23 +1248,31 @@ function toFieldsSig(contractName, functionSig) {
         isMutable: [false].concat(functionSig.paramIsMutable)
     };
 }
-async function multicallMethods(contract, instance, calls, getContractByCodeHash) {
-    const callEntries = Object.entries(calls);
-    const callsParams = callEntries.map((entry) => {
-        const [methodName, params] = entry;
-        const methodIndex = contract.contract.getMethodIndex(methodName);
-        const txId = params?.txId ?? randomTxId();
-        return contract.contract.toApiCallContract({ ...params, txId: txId, args: params.args === undefined ? {} : params.args }, instance.groupIndex, instance.address, methodIndex);
+async function multicallMethods(contract, instance, callss, getContractByCodeHash) {
+    const callEntries = callss.map((calls) => Object.entries(calls));
+    const callsParams = callEntries.map((entries) => {
+        return entries.map((entry) => {
+            const [methodName, params] = entry;
+            const methodIndex = contract.contract.getMethodIndex(methodName);
+            const txId = params?.txId ?? randomTxId();
+            return contract.contract.toApiCallContract({ ...params, txId: txId, args: params.args === undefined ? {} : params.args }, instance.groupIndex, instance.address, methodIndex);
+        });
     });
-    const result = await (0, global_1.getCurrentNodeProvider)().contracts.postContractsMulticallContract({ calls: callsParams });
-    const callsResult = {};
-    callsParams.forEach((call, index) => {
-        const methodIndex = call.methodIndex;
-        const callResult = result.results[`${index}`];
-        const methodName = callEntries[`${index}`][`0`];
-        callsResult[`${methodName}`] = contract.contract.fromApiCallContractResult(callResult, call.txId, methodIndex, getContractByCodeHash);
+    const result = await (0, global_1.getCurrentNodeProvider)().contracts.postContractsMulticallContract({ calls: callsParams.flat() });
+    let callResultIndex = 0;
+    const results = callsParams.map((calls, index0) => {
+        const callsResult = {};
+        const entries = callEntries[`${index0}`];
+        calls.forEach((call, index1) => {
+            const methodIndex = call.methodIndex;
+            const callResult = result.results[`${callResultIndex}`];
+            const methodName = entries[`${index1}`][`0`];
+            callsResult[`${methodName}`] = contract.contract.fromApiCallContractResult(callResult, call.txId, methodIndex, getContractByCodeHash);
+            callResultIndex += 1;
+        });
+        return callsResult;
     });
-    return callsResult;
+    return results.length === 1 ? results[0] : results;
 }
 exports.multicallMethods = multicallMethods;
 async function getContractEventsCurrentCount(contractAddress) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alephium/web3",
-  "version": "1.2.4",
+  "version": "1.4.0",
   "description": "A JS/TS library to interact with the Alephium platform",
   "license": "GPL",
   "main": "dist/src/index.js",
@@ -33,7 +33,7 @@
   },
   "author": "Alephium dev <dev@alephium.org>",
   "config": {
-    "alephium_version": "3.3.0",
+    "alephium_version": "3.5.0",
     "explorer_backend_version": "2.0.0"
   },
   "type": "commonjs",

package/src/address/address.ts

@@ -22,7 +22,7 @@ import { TOTAL_NUMBER_OF_GROUPS } from '../constants'
 import blake from 'blakejs'
 import bs58 from '../utils/bs58'
 import djb2 from '../utils/djb2'
-import { binToHex, concatBytes, hexToBinUnsafe } from '../utils'
+import { binToHex, concatBytes, hexToBinUnsafe, isHexString } from '../utils'
 import { KeyType } from '../signer'
 import { MultiSig, lockupScriptCodec } from '../codec/lockup-script-codec'
 import { compactSignedIntCodec } from '../codec'
@@ -211,6 +211,12 @@ export function subContractId(parentContractId: string, pathInHex: string, group
   if (group < 0 || group >= TOTAL_NUMBER_OF_GROUPS) {
     throw new Error(`Invalid group ${group}`)
   }
+  if (!isHexString(parentContractId)) {
+    throw new Error(`Invalid parent contract ID: ${parentContractId}, expected hex string`)
+  }
+  if (!isHexString(pathInHex)) {
+    throw new Error(`Invalid path: ${pathInHex}, expected hex string`)
+  }
   const data = concatBytes([hexToBinUnsafe(parentContractId), hexToBinUnsafe(pathInHex)])
   const bytes = new Uint8Array([
     ...blake.blake2b(blake.blake2b(data, undefined, 32), undefined, 32).slice(0, -1),

package/src/api/api-alephium.ts

@@ -21,7 +21,6 @@ export interface AddressBalance {
   lockedBalance: string
   /** @format x.x ALPH */
   lockedBalanceHint: string
-  warning?: string
 }
 
 /** AddressInfo */
@@ -93,7 +92,6 @@ export interface Balance {
   lockedTokenBalances?: Token[]
   /** @format int32 */
   utxoNum: number
-  warning?: string
 }
 
 /** Balances */
@@ -503,6 +501,9 @@ export interface CompileProjectResult {
   contracts: CompileContractResult[]
   scripts: CompileScriptResult[]
   structs?: StructSig[]
+  constants?: Constant[]
+  enums?: Enum[]
+  warnings?: string[]
 }
 
 /** CompileScriptResult */
@@ -524,6 +525,7 @@ export interface CompilerOptions {
   ignoreUnusedPrivateFunctionsWarnings?: boolean
   ignoreUpdateFieldsCheckWarnings?: boolean
   ignoreCheckExternalCallerWarnings?: boolean
+  ignoreUnusedFunctionReturnWarnings?: boolean
 }
 
 /** Confirmed */
@@ -632,6 +634,12 @@ export interface ContractState {
   asset: AssetState
 }
 
+/** CurrentDifficulty */
+export interface CurrentDifficulty {
+  /** @format bigint */
+  difficulty: string
+}
+
 /** DebugMessage */
 export interface DebugMessage {
   /** @format address */
@@ -738,6 +746,11 @@ export interface Group {
   group: number
 }
 
+/** HashRateResponse */
+export interface HashRateResponse {
+  hashrate: string
+}
+
 /** HashesAtHeight */
 export interface HashesAtHeight {
   headers: string[]
@@ -1132,7 +1145,6 @@ export interface UTXO {
 /** UTXOs */
 export interface UTXOs {
   utxos: UTXO[]
-  warning?: string
 }
 
 /** Unauthorized */
@@ -1481,7 +1493,7 @@ export class HttpClient<SecurityDataType = unknown> {
 
 /**
  * @title Alephium API
- * @version 3.3.0
+ * @version 3.5.0
  * @baseUrl ../
  */
 export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {
@@ -2019,7 +2031,7 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
       },
       params: RequestParams = {}
     ) =>
-      this.request<string, BadRequest | Unauthorized | NotFound | InternalServerError | ServiceUnavailable>({
+      this.request<HashRateResponse, BadRequest | Unauthorized | NotFound | InternalServerError | ServiceUnavailable>({
         path: `/infos/history-hashrate`,
         method: 'GET',
         query: query,
@@ -2045,7 +2057,7 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
       },
       params: RequestParams = {}
     ) =>
-      this.request<string, BadRequest | Unauthorized | NotFound | InternalServerError | ServiceUnavailable>({
+      this.request<HashRateResponse, BadRequest | Unauthorized | NotFound | InternalServerError | ServiceUnavailable>({
         path: `/infos/current-hashrate`,
         method: 'GET',
         query: query,
@@ -2062,7 +2074,7 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      * @request GET:/infos/current-difficulty
      */
     getInfosCurrentDifficulty: (params: RequestParams = {}) =>
-      this.request<string, BadRequest | Unauthorized | NotFound | InternalServerError | ServiceUnavailable>({
+      this.request<CurrentDifficulty, BadRequest | Unauthorized | NotFound | InternalServerError | ServiceUnavailable>({
         path: `/infos/current-difficulty`,
         method: 'GET',
         format: 'json',

package/src/contract/contract.ts

@@ -112,7 +112,8 @@ export const DEFAULT_NODE_COMPILER_OPTIONS: node.CompilerOptions = {
   ignoreUnusedFieldsWarnings: false,
   ignoreUnusedPrivateFunctionsWarnings: false,
   ignoreUpdateFieldsCheckWarnings: false,
-  ignoreCheckExternalCallerWarnings: false
+  ignoreCheckExternalCallerWarnings: false,
+  ignoreUnusedFunctionReturnWarnings: false
 }
 
 export const DEFAULT_COMPILER_OPTIONS: CompilerOptions = { errorOnWarnings: true, ...DEFAULT_NODE_COMPILER_OPTIONS }
@@ -1010,6 +1011,12 @@ export abstract class ContractFactory<I extends ContractInstance, F extends Fiel
     }
   }
 
+  async deployTemplate(signer: SignerProvider): Promise<DeployContractResult<I>> {
+    return this.deploy(signer, {
+      initialFields: this.contract.getInitialFieldsWithDefaultValues() as F
+    })
+  }
+
   // This is used for testing contract functions
   stateForTest(initFields: F, asset?: Asset, address?: string): ContractState<F> {
     const newAsset = {
@@ -1681,10 +1688,10 @@ export async function signExecuteMethod<I extends ContractInstance, F extends Fi
 ): Promise<SignExecuteScriptTxResult> {
   const methodIndex = contract.contract.getMethodIndex(methodName)
   const functionSig = contract.contract.functions[methodIndex]
-  const usePreapprovedAssets = contract.contract.decodedMethods[methodIndex].usePreapprovedAssets
+  const methodUsePreapprovedAssets = contract.contract.decodedMethods[methodIndex].usePreapprovedAssets
   const bytecodeTemplate = getBytecodeTemplate(
     methodIndex,
-    usePreapprovedAssets,
+    methodUsePreapprovedAssets,
     functionSig,
     contract.contract.structs,
     params.attoAlphAmount,
@@ -1716,7 +1723,7 @@ export async function signExecuteMethod<I extends ContractInstance, F extends Fi
 
 function getBytecodeTemplate(
   methodIndex: number,
-  usePreapprovedAssets: boolean,
+  methodUsePreapprovedAssets: boolean,
   functionSig: FunctionSig,
   structs: Struct[],
   attoAlphAmount?: Number256,
@@ -1725,14 +1732,15 @@ function getBytecodeTemplate(
   // For the default TxScript main function
   const numberOfMethods = '01'
   const isPublic = '01'
-  const modifier = usePreapprovedAssets ? '03' : '00'
+  const scriptUseApprovedAssets = attoAlphAmount !== undefined || tokens !== undefined
+  const modifier = scriptUseApprovedAssets ? '03' : '00'
   const argsLength = '00'
   const returnsLength = '00'
 
   const [templateVarStoreLocalInstrs, templateVarsLength] = getTemplateVarStoreLocalInstrs(functionSig, structs)
 
-  const approveAlphInstrs: string[] = getApproveAlphInstrs(usePreapprovedAssets ? attoAlphAmount : undefined)
-  const approveTokensInstrs: string[] = getApproveTokensInstrs(usePreapprovedAssets ? tokens : undefined)
+  const approveAlphInstrs: string[] = getApproveAlphInstrs(methodUsePreapprovedAssets ? attoAlphAmount : undefined)
+  const approveTokensInstrs: string[] = getApproveTokensInstrs(methodUsePreapprovedAssets ? tokens : undefined)
   const callerInstrs: string[] = getCallAddressInstrs(approveAlphInstrs.length / 2 + approveTokensInstrs.length / 3)
 
   // First template var is the contract
@@ -1921,35 +1929,43 @@ function toFieldsSig(contractName: string, functionSig: FunctionSig): FieldsSig
 export async function multicallMethods<I extends ContractInstance, F extends Fields>(
   contract: ContractFactory<I, F>,
   instance: ContractInstance,
-  calls: Record<string, Optional<CallContractParams<any>, 'args'>>,
+  callss: Record<string, Optional<CallContractParams<any>, 'args'>>[],
   getContractByCodeHash: (codeHash: string) => Contract
-): Promise<Record<string, CallContractResult<any>>> {
-  const callEntries = Object.entries(calls)
-  const callsParams = callEntries.map((entry) => {
-    const [methodName, params] = entry
-    const methodIndex = contract.contract.getMethodIndex(methodName)
-    const txId = params?.txId ?? randomTxId()
-    return contract.contract.toApiCallContract(
-      { ...params, txId: txId, args: params.args === undefined ? {} : params.args },
-      instance.groupIndex,
-      instance.address,
-      methodIndex
-    )
+): Promise<Record<string, CallContractResult<any>>[] | Record<string, CallContractResult<any>>> {
+  const callEntries = callss.map((calls) => Object.entries(calls))
+  const callsParams = callEntries.map((entries) => {
+    return entries.map((entry) => {
+      const [methodName, params] = entry
+      const methodIndex = contract.contract.getMethodIndex(methodName)
+      const txId = params?.txId ?? randomTxId()
+      return contract.contract.toApiCallContract(
+        { ...params, txId: txId, args: params.args === undefined ? {} : params.args },
+        instance.groupIndex,
+        instance.address,
+        methodIndex
+      )
+    })
   })
-  const result = await getCurrentNodeProvider().contracts.postContractsMulticallContract({ calls: callsParams })
-  const callsResult: Record<string, CallContractResult<any>> = {}
-  callsParams.forEach((call, index) => {
-    const methodIndex = call.methodIndex
-    const callResult = result.results[`${index}`]
-    const methodName = callEntries[`${index}`][`0`]
-    callsResult[`${methodName}`] = contract.contract.fromApiCallContractResult(
-      callResult,
-      call.txId!,
-      methodIndex,
-      getContractByCodeHash
-    ) as CallContractResult<any>
+  const result = await getCurrentNodeProvider().contracts.postContractsMulticallContract({ calls: callsParams.flat() })
+  let callResultIndex = 0
+  const results = callsParams.map((calls, index0) => {
+    const callsResult: Record<string, CallContractResult<any>> = {}
+    const entries = callEntries[`${index0}`]
+    calls.forEach((call, index1) => {
+      const methodIndex = call.methodIndex
+      const callResult = result.results[`${callResultIndex}`]
+      const methodName = entries[`${index1}`][`0`]
+      callsResult[`${methodName}`] = contract.contract.fromApiCallContractResult(
+        callResult,
+        call.txId!,
+        methodIndex,
+        getContractByCodeHash
+      ) as CallContractResult<any>
+      callResultIndex += 1
+    })
+    return callsResult
   })
-  return callsResult
+  return results.length === 1 ? results[0] : results
 }
 
 export async function getContractEventsCurrentCount(contractAddress: Address): Promise<number> {