@alephium/web3 0.4.0 → 0.5.0-rc.1

package/src/contract/ralph.ts

@@ -249,8 +249,12 @@ export function buildScriptByteCode(bytecodeTemplate: string, fields: Fields, fi
   })
 }
 
-export function buildContractByteCode(bytecode: string, fields: Fields, fieldsSig: FieldsSig): string {
-  const fieldsEncoded = fieldsSig.names.flatMap((fieldName, fieldIndex) => {
+function encodeFields(fields: Fields, fieldsSig: FieldsSig, mutable: boolean) {
+  const fieldIndexes = fieldsSig.isMutable
+    .map((_, index) => index)
+    .filter((index) => fieldsSig.isMutable[`${index}`] === mutable)
+  const fieldsEncoded = fieldIndexes.flatMap((fieldIndex) => {
+    const fieldName = fieldsSig.names[`${fieldIndex}`]
     const fieldType = fieldsSig.types[`${fieldIndex}`]
     if (fieldName in fields) {
       const fieldValue = fields[`${fieldName}`]
@@ -260,7 +264,13 @@ export function buildContractByteCode(bytecode: string, fields: Fields, fieldsSi
     }
   })
   const fieldsLength = Buffer.from(encodeI256(BigInt(fieldsEncoded.length))).toString('hex')
-  return bytecode + fieldsLength + fieldsEncoded.map((f) => Buffer.from(f).toString('hex')).join('')
+  return fieldsLength + fieldsEncoded.map((f) => Buffer.from(f).toString('hex')).join('')
+}
+
+export function buildContractByteCode(bytecode: string, fields: Fields, fieldsSig: FieldsSig): string {
+  const encodedImmFields = encodeFields(fields, fieldsSig, false)
+  const encodedMutFields = encodeFields(fields, fieldsSig, true)
+  return bytecode + encodedImmFields + encodedMutFields
 }
 
 enum ApiValType {

package/src/signer/tx-builder.ts

@@ -85,7 +85,7 @@ export abstract class TransactionBuilder {
     }
     const response = await this.nodeProvider.contracts.postContractsUnsignedTxDeployContract(data)
     const contractId = utils.binToHex(utils.contractIdFromAddress(response.contractAddress))
-    return { ...response, contractId, gasPrice: fromApiNumber256(response.gasPrice) }
+    return { ...response, groupIndex: response.fromGroup, contractId, gasPrice: fromApiNumber256(response.gasPrice) }
   }
 
   async buildExecuteScriptTx(
@@ -103,7 +103,7 @@ export abstract class TransactionBuilder {
       ...rest
     }
     const response = await this.nodeProvider.contracts.postContractsUnsignedTxExecuteScript(data)
-    return { ...response, gasPrice: fromApiNumber256(response.gasPrice) }
+    return { ...response, groupIndex: response.fromGroup, gasPrice: fromApiNumber256(response.gasPrice) }
   }
 
   async buildUnsignedTx(params: SignUnsignedTxParams): Promise<Omit<SignUnsignedTxResult, 'signature'>> {

package/src/signer/types.ts

@@ -73,8 +73,7 @@ export interface SignDeployContractTxParams {
 }
 assertType<Eq<keyof SignDeployContractTxParams, keyof TxBuildParams<node.BuildDeployContractTx>>>()
 export interface SignDeployContractTxResult {
-  fromGroup: number
-  toGroup: number
+  groupIndex: number
   unsignedTx: string
   txId: string
   signature: string
@@ -83,7 +82,12 @@ export interface SignDeployContractTxResult {
   gasAmount: number
   gasPrice: Number256
 }
-assertType<Eq<SignDeployContractTxResult, SignResult<node.BuildDeployContractTxResult> & { contractId: string }>>()
+assertType<
+  Eq<
+    Omit<SignDeployContractTxResult, 'groupIndex'>,
+    Omit<SignResult<node.BuildDeployContractTxResult> & { contractId: string }, 'fromGroup' | 'toGroup'>
+  >
+>()
 
 export interface SignExecuteScriptTxParams {
   signerAddress: string
@@ -95,15 +99,19 @@ export interface SignExecuteScriptTxParams {
 }
 assertType<Eq<keyof SignExecuteScriptTxParams, keyof TxBuildParams<node.BuildExecuteScriptTx>>>()
 export interface SignExecuteScriptTxResult {
-  fromGroup: number
-  toGroup: number
+  groupIndex: number
   unsignedTx: string
   txId: string
   signature: string
   gasAmount: number
   gasPrice: Number256
 }
-assertType<Eq<SignExecuteScriptTxResult, SignResult<node.BuildExecuteScriptTxResult>>>()
+assertType<
+  Eq<
+    Omit<SignExecuteScriptTxResult, 'groupIndex'>,
+    Omit<SignResult<node.BuildExecuteScriptTxResult>, 'fromGroup' | 'toGroup'>
+  >
+>()
 
 export interface SignUnsignedTxParams {
   signerAddress: string

package/src/utils/utils.ts

@@ -91,7 +91,9 @@ export function groupOfAddress(address: string): number {
   } else if (addressType == AddressType.P2SH) {
     return groupOfP2shAddress(addressBody)
   } else {
-    throw new Error(`Invalid asset address type: ${addressType}`)
+    // Contract Address
+    const id = contractIdFromAddress(address)
+    return id[`${id.length - 1}`]
   }
 }
 
@@ -217,3 +219,4 @@ type _Eq<X, Y> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1
 export type Eq<X, Y> = _Eq<{ [P in keyof X]: X[P] }, { [P in keyof Y]: Y[P] }>
 // eslint-disable-next-line @typescript-eslint/no-empty-function, @typescript-eslint/no-unused-vars
 export function assertType<T extends true>(): void {}
+export type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>