@alephium/web3 2.0.1 → 2.0.2

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

@@ -1,5 +1,5 @@
 import { NamedVals, node, NodeProvider, Number256, Token, Val } from '../api';
-import { SignDeployContractTxParams, SignDeployContractTxResult, SignExecuteScriptTxParams, SignerProvider, Address, SignExecuteScriptTxResult } from '../signer';
+import { SignDeployContractTxParams, SignDeployContractTxResult, SignExecuteScriptTxParams, SignerProvider, Address, SignExecuteScriptTxResult, Account } from '../signer';
 import { Optional, HexString } from '../utils';
 import { EventSubscribeOptions, EventSubscription } from './events';
 import { contract, Method } from '../codec';
@@ -101,6 +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;
+    getBytecodeAndGroup<P extends Fields>(account: Account, fields: P): [string, number];
     txParamsForExecution<P extends Fields>(params: ExecuteScriptParams<P>): Promise<SignExecuteScriptTxParams>;
     buildByteCodeToDeploy(initialFields: Fields): string;
 }

package/dist/src/contract/contract.js

@@ -522,10 +522,23 @@ 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 = this.buildByteCodeToDeploy(params.initialFields ?? {});
-        const group = getGroupFromTxScript(bytecode, selectedAccount);
+        const [bytecode, group] = this.getBytecodeAndGroup(selectedAccount, params.initialFields ?? {});
         const signerParams = {
             signerAddress: selectedAccount.address,
             signerKeyType: selectedAccount.keyType,
@@ -549,9 +562,7 @@ class Script extends Artifact {
     }
 }
 exports.Script = Script;
-function getGroupFromTxScript(bytecode, account) {
-    if ((0, signer_1.isGroupedAccount)(account))
-        return account.group;
+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) {
@@ -574,7 +585,7 @@ function getGroupFromTxScript(bytecode, account) {
             }
         }
     }
-    return (0, address_1.groupOfAddress)(account.address);
+    return undefined;
 }
 function fromApiFields(immFields, mutFields, fieldsSig, structs) {
     let [immIndex, mutIndex] = [0, 0];

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

@@ -63,6 +63,7 @@ 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.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.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;
 const api_1 = require("../api");
 const utils_1 = require("../utils");
 const codec_1 = require("../codec");
@@ -336,6 +336,31 @@ 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/package.json

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

package/src/contract/contract.ts

@@ -796,10 +796,26 @@ export class Script extends Artifact {
     return JSON.stringify(object, null, 2)
   }
 
+  getBytecodeAndGroup<P extends Fields>(account: Account, fields: P): [string, number] {
+    const bytecode = this.buildByteCodeToDeploy(fields)
+    if (isGroupedAccount(account)) {
+      return [bytecode, account.group]
+    }
+
+    const group = getGroupFromTxScript(bytecode)
+    const defaultGroup = groupOfAddress(account.address)
+    if (group === undefined || group === defaultGroup) {
+      return [bytecode, defaultGroup]
+    }
+
+    const newFields = ralph.updateFieldsWithGroup(fields, group) as P
+    const newBytecode = this.buildByteCodeToDeploy(newFields)
+    return [newBytecode, group]
+  }
+
   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 [bytecode, group] = this.getBytecodeAndGroup(selectedAccount, params.initialFields ?? {})
     const signerParams: SignExecuteScriptTxParams = {
       signerAddress: selectedAccount.address,
       signerKeyType: selectedAccount.keyType,
@@ -823,9 +839,7 @@ export class Script extends Artifact {
   }
 }
 
-function getGroupFromTxScript(bytecode: string, account: Account): number {
-  if (isGroupedAccount(account)) return account.group
-
+function getGroupFromTxScript(bytecode: string): number | undefined {
   const script = scriptCodec.decode(hexToBinUnsafe(bytecode))
   const instrs = script.methods.flatMap((method) => method.instrs)
   for (let index = 0; index < instrs.length - 1; index += 1) {
@@ -850,7 +864,7 @@ function getGroupFromTxScript(bytecode: string, account: Account): number {
       }
     }
   }
-  return groupOfAddress(account.address)
+  return undefined
 }
 
 export function fromApiFields(

package/src/contract/ralph.ts

@@ -39,13 +39,13 @@ import {
   instrCodec,
   u256Codec,
   toU256,
-  toI256,
-  intAs4BytesCodec
+  toI256
 } from '../codec'
 import { boolCodec } from '../codec/codec'
 import { TraceableError } from '../error'
-import djb2 from '../utils/djb2'
-import { addressToBytes, groupFromHint } from '../address'
+import { addressToBytes, isGrouplessAddressWithoutGroupIndex, isValidAddress } from '../address'
+import { scriptCodec } from '../codec/script-codec'
+import { TOTAL_NUMBER_OF_GROUPS } from '../constants'
 
 export function encodeByteVec(hex: string): Uint8Array {
   if (!isHexString(hex)) {
@@ -399,6 +399,32 @@ function checkPrimitiveValue(name: string, ralphType: string, value: Val): strin
   throw Error(`Invalid value ${value} for ${name}, expected a value of type ${ralphType}`)
 }
 
+export function updateFieldsWithGroup(fields: Fields, group: number): Fields {
+  const newFields: Fields = {}
+  for (const key in fields) {
+    const value = fields[`${key}`]
+    newFields[`${key}`] = updateValWithGroup(value, group)
+  }
+  return newFields
+}
+
+function updateValWithGroup(value: Val, group: number): Val {
+  if (typeof value === 'string') {
+    if (!isValidAddress(value)) return value
+    if (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 as Fields, group)
+  }
+  return value
+}
+
 const scriptFieldRegex = /\{([0-9]*)\}/g
 
 export function buildScriptByteCode(