@alephium/web3 2.0.0-rc.2 → 2.0.0

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

@@ -131,6 +131,7 @@ export interface BlockEntry {
     /** @format hex-string */
     target: string;
     ghostUncles: GhostUncleBlockEntry[];
+    conflictedTxs?: string[];
 }
 /** BlockHeaderEntry */
 export interface BlockHeaderEntry {
@@ -250,6 +251,8 @@ export interface BuildExecuteScriptTx {
     group?: number;
     /** @format double */
     gasEstimationMultiplier?: number;
+    /** @format uint256 */
+    dustAmount?: string;
 }
 /** BuildExecuteScriptTxResult */
 export type BuildExecuteScriptTxResult = BuildGrouplessExecuteScriptTxResult | BuildSimpleExecuteScriptTxResult;
@@ -610,6 +613,20 @@ export interface Confirmed {
     toGroupConfirmations: number;
     type: string;
 }
+/** Conflicted */
+export interface Conflicted {
+    /** @format block-hash */
+    blockHash: string;
+    /** @format int32 */
+    txIndex: number;
+    /** @format int32 */
+    chainConfirmations: number;
+    /** @format int32 */
+    fromGroupConfirmations: number;
+    /** @format int32 */
+    toGroupConfirmations: number;
+    type: string;
+}
 /** Constant */
 export interface Constant {
     name: string;
@@ -958,6 +975,8 @@ export interface RichAssetInput {
     /** @format address */
     address: string;
     tokens: Token[];
+    /** @format 32-byte-hash */
+    outputRefTxId: string;
 }
 /** RichBlockAndEvents */
 export interface RichBlockAndEvents {
@@ -988,6 +1007,7 @@ export interface RichBlockEntry {
     /** @format hex-string */
     target: string;
     ghostUncles: GhostUncleBlockEntry[];
+    conflictedTxs?: string[];
 }
 /** RichBlocksAndEventsPerTimeStampRange */
 export interface RichBlocksAndEventsPerTimeStampRange {
@@ -1004,6 +1024,8 @@ export interface RichContractInput {
     /** @format address */
     address: string;
     tokens: Token[];
+    /** @format 32-byte-hash */
+    outputRefTxId: string;
 }
 /** RichTransaction */
 export interface RichTransaction {
@@ -1235,7 +1257,7 @@ export interface TxNotFound {
     type: string;
 }
 /** TxStatus */
-export type TxStatus = Confirmed | MemPooled | TxNotFound;
+export type TxStatus = Confirmed | Conflicted | MemPooled | TxNotFound;
 /** UTXO */
 export interface UTXO {
     ref: OutputRef;
@@ -1421,7 +1443,7 @@ export declare class HttpClient<SecurityDataType = unknown> {
 }
 /**
  * @title Alephium API
- * @version 3.15.2
+ * @version 4.2.0
  * @baseUrl ../
  */
 export declare class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {
@@ -2040,7 +2062,7 @@ export declare class Api<SecurityDataType extends unknown> extends HttpClient<Se
             fromGroup?: number;
             /** @format int32 */
             toGroup?: number;
-        }, params?: RequestParams) => Promise<Confirmed | MemPooled | TxNotFound>;
+        }, params?: RequestParams) => Promise<Confirmed | Conflicted | MemPooled | TxNotFound>;
         /**
          * No description
          *

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

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

package/dist/src/api/types.d.ts

@@ -22,6 +22,7 @@ export declare function toApiAddress(v0: Val): string;
 export declare function toApiArray(tpe: string, v: Val): node.Val;
 export declare function toApiVal(v: Val, tpe: string): node.Val;
 export declare function fromApiPrimitiveVal(value: node.Val, tpe: string, systemEvent?: boolean): Val;
+export declare function decodeTupleType(tpe: string): string[];
 export declare function decodeArrayType(tpe: string): [string, number];
 export declare function getDefaultPrimitiveValue(tpe: string): Val;
 export interface ApiRequestArguments {

package/dist/src/api/types.js

@@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with the library. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StdInterfaceIds = exports.request = exports.requestWithLog = exports.forwardRequests = exports.getDefaultPrimitiveValue = exports.decodeArrayType = exports.fromApiPrimitiveVal = exports.toApiVal = exports.toApiArray = exports.toApiAddress = exports.toApiByteVec = exports.fromApiNumber256 = exports.toApiNumber256Optional = exports.toApiNumber256 = exports.toApiBoolean = exports.fromApiTokens = exports.fromApiToken = exports.toApiTokens = exports.toApiToken = exports.PrimitiveTypes = void 0;
+exports.StdInterfaceIds = exports.request = exports.requestWithLog = exports.forwardRequests = exports.getDefaultPrimitiveValue = exports.decodeArrayType = exports.decodeTupleType = exports.fromApiPrimitiveVal = exports.toApiVal = exports.toApiArray = exports.toApiAddress = exports.toApiByteVec = exports.fromApiNumber256 = exports.toApiNumber256Optional = exports.toApiNumber256 = exports.toApiBoolean = exports.fromApiTokens = exports.fromApiToken = exports.toApiTokens = exports.toApiToken = exports.PrimitiveTypes = void 0;
 const address_1 = require("../address");
 const constants_1 = require("../constants");
 const debug_1 = require("../debug");
@@ -159,6 +159,29 @@ function fromApiPrimitiveVal(value, tpe, systemEvent = false) {
     }
 }
 exports.fromApiPrimitiveVal = fromApiPrimitiveVal;
+function decodeTupleType(tpe) {
+    const str = tpe.slice(1, -1);
+    const types = [];
+    let current = '';
+    let depth = 0;
+    for (const char of str) {
+        if (char === ',' && depth === 0) {
+            types.push(current);
+            current = '';
+        }
+        else {
+            if (char === '(')
+                depth++;
+            if (char === ')')
+                depth--;
+            current += char;
+        }
+    }
+    if (current !== '')
+        types.push(current);
+    return types;
+}
+exports.decodeTupleType = decodeTupleType;
 function decodeArrayType(tpe) {
     const semiColonIndex = tpe.lastIndexOf(';');
     if (semiColonIndex === -1) {

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

@@ -216,6 +216,7 @@ export interface ExecuteScriptParams<P extends Fields = Fields> {
     tokens?: Token[];
     gasAmount?: number;
     gasPrice?: Number256;
+    dustAmount?: Number256;
 }
 export interface ExecuteScriptResult {
     groupIndex: number;
@@ -259,6 +260,7 @@ export interface SignExecuteContractMethodParams<T extends Arguments = Arguments
     tokens?: Token[];
     gasAmount?: number;
     gasPrice?: Number256;
+    dustAmount?: Number256;
 }
 export declare const CreateContractEventAddresses: string[];
 export declare const DestroyContractEventAddresses: string[];

package/dist/src/contract/contract.js

@@ -43,6 +43,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getContractCodeByCodeHash = exports.getTokenIdFromUnsignedTx = exports.getContractIdFromUnsignedTx = exports.getContractEventsCurrentCount = exports.multicallMethods = exports.signExecuteMethod = exports.callMethod = exports.subscribeContractEvents = exports.subscribeContractEvent = exports.decodeEvent = exports.subscribeContractDestroyedEvent = exports.subscribeContractCreatedEvent = exports.fetchContractState = exports.ContractInstance = exports.getMapItem = exports.RalphMap = exports.printDebugMessagesFromTx = exports.getDebugMessagesFromTx = exports.testMethod = exports.extractMapsFromApiResult = exports.addStdIdToFields = exports.subscribeEventsFromContract = exports.decodeContractDestroyedEvent = exports.decodeContractCreatedEvent = exports.DestroyContractEventAddresses = exports.CreateContractEventAddresses = exports.ExecutableScript = exports.ContractFactory = exports.randomTxId = exports.fromApiEventFields = exports.fromApiArray = exports.getDefaultValue = exports.fromApiFields = exports.Script = exports.Contract = exports.Artifact = exports.Struct = exports.DEFAULT_COMPILER_OPTIONS = exports.DEFAULT_NODE_COMPILER_OPTIONS = exports.StdIdFieldName = void 0;
 const fs_1 = require("fs");
 const api_1 = require("../api");
+const signer_1 = require("../signer");
 const ralph = __importStar(require("./ralph"));
 const utils_1 = require("../utils");
 const address_1 = require("../address");
@@ -53,6 +54,7 @@ const blake = __importStar(require("blakejs"));
 const debug_1 = require("../debug");
 const codec_1 = require("../codec");
 const error_1 = require("../error");
+const script_codec_1 = require("../codec/script-codec");
 const crypto = new utils_1.WebCrypto();
 exports.StdIdFieldName = '__stdInterfaceId';
 exports.DEFAULT_NODE_COMPILER_OPTIONS = {
@@ -522,14 +524,18 @@ class Script extends Artifact {
     }
     async txParamsForExecution(params) {
         const selectedAccount = await params.signer.getSelectedAccount();
+        const bytecode = this.buildByteCodeToDeploy(params.initialFields ?? {});
+        const group = getGroupFromTxScript(bytecode, selectedAccount);
         const signerParams = {
             signerAddress: selectedAccount.address,
             signerKeyType: selectedAccount.keyType,
-            bytecode: this.buildByteCodeToDeploy(params.initialFields ?? {}),
+            bytecode,
             attoAlphAmount: params.attoAlphAmount,
             tokens: params.tokens,
             gasAmount: params.gasAmount,
-            gasPrice: params.gasPrice
+            gasPrice: params.gasPrice,
+            group,
+            dustAmount: params.dustAmount
         };
         return signerParams;
     }
@@ -543,6 +549,33 @@ class Script extends Artifact {
     }
 }
 exports.Script = Script;
+function getGroupFromTxScript(bytecode, account) {
+    if ((0, signer_1.isGroupedAccount)(account))
+        return account.group;
+    const script = script_codec_1.scriptCodec.decode((0, utils_1.hexToBinUnsafe)(bytecode));
+    const instrs = script.methods.flatMap((method) => method.instrs);
+    for (let index = 0; index < instrs.length - 1; index += 1) {
+        const instr = instrs[`${index}`];
+        const nextInstr = instrs[index + 1];
+        if (instr.name === 'BytesConst' &&
+            instr.value.length === 32 &&
+            (nextInstr.name === 'CallExternal' || nextInstr.name === 'CallExternalBySelector')) {
+            const groupIndex = instr.value[instr.value.length - 1];
+            if (groupIndex >= 0 && groupIndex < constants_1.TOTAL_NUMBER_OF_GROUPS) {
+                return groupIndex;
+            }
+        }
+    }
+    for (const instr of instrs) {
+        if (instr.name === 'BytesConst' && instr.value.length === 32) {
+            const groupIndex = instr.value[instr.value.length - 1];
+            if (groupIndex >= 0 && groupIndex < constants_1.TOTAL_NUMBER_OF_GROUPS) {
+                return groupIndex;
+            }
+        }
+    }
+    return (0, address_1.groupOfAddress)(account.address);
+}
 function fromApiFields(immFields, mutFields, fieldsSig, structs) {
     let [immIndex, mutIndex] = [0, 0];
     const func = (type, isMutable) => {
@@ -562,6 +595,13 @@ function buildVal(isMutable, type, structs, func) {
         const [baseType, size] = (0, api_1.decodeArrayType)(type);
         return Array.from(Array(size).keys()).map(() => buildVal(isMutable, baseType, structs, func));
     }
+    if (type.startsWith('(')) {
+        const tuple = (0, api_1.decodeTupleType)(type);
+        return tuple.reduce((acc, fieldType) => {
+            acc.push(buildVal(isMutable, fieldType, structs, func));
+            return acc;
+        }, []);
+    }
     const struct = structs.find((s) => s.name === type);
     if (struct !== undefined) {
         return struct.fieldNames.reduce((acc, name, index) => {
@@ -1265,7 +1305,9 @@ async function signExecuteMethod(contract, instance, methodName, params) {
         attoAlphAmount: params.attoAlphAmount,
         tokens: params.tokens,
         gasAmount: params.gasAmount,
-        gasPrice: params.gasPrice
+        gasPrice: params.gasPrice,
+        group: instance.groupIndex,
+        dustAmount: params.dustAmount
     };
     const result = (await signer.signAndSubmitExecuteScriptTx(signerParams));
     if ((0, debug_1.isContractDebugMessageEnabled)() && isDevnet) {

package/dist/src/contract/ralph.js

@@ -178,6 +178,16 @@ function calcFieldSize(type, isMutable, structs) {
         const base = calcFieldSize(baseType, isMutable, structs);
         return { immFields: base.immFields * size, mutFields: base.mutFields * size };
     }
+    if (type.startsWith('(')) {
+        const tuple = (0, api_1.decodeTupleType)(type);
+        return tuple.reduce((acc, fieldType) => {
+            const subFieldSize = calcFieldSize(fieldType, isMutable, structs);
+            return {
+                immFields: acc.immFields + subFieldSize.immFields,
+                mutFields: acc.mutFields + subFieldSize.mutFields
+            };
+        }, { immFields: 0, mutFields: 0 });
+    }
     return isMutable ? { immFields: 0, mutFields: 1 } : { immFields: 1, mutFields: 0 };
 }
 exports.calcFieldSize = calcFieldSize;
@@ -251,6 +261,10 @@ function typeLength(typ, structs) {
         const [baseType, size] = (0, api_1.decodeArrayType)(typ);
         return size * typeLength(baseType, structs);
     }
+    if (typ.startsWith('(')) {
+        const tuple = (0, api_1.decodeTupleType)(typ);
+        return tuple.reduce((acc, fieldType) => acc + typeLength(fieldType, structs), 0);
+    }
     const struct = structs.find((s) => s.name === typ);
     if (struct !== undefined) {
         return struct.fieldTypes.reduce((acc, fieldType) => acc + typeLength(fieldType, structs), 0);
@@ -277,6 +291,15 @@ function flattenField(isMutable, name, type, value, structs) {
             return flattenField(isMutable, `${name}[${index}]`, baseType, item, structs);
         });
     }
+    if (Array.isArray(value) && type.startsWith('(')) {
+        const tuple = (0, api_1.decodeTupleType)(type);
+        if (value.length !== tuple.length) {
+            throw Error(`Invalid tuple length, expected ${tuple.length}, got ${value.length}`);
+        }
+        return tuple.flatMap((fieldType, index) => {
+            return flattenField(isMutable, `${name}._${index}`, fieldType, value[`${index}`], structs);
+        });
+    }
     const struct = structs.find((s) => s.name === type);
     if (struct !== undefined) {
         if (typeof value !== 'object') {

package/dist/src/signer/tx-builder.js

@@ -149,13 +149,14 @@ class TransactionBuilder {
     }
     buildExecuteScriptTxParams(params, publicKey) {
         TransactionBuilder.validatePublicKey(params, publicKey, params.signerKeyType);
-        const { attoAlphAmount, tokens, gasPrice, ...rest } = params;
+        const { attoAlphAmount, tokens, gasPrice, dustAmount, ...rest } = params;
         return {
             fromPublicKey: publicKey,
             fromPublicKeyType: params.signerKeyType,
             attoAlphAmount: (0, api_1.toApiNumber256Optional)(attoAlphAmount),
             tokens: (0, api_1.toApiTokens)(tokens),
             gasPrice: (0, api_1.toApiNumber256Optional)(gasPrice),
+            dustAmount: (0, api_1.toApiNumber256Optional)(dustAmount),
             ...rest
         };
     }

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

@@ -11,8 +11,11 @@ export interface Destination {
     lockTime?: number;
     message?: string;
 }
-export type GroupedKeyType = 'default' | 'bip340-schnorr';
-export type GrouplessKeyType = 'gl-secp256k1' | 'gl-secp256r1' | 'gl-ed25519' | 'gl-webauthn';
+export declare const groupedKeyTypes: readonly ["default", "bip340-schnorr"];
+export declare const grouplessKeyTypes: readonly ["gl-secp256k1", "gl-secp256r1", "gl-ed25519", "gl-webauthn"];
+export declare const keyTypes: readonly ["default", "bip340-schnorr", "gl-secp256k1", "gl-secp256r1", "gl-ed25519", "gl-webauthn"];
+export type GroupedKeyType = (typeof groupedKeyTypes)[number];
+export type GrouplessKeyType = (typeof grouplessKeyTypes)[number];
 export type KeyType = GroupedKeyType | GrouplessKeyType;
 export interface GroupedAccount {
     keyType: GroupedKeyType;
@@ -26,6 +29,8 @@ export interface GrouplessAccount {
     publicKey: string;
 }
 export type Account = GroupedAccount | GrouplessAccount;
+export declare function isGroupedKeyType(keyType: KeyType): keyType is GroupedKeyType;
+export declare function isGrouplessKeyType(keyType: KeyType): keyType is GrouplessKeyType;
 export declare function isGroupedAccount(account: Account): account is GroupedAccount;
 export declare function isGrouplessAccount(account: Account): account is GrouplessAccount;
 export type SignerAddress = {
@@ -82,6 +87,7 @@ export interface SignExecuteScriptTxParams {
     gasPrice?: Number256;
     gasEstimationMultiplier?: number;
     group?: number;
+    dustAmount?: Number256;
 }
 export interface SignExecuteScriptTxResult {
     groupIndex: number;

package/dist/src/signer/types.js

@@ -17,15 +17,26 @@ You should have received a copy of the GNU Lesser General Public License
 along with the library. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isGrouplessAccount = exports.isGroupedAccount = void 0;
+exports.isGrouplessAccount = exports.isGroupedAccount = exports.isGrouplessKeyType = exports.isGroupedKeyType = exports.keyTypes = exports.grouplessKeyTypes = exports.groupedKeyTypes = void 0;
 const utils_1 = require("../utils");
 utils_1.assertType;
+exports.groupedKeyTypes = ['default', 'bip340-schnorr'];
+exports.grouplessKeyTypes = ['gl-secp256k1', 'gl-secp256r1', 'gl-ed25519', 'gl-webauthn'];
+exports.keyTypes = [...exports.groupedKeyTypes, ...exports.grouplessKeyTypes];
+function isGroupedKeyType(keyType) {
+    return keyType === 'default' || keyType === 'bip340-schnorr';
+}
+exports.isGroupedKeyType = isGroupedKeyType;
+function isGrouplessKeyType(keyType) {
+    return keyType !== 'default' && keyType !== 'bip340-schnorr';
+}
+exports.isGrouplessKeyType = isGrouplessKeyType;
 function isGroupedAccount(account) {
-    return account.keyType === 'default' || account.keyType === 'bip340-schnorr';
+    return isGroupedKeyType(account.keyType);
 }
 exports.isGroupedAccount = isGroupedAccount;
 function isGrouplessAccount(account) {
-    return account.keyType !== 'default' && account.keyType !== 'bip340-schnorr';
+    return isGrouplessKeyType(account.keyType);
 }
 exports.isGrouplessAccount = isGrouplessAccount;
 (0, utils_1.assertType)();

package/dist/src/utils/sign.js

@@ -59,7 +59,7 @@ necc.utils.hmacSha256Sync = (key, ...messages) => {
 };
 function checkKeyType(keyType) {
     if (keyType !== 'default' && keyType !== 'bip340-schnorr' && keyType !== 'gl-secp256k1') {
-        throw new Error(`Invalid key type ${keyType}`);
+        throw new Error(`Invalid key type ${keyType}, only supports secp256k1 and schnorr for now`);
     }
 }
 // hash has to be 32 bytes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alephium/web3",
-  "version": "2.0.0-rc.2",
+  "version": "2.0.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.15.2",
+    "alephium_version": "4.2.0",
     "explorer_backend_version": "2.3.2"
   },
   "type": "commonjs",

package/src/api/api-alephium.ts

@@ -155,6 +155,7 @@ export interface BlockEntry {
   /** @format hex-string */
   target: string
   ghostUncles: GhostUncleBlockEntry[]
+  conflictedTxs?: string[]
 }
 
 /** BlockHeaderEntry */
@@ -292,6 +293,8 @@ export interface BuildExecuteScriptTx {
   group?: number
   /** @format double */
   gasEstimationMultiplier?: number
+  /** @format uint256 */
+  dustAmount?: string
 }
 
 /** BuildExecuteScriptTxResult */
@@ -684,6 +687,21 @@ export interface Confirmed {
   type: string
 }
 
+/** Conflicted */
+export interface Conflicted {
+  /** @format block-hash */
+  blockHash: string
+  /** @format int32 */
+  txIndex: number
+  /** @format int32 */
+  chainConfirmations: number
+  /** @format int32 */
+  fromGroupConfirmations: number
+  /** @format int32 */
+  toGroupConfirmations: number
+  type: string
+}
+
 /** Constant */
 export interface Constant {
   name: string
@@ -1085,6 +1103,8 @@ export interface RichAssetInput {
   /** @format address */
   address: string
   tokens: Token[]
+  /** @format 32-byte-hash */
+  outputRefTxId: string
 }
 
 /** RichBlockAndEvents */
@@ -1117,6 +1137,7 @@ export interface RichBlockEntry {
   /** @format hex-string */
   target: string
   ghostUncles: GhostUncleBlockEntry[]
+  conflictedTxs?: string[]
 }
 
 /** RichBlocksAndEventsPerTimeStampRange */
@@ -1135,6 +1156,8 @@ export interface RichContractInput {
   /** @format address */
   address: string
   tokens: Token[]
+  /** @format 32-byte-hash */
+  outputRefTxId: string
 }
 
 /** RichTransaction */
@@ -1394,7 +1417,7 @@ export interface TxNotFound {
 }
 
 /** TxStatus */
-export type TxStatus = Confirmed | MemPooled | TxNotFound
+export type TxStatus = Confirmed | Conflicted | MemPooled | TxNotFound
 
 /** UTXO */
 export interface UTXO {
@@ -1754,7 +1777,7 @@ export class HttpClient<SecurityDataType = unknown> {
 
 /**
  * @title Alephium API
- * @version 3.15.2
+ * @version 4.2.0
  * @baseUrl ../
  */
 export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {

package/src/api/types.ts

@@ -160,6 +160,26 @@ export function fromApiPrimitiveVal(value: node.Val, tpe: string, systemEvent =
   }
 }
 
+export function decodeTupleType(tpe: string): string[] {
+  const str = tpe.slice(1, -1)
+  const types: string[] = []
+  let current = ''
+  let depth = 0
+
+  for (const char of str) {
+    if (char === ',' && depth === 0) {
+      types.push(current)
+      current = ''
+    } else {
+      if (char === '(') depth++
+      if (char === ')') depth--
+      current += char
+    }
+  }
+  if (current !== '') types.push(current)
+  return types
+}
+
 export function decodeArrayType(tpe: string): [string, number] {
   const semiColonIndex = tpe.lastIndexOf(';')
   if (semiColonIndex === -1) {

package/src/contract/contract.ts

@@ -33,7 +33,8 @@ import {
   PrimitiveTypes,
   decodeArrayType,
   fromApiPrimitiveVal,
-  tryGetCallResult
+  tryGetCallResult,
+  decodeTupleType
 } from '../api'
 import {
   SignDeployContractTxParams,
@@ -41,7 +42,9 @@ import {
   SignExecuteScriptTxParams,
   SignerProvider,
   Address,
-  SignExecuteScriptTxResult
+  SignExecuteScriptTxResult,
+  Account,
+  isGroupedAccount
 } from '../signer'
 import * as ralph from './ralph'
 import {
@@ -97,6 +100,7 @@ import {
 } from '../codec'
 import { TraceableError } from '../error'
 import { SimulationResult } from '../api/api-alephium'
+import { scriptCodec } from '../codec/script-codec'
 
 const crypto = new WebCrypto()
 
@@ -794,14 +798,18 @@ export class Script extends Artifact {
 
   async txParamsForExecution<P extends Fields>(params: ExecuteScriptParams<P>): Promise<SignExecuteScriptTxParams> {
     const selectedAccount = await params.signer.getSelectedAccount()
+    const bytecode = this.buildByteCodeToDeploy(params.initialFields ?? {})
+    const group = getGroupFromTxScript(bytecode, selectedAccount)
     const signerParams: SignExecuteScriptTxParams = {
       signerAddress: selectedAccount.address,
       signerKeyType: selectedAccount.keyType,
-      bytecode: this.buildByteCodeToDeploy(params.initialFields ?? {}),
+      bytecode,
       attoAlphAmount: params.attoAlphAmount,
       tokens: params.tokens,
       gasAmount: params.gasAmount,
-      gasPrice: params.gasPrice
+      gasPrice: params.gasPrice,
+      group,
+      dustAmount: params.dustAmount
     }
     return signerParams
   }
@@ -815,6 +823,36 @@ export class Script extends Artifact {
   }
 }
 
+function getGroupFromTxScript(bytecode: string, account: Account): number {
+  if (isGroupedAccount(account)) return account.group
+
+  const script = scriptCodec.decode(hexToBinUnsafe(bytecode))
+  const instrs = script.methods.flatMap((method) => method.instrs)
+  for (let index = 0; index < instrs.length - 1; index += 1) {
+    const instr = instrs[`${index}`]
+    const nextInstr = instrs[index + 1]
+    if (
+      instr.name === 'BytesConst' &&
+      instr.value.length === 32 &&
+      (nextInstr.name === 'CallExternal' || nextInstr.name === 'CallExternalBySelector')
+    ) {
+      const groupIndex = instr.value[instr.value.length - 1]
+      if (groupIndex >= 0 && groupIndex < TOTAL_NUMBER_OF_GROUPS) {
+        return groupIndex
+      }
+    }
+  }
+  for (const instr of instrs) {
+    if (instr.name === 'BytesConst' && instr.value.length === 32) {
+      const groupIndex = instr.value[instr.value.length - 1]
+      if (groupIndex >= 0 && groupIndex < TOTAL_NUMBER_OF_GROUPS) {
+        return groupIndex
+      }
+    }
+  }
+  return groupOfAddress(account.address)
+}
+
 export function fromApiFields(
   immFields: node.Val[],
   mutFields: node.Val[],
@@ -845,6 +883,13 @@ function buildVal(
     const [baseType, size] = decodeArrayType(type)
     return Array.from(Array(size).keys()).map(() => buildVal(isMutable, baseType, structs, func))
   }
+  if (type.startsWith('(')) {
+    const tuple = decodeTupleType(type)
+    return tuple.reduce<Val[]>((acc, fieldType) => {
+      acc.push(buildVal(isMutable, fieldType, structs, func))
+      return acc
+    }, [])
+  }
   const struct = structs.find((s) => s.name === type)
   if (struct !== undefined) {
     return struct.fieldNames.reduce((acc, name, index) => {
@@ -1190,6 +1235,7 @@ export interface ExecuteScriptParams<P extends Fields = Fields> {
   tokens?: Token[]
   gasAmount?: number
   gasPrice?: Number256
+  dustAmount?: Number256
 }
 
 export interface ExecuteScriptResult {
@@ -1239,6 +1285,7 @@ export interface SignExecuteContractMethodParams<T extends Arguments = Arguments
   tokens?: Token[]
   gasAmount?: number
   gasPrice?: Number256
+  dustAmount?: Number256
 }
 
 function specialContractAddress(eventIndex: number, groupIndex: number): string {
@@ -1963,7 +2010,9 @@ export async function signExecuteMethod<I extends ContractInstance, F extends Fi
     attoAlphAmount: params.attoAlphAmount,
     tokens: params.tokens,
     gasAmount: params.gasAmount,
-    gasPrice: params.gasPrice
+    gasPrice: params.gasPrice,
+    group: instance.groupIndex,
+    dustAmount: params.dustAmount
   }
 
   const result = (await signer.signAndSubmitExecuteScriptTx(signerParams)) as SignExecuteScriptTxResult