@alephium/web3 1.2.4 → 1.3.0

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

@@ -451,6 +451,9 @@ export interface CompileProjectResult {
     contracts: CompileContractResult[];
     scripts: CompileScriptResult[];
     structs?: StructSig[];
+    constants?: Constant[];
+    enums?: Enum[];
+    warnings?: string[];
 }
 /** CompileScriptResult */
 export interface CompileScriptResult {
@@ -566,6 +569,11 @@ export interface ContractState {
     mutFields: Val[];
     asset: AssetState;
 }
+/** CurrentDifficulty */
+export interface CurrentDifficulty {
+    /** @format bigint */
+    difficulty: string;
+}
 /** DebugMessage */
 export interface DebugMessage {
     /** @format address */
@@ -659,6 +667,10 @@ export interface Group {
     /** @format int32 */
     group: number;
 }
+/** HashRateResponse */
+export interface HashRateResponse {
+    hashrate: string;
+}
 /** HashesAtHeight */
 export interface HashesAtHeight {
     headers: string[];
@@ -1179,7 +1191,7 @@ export declare class HttpClient<SecurityDataType = unknown> {
 }
 /**
  * @title Alephium API
- * @version 3.3.0
+ * @version 3.4.0
  * @baseUrl ../
  */
 export declare class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {
@@ -1469,7 +1481,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 +1496,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 +1505,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.4.0
  * @baseUrl ../
  */
 class Api extends HttpClient {

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

@@ -288,7 +288,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

@@ -1241,23 +1241,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.3.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.4.0",
     "explorer_backend_version": "2.0.0"
   },
   "type": "commonjs",

package/src/api/api-alephium.ts

@@ -503,6 +503,9 @@ export interface CompileProjectResult {
   contracts: CompileContractResult[]
   scripts: CompileScriptResult[]
   structs?: StructSig[]
+  constants?: Constant[]
+  enums?: Enum[]
+  warnings?: string[]
 }
 
 /** CompileScriptResult */
@@ -632,6 +635,12 @@ export interface ContractState {
   asset: AssetState
 }
 
+/** CurrentDifficulty */
+export interface CurrentDifficulty {
+  /** @format bigint */
+  difficulty: string
+}
+
 /** DebugMessage */
 export interface DebugMessage {
   /** @format address */
@@ -738,6 +747,11 @@ export interface Group {
   group: number
 }
 
+/** HashRateResponse */
+export interface HashRateResponse {
+  hashrate: string
+}
+
 /** HashesAtHeight */
 export interface HashesAtHeight {
   headers: string[]
@@ -1481,7 +1495,7 @@ export class HttpClient<SecurityDataType = unknown> {
 
 /**
  * @title Alephium API
- * @version 3.3.0
+ * @version 3.4.0
  * @baseUrl ../
  */
 export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {
@@ -2019,7 +2033,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 +2059,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 +2076,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

@@ -1921,35 +1921,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> {