Optional group param for contract deploy function

alephium · Feb 14, 2025 · c69d5a4 · c69d5a4
1 parent 4a5170d
commit c69d5a4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/packages/web3/src/address/address.ts b/packages/web3/src/address/address.ts
@@ -94,7 +94,7 @@ function decodeAndValidateAddress(address: string): Uint8Array {
 }
 
 export function addressToBytes(address: string): Uint8Array {
-  if (address.length > 2 && address[address.length - 2] === '@') {
+  if (hasExplicitGroupIndex(address)) {
     const groupIndex = parseGroupIndex(address[address.length - 1])
     const decoded = base58ToBytes(address.slice(0, address.length - 2))
     if (decoded[0] === 0x04 && decoded.length === 39) {
@@ -295,6 +295,10 @@ export function groupFromHint(hint: number): number {
   return hash % TOTAL_NUMBER_OF_GROUPS
 }
 
+export function hasExplicitGroupIndex(address: string): boolean {
+  return address.length > 2 && address[address.length - 2] === '@'
+}
+
 function findScriptHint(hint: number, groupIndex: number): number {
   if (groupFromHint(hint) === groupIndex) {
     return hint

diff --git a/packages/web3/src/contract/contract.ts b/packages/web3/src/contract/contract.ts
@@ -58,7 +58,7 @@ import {
   isHexString,
   hexToString
 } from '../utils'
-import { contractIdFromAddress, groupOfAddress, addressFromContractId, subContractId } from '../address'
+import { contractIdFromAddress, groupOfAddress, addressFromContractId, subContractId, isGrouplessAddress, hasExplicitGroupIndex } from '../address'
 import { getCurrentNodeProvider } from '../global'
 import { EventSubscribeOptions, EventSubscription, subscribeToEvents } from './events'
 import { MINIMAL_CONTRACT_DEPOSIT, ONE_ALPH, TOTAL_NUMBER_OF_GROUPS } from '../constants'
@@ -590,7 +590,8 @@ export class Contract extends Artifact {
 
   async txParamsForDeployment<P extends Fields>(
     signer: SignerProvider,
-    params: DeployContractParams<P>
+    params: DeployContractParams<P>,
+    group?: number
   ): Promise<SignDeployContractTxParams> {
     const isDevnet = await this.isDevnet(signer)
     const initialFields: Fields = params.initialFields ?? {}
@@ -600,8 +601,16 @@ export class Contract extends Artifact {
       params.exposePrivateFunctions ?? false
     )
     const selectedAccount = await signer.getSelectedAccount()
+    let signerAddress = selectedAccount.address
+    if (isGrouplessAddress(selectedAccount.address) && !hasExplicitGroupIndex(selectedAccount.address)) {
+      if (group === undefined) {
+        throw new Error('Groupless address requires a group number')
+      }
+      signerAddress = `${selectedAccount.address}@${group}`
+    }
+
     const signerParams: SignDeployContractTxParams = {
-      signerAddress: selectedAccount.address,
+      signerAddress,
       signerKeyType: selectedAccount.keyType,
       bytecode: bytecode,
       initialAttoAlphAmount: params?.initialAttoAlphAmount,
@@ -1079,11 +1088,12 @@ export abstract class ContractFactory<I extends ContractInstance, F extends Fiel
 
   abstract at(address: string): I
 
-  async deploy(signer: SignerProvider, deployParams: DeployContractParams<F>): Promise<DeployContractResult<I>> {
+  async deploy(signer: SignerProvider, deployParams: DeployContractParams<F>, group?: number): Promise<DeployContractResult<I>> {
+
     const signerParams = await this.contract.txParamsForDeployment(signer, {
       ...deployParams,
       initialFields: addStdIdToFields(this.contract, deployParams.initialFields)
-    })
+    }, group)
     const result = await signer.signAndSubmitDeployContractTx(signerParams)
     return {
       ...result,