@alephium/web3 2.0.2 → 2.0.4

package/dist/src/contract/contract.js

@@ -43,7 +43,6 @@ 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");
@@ -54,7 +53,6 @@ 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,23 +520,9 @@ class Script extends Artifact {
         };
         return JSON.stringify(object, null, 2);
     }
-    getBytecodeAndGroup(account, fields) {
-        const bytecode = this.buildByteCodeToDeploy(fields);
-        if ((0, signer_1.isGroupedAccount)(account)) {
-            return [bytecode, account.group];
-        }
-        const group = getGroupFromTxScript(bytecode);
-        const defaultGroup = (0, address_1.groupOfAddress)(account.address);
-        if (group === undefined || group === defaultGroup) {
-            return [bytecode, defaultGroup];
-        }
-        const newFields = ralph.updateFieldsWithGroup(fields, group);
-        const newBytecode = this.buildByteCodeToDeploy(newFields);
-        return [newBytecode, group];
-    }
     async txParamsForExecution(params) {
         const selectedAccount = await params.signer.getSelectedAccount();
-        const [bytecode, group] = this.getBytecodeAndGroup(selectedAccount, params.initialFields ?? {});
+        const bytecode = this.buildByteCodeToDeploy(params.initialFields ?? {});
         const signerParams = {
             signerAddress: selectedAccount.address,
             signerKeyType: selectedAccount.keyType,
@@ -547,7 +531,6 @@ class Script extends Artifact {
             tokens: params.tokens,
             gasAmount: params.gasAmount,
             gasPrice: params.gasPrice,
-            group,
             dustAmount: params.dustAmount
         };
         return signerParams;
@@ -562,31 +545,6 @@ class Script extends Artifact {
     }
 }
 exports.Script = Script;
-function getGroupFromTxScript(bytecode) {
-    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 undefined;
-}
 function fromApiFields(immFields, mutFields, fieldsSig, structs) {
     let [immIndex, mutIndex] = [0, 0];
     const func = (type, isMutable) => {

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

@@ -63,7 +63,6 @@ export declare function flattenFields(fields: Fields, names: string[], types: st
     value: Val;
     isMutable: boolean;
 }[];
-export declare function updateFieldsWithGroup(fields: Fields, group: number): Fields;
 export declare function buildScriptByteCode(bytecodeTemplate: string, fields: Fields, fieldsSig: FieldsSig, structs: Struct[]): string;
 export declare function encodeContractFields(fields: Fields, fieldsSig: FieldsSig, structs: Struct[]): {
     encodedImmFields: Uint8Array;

package/dist/src/contract/ralph.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.buildDebugBytecode = exports.encodeContractField = exports.buildContractByteCode = exports.encodeContractFields = exports.buildScriptByteCode = exports.updateFieldsWithGroup = exports.flattenFields = exports.typeLength = exports.encodeMapKey = exports.decodePrimitive = exports.tryDecodeMapDebugLog = exports.calcFieldSize = exports.encodeMapPrefix = exports.parseMapType = exports.splitFields = exports.encodeScriptField = exports.encodeScriptFieldAsString = exports.encodePrimitiveValues = exports.addressVal = exports.byteVecVal = exports.u256Val = exports.i256Val = exports.boolVal = exports.encodeVmAddress = exports.encodeVmByteVec = exports.encodeVmU256 = exports.encodeVmI256 = exports.encodeVmBool = exports.VmValType = exports.encodeAddress = exports.encodeByteVec = void 0;
+exports.buildDebugBytecode = exports.encodeContractField = exports.buildContractByteCode = exports.encodeContractFields = exports.buildScriptByteCode = exports.flattenFields = exports.typeLength = exports.encodeMapKey = exports.decodePrimitive = exports.tryDecodeMapDebugLog = exports.calcFieldSize = exports.encodeMapPrefix = exports.parseMapType = exports.splitFields = exports.encodeScriptField = exports.encodeScriptFieldAsString = exports.encodePrimitiveValues = exports.addressVal = exports.byteVecVal = exports.u256Val = exports.i256Val = exports.boolVal = exports.encodeVmAddress = exports.encodeVmByteVec = exports.encodeVmU256 = exports.encodeVmI256 = exports.encodeVmBool = exports.VmValType = exports.encodeAddress = exports.encodeByteVec = void 0;
 const api_1 = require("../api");
 const utils_1 = require("../utils");
 const codec_1 = require("../codec");
@@ -336,31 +336,6 @@ function checkPrimitiveValue(name, ralphType, value) {
     }
     throw Error(`Invalid value ${value} for ${name}, expected a value of type ${ralphType}`);
 }
-function updateFieldsWithGroup(fields, group) {
-    const newFields = {};
-    for (const key in fields) {
-        const value = fields[`${key}`];
-        newFields[`${key}`] = updateValWithGroup(value, group);
-    }
-    return newFields;
-}
-exports.updateFieldsWithGroup = updateFieldsWithGroup;
-function updateValWithGroup(value, group) {
-    if (typeof value === 'string') {
-        if (!(0, address_1.isValidAddress)(value))
-            return value;
-        if ((0, address_1.isGrouplessAddressWithoutGroupIndex)(value))
-            return `${value}:${group}`;
-        return value;
-    }
-    if (Array.isArray(value)) {
-        return value.map((v) => updateValWithGroup(v, group));
-    }
-    if (typeof value === 'object') {
-        return updateFieldsWithGroup(value, group);
-    }
-    return value;
-}
 const scriptFieldRegex = /\{([0-9]*)\}/g;
 function buildScriptByteCode(bytecodeTemplate, fields, fieldsSig, structs) {
     const allFields = flattenFields(fields, fieldsSig.names, fieldsSig.types, fieldsSig.isMutable, structs);

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

@@ -12,8 +12,11 @@ export declare abstract class TransactionBuilder {
     static buildUnsignedTx(params: SignUnsignedTxParams): Omit<SignUnsignedTxResult, 'signature'>;
     private buildTransferTxParams;
     private buildDeployContractTxParams;
+    private static checkAndGetParams;
     private buildExecuteScriptTxParams;
     private convertTransferTxResult;
     private convertDeployContractTxResult;
     private convertExecuteScriptTxResult;
 }
+export declare function getGroupFromTxScript(bytecode: string): number | undefined;
+export declare function updateBytecodeWithGroup(bytecode: string, group: number): string;

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

@@ -17,14 +17,17 @@ 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.TransactionBuilder = void 0;
+exports.updateBytecodeWithGroup = exports.getGroupFromTxScript = exports.TransactionBuilder = void 0;
 const utils_1 = require("../utils");
 const api_1 = require("../api");
 const address_1 = require("../address");
 const signer_1 = require("./signer");
+const types_1 = require("./types");
 const codec_1 = require("../codec");
 const transaction_1 = require("../transaction");
 const hash_1 = require("../codec/hash");
+const constants_1 = require("../constants");
+const script_codec_1 = require("../codec/script-codec");
 class TransactionBuilder {
     static from(param0, param1, customFetch) {
         const nodeProvider = typeof param0 === 'string' ? new api_1.NodeProvider(param0, param1, customFetch) : param0;
@@ -147,12 +150,29 @@ class TransactionBuilder {
             ...rest
         };
     }
+    static checkAndGetParams(params) {
+        if ((0, types_1.isGroupedKeyType)(params.signerKeyType ?? 'default')) {
+            return params;
+        }
+        if (!(0, address_1.isGrouplessAddress)(params.signerAddress)) {
+            throw new Error('Invalid signer key type for groupless address');
+        }
+        const group = params.group ?? getGroupFromTxScript(params.bytecode);
+        const defaultGroup = (0, address_1.groupOfAddress)(params.signerAddress);
+        if (group === undefined || group === defaultGroup) {
+            return { ...params, group: defaultGroup };
+        }
+        const newBytecode = updateBytecodeWithGroup(params.bytecode, group);
+        const newParams = { ...params, bytecode: newBytecode };
+        return { ...newParams, group };
+    }
     buildExecuteScriptTxParams(params, publicKey) {
         TransactionBuilder.validatePublicKey(params, publicKey, params.signerKeyType);
-        const { attoAlphAmount, tokens, gasPrice, dustAmount, ...rest } = params;
+        const newParams = TransactionBuilder.checkAndGetParams(params);
+        const { signerKeyType, attoAlphAmount, tokens, gasPrice, dustAmount, ...rest } = newParams;
         return {
             fromPublicKey: publicKey,
-            fromPublicKeyType: params.signerKeyType,
+            fromPublicKeyType: signerKeyType,
             attoAlphAmount: (0, api_1.toApiNumber256Optional)(attoAlphAmount),
             tokens: (0, api_1.toApiTokens)(tokens),
             gasPrice: (0, api_1.toApiNumber256Optional)(gasPrice),
@@ -229,3 +249,45 @@ class TransactionBuilder {
     }
 }
 exports.TransactionBuilder = TransactionBuilder;
+function getGroupFromTxScript(bytecode) {
+    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 undefined;
+}
+exports.getGroupFromTxScript = getGroupFromTxScript;
+function updateBytecodeWithGroup(bytecode, group) {
+    const script = script_codec_1.scriptCodec.decode((0, utils_1.hexToBinUnsafe)(bytecode));
+    const newMethods = script.methods.map((method) => {
+        const newInstrs = method.instrs.map((instr) => {
+            if (instr.name === 'AddressConst' && instr.value.kind === 'P2PK') {
+                const newLockupScript = { ...instr.value, value: { ...instr.value.value, group } };
+                return { ...instr, value: newLockupScript };
+            }
+            return instr;
+        });
+        return { ...method, instrs: newInstrs };
+    });
+    const bytes = script_codec_1.scriptCodec.encode({ methods: newMethods });
+    return (0, utils_1.binToHex)(bytes);
+}
+exports.updateBytecodeWithGroup = updateBytecodeWithGroup;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alephium/web3",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "A JS/TS library to interact with the Alephium platform",
   "license": "GPL",
   "main": "dist/src/index.js",
@@ -34,7 +34,7 @@
   "author": "Alephium dev <dev@alephium.org>",
   "config": {
     "alephium_version": "4.2.3",
-    "explorer_backend_version": "2.3.2"
+    "explorer_backend_version": "3.3.2"
   },
   "type": "commonjs",
   "dependencies": {