@alephium/web3 0.2.0-rc.36 → 0.2.0-rc.37

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

@@ -1,5 +1,5 @@
 import { NamedVals, node, Number256, Token, Val } from '../api';
-import { SignDeployContractTxParams, SignExecuteScriptTxParams, SignerProvider } from '../signer';
+import { SignDeployContractTxParams, SignExecuteScriptTxParams, SignerProvider, SignExecuteScriptTxResult, SignDeployContractTxResult } from '../signer';
 export declare type FieldsSig = node.FieldsSig;
 export declare type EventSig = node.EventSig;
 export declare type FunctionSig = node.FunctionSig;
@@ -116,13 +116,13 @@ export declare class Contract extends Artifact {
     getMethodIndex(funcName: string): number;
     toApiContractStates(states?: ContractState[]): node.ContractState[] | undefined;
     toTestContract(funcName: string, params: TestContractParams): node.TestContract;
-    fromApiContractState(state: node.ContractState): Promise<ContractState>;
+    fromApiContractState(state: node.ContractState): ContractState;
     static ContractCreatedEvent: EventSig;
     static ContractDestroyedEvent: EventSig;
-    static fromApiEvent(event: node.ContractEventByTxId, codeHash: string | undefined): Promise<ContractEventByTxId>;
-    fromTestContractResult(methodIndex: number, result: node.TestContractResult): Promise<TestContractResult>;
+    static fromApiEvent(event: node.ContractEventByTxId, codeHash: string | undefined): ContractEventByTxId;
+    fromTestContractResult(methodIndex: number, result: node.TestContractResult): TestContractResult;
     txParamsForDeployment(signer: SignerProvider, params: Omit<BuildDeployContractTx, 'signerAddress'>): Promise<SignDeployContractTxParams>;
-    deploy(signer: SignerProvider, params: Omit<BuildDeployContractTx, 'signerAddress'>): Promise<DeployContractTransaction>;
+    deploy(signer: SignerProvider, params: Omit<BuildDeployContractTx, 'signerAddress'>): Promise<SignDeployContractTxResult>;
     buildByteCodeToDeploy(initialFields: Fields): string;
 }
 export declare class Script extends Artifact {
@@ -135,7 +135,7 @@ export declare class Script extends Artifact {
     static fromArtifactFile(path: string, bytecodeDebugPatch: string): Promise<Script>;
     toString(): string;
     txParamsForExecution(signer: SignerProvider, params: Omit<BuildExecuteScriptTx, 'signerAddress'>): Promise<SignExecuteScriptTxParams>;
-    execute(signer: SignerProvider, params: Omit<BuildExecuteScriptTx, 'signerAddress'>): Promise<BuildScriptTxResult>;
+    execute(signer: SignerProvider, params: Omit<BuildExecuteScriptTx, 'signerAddress'>): Promise<SignExecuteScriptTxResult>;
     buildByteCodeToDeploy(initialFields: Fields): string;
 }
 export interface Asset {

package/dist/src/contract/contract.js

@@ -241,7 +241,7 @@ class Project {
             return fs_2.promises.writeFile(artifactDir, compiled.artifact.toString());
         };
         for (const contract of this.contracts) {
-            await saveToFile(contract);
+            saveToFile(contract);
         }
         for (const script of this.scripts) {
             await saveToFile(script);
@@ -526,7 +526,7 @@ class Contract extends Artifact {
             inputAssets: toApiInputAssets(params.inputAssets)
         };
     }
-    async fromApiContractState(state) {
+    fromApiContractState(state) {
         const contract = Project.currentProject.contractByCodeHash(state.codeHash);
         return {
             address: state.address,
@@ -539,7 +539,7 @@ class Contract extends Artifact {
             asset: fromApiAsset(state.asset)
         };
     }
-    static async fromApiEvent(event, codeHash) {
+    static fromApiEvent(event, codeHash) {
         let eventSig;
         if (event.eventIndex == -1) {
             eventSig = this.ContractCreatedEvent;
@@ -558,7 +558,7 @@ class Contract extends Artifact {
             fields: fromApiEventFields(event.fields, eventSig)
         };
     }
-    async fromTestContractResult(methodIndex, result) {
+    fromTestContractResult(methodIndex, result) {
         const addressToCodeHash = new Map();
         addressToCodeHash.set(result.address, result.codeHash);
         result.contracts.forEach((contract) => addressToCodeHash.set(contract.address, contract.codeHash));
@@ -567,9 +567,9 @@ class Contract extends Artifact {
             contractAddress: result.address,
             returns: (0, api_1.fromApiArray)(result.returns, this.functions[`${methodIndex}`].returnTypes),
             gasUsed: result.gasUsed,
-            contracts: await Promise.all(result.contracts.map((contract) => this.fromApiContractState(contract))),
+            contracts: result.contracts.map((contract) => this.fromApiContractState(contract)),
             txOutputs: result.txOutputs.map(fromApiOutput),
-            events: await Promise.all(result.events.map((event) => {
+            events: result.events.map((event) => {
                 const contractAddress = event.contractAddress;
                 const codeHash = addressToCodeHash.get(contractAddress);
                 if (typeof codeHash !== 'undefined' || event.eventIndex < 0) {
@@ -578,7 +578,7 @@ class Contract extends Artifact {
                 else {
                     throw Error(`Cannot find codeHash for the contract address: ${contractAddress}`);
                 }
-            })),
+            }),
             debugMessages: result.debugMessages
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alephium/web3",
-  "version": "0.2.0-rc.36",
+  "version": "0.2.0-rc.37",
   "description": "A JS/TS library to interact with the Alephium platform",
   "license": "GPL",
   "main": "dist/src/index.js",

package/src/contract/contract.ts

@@ -35,7 +35,13 @@ import {
   fromApiTokens,
   fromApiVals
 } from '../api'
-import { SignDeployContractTxParams, SignExecuteScriptTxParams, SignerProvider } from '../signer'
+import {
+  SignDeployContractTxParams,
+  SignExecuteScriptTxParams,
+  SignerProvider,
+  SignExecuteScriptTxResult,
+  SignDeployContractTxResult
+} from '../signer'
 import * as ralph from './ralph'
 import { bs58, binToHex, contractIdFromAddress, assertType, Eq } from '../utils'
 import { getCurrentNodeProvider } from '../global'
@@ -320,7 +326,7 @@ export class Project {
       return fsPromises.writeFile(artifactDir, compiled.artifact.toString())
     }
     for (const contract of this.contracts) {
-      await saveToFile(contract)
+      saveToFile(contract)
     }
     for (const script of this.scripts) {
       await saveToFile(script)
@@ -732,7 +738,7 @@ export class Contract extends Artifact {
     }
   }
 
-  async fromApiContractState(state: node.ContractState): Promise<ContractState> {
+  fromApiContractState(state: node.ContractState): ContractState {
     const contract = Project.currentProject.contractByCodeHash(state.codeHash)
     return {
       address: state.address,
@@ -758,10 +764,7 @@ export class Contract extends Artifact {
     fieldTypes: ['Address']
   }
 
-  static async fromApiEvent(
-    event: node.ContractEventByTxId,
-    codeHash: string | undefined
-  ): Promise<ContractEventByTxId> {
+  static fromApiEvent(event: node.ContractEventByTxId, codeHash: string | undefined): ContractEventByTxId {
     let eventSig: EventSig
 
     if (event.eventIndex == -1) {
@@ -781,7 +784,7 @@ export class Contract extends Artifact {
     }
   }
 
-  async fromTestContractResult(methodIndex: number, result: node.TestContractResult): Promise<TestContractResult> {
+  fromTestContractResult(methodIndex: number, result: node.TestContractResult): TestContractResult {
     const addressToCodeHash = new Map<string, string>()
     addressToCodeHash.set(result.address, result.codeHash)
     result.contracts.forEach((contract) => addressToCodeHash.set(contract.address, contract.codeHash))
@@ -790,19 +793,17 @@ export class Contract extends Artifact {
       contractAddress: result.address,
       returns: fromApiArray(result.returns, this.functions[`${methodIndex}`].returnTypes),
       gasUsed: result.gasUsed,
-      contracts: await Promise.all(result.contracts.map((contract) => this.fromApiContractState(contract))),
+      contracts: result.contracts.map((contract) => this.fromApiContractState(contract)),
       txOutputs: result.txOutputs.map(fromApiOutput),
-      events: await Promise.all(
-        result.events.map((event) => {
-          const contractAddress = event.contractAddress
-          const codeHash = addressToCodeHash.get(contractAddress)
-          if (typeof codeHash !== 'undefined' || event.eventIndex < 0) {
-            return Contract.fromApiEvent(event, codeHash)
-          } else {
-            throw Error(`Cannot find codeHash for the contract address: ${contractAddress}`)
-          }
-        })
-      ),
+      events: result.events.map((event) => {
+        const contractAddress = event.contractAddress
+        const codeHash = addressToCodeHash.get(contractAddress)
+        if (typeof codeHash !== 'undefined' || event.eventIndex < 0) {
+          return Contract.fromApiEvent(event, codeHash)
+        } else {
+          throw Error(`Cannot find codeHash for the contract address: ${contractAddress}`)
+        }
+      }),
       debugMessages: result.debugMessages
     }
   }
@@ -827,7 +828,7 @@ export class Contract extends Artifact {
   async deploy(
     signer: SignerProvider,
     params: Omit<BuildDeployContractTx, 'signerAddress'>
-  ): Promise<DeployContractTransaction> {
+  ): Promise<SignDeployContractTxResult> {
     const signerParams = await this.txParamsForDeployment(signer, params)
     return signer.signAndSubmitDeployContractTx(signerParams)
   }
@@ -912,7 +913,7 @@ export class Script extends Artifact {
   async execute(
     signer: SignerProvider,
     params: Omit<BuildExecuteScriptTx, 'signerAddress'>
-  ): Promise<BuildScriptTxResult> {
+  ): Promise<SignExecuteScriptTxResult> {
     const signerParams = await this.txParamsForExecution(signer, params)
     return await signer.signAndSubmitExecuteScriptTx(signerParams)
   }