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

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

@@ -315,6 +315,7 @@ export interface ChangeActiveAddress {
     address: string;
 }
 export interface CompileContractResult {
+    version: string;
     name: string;
     bytecode: string;
     bytecodeDebugPatch: string;
@@ -332,6 +333,7 @@ export interface CompileProjectResult {
     scripts: CompileScriptResult[];
 }
 export interface CompileScriptResult {
+    version: string;
     name: string;
     bytecodeTemplate: string;
     bytecodeDebugPatch: string;
@@ -1364,6 +1366,18 @@ export declare class Api<SecurityDataType extends unknown> extends HttpClient<Se
          * @request POST:/transactions/decode-unsigned-tx
          */
         postTransactionsDecodeUnsignedTx: (data: DecodeUnsignedTx, params?: RequestParams) => Promise<DecodeUnsignedTxResult>;
+        /**
+         * No description
+         *
+         * @tags Transactions
+         * @name GetTransactionsDetailsTxid
+         * @summary Get transaction details
+         * @request GET:/transactions/details/{txId}
+         */
+        getTransactionsDetailsTxid: (txId: string, query?: {
+            fromGroup?: number;
+            toGroup?: number;
+        }, params?: RequestParams) => Promise<Transaction>;
         /**
          * No description
          *

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

@@ -856,6 +856,21 @@ class Api extends HttpClient {
                 format: 'json',
                 ...params
             }).then(utils_1.convertHttpResponse),
+            /**
+             * No description
+             *
+             * @tags Transactions
+             * @name GetTransactionsDetailsTxid
+             * @summary Get transaction details
+             * @request GET:/transactions/details/{txId}
+             */
+            getTransactionsDetailsTxid: (txId, query, params = {}) => this.request({
+                path: `/transactions/details/${txId}`,
+                method: 'GET',
+                query: query,
+                format: 'json',
+                ...params
+            }).then(utils_1.convertHttpResponse),
             /**
              * No description
              *

package/dist/src/api/index.js

@@ -85,16 +85,16 @@ class NodeProvider {
         else {
             nodeApi = param0;
         }
-        this.wallets = nodeApi.wallets;
-        this.infos = nodeApi.infos;
-        this.blockflow = nodeApi.blockflow;
-        this.addresses = nodeApi.addresses;
-        this.transactions = nodeApi.transactions;
-        this.contracts = nodeApi.contracts;
-        this.multisig = nodeApi.multisig;
-        this.utils = nodeApi.utils;
-        this.miners = nodeApi.miners;
-        this.events = nodeApi.events;
+        this.wallets = { ...nodeApi.wallets };
+        this.infos = { ...nodeApi.infos };
+        this.blockflow = { ...nodeApi.blockflow };
+        this.addresses = { ...nodeApi.addresses };
+        this.transactions = { ...nodeApi.transactions };
+        this.contracts = { ...nodeApi.contracts };
+        this.multisig = { ...nodeApi.multisig };
+        this.utils = { ...nodeApi.utils };
+        this.miners = { ...nodeApi.miners };
+        this.events = { ...nodeApi.events };
     }
     // This can prevent the proxied node provider from being modified
     static Proxy(nodeProvider) {
@@ -140,16 +140,16 @@ class ExplorerProvider {
         else {
             explorerApi = param0;
         }
-        this.blocks = explorerApi.blocks;
-        this.transactions = explorerApi.transactions;
-        this.transactionByOutputRefKey = explorerApi.transactionByOutputRefKey;
-        this.addresses = explorerApi.addresses;
-        this.addressesActive = explorerApi.addressesActive;
-        this.infos = explorerApi.infos;
-        this.unconfirmedTransactions = explorerApi.unconfirmedTransactions;
-        this.tokens = explorerApi.tokens;
-        this.charts = explorerApi.charts;
-        this.utils = explorerApi.utils;
+        this.blocks = { ...explorerApi.blocks };
+        this.transactions = { ...explorerApi.transactions };
+        this.transactionByOutputRefKey = { ...explorerApi.transactionByOutputRefKey };
+        this.addresses = { ...explorerApi.addresses };
+        this.addressesActive = { ...explorerApi.addressesActive };
+        this.infos = { ...explorerApi.infos };
+        this.unconfirmedTransactions = { ...explorerApi.unconfirmedTransactions };
+        this.tokens = { ...explorerApi.tokens };
+        this.charts = { ...explorerApi.charts };
+        this.utils = { ...explorerApi.utils };
     }
     // This can prevent the proxied explorer provider from being modified
     static Proxy(explorerProvider) {

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;
@@ -83,9 +83,10 @@ export declare class Project {
     static build(compilerOptionsPartial?: Partial<CompilerOptions>, contractsRootDir?: string, artifactsRootDir?: string): Promise<void>;
 }
 export declare abstract class Artifact {
+    readonly version: string;
     readonly name: string;
     readonly functions: FunctionSig[];
-    constructor(name: string, functions: FunctionSig[]);
+    constructor(version: string, name: string, functions: FunctionSig[]);
     abstract buildByteCodeToDeploy(initialFields?: Fields): string;
     publicFunctions(): string[];
     usingPreapprovedAssetsFunctions(): string[];
@@ -99,7 +100,7 @@ export declare class Contract extends Artifact {
     readonly eventsSig: EventSig[];
     readonly bytecodeDebug: string;
     readonly codeHashDebug: string;
-    constructor(name: string, bytecode: string, bytecodeDebugPatch: string, codeHash: string, codeHashDebug: string, fieldsSig: FieldsSig, eventsSig: EventSig[], functions: FunctionSig[]);
+    constructor(version: string, name: string, bytecode: string, bytecodeDebugPatch: string, codeHash: string, codeHashDebug: string, fieldsSig: FieldsSig, eventsSig: EventSig[], functions: FunctionSig[]);
     static fromJson(artifact: any, bytecodeDebugPatch?: string, codeHashDebug?: string): Contract;
     static fromCompileResult(result: node.CompileContractResult): Contract;
     static fromArtifactFile(path: string, bytecodeDebugPatch: string, codeHashDebug: string): Promise<Contract>;
@@ -116,26 +117,26 @@ 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 {
     readonly bytecodeTemplate: string;
     readonly bytecodeDebugPatch: string;
     readonly fieldsSig: FieldsSig;
-    constructor(name: string, bytecodeTemplate: string, bytecodeDebugPatch: string, fieldsSig: FieldsSig, functions: FunctionSig[]);
+    constructor(version: string, name: string, bytecodeTemplate: string, bytecodeDebugPatch: string, fieldsSig: FieldsSig, functions: FunctionSig[]);
     static fromCompileResult(result: node.CompileScriptResult): Script;
     static fromJson(artifact: any, bytecodeDebugPatch?: string): Script;
     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);
@@ -375,7 +375,8 @@ Project.matchers = [
 Project.DEFAULT_CONTRACTS_DIR = 'contracts';
 Project.DEFAULT_ARTIFACTS_DIR = 'artifacts';
 class Artifact {
-    constructor(name, functions) {
+    constructor(version, name, functions) {
+        this.version = version;
         this.name = name;
         this.functions = functions;
     }
@@ -391,8 +392,8 @@ class Artifact {
 }
 exports.Artifact = Artifact;
 class Contract extends Artifact {
-    constructor(name, bytecode, bytecodeDebugPatch, codeHash, codeHashDebug, fieldsSig, eventsSig, functions) {
-        super(name, functions);
+    constructor(version, name, bytecode, bytecodeDebugPatch, codeHash, codeHashDebug, fieldsSig, eventsSig, functions) {
+        super(version, name, functions);
         this.bytecode = bytecode;
         this.bytecodeDebugPatch = bytecodeDebugPatch;
         this.codeHash = codeHash;
@@ -403,7 +404,8 @@ class Contract extends Artifact {
     }
     // TODO: safely parse json
     static fromJson(artifact, bytecodeDebugPatch = '', codeHashDebug = '') {
-        if (artifact.name == null ||
+        if (artifact.version == null ||
+            artifact.name == null ||
             artifact.bytecode == null ||
             artifact.codeHash == null ||
             artifact.fieldsSig == null ||
@@ -411,11 +413,11 @@ class Contract extends Artifact {
             artifact.functions == null) {
             throw Error('The artifact JSON for contract is incomplete');
         }
-        const contract = new Contract(artifact.name, artifact.bytecode, bytecodeDebugPatch, artifact.codeHash, codeHashDebug ? codeHashDebug : artifact.codeHash, artifact.fieldsSig, artifact.eventsSig, artifact.functions);
+        const contract = new Contract(artifact.version, artifact.name, artifact.bytecode, bytecodeDebugPatch, artifact.codeHash, codeHashDebug ? codeHashDebug : artifact.codeHash, artifact.fieldsSig, artifact.eventsSig, artifact.functions);
         return contract;
     }
     static fromCompileResult(result) {
-        return new Contract(result.name, result.bytecode, result.bytecodeDebugPatch, result.codeHash, result.codeHashDebug, result.fields, result.events, result.functions);
+        return new Contract(result.version, result.name, result.bytecode, result.bytecodeDebugPatch, result.codeHash, result.codeHashDebug, result.fields, result.events, result.functions);
     }
     // support both 'code.ral' and 'code.ral.json'
     static async fromArtifactFile(path, bytecodeDebugPatch, codeHashDebug) {
@@ -431,6 +433,7 @@ class Contract extends Artifact {
     }
     toString() {
         const object = {
+            version: this.version,
             name: this.name,
             bytecode: this.bytecode,
             codeHash: this.codeHash,
@@ -526,7 +529,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 +542,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 +561,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 +570,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 +581,7 @@ class Contract extends Artifact {
                 else {
                     throw Error(`Cannot find codeHash for the contract address: ${contractAddress}`);
                 }
-            })),
+            }),
             debugMessages: result.debugMessages
         };
     }
@@ -615,24 +618,25 @@ Contract.ContractDestroyedEvent = {
     fieldTypes: ['Address']
 };
 class Script extends Artifact {
-    constructor(name, bytecodeTemplate, bytecodeDebugPatch, fieldsSig, functions) {
-        super(name, functions);
+    constructor(version, name, bytecodeTemplate, bytecodeDebugPatch, fieldsSig, functions) {
+        super(version, name, functions);
         this.bytecodeTemplate = bytecodeTemplate;
         this.bytecodeDebugPatch = bytecodeDebugPatch;
         this.fieldsSig = fieldsSig;
     }
     static fromCompileResult(result) {
-        return new Script(result.name, result.bytecodeTemplate, result.bytecodeDebugPatch, result.fields, result.functions);
+        return new Script(result.version, result.name, result.bytecodeTemplate, result.bytecodeDebugPatch, result.fields, result.functions);
     }
     // TODO: safely parse json
     static fromJson(artifact, bytecodeDebugPatch = '') {
-        if (artifact.name == null ||
+        if (artifact.version == null ||
+            artifact.name == null ||
             artifact.bytecodeTemplate == null ||
             artifact.fieldsSig == null ||
             artifact.functions == null) {
             throw Error('The artifact JSON for script is incomplete');
         }
-        return new Script(artifact.name, artifact.bytecodeTemplate, bytecodeDebugPatch, artifact.fieldsSig, artifact.functions);
+        return new Script(artifact.version, artifact.name, artifact.bytecodeTemplate, bytecodeDebugPatch, artifact.fieldsSig, artifact.functions);
     }
     static async fromArtifactFile(path, bytecodeDebugPatch) {
         const content = await fs_2.promises.readFile(path);
@@ -641,6 +645,7 @@ class Script extends Artifact {
     }
     toString() {
         const object = {
+            version: this.version,
             name: this.name,
             bytecodeTemplate: this.bytecodeTemplate,
             fieldsSig: this.fieldsSig,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alephium/web3",
-  "version": "0.2.0-rc.36",
+  "version": "0.2.0-rc.38",
   "description": "A JS/TS library to interact with the Alephium platform",
   "license": "GPL",
   "main": "dist/src/index.js",
@@ -27,7 +27,7 @@
   },
   "author": "Alephium dev <dev@alephium.org>",
   "config": {
-    "alephium_version": "1.5.0-rc12",
+    "alephium_version": "1.5.0-rc13",
     "explorer_backend_version": "1.9.0-rc2"
   },
   "scripts": {
@@ -80,7 +80,7 @@
     "ts-jest": "^28.0.2",
     "ts-node": "^10.7.0",
     "tslib": "^2.3.1",
-    "typescript": "4.7.4",
+    "typescript": "^4.7.4",
     "webpack": "^5.72.0",
     "webpack-cli": "^4.9.2"
   },

package/src/api/api-alephium.ts

@@ -435,6 +435,7 @@ export interface ChangeActiveAddress {
 }
 
 export interface CompileContractResult {
+  version: string
   name: string
   bytecode: string
   bytecodeDebugPatch: string
@@ -456,6 +457,7 @@ export interface CompileProjectResult {
 }
 
 export interface CompileScriptResult {
+  version: string
   name: string
   bytecodeTemplate: string
   bytecodeDebugPatch: string
@@ -2166,6 +2168,27 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
         ...params
       }).then(convertHttpResponse),
 
+    /**
+     * No description
+     *
+     * @tags Transactions
+     * @name GetTransactionsDetailsTxid
+     * @summary Get transaction details
+     * @request GET:/transactions/details/{txId}
+     */
+    getTransactionsDetailsTxid: (
+      txId: string,
+      query?: { fromGroup?: number; toGroup?: number },
+      params: RequestParams = {}
+    ) =>
+      this.request<Transaction, BadRequest | Unauthorized | NotFound | InternalServerError | ServiceUnavailable>({
+        path: `/transactions/details/${txId}`,
+        method: 'GET',
+        query: query,
+        format: 'json',
+        ...params
+      }).then(convertHttpResponse),
+
     /**
      * No description
      *

package/src/api/index.ts

@@ -78,16 +78,16 @@ export class NodeProvider {
       nodeApi = param0 as NodeProvider
     }
 
-    this.wallets = nodeApi.wallets
-    this.infos = nodeApi.infos
-    this.blockflow = nodeApi.blockflow
-    this.addresses = nodeApi.addresses
-    this.transactions = nodeApi.transactions
-    this.contracts = nodeApi.contracts
-    this.multisig = nodeApi.multisig
-    this.utils = nodeApi.utils
-    this.miners = nodeApi.miners
-    this.events = nodeApi.events
+    this.wallets = { ...nodeApi.wallets }
+    this.infos = { ...nodeApi.infos }
+    this.blockflow = { ...nodeApi.blockflow }
+    this.addresses = { ...nodeApi.addresses }
+    this.transactions = { ...nodeApi.transactions }
+    this.contracts = { ...nodeApi.contracts }
+    this.multisig = { ...nodeApi.multisig }
+    this.utils = { ...nodeApi.utils }
+    this.miners = { ...nodeApi.miners }
+    this.events = { ...nodeApi.events }
   }
 
   request = (args: ApiRequestArguments): Promise<any> => {
@@ -140,16 +140,16 @@ export class ExplorerProvider {
       explorerApi = param0 as ExplorerProvider
     }
 
-    this.blocks = explorerApi.blocks
-    this.transactions = explorerApi.transactions
-    this.transactionByOutputRefKey = explorerApi.transactionByOutputRefKey
-    this.addresses = explorerApi.addresses
-    this.addressesActive = explorerApi.addressesActive
-    this.infos = explorerApi.infos
-    this.unconfirmedTransactions = explorerApi.unconfirmedTransactions
-    this.tokens = explorerApi.tokens
-    this.charts = explorerApi.charts
-    this.utils = explorerApi.utils
+    this.blocks = { ...explorerApi.blocks }
+    this.transactions = { ...explorerApi.transactions }
+    this.transactionByOutputRefKey = { ...explorerApi.transactionByOutputRefKey }
+    this.addresses = { ...explorerApi.addresses }
+    this.addressesActive = { ...explorerApi.addressesActive }
+    this.infos = { ...explorerApi.infos }
+    this.unconfirmedTransactions = { ...explorerApi.unconfirmedTransactions }
+    this.tokens = { ...explorerApi.tokens }
+    this.charts = { ...explorerApi.charts }
+    this.utils = { ...explorerApi.utils }
   }
 
   request = (args: ApiRequestArguments): Promise<any> => {

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)
@@ -503,10 +509,12 @@ export class Project {
 }
 
 export abstract class Artifact {
+  readonly version: string
   readonly name: string
   readonly functions: FunctionSig[]
 
-  constructor(name: string, functions: FunctionSig[]) {
+  constructor(version: string, name: string, functions: FunctionSig[]) {
+    this.version = version
     this.name = name
     this.functions = functions
   }
@@ -537,6 +545,7 @@ export class Contract extends Artifact {
   readonly codeHashDebug: string
 
   constructor(
+    version: string,
     name: string,
     bytecode: string,
     bytecodeDebugPatch: string,
@@ -546,7 +555,7 @@ export class Contract extends Artifact {
     eventsSig: EventSig[],
     functions: FunctionSig[]
   ) {
-    super(name, functions)
+    super(version, name, functions)
     this.bytecode = bytecode
     this.bytecodeDebugPatch = bytecodeDebugPatch
     this.codeHash = codeHash
@@ -560,6 +569,7 @@ export class Contract extends Artifact {
   // TODO: safely parse json
   static fromJson(artifact: any, bytecodeDebugPatch = '', codeHashDebug = ''): Contract {
     if (
+      artifact.version == null ||
       artifact.name == null ||
       artifact.bytecode == null ||
       artifact.codeHash == null ||
@@ -570,6 +580,7 @@ export class Contract extends Artifact {
       throw Error('The artifact JSON for contract is incomplete')
     }
     const contract = new Contract(
+      artifact.version,
       artifact.name,
       artifact.bytecode,
       bytecodeDebugPatch,
@@ -584,6 +595,7 @@ export class Contract extends Artifact {
 
   static fromCompileResult(result: node.CompileContractResult): Contract {
     return new Contract(
+      result.version,
       result.name,
       result.bytecode,
       result.bytecodeDebugPatch,
@@ -611,6 +623,7 @@ export class Contract extends Artifact {
 
   override toString(): string {
     const object = {
+      version: this.version,
       name: this.name,
       bytecode: this.bytecode,
       codeHash: this.codeHash,
@@ -732,7 +745,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 +771,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 +791,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 +800,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 +835,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)
   }
@@ -843,25 +851,34 @@ export class Script extends Artifact {
   readonly fieldsSig: FieldsSig
 
   constructor(
+    version: string,
     name: string,
     bytecodeTemplate: string,
     bytecodeDebugPatch: string,
     fieldsSig: FieldsSig,
     functions: FunctionSig[]
   ) {
-    super(name, functions)
+    super(version, name, functions)
     this.bytecodeTemplate = bytecodeTemplate
     this.bytecodeDebugPatch = bytecodeDebugPatch
     this.fieldsSig = fieldsSig
   }
 
   static fromCompileResult(result: node.CompileScriptResult): Script {
-    return new Script(result.name, result.bytecodeTemplate, result.bytecodeDebugPatch, result.fields, result.functions)
+    return new Script(
+      result.version,
+      result.name,
+      result.bytecodeTemplate,
+      result.bytecodeDebugPatch,
+      result.fields,
+      result.functions
+    )
   }
 
   // TODO: safely parse json
   static fromJson(artifact: any, bytecodeDebugPatch = ''): Script {
     if (
+      artifact.version == null ||
       artifact.name == null ||
       artifact.bytecodeTemplate == null ||
       artifact.fieldsSig == null ||
@@ -870,6 +887,7 @@ export class Script extends Artifact {
       throw Error('The artifact JSON for script is incomplete')
     }
     return new Script(
+      artifact.version,
       artifact.name,
       artifact.bytecodeTemplate,
       bytecodeDebugPatch,
@@ -886,6 +904,7 @@ export class Script extends Artifact {
 
   override toString(): string {
     const object = {
+      version: this.version,
       name: this.name,
       bytecodeTemplate: this.bytecodeTemplate,
       fieldsSig: this.fieldsSig,
@@ -912,7 +931,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)
   }