@alephium/web3 1.12.0-beta.0 → 1.12.0-danube.1

package/dist/src/codec/instr-codec.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.I256Add = exports.BoolToByteVec = exports.BoolNeq = exports.BoolEq = exports.BoolOr = exports.BoolAnd = exports.BoolNot = exports.Pop = exports.StoreLocal = exports.LoadLocal = exports.AddressConst = exports.BytesConst = exports.U256Const = exports.I256Const = exports.U256Const5 = exports.U256Const4 = exports.U256Const3 = exports.U256Const2 = exports.U256Const1 = exports.U256Const0 = exports.I256ConstN1 = exports.I256Const5 = exports.I256Const4 = exports.I256Const3 = exports.I256Const2 = exports.I256Const1 = exports.I256Const0 = exports.ConstFalse = exports.ConstTrue = exports.Return = exports.CallExternal = exports.CallLocal = exports.CallExternalBySelectorCode = exports.MethodSelectorCode = exports.CreateMapEntryCode = exports.LoadImmFieldCode = exports.StoreMutFieldCode = exports.LoadMutFieldCode = exports.DEBUGCode = exports.IfFalseCode = exports.IfTrueCode = exports.JumpCode = exports.StoreLocalCode = exports.LoadLocalCode = exports.AddressConstCode = exports.BytesConstCode = exports.U256ConstCode = exports.I256ConstCode = exports.CallExternalCode = exports.CallLocalCode = void 0;
-exports.Sha3 = exports.Sha256 = exports.Keccak256 = exports.Blake2b = exports.Assert = exports.IfFalse = exports.IfTrue = exports.Jump = exports.IsContractAddress = exports.IsAssetAddress = exports.AddressToByteVec = exports.AddressNeq = exports.AddressEq = exports.ByteVecConcat = exports.ByteVecSize = exports.ByteVecNeq = exports.ByteVecEq = exports.U256ToByteVec = exports.U256ToI256 = exports.I256ToByteVec = exports.I256ToU256 = exports.U256SHR = exports.U256SHL = exports.U256Xor = exports.U256BitOr = exports.U256BitAnd = exports.U256ModMul = exports.U256ModSub = exports.U256ModAdd = exports.U256Ge = exports.U256Gt = exports.U256Le = exports.U256Lt = exports.U256Neq = exports.U256Eq = exports.U256Mod = exports.U256Div = exports.U256Mul = exports.U256Sub = exports.U256Add = exports.I256Ge = exports.I256Gt = exports.I256Le = exports.I256Lt = exports.I256Neq = exports.I256Eq = exports.I256Mod = exports.I256Div = exports.I256Mul = exports.I256Sub = void 0;
+exports.Sha3 = exports.Sha256 = exports.Keccak256 = exports.Blake2b = exports.Assert = exports.IfFalse = exports.IfTrue = exports.Jump = exports.IsContractAddress = exports.IsAssetAddress = exports.AddressToByteVec = exports.AddressNeq = exports.AddressEq = exports.ByteVecConcat = exports.ByteVecSize = exports.ByteVecNeq = exports.ByteVecEq = exports.U256ToByteVec = exports.U256ToI256 = exports.I256ToByteVec = exports.I256ToU256 = exports.NumericSHR = exports.NumericSHL = exports.NumericXor = exports.NumericBitOr = exports.NumericBitAnd = exports.U256ModMul = exports.U256ModSub = exports.U256ModAdd = exports.U256Ge = exports.U256Gt = exports.U256Le = exports.U256Lt = exports.U256Neq = exports.U256Eq = exports.U256Mod = exports.U256Div = exports.U256Mul = exports.U256Sub = exports.U256Add = exports.I256Ge = exports.I256Gt = exports.I256Le = exports.I256Lt = exports.I256Neq = exports.I256Eq = exports.I256Mod = exports.I256Div = exports.I256Mul = exports.I256Sub = void 0;
 exports.U256Exp = exports.I256Exp = exports.TxGasFee = exports.TxGasAmount = exports.TxGasPrice = exports.DEBUG = exports.BlockHash = exports.Swap = exports.AssertWithErrorCode = exports.Dup = exports.StoreLocalByIndex = exports.LoadLocalByIndex = exports.ContractIdToAddress = exports.Log9 = exports.Log8 = exports.Log7 = exports.Log6 = exports.EthEcRecover = exports.U256From32Byte = exports.U256From16Byte = exports.U256From8Byte = exports.U256From4Byte = exports.U256From2Byte = exports.U256From1Byte = exports.U256To32Byte = exports.U256To16Byte = exports.U256To8Byte = exports.U256To4Byte = exports.U256To2Byte = exports.U256To1Byte = exports.Zeros = exports.Encode = exports.ByteVecToAddress = exports.ByteVecSlice = exports.Log5 = exports.Log4 = exports.Log3 = exports.Log2 = exports.Log1 = exports.VerifyRelativeLocktime = exports.VerifyAbsoluteLocktime = exports.TxInputsSize = exports.TxInputAddressAt = exports.TxId = exports.BlockTarget = exports.BlockTimeStamp = exports.NetworkId = exports.VerifyED25519 = exports.VerifySecP256K1 = exports.VerifyTxSignature = void 0;
-exports.CreateSubContractAndTransferToken = exports.CopyCreateContractAndTransferToken = exports.CreateContractAndTransferToken = exports.ContractExists = exports.StoreMutFieldByIndex = exports.LoadMutFieldByIndex = exports.CopyCreateSubContractWithToken = exports.CopyCreateSubContract = exports.CreateSubContractWithToken = exports.CreateSubContract = exports.LockApprovedAssets = exports.BurnToken = exports.CopyCreateContractWithToken = exports.MigrateWithFields = exports.MigrateSimple = exports.ContractCodeHash = exports.ContractInitialStateHash = exports.CallerCodeHash = exports.CallerInitialStateHash = exports.IsCalledFromTxScript = exports.CallerAddress = exports.CallerContractId = exports.SelfAddress = exports.SelfContractId = exports.DestroySelf = exports.CopyCreateContract = exports.CreateContractWithToken = exports.CreateContract = exports.TransferTokenToSelf = exports.TransferTokenFromSelf = exports.TransferToken = exports.TransferAlphToSelf = exports.TransferAlphFromSelf = exports.TransferAlph = exports.IsPaying = exports.TokenRemaining = exports.AlphRemaining = exports.ApproveToken = exports.ApproveAlph = exports.StoreMutField = exports.LoadMutField = exports.GroupOfAddress = exports.BoolToString = exports.I256ToString = exports.U256ToString = exports.AddModN = exports.MulModN = exports.GetSegregatedSignature = exports.VerifyBIP340Schnorr = exports.U256ModExp = void 0;
-exports.toI256 = exports.toU256 = exports.instrsCodec = exports.instrCodec = exports.InstrCodec = exports.CallExternalBySelector = exports.MethodSelector = exports.CreateMapEntry = exports.MinimalContractDeposit = exports.PayGasFee = exports.LoadImmFieldByIndex = exports.LoadImmField = exports.ALPHTokenId = exports.SubContractIdOf = exports.SubContractId = exports.NullContractAddress = exports.CopyCreateSubContractAndTransferToken = void 0;
+exports.CreateContractAndTransferToken = exports.ContractExists = exports.StoreMutFieldByIndex = exports.LoadMutFieldByIndex = exports.CopyCreateSubContractWithToken = exports.CopyCreateSubContract = exports.CreateSubContractWithToken = exports.CreateSubContract = exports.LockApprovedAssets = exports.BurnToken = exports.CopyCreateContractWithToken = exports.MigrateWithFields = exports.MigrateSimple = exports.ContractCodeHash = exports.ContractInitialStateHash = exports.CallerCodeHash = exports.CallerInitialStateHash = exports.IsCalledFromTxScript = exports.CallerAddress = exports.CallerContractId = exports.SelfAddress = exports.SelfContractId = exports.DestroySelf = exports.CopyCreateContract = exports.CreateContractWithToken = exports.CreateContract = exports.TransferTokenToSelf = exports.TransferTokenFromSelf = exports.TransferToken = exports.TransferAlphToSelf = exports.TransferAlphFromSelf = exports.TransferAlph = exports.IsPaying = exports.TokenRemaining = exports.AlphRemaining = exports.ApproveToken = exports.ApproveAlph = exports.StoreMutField = exports.LoadMutField = exports.GetSegregatedWebAuthnSignature = exports.VerifySignature = exports.GroupOfAddress = exports.BoolToString = exports.I256ToString = exports.U256ToString = exports.AddModN = exports.MulModN = exports.GetSegregatedSignature = exports.VerifyBIP340Schnorr = exports.U256ModExp = void 0;
+exports.toI256 = exports.toU256 = exports.instrsCodec = exports.instrCodec = exports.InstrCodec = exports.ExternalCallerAddress = exports.ExternalCallerContractId = exports.CallExternalBySelector = exports.MethodSelector = exports.CreateMapEntry = exports.MinimalContractDeposit = exports.PayGasFee = exports.LoadImmFieldByIndex = exports.LoadImmField = exports.ALPHTokenId = exports.SubContractIdOf = exports.SubContractId = exports.NullContractAddress = exports.CopyCreateSubContractAndTransferToken = exports.CreateSubContractAndTransferToken = exports.CopyCreateContractAndTransferToken = void 0;
 /*
 Copyright 2018 - 2022 The Alephium Authors
 This file is part of the alephium project.
@@ -127,11 +127,11 @@ exports.U256Ge = { name: 'U256Ge', code: 0x34 };
 exports.U256ModAdd = { name: 'U256ModAdd', code: 0x35 };
 exports.U256ModSub = { name: 'U256ModSub', code: 0x36 };
 exports.U256ModMul = { name: 'U256ModMul', code: 0x37 };
-exports.U256BitAnd = { name: 'U256BitAnd', code: 0x38 };
-exports.U256BitOr = { name: 'U256BitOr', code: 0x39 };
-exports.U256Xor = { name: 'U256Xor', code: 0x3a };
-exports.U256SHL = { name: 'U256SHL', code: 0x3b };
-exports.U256SHR = { name: 'U256SHR', code: 0x3c };
+exports.NumericBitAnd = { name: 'NumericBitAnd', code: 0x38 };
+exports.NumericBitOr = { name: 'NumericBitOr', code: 0x39 };
+exports.NumericXor = { name: 'NumericXor', code: 0x3a };
+exports.NumericSHL = { name: 'NumericSHL', code: 0x3b };
+exports.NumericSHR = { name: 'NumericSHR', code: 0x3c };
 exports.I256ToU256 = { name: 'I256ToU256', code: 0x3d };
 exports.I256ToByteVec = { name: 'I256ToByteVec', code: 0x3e };
 exports.U256ToI256 = { name: 'U256ToI256', code: 0x3f };
@@ -224,6 +224,8 @@ exports.U256ToString = { name: 'U256ToString', code: 0x89 };
 exports.I256ToString = { name: 'I256ToString', code: 0x8a };
 exports.BoolToString = { name: 'BoolToString', code: 0x8b };
 exports.GroupOfAddress = { name: 'GroupOfAddress', code: 0x8c };
+exports.VerifySignature = { name: 'VerifySignature', code: 0x8d };
+exports.GetSegregatedWebAuthnSignature = { name: 'GetSegregatedWebAuthnSignature', code: 0x8e };
 const LoadMutField = (index) => {
     return { name: 'LoadMutField', code: 0xa0, index };
 };
@@ -298,6 +300,8 @@ const CallExternalBySelector = (selector) => {
     return { name: 'CallExternalBySelector', code: 0xd4, selector };
 };
 exports.CallExternalBySelector = CallExternalBySelector;
+exports.ExternalCallerContractId = { name: 'ExternalCallerContractId', code: 0xd5 };
+exports.ExternalCallerAddress = { name: 'ExternalCallerAddress', code: 0xd6 };
 class InstrCodec extends codec_1.Codec {
     encode(instr) {
         switch (instr.name) {
@@ -413,15 +417,15 @@ class InstrCodec extends codec_1.Codec {
                 return new Uint8Array([0x36]);
             case 'U256ModMul':
                 return new Uint8Array([0x37]);
-            case 'U256BitAnd':
+            case 'NumericBitAnd':
                 return new Uint8Array([0x38]);
-            case 'U256BitOr':
+            case 'NumericBitOr':
                 return new Uint8Array([0x39]);
-            case 'U256Xor':
+            case 'NumericXor':
                 return new Uint8Array([0x3a]);
-            case 'U256SHL':
+            case 'NumericSHL':
                 return new Uint8Array([0x3b]);
-            case 'U256SHR':
+            case 'NumericSHR':
                 return new Uint8Array([0x3c]);
             case 'I256ToU256':
                 return new Uint8Array([0x3d]);
@@ -583,6 +587,10 @@ class InstrCodec extends codec_1.Codec {
                 return new Uint8Array([0x8b]);
             case 'GroupOfAddress':
                 return new Uint8Array([0x8c]);
+            case 'VerifySignature':
+                return new Uint8Array([0x8d]);
+            case 'GetSegregatedWebAuthnSignature':
+                return new Uint8Array([0x8e]);
             case 'LoadMutField':
                 return new Uint8Array([0xa0, ...codec_1.byteCodec.encode(instr.index)]);
             case 'StoreMutField':
@@ -689,6 +697,10 @@ class InstrCodec extends codec_1.Codec {
                 return new Uint8Array([0xd3, ...int_as_4bytes_codec_1.intAs4BytesCodec.encode(instr.selector)]);
             case 'CallExternalBySelector':
                 return new Uint8Array([0xd4, ...int_as_4bytes_codec_1.intAs4BytesCodec.encode(instr.selector)]);
+            case 'ExternalCallerContractId':
+                return new Uint8Array([0xd5]);
+            case 'ExternalCallerAddress':
+                return new Uint8Array([0xd6]);
         }
     }
     _decode(input) {
@@ -807,15 +819,15 @@ class InstrCodec extends codec_1.Codec {
             case 0x37:
                 return exports.U256ModMul;
             case 0x38:
-                return exports.U256BitAnd;
+                return exports.NumericBitAnd;
             case 0x39:
-                return exports.U256BitOr;
+                return exports.NumericBitOr;
             case 0x3a:
-                return exports.U256Xor;
+                return exports.NumericXor;
             case 0x3b:
-                return exports.U256SHL;
+                return exports.NumericSHL;
             case 0x3c:
-                return exports.U256SHR;
+                return exports.NumericSHR;
             case 0x3d:
                 return exports.I256ToU256;
             case 0x3e:
@@ -976,6 +988,10 @@ class InstrCodec extends codec_1.Codec {
                 return exports.BoolToString;
             case 0x8c:
                 return exports.GroupOfAddress;
+            case 0x8d:
+                return exports.VerifySignature;
+            case 0x8e:
+                return exports.GetSegregatedWebAuthnSignature;
             case 0xa0:
                 return (0, exports.LoadMutField)(codec_1.byteCodec._decode(input));
             case 0xa1:
@@ -1082,6 +1098,10 @@ class InstrCodec extends codec_1.Codec {
                 return (0, exports.MethodSelector)(int_as_4bytes_codec_1.intAs4BytesCodec._decode(input));
             case 0xd4:
                 return (0, exports.CallExternalBySelector)(int_as_4bytes_codec_1.intAs4BytesCodec._decode(input));
+            case 0xd5:
+                return exports.ExternalCallerContractId;
+            case 0xd6:
+                return exports.ExternalCallerAddress;
             default:
                 throw new Error(`Unknown instr code: ${code}`);
         }

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

@@ -3,6 +3,7 @@ import { SignDeployContractTxParams, SignDeployContractTxResult, SignExecuteScri
 import { Optional, HexString } from '../utils';
 import { EventSubscribeOptions, EventSubscription } from './events';
 import { contract, Method } from '../codec';
+import { SimulationResult } from '../api/api-alephium';
 export type FieldsSig = node.FieldsSig;
 export type MapsSig = node.MapsSig;
 export type EventSig = node.EventSig;
@@ -100,7 +101,7 @@ export declare class Script extends Artifact {
     static fromJson(artifact: any, bytecodeDebugPatch?: string, structs?: Struct[]): Script;
     static fromArtifactFile(path: string, bytecodeDebugPatch: string, structs?: Struct[]): Promise<Script>;
     toString(): string;
-    txParamsForExecution<P extends Fields>(signer: SignerProvider, params: ExecuteScriptParams<P>): Promise<SignExecuteScriptTxParams>;
+    txParamsForExecution<P extends Fields>(params: ExecuteScriptParams<P>): Promise<SignExecuteScriptTxParams>;
     buildByteCodeToDeploy(initialFields: Fields): string;
 }
 export declare function fromApiFields(immFields: node.Val[], mutFields: node.Val[], fieldsSig: FieldsSig, structs: Struct[]): NamedVals;
@@ -131,7 +132,7 @@ export interface ContractStateWithMaps<T extends Fields = Fields, M extends Reco
 export type TestContractParamsWithoutMaps<F extends Fields = Fields, A extends Arguments = Arguments> = Omit<TestContractParams<F, A>, 'initialMaps'>;
 export interface TestContractParams<F extends Fields = Fields, A extends Arguments = Arguments, M extends Record<string, Map<Val, Val>> = Record<string, Map<Val, Val>>> {
     group?: number;
-    address?: string;
+    contractAddress?: string;
     callerContractAddress?: string;
     blockHash?: string;
     blockTimeStamp?: number;
@@ -139,9 +140,10 @@ export interface TestContractParams<F extends Fields = Fields, A extends Argumen
     initialFields: F;
     initialMaps?: M;
     initialAsset?: Asset;
-    testArgs: A;
+    args: A;
     existingContracts?: ContractStateWithMaps[];
     inputAssets?: InputAsset[];
+    dustAmount?: Number256;
 }
 export interface ContractEvent<T extends Fields = Fields> {
     txId: string;
@@ -187,6 +189,7 @@ export interface DeployContractParams<P extends Fields = Fields> {
     gasAmount?: number;
     gasPrice?: Number256;
     exposePrivateFunctions?: boolean;
+    group?: number;
 }
 export type DeployContractResult<T extends ContractInstance> = Omit<SignDeployContractTxResult, 'contractId' | 'contractAddress' | 'groupIndex'> & {
     contractInstance: T;
@@ -203,11 +206,12 @@ export declare class ExecutableScript<P extends Fields = Fields, R extends Val |
     readonly script: Script;
     readonly getContractByCodeHash: (codeHash: string) => Contract;
     constructor(script: Script, getContractByCodeHash: (codeHash: string) => Contract);
-    execute(signer: SignerProvider, params: ExecuteScriptParams<P>): Promise<ExecuteScriptResult>;
+    execute(params: ExecuteScriptParams<P>): Promise<ExecuteScriptResult>;
     call(params: CallScriptParams<P>): Promise<CallScriptResult<R>>;
 }
 export interface ExecuteScriptParams<P extends Fields = Fields> {
     initialFields: P;
+    signer: SignerProvider;
     attoAlphAmount?: Number256;
     tokens?: Token[];
     gasAmount?: number;
@@ -220,6 +224,7 @@ export interface ExecuteScriptResult {
     signature: string;
     gasAmount: number;
     gasPrice: Number256;
+    simulationResult: SimulationResult;
 }
 export interface CallScriptParams<P extends Fields = Fields> {
     initialFields: P;
@@ -273,11 +278,11 @@ export declare function subscribeEventsFromContract<T extends Fields, M extends
 export declare function addStdIdToFields<F extends Fields>(contract: Contract, fields: F): F | (F & {
     __stdInterfaceId: HexString;
 });
-export declare function extractMapsFromApiResult(selfAddress: string, params: Optional<TestContractParams, 'testArgs' | 'initialFields'>, group: number, apiResult: node.TestContractResult, getContractByCodeHash: (codeHash: string) => Contract): {
+export declare function extractMapsFromApiResult(selfAddress: string, params: Optional<TestContractParams, 'args' | 'initialFields'>, group: number, apiResult: node.TestContractResult, getContractByCodeHash: (codeHash: string) => Contract): {
     address: string;
     maps: Record<string, Map<Val, Val>>;
 }[];
-export declare function testMethod<I extends ContractInstance, F extends Fields, A extends Arguments, R, M extends Record<string, Map<Val, Val>> = Record<string, Map<Val, Val>>>(factory: ContractFactory<I, F>, methodName: string, params: Optional<TestContractParams<F, A, M>, 'testArgs' | 'initialFields'>, getContractByCodeHash: (codeHash: string) => Contract): Promise<TestContractResult<R, M>>;
+export declare function testMethod<I extends ContractInstance, F extends Fields, A extends Arguments, R, M extends Record<string, Map<Val, Val>> = Record<string, Map<Val, Val>>>(factory: ContractFactory<I, F>, methodName: string, params: Optional<TestContractParams<F, A, M>, 'args' | 'initialFields'>, getContractByCodeHash: (codeHash: string) => Contract): Promise<TestContractResult<R, M>>;
 export declare function getDebugMessagesFromTx(txId: HexString, provider?: NodeProvider): Promise<{
     contractAddress: string;
     message: string;

package/dist/src/contract/contract.js

@@ -309,16 +309,17 @@ class Contract extends Artifact {
             blockHash: params.blockHash,
             blockTimeStamp: params.blockTimeStamp,
             txId: params.txId,
-            address: params.address,
+            address: params.contractAddress,
             callerContractAddress: params.callerContractAddress,
             bytecode: this.isInlineFunc(methodIndex) ? this.getByteCodeForTesting() : this.bytecodeDebug,
             initialImmFields: immFields,
             initialMutFields: mutFields,
             initialAsset: typeof params.initialAsset !== 'undefined' ? toApiAsset(params.initialAsset) : undefined,
             methodIndex,
-            args: this.toApiArgs(funcName, params.testArgs),
+            args: this.toApiArgs(funcName, params.args),
             existingContracts: this.toApiContractStates(params.existingContracts),
-            inputAssets: toApiInputAssets(params.inputAssets)
+            inputAssets: toApiInputAssets(params.inputAssets),
+            dustAmount: params.dustAmount?.toString()
         };
     }
     fromApiContractState(state) {
@@ -387,15 +388,13 @@ class Contract extends Artifact {
         const initialFields = params.initialFields ?? {};
         const bytecode = this.buildByteCodeToDeploy(addStdIdToFields(this, initialFields), isDevnet, params.exposePrivateFunctions ?? false);
         const selectedAccount = await signer.getSelectedAccount();
-        let signerAddress = selectedAccount.address;
-        if ((0, address_1.isGrouplessAddressWithoutGroupIndex)(selectedAccount.address)) {
+        if (selectedAccount.keyType === 'gl-secp256k1') {
             if (group === undefined) {
                 throw new Error('Groupless address requires explicit group number for contract deployment');
             }
-            signerAddress = `${selectedAccount.address}:${group}`;
         }
         const signerParams = {
-            signerAddress,
+            signerAddress: selectedAccount.address,
             signerKeyType: selectedAccount.keyType,
             bytecode: bytecode,
             initialAttoAlphAmount: params?.initialAttoAlphAmount,
@@ -403,7 +402,8 @@ class Contract extends Artifact {
             issueTokenTo: params?.issueTokenTo,
             initialTokenAmounts: params?.initialTokenAmounts,
             gasAmount: params?.gasAmount,
-            gasPrice: params?.gasPrice
+            gasPrice: params?.gasPrice,
+            group: group
         };
         return signerParams;
     }
@@ -519,8 +519,8 @@ class Script extends Artifact {
         };
         return JSON.stringify(object, null, 2);
     }
-    async txParamsForExecution(signer, params) {
-        const selectedAccount = await signer.getSelectedAccount();
+    async txParamsForExecution(params) {
+        const selectedAccount = await params.signer.getSelectedAccount();
         const signerParams = {
             signerAddress: selectedAccount.address,
             signerKeyType: selectedAccount.keyType,
@@ -691,10 +691,18 @@ class ContractFactory {
             initialFields: addStdIdToFields(this.contract, deployParams.initialFields)
         }, group);
         const result = await signer.signAndSubmitDeployContractTx(signerParams);
-        return {
-            ...result,
-            contractInstance: this.at(result.contractAddress)
-        };
+        if ('transferTxs' in result) {
+            return {
+                ...result.tx,
+                contractInstance: this.at(result.tx.contractAddress)
+            };
+        }
+        else {
+            return {
+                ...result,
+                contractInstance: this.at(result.contractAddress)
+            };
+        }
     }
     async deployTemplate(signer) {
         return this.deploy(signer, {
@@ -722,9 +730,15 @@ class ExecutableScript {
         this.script = script;
         this.getContractByCodeHash = getContractByCodeHash;
     }
-    async execute(signer, params) {
-        const signerParams = await this.script.txParamsForExecution(signer, params);
-        return await signer.signAndSubmitExecuteScriptTx(signerParams);
+    async execute(params) {
+        const signerParams = await this.script.txParamsForExecution(params);
+        const result = await params.signer.signAndSubmitExecuteScriptTx(signerParams);
+        if ('transferTxs' in result) {
+            return result.tx;
+        }
+        else {
+            return result;
+        }
     }
     async call(params) {
         const mainFunc = this.script.functions.find((f) => f.name === 'main');
@@ -971,16 +985,16 @@ exports.extractMapsFromApiResult = extractMapsFromApiResult;
 async function testMethod(factory, methodName, params, getContractByCodeHash) {
     const txId = params?.txId ?? randomTxId();
     const selfContract = factory.contract;
-    const selfAddress = params.address ?? (0, address_1.addressFromContractId)((0, utils_1.binToHex)(crypto.getRandomValues(new Uint8Array(32))));
+    const selfAddress = params.contractAddress ?? (0, address_1.addressFromContractId)((0, utils_1.binToHex)(crypto.getRandomValues(new Uint8Array(32))));
     const selfContractId = (0, utils_1.binToHex)((0, address_1.contractIdFromAddress)(selfAddress));
     const group = params.group ?? 0;
     const existingContracts = getTestExistingContracts(selfContract, selfContractId, group, params, getContractByCodeHash);
     const apiParams = selfContract.toApiTestContractParams(methodName, {
         ...params,
-        address: selfAddress,
+        contractAddress: selfAddress,
         txId: txId,
         initialFields: addStdIdToFields(selfContract, params.initialFields ?? {}),
-        testArgs: params.testArgs === undefined ? {} : params.testArgs,
+        args: params.args === undefined ? {} : params.args,
         existingContracts
     });
     const apiResult = await (0, global_1.getCurrentNodeProvider)().contracts.postContractsTestContract(apiParams);
@@ -1258,7 +1272,7 @@ async function signExecuteMethod(contract, instance, methodName, params) {
         gasAmount: params.gasAmount,
         gasPrice: params.gasPrice
     };
-    const result = await signer.signAndSubmitExecuteScriptTx(signerParams);
+    const result = (await signer.signAndSubmitExecuteScriptTx(signerParams));
     if ((0, debug_1.isContractDebugMessageEnabled)() && isDevnet) {
         await printDebugMessagesFromTx(result.txId, signer.nodeProvider);
     }

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

@@ -1,3 +1,4 @@
+import { SimulationResult } from '../api/api-alephium';
 import { ContractInstance } from './contract';
 export interface ExecutionResult {
     txId: string;
@@ -16,4 +17,5 @@ export interface DeployContractExecutionResult<I extends ContractInstance = Cont
 }
 export interface RunScriptResult extends ExecutionResult {
     groupIndex: number;
+    simulationResult: SimulationResult;
 }

package/dist/src/signer/signer.d.ts

@@ -1,15 +1,15 @@
 import { ExplorerProvider, NodeProvider } from '../api';
 import { node } from '../api';
-import { Account, EnableOptionsBase, Destination, SignDeployContractTxParams, SignDeployContractTxResult, SignExecuteScriptTxParams, SignExecuteScriptTxResult, SignMessageParams, SignMessageResult, SignTransferTxParams, SignTransferTxResult, SignUnsignedTxParams, SignUnsignedTxResult, SubmissionResult, SubmitTransactionParams, KeyType, MessageHasher, SignChainedTxParams, SignChainedTxResult } from './types';
+import { Account, EnableOptionsBase, Destination, SignDeployContractTxParams, SignDeployContractTxResult, SignExecuteScriptTxParams, SignExecuteScriptTxResult, SignMessageParams, SignMessageResult, SignTransferTxParams, SignTransferTxResult, SignUnsignedTxParams, SignUnsignedTxResult, SubmissionResult, SubmitTransactionParams, KeyType, MessageHasher, SignChainedTxParams, SignChainedTxResult, BuildTxResult, SignTxResult } from './types';
 export declare abstract class SignerProvider {
     abstract get nodeProvider(): NodeProvider | undefined;
     abstract get explorerProvider(): ExplorerProvider | undefined;
     protected abstract unsafeGetSelectedAccount(): Promise<Account>;
     getSelectedAccount(): Promise<Account>;
     static validateAccount(account: Account): void;
-    abstract signAndSubmitTransferTx(params: SignTransferTxParams): Promise<SignTransferTxResult>;
-    abstract signAndSubmitDeployContractTx(params: SignDeployContractTxParams): Promise<SignDeployContractTxResult>;
-    abstract signAndSubmitExecuteScriptTx(params: SignExecuteScriptTxParams): Promise<SignExecuteScriptTxResult>;
+    abstract signAndSubmitTransferTx(params: SignTransferTxParams): Promise<SignTxResult<SignTransferTxResult>>;
+    abstract signAndSubmitDeployContractTx(params: SignDeployContractTxParams): Promise<SignTxResult<SignDeployContractTxResult>>;
+    abstract signAndSubmitExecuteScriptTx(params: SignExecuteScriptTxParams): Promise<SignTxResult<SignExecuteScriptTxResult>>;
     abstract signAndSubmitUnsignedTx(params: SignUnsignedTxParams): Promise<SignUnsignedTxResult>;
     abstract signAndSubmitChainedTx(params: SignChainedTxParams[]): Promise<SignChainedTxResult[]>;
     abstract signUnsignedTx(params: SignUnsignedTxParams): Promise<SignUnsignedTxResult>;
@@ -23,18 +23,18 @@ export declare abstract class InteractiveSignerProvider<EnableOptions extends En
 export declare abstract class SignerProviderSimple extends SignerProvider {
     abstract get nodeProvider(): NodeProvider;
     submitTransaction(params: SubmitTransactionParams): Promise<SubmissionResult>;
-    signAndSubmitTransferTx(params: SignTransferTxParams): Promise<SignTransferTxResult>;
-    signAndSubmitDeployContractTx(params: SignDeployContractTxParams): Promise<SignDeployContractTxResult>;
-    signAndSubmitExecuteScriptTx(params: SignExecuteScriptTxParams): Promise<SignExecuteScriptTxResult>;
+    signAndSubmitTransferTx(params: SignTransferTxParams): Promise<SignTxResult<SignTransferTxResult>>;
+    signAndSubmitDeployContractTx(params: SignDeployContractTxParams): Promise<SignTxResult<SignDeployContractTxResult>>;
+    signAndSubmitExecuteScriptTx(params: SignExecuteScriptTxParams): Promise<SignTxResult<SignExecuteScriptTxResult>>;
     signAndSubmitUnsignedTx(params: SignUnsignedTxParams): Promise<SignUnsignedTxResult>;
     signAndSubmitChainedTx(params: SignChainedTxParams[]): Promise<SignChainedTxResult[]>;
     protected abstract getPublicKey(address: string): Promise<string>;
-    signTransferTx(params: SignTransferTxParams): Promise<SignTransferTxResult>;
-    buildTransferTx(params: SignTransferTxParams): Promise<Omit<SignTransferTxResult, 'signature'>>;
-    signDeployContractTx(params: SignDeployContractTxParams): Promise<SignDeployContractTxResult>;
-    buildDeployContractTx(params: SignDeployContractTxParams): Promise<Omit<SignDeployContractTxResult, 'signature'>>;
-    signExecuteScriptTx(params: SignExecuteScriptTxParams): Promise<SignExecuteScriptTxResult>;
-    buildExecuteScriptTx(params: SignExecuteScriptTxParams): Promise<Omit<SignExecuteScriptTxResult, 'signature'>>;
+    signTransferTx(params: SignTransferTxParams): Promise<SignTxResult<SignTransferTxResult>>;
+    buildTransferTx(params: SignTransferTxParams): Promise<BuildTxResult<SignTransferTxResult>>;
+    signDeployContractTx(params: SignDeployContractTxParams): Promise<SignTxResult<SignDeployContractTxResult>>;
+    buildDeployContractTx(params: SignDeployContractTxParams): Promise<BuildTxResult<SignDeployContractTxResult>>;
+    signExecuteScriptTx(params: SignExecuteScriptTxParams): Promise<SignTxResult<SignExecuteScriptTxResult>>;
+    buildExecuteScriptTx(params: SignExecuteScriptTxParams): Promise<BuildTxResult<SignExecuteScriptTxResult>>;
     signChainedTx(params: SignChainedTxParams[]): Promise<SignChainedTxResult[]>;
     buildChainedTx(params: SignChainedTxParams[]): Promise<Omit<SignChainedTxResult, 'signature'>[]>;
     signUnsignedTx(params: SignUnsignedTxParams): Promise<SignUnsignedTxResult>;

package/dist/src/signer/signer.js

@@ -81,17 +81,41 @@ class SignerProviderSimple extends SignerProvider {
     }
     async signAndSubmitTransferTx(params) {
         const signResult = await this.signTransferTx(params);
-        await this.submitTransaction(signResult);
+        if ('transferTxs' in signResult) {
+            for (const r of signResult.transferTxs) {
+                await this.submitTransaction(r);
+            }
+            await this.submitTransaction(signResult.tx);
+        }
+        else {
+            await this.submitTransaction(signResult);
+        }
         return signResult;
     }
     async signAndSubmitDeployContractTx(params) {
         const signResult = await this.signDeployContractTx(params);
-        await this.submitTransaction(signResult);
+        if ('transferTxs' in signResult) {
+            for (const r of signResult.transferTxs) {
+                await this.submitTransaction(r);
+            }
+            await this.submitTransaction(signResult.tx);
+        }
+        else {
+            await this.submitTransaction(signResult);
+        }
         return signResult;
     }
     async signAndSubmitExecuteScriptTx(params) {
         const signResult = await this.signExecuteScriptTx(params);
-        await this.submitTransaction(signResult);
+        if ('transferTxs' in signResult) {
+            for (const r of signResult.transferTxs) {
+                await this.submitTransaction(r);
+            }
+            await this.submitTransaction(signResult.tx);
+        }
+        else {
+            await this.submitTransaction(signResult);
+        }
         return signResult;
     }
     async signAndSubmitUnsignedTx(params) {
@@ -108,24 +132,75 @@ class SignerProviderSimple extends SignerProvider {
     }
     async signTransferTx(params) {
         const response = await this.buildTransferTx(params);
-        const signature = await this.signRaw(params.signerAddress, response.txId);
-        return { signature, ...response };
+        if ('transferTxs' in response) {
+            const transferTxs = [];
+            for (let i = 0; i < response.transferTxs.length; i++) {
+                const txSignature = await this.signRaw(params.signerAddress, response.transferTxs[i].txId);
+                transferTxs.push({
+                    ...response.transferTxs[i],
+                    signature: txSignature
+                });
+            }
+            const signature = await this.signRaw(params.signerAddress, response.tx.txId);
+            return {
+                transferTxs,
+                tx: { ...response.tx, signature }
+            };
+        }
+        else {
+            const signature = await this.signRaw(params.signerAddress, response.txId);
+            return { signature, ...response };
+        }
     }
     async buildTransferTx(params) {
         return tx_builder_1.TransactionBuilder.from(this.nodeProvider).buildTransferTx(params, await this.getPublicKey(params.signerAddress));
     }
     async signDeployContractTx(params) {
         const response = await this.buildDeployContractTx(params);
-        const signature = await this.signRaw(params.signerAddress, response.txId);
-        return { signature, ...response };
+        if ('transferTxs' in response) {
+            const transferTxs = [];
+            for (let i = 0; i < response.transferTxs.length; i++) {
+                const txSignature = await this.signRaw(params.signerAddress, response.transferTxs[i].txId);
+                transferTxs.push({
+                    ...response.transferTxs[i],
+                    signature: txSignature
+                });
+            }
+            const signature = await this.signRaw(params.signerAddress, response.tx.txId);
+            return {
+                transferTxs,
+                tx: { ...response.tx, signature }
+            };
+        }
+        else {
+            const signature = await this.signRaw(params.signerAddress, response.txId);
+            return { signature, ...response };
+        }
     }
     async buildDeployContractTx(params) {
         return tx_builder_1.TransactionBuilder.from(this.nodeProvider).buildDeployContractTx(params, await this.getPublicKey(params.signerAddress));
     }
     async signExecuteScriptTx(params) {
         const response = await this.buildExecuteScriptTx(params);
-        const signature = await this.signRaw(params.signerAddress, response.txId);
-        return { signature, ...response };
+        if ('transferTxs' in response) {
+            const transferTxs = [];
+            for (let i = 0; i < response.transferTxs.length; i++) {
+                const txSignature = await this.signRaw(params.signerAddress, response.transferTxs[i].txId);
+                transferTxs.push({
+                    ...response.transferTxs[i],
+                    signature: txSignature
+                });
+            }
+            const signature = await this.signRaw(params.signerAddress, response.tx.txId);
+            return {
+                transferTxs,
+                tx: { ...response.tx, signature }
+            };
+        }
+        else {
+            const signature = await this.signRaw(params.signerAddress, response.txId);
+            return { signature, ...response };
+        }
     }
     async buildExecuteScriptTx(params) {
         return tx_builder_1.TransactionBuilder.from(this.nodeProvider).buildExecuteScriptTx(params, await this.getPublicKey(params.signerAddress));

package/dist/src/signer/tx-builder.d.ts

@@ -1,22 +1,16 @@
 import { NodeProvider } from '../api';
-import { SignChainedTxParams, SignChainedTxResult, SignDeployContractTxParams, SignDeployContractTxResult, SignExecuteScriptTxParams, SignExecuteScriptTxResult, SignTransferTxParams, SignTransferTxResult, SignUnsignedTxParams, SignUnsignedTxResult, SignGrouplessTransferTxParams, SignGrouplessDeployContractTxParams, SignGrouplessExecuteScriptTxParams } from './types';
+import { SignChainedTxParams, SignChainedTxResult, SignDeployContractTxParams, SignDeployContractTxResult, SignExecuteScriptTxParams, SignExecuteScriptTxResult, SignTransferTxParams, SignTransferTxResult, SignUnsignedTxParams, SignUnsignedTxResult, BuildTxResult } from './types';
 export declare abstract class TransactionBuilder {
     abstract get nodeProvider(): NodeProvider;
     static from(nodeProvider: NodeProvider): TransactionBuilder;
     static from(baseUrl: string, apiKey?: string, customFetch?: typeof fetch): TransactionBuilder;
     private static validatePublicKey;
-    buildTransferTx(params: SignTransferTxParams, publicKey: string): Promise<Omit<SignTransferTxResult, 'signature'>>;
-    buildDeployContractTx(params: SignDeployContractTxParams, publicKey: string): Promise<Omit<SignDeployContractTxResult, 'signature'>>;
-    buildExecuteScriptTx(params: SignExecuteScriptTxParams, publicKey: string): Promise<Omit<SignExecuteScriptTxResult, 'signature'>>;
+    buildTransferTx(params: SignTransferTxParams, publicKey: string): Promise<BuildTxResult<SignTransferTxResult>>;
+    buildDeployContractTx(params: SignDeployContractTxParams, publicKey: string): Promise<BuildTxResult<SignDeployContractTxResult>>;
+    buildExecuteScriptTx(params: SignExecuteScriptTxParams, publicKey: string): Promise<BuildTxResult<SignExecuteScriptTxResult>>;
     buildChainedTx(params: SignChainedTxParams[], publicKeys: string[]): Promise<Omit<SignChainedTxResult, 'signature'>[]>;
-    buildGrouplessTransferTx(params: SignGrouplessTransferTxParams): Promise<Omit<SignChainedTxResult, 'signature'>[]>;
-    buildGrouplessDeployContractTx(params: SignGrouplessDeployContractTxParams): Promise<Omit<SignChainedTxResult, 'signature'>[]>;
-    buildGrouplessExecuteScriptTx(params: SignGrouplessExecuteScriptTxParams): Promise<Omit<SignChainedTxResult, 'signature'>[]>;
     static buildUnsignedTx(params: SignUnsignedTxParams): Omit<SignUnsignedTxResult, 'signature'>;
     private buildTransferTxParams;
-    private buildGrouplessTransferTxParams;
-    private buildGrouplessDeployContractTxParams;
-    private buildGrouplessExecuteScriptTxParams;
     private buildDeployContractTxParams;
     private buildExecuteScriptTxParams;
     private convertTransferTxResult;