@alephium/web3 1.7.2 → 1.7.3

package/dist/src/address/address.d.ts

@@ -1,4 +1,5 @@
 import { KeyType } from '../signer';
+import { LockupScript } from '../codec/lockup-script-codec';
 export declare enum AddressType {
     P2PKH = 0,
     P2MPKH = 1,
@@ -20,4 +21,4 @@ export declare function addressFromContractId(contractId: string): string;
 export declare function addressFromTokenId(tokenId: string): string;
 export declare function contractIdFromTx(txId: string, outputIndex: number): string;
 export declare function subContractId(parentContractId: string, pathInHex: string, group: number): string;
-export declare function xorByte(intValue: number): number;
+export declare function groupOfLockupScript(lockupScript: LockupScript): number;

package/dist/src/address/address.js

@@ -20,16 +20,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.xorByte = exports.subContractId = exports.contractIdFromTx = exports.addressFromTokenId = exports.addressFromContractId = exports.addressFromScript = exports.addressFromPublicKey = exports.publicKeyFromPrivateKey = exports.groupOfPrivateKey = exports.tokenIdFromAddress = exports.contractIdFromAddress = exports.groupOfAddress = exports.isContractAddress = exports.isAssetAddress = exports.isValidAddress = exports.validateAddress = exports.AddressType = void 0;
+exports.groupOfLockupScript = exports.subContractId = exports.contractIdFromTx = exports.addressFromTokenId = exports.addressFromContractId = exports.addressFromScript = exports.addressFromPublicKey = exports.publicKeyFromPrivateKey = exports.groupOfPrivateKey = exports.tokenIdFromAddress = exports.contractIdFromAddress = exports.groupOfAddress = exports.isContractAddress = exports.isAssetAddress = exports.isValidAddress = exports.validateAddress = exports.AddressType = void 0;
 const elliptic_1 = require("elliptic");
 const bn_js_1 = __importDefault(require("bn.js"));
 const constants_1 = require("../constants");
 const blakejs_1 = __importDefault(require("blakejs"));
 const bs58_1 = __importDefault(require("../utils/bs58"));
-const djb2_1 = __importDefault(require("../utils/djb2"));
 const utils_1 = require("../utils");
 const lockup_script_codec_1 = require("../codec/lockup-script-codec");
 const codec_1 = require("../codec");
+const djb2_1 = __importDefault(require("../utils/djb2"));
 const ec = new elliptic_1.ec('secp256k1');
 const PublicKeyHashSize = 32;
 var AddressType;
@@ -120,23 +120,17 @@ function groupOfAddress(address) {
     }
 }
 exports.groupOfAddress = groupOfAddress;
-function groupOfAddressBytes(bytes) {
-    const hint = (0, djb2_1.default)(bytes) | 1;
-    const hash = xorByte(hint);
-    const group = hash % constants_1.TOTAL_NUMBER_OF_GROUPS;
-    return group;
-}
 // Pay to public key hash address
 function groupOfP2pkhAddress(address) {
-    return groupOfAddressBytes(address);
+    return groupFromBytesForAssetAddress(address);
 }
 // Pay to multiple public key hash address
 function groupOfP2mpkhAddress(address) {
-    return groupOfAddressBytes(address.slice(1, 33));
+    return groupFromBytesForAssetAddress(address.slice(1, 33));
 }
 // Pay to script hash address
 function groupOfP2shAddress(address) {
-    return groupOfAddressBytes(address);
+    return groupFromBytesForAssetAddress(address);
 }
 function contractIdFromAddress(address) {
     return idFromAddress(address);
@@ -228,11 +222,25 @@ function subContractId(parentContractId, pathInHex, group) {
     return (0, utils_1.binToHex)(bytes);
 }
 exports.subContractId = subContractId;
-function xorByte(intValue) {
-    const byte0 = (intValue >> 24) & 0xff;
-    const byte1 = (intValue >> 16) & 0xff;
-    const byte2 = (intValue >> 8) & 0xff;
-    const byte3 = intValue & 0xff;
-    return (byte0 ^ byte1 ^ byte2 ^ byte3) & 0xff;
-}
-exports.xorByte = xorByte;
+function groupOfLockupScript(lockupScript) {
+    if (lockupScript.kind === 'P2PKH') {
+        return groupFromBytesForAssetAddress(lockupScript.value);
+    }
+    else if (lockupScript.kind === 'P2MPKH') {
+        return groupFromBytesForAssetAddress(lockupScript.value.publicKeyHashes[0]);
+    }
+    else if (lockupScript.kind === 'P2SH') {
+        return groupFromBytesForAssetAddress(lockupScript.value);
+    }
+    else {
+        // P2C
+        const contractId = lockupScript.value;
+        return contractId[`${contractId.length - 1}`];
+    }
+}
+exports.groupOfLockupScript = groupOfLockupScript;
+function groupFromBytesForAssetAddress(bytes) {
+    const hint = (0, djb2_1.default)(bytes) | 1;
+    const hash = (0, utils_1.xorByte)(hint);
+    return hash % constants_1.TOTAL_NUMBER_OF_GROUPS;
+}

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

@@ -8,5 +8,5 @@ export declare abstract class TransactionBuilder {
     buildTransferTx(params: SignTransferTxParams, publicKey: string): Promise<Omit<SignTransferTxResult, 'signature'>>;
     buildDeployContractTx(params: SignDeployContractTxParams, publicKey: string): Promise<Omit<SignDeployContractTxResult, 'signature'>>;
     buildExecuteScriptTx(params: SignExecuteScriptTxParams, publicKey: string): Promise<Omit<SignExecuteScriptTxResult, 'signature'>>;
-    buildUnsignedTx(params: SignUnsignedTxParams): Promise<Omit<SignUnsignedTxResult, 'signature'>>;
+    buildUnsignedTx(params: SignUnsignedTxParams): Omit<SignUnsignedTxResult, 'signature'>;
 }

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

@@ -22,6 +22,9 @@ const utils_1 = require("../utils");
 const api_1 = require("../api");
 const address_1 = require("../address");
 const signer_1 = require("./signer");
+const codec_1 = require("../codec");
+const transaction_1 = require("../transaction");
+const hash_1 = require("../codec/hash");
 class TransactionBuilder {
     static from(param0, param1, customFetch) {
         const nodeProvider = typeof param0 === 'string' ? new api_1.NodeProvider(param0, param1, customFetch) : param0;
@@ -80,16 +83,18 @@ class TransactionBuilder {
         const response = await this.nodeProvider.contracts.postContractsUnsignedTxExecuteScript(data);
         return { ...response, groupIndex: response.fromGroup, gasPrice: (0, api_1.fromApiNumber256)(response.gasPrice) };
     }
-    async buildUnsignedTx(params) {
-        const data = { unsignedTx: params.unsignedTx };
-        const decoded = await this.nodeProvider.transactions.postTransactionsDecodeUnsignedTx(data);
+    buildUnsignedTx(params) {
+        const unsignedTxBin = (0, utils_1.hexToBinUnsafe)(params.unsignedTx);
+        const decoded = codec_1.unsignedTxCodec.decode(unsignedTxBin);
+        const txId = (0, utils_1.binToHex)((0, hash_1.blakeHash)(unsignedTxBin));
+        const [fromGroup, toGroup] = (0, transaction_1.groupIndexOfTransaction)(decoded);
         return {
-            fromGroup: decoded.fromGroup,
-            toGroup: decoded.toGroup,
+            fromGroup: fromGroup,
+            toGroup: toGroup,
             unsignedTx: params.unsignedTx,
-            txId: decoded.unsignedTx.txId,
-            gasAmount: decoded.unsignedTx.gasAmount,
-            gasPrice: (0, api_1.fromApiNumber256)(decoded.unsignedTx.gasPrice)
+            txId: txId,
+            gasAmount: decoded.gasAmount,
+            gasPrice: decoded.gasPrice
         };
     }
 }

package/dist/src/transaction/utils.d.ts

@@ -1,2 +1,4 @@
 import { node } from '../api';
+import { UnsignedTx } from '../codec';
 export declare function waitForTxConfirmation(txId: string, confirmations: number, requestInterval: number): Promise<node.Confirmed>;
+export declare function groupIndexOfTransaction(unsignedTx: UnsignedTx): [number, number];

package/dist/src/transaction/utils.js

@@ -17,8 +17,11 @@ 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.waitForTxConfirmation = void 0;
+exports.groupIndexOfTransaction = exports.waitForTxConfirmation = void 0;
+const address_1 = require("../address");
+const constants_1 = require("../constants");
 const global_1 = require("../global");
+const utils_1 = require("../utils");
 function isConfirmed(txStatus) {
     return txStatus.type === 'Confirmed';
 }
@@ -32,3 +35,22 @@ async function waitForTxConfirmation(txId, confirmations, requestInterval) {
     return waitForTxConfirmation(txId, confirmations, requestInterval);
 }
 exports.waitForTxConfirmation = waitForTxConfirmation;
+function groupIndexOfTransaction(unsignedTx) {
+    if (unsignedTx.inputs.length === 0)
+        throw new Error('Empty inputs for unsignedTx');
+    const fromGroup = groupFromHint(unsignedTx.inputs[0].hint);
+    let toGroup = fromGroup;
+    for (const output of unsignedTx.fixedOutputs) {
+        const outputGroup = (0, address_1.groupOfLockupScript)(output.lockupScript);
+        if (outputGroup !== fromGroup) {
+            toGroup = outputGroup;
+            break;
+        }
+    }
+    return [fromGroup, toGroup];
+}
+exports.groupIndexOfTransaction = groupIndexOfTransaction;
+function groupFromHint(hint) {
+    const hash = (0, utils_1.xorByte)(hint);
+    return hash % constants_1.TOTAL_NUMBER_OF_GROUPS;
+}

package/dist/src/utils/utils.d.ts

@@ -24,6 +24,7 @@ export declare function isDevnet(networkId?: number): boolean;
 export declare function targetToDifficulty(compactedTarget: HexString): bigint;
 export declare function difficultyToTarget(diff: bigint): HexString;
 export declare function concatBytes(arrays: Uint8Array[]): Uint8Array;
+export declare function xorByte(intValue: number): number;
 type _Eq<X, Y> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? true : false;
 export type Eq<X, Y> = _Eq<{
     [P in keyof X]: X[P];

package/dist/src/utils/utils.js

@@ -20,7 +20,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertType = exports.concatBytes = exports.difficultyToTarget = exports.targetToDifficulty = exports.isDevnet = exports.sleep = exports.hexToString = exports.stringToHex = exports.blockChainIndex = exports.binToHex = exports.hexToBinUnsafe = exports.toNonNegativeBigInt = exports.isHexString = exports.signatureDecode = exports.encodeHexSignature = exports.encodeSignature = exports.networkIds = void 0;
+exports.assertType = exports.xorByte = exports.concatBytes = exports.difficultyToTarget = exports.targetToDifficulty = exports.isDevnet = exports.sleep = exports.hexToString = exports.stringToHex = exports.blockChainIndex = exports.binToHex = exports.hexToBinUnsafe = exports.toNonNegativeBigInt = exports.isHexString = exports.signatureDecode = exports.encodeHexSignature = exports.encodeSignature = exports.networkIds = void 0;
 const elliptic_1 = require("elliptic");
 const bn_js_1 = __importDefault(require("bn.js"));
 const constants_1 = require("../constants");
@@ -153,6 +153,14 @@ function concatBytes(arrays) {
     return result;
 }
 exports.concatBytes = concatBytes;
+function xorByte(intValue) {
+    const byte0 = (intValue >> 24) & 0xff;
+    const byte1 = (intValue >> 16) & 0xff;
+    const byte2 = (intValue >> 8) & 0xff;
+    const byte3 = intValue & 0xff;
+    return (byte0 ^ byte1 ^ byte2 ^ byte3) & 0xff;
+}
+exports.xorByte = xorByte;
 // eslint-disable-next-line @typescript-eslint/no-empty-function, @typescript-eslint/no-unused-vars
 function assertType() { }
 exports.assertType = assertType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alephium/web3",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "description": "A JS/TS library to interact with the Alephium platform",
   "license": "GPL",
   "main": "dist/src/index.js",
@@ -83,7 +83,7 @@
     "ts-node": "^10.9.1",
     "tslib": "^2.5.0",
     "typescript": "^4.9.5",
-    "webpack": "^5.77.0",
+    "webpack": "^5.94.0",
     "webpack-cli": "^4.10.0"
   },
   "engines": {

package/src/address/address.ts

@@ -21,11 +21,12 @@ import BN from 'bn.js'
 import { TOTAL_NUMBER_OF_GROUPS } from '../constants'
 import blake from 'blakejs'
 import bs58 from '../utils/bs58'
-import djb2 from '../utils/djb2'
-import { binToHex, concatBytes, hexToBinUnsafe, isHexString } from '../utils'
+import { binToHex, concatBytes, hexToBinUnsafe, isHexString, xorByte } from '../utils'
 import { KeyType } from '../signer'
 import { P2MPKH, lockupScriptCodec } from '../codec/lockup-script-codec'
 import { i32Codec } from '../codec'
+import { LockupScript } from '../codec/lockup-script-codec'
+import djb2 from '../utils/djb2'
 
 const ec = new EC('secp256k1')
 const PublicKeyHashSize = 32
@@ -112,26 +113,19 @@ export function groupOfAddress(address: string): number {
   }
 }
 
-function groupOfAddressBytes(bytes: Uint8Array): number {
-  const hint = djb2(bytes) | 1
-  const hash = xorByte(hint)
-  const group = hash % TOTAL_NUMBER_OF_GROUPS
-  return group
-}
-
 // Pay to public key hash address
 function groupOfP2pkhAddress(address: Uint8Array): number {
-  return groupOfAddressBytes(address)
+  return groupFromBytesForAssetAddress(address)
 }
 
 // Pay to multiple public key hash address
 function groupOfP2mpkhAddress(address: Uint8Array): number {
-  return groupOfAddressBytes(address.slice(1, 33))
+  return groupFromBytesForAssetAddress(address.slice(1, 33))
 }
 
 // Pay to script hash address
 function groupOfP2shAddress(address: Uint8Array): number {
-  return groupOfAddressBytes(address)
+  return groupFromBytesForAssetAddress(address)
 }
 
 export function contractIdFromAddress(address: string): Uint8Array {
@@ -225,10 +219,22 @@ export function subContractId(parentContractId: string, pathInHex: string, group
   return binToHex(bytes)
 }
 
-export function xorByte(intValue: number): number {
-  const byte0 = (intValue >> 24) & 0xff
-  const byte1 = (intValue >> 16) & 0xff
-  const byte2 = (intValue >> 8) & 0xff
-  const byte3 = intValue & 0xff
-  return (byte0 ^ byte1 ^ byte2 ^ byte3) & 0xff
+export function groupOfLockupScript(lockupScript: LockupScript): number {
+  if (lockupScript.kind === 'P2PKH') {
+    return groupFromBytesForAssetAddress(lockupScript.value)
+  } else if (lockupScript.kind === 'P2MPKH') {
+    return groupFromBytesForAssetAddress(lockupScript.value.publicKeyHashes[0])
+  } else if (lockupScript.kind === 'P2SH') {
+    return groupFromBytesForAssetAddress(lockupScript.value)
+  } else {
+    // P2C
+    const contractId = lockupScript.value
+    return contractId[`${contractId.length - 1}`]
+  }
+}
+
+function groupFromBytesForAssetAddress(bytes: Uint8Array): number {
+  const hint = djb2(bytes) | 1
+  const hash = xorByte(hint)
+  return hash % TOTAL_NUMBER_OF_GROUPS
 }

package/src/signer/tx-builder.ts

@@ -16,7 +16,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/>.
 */
 
-import { binToHex } from '../utils'
+import { binToHex, hexToBinUnsafe } from '../utils'
 import { fromApiNumber256, node, NodeProvider, toApiNumber256Optional, toApiTokens } from '../api'
 import { addressFromPublicKey, contractIdFromAddress } from '../address'
 import { toApiDestinations } from './signer'
@@ -32,6 +32,9 @@ import {
   SignUnsignedTxParams,
   SignUnsignedTxResult
 } from './types'
+import { unsignedTxCodec, UnsignedTxCodec } from '../codec'
+import { groupIndexOfTransaction } from '../transaction'
+import { blakeHash } from '../codec/hash'
 
 export abstract class TransactionBuilder {
   abstract get nodeProvider(): NodeProvider
@@ -113,16 +116,18 @@ export abstract class TransactionBuilder {
     return { ...response, groupIndex: response.fromGroup, gasPrice: fromApiNumber256(response.gasPrice) }
   }
 
-  async buildUnsignedTx(params: SignUnsignedTxParams): Promise<Omit<SignUnsignedTxResult, 'signature'>> {
-    const data = { unsignedTx: params.unsignedTx }
-    const decoded = await this.nodeProvider.transactions.postTransactionsDecodeUnsignedTx(data)
+  buildUnsignedTx(params: SignUnsignedTxParams): Omit<SignUnsignedTxResult, 'signature'> {
+    const unsignedTxBin = hexToBinUnsafe(params.unsignedTx)
+    const decoded = unsignedTxCodec.decode(unsignedTxBin)
+    const txId = binToHex(blakeHash(unsignedTxBin))
+    const [fromGroup, toGroup] = groupIndexOfTransaction(decoded)
     return {
-      fromGroup: decoded.fromGroup,
-      toGroup: decoded.toGroup,
+      fromGroup: fromGroup,
+      toGroup: toGroup,
       unsignedTx: params.unsignedTx,
-      txId: decoded.unsignedTx.txId,
-      gasAmount: decoded.unsignedTx.gasAmount,
-      gasPrice: fromApiNumber256(decoded.unsignedTx.gasPrice)
+      txId: txId,
+      gasAmount: decoded.gasAmount,
+      gasPrice: decoded.gasPrice
     }
   }
 }

package/src/transaction/utils.ts

@@ -16,8 +16,12 @@ 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/>.
 */
 
+import { groupOfLockupScript } from '../address'
 import { node } from '../api'
+import { UnsignedTx } from '../codec'
+import { TOTAL_NUMBER_OF_GROUPS } from '../constants'
 import { getCurrentNodeProvider } from '../global'
+import { xorByte } from '../utils'
 
 function isConfirmed(txStatus: node.TxStatus): txStatus is node.Confirmed {
   return txStatus.type === 'Confirmed'
@@ -36,3 +40,25 @@ export async function waitForTxConfirmation(
   await new Promise((r) => setTimeout(r, requestInterval))
   return waitForTxConfirmation(txId, confirmations, requestInterval)
 }
+
+export function groupIndexOfTransaction(unsignedTx: UnsignedTx): [number, number] {
+  if (unsignedTx.inputs.length === 0) throw new Error('Empty inputs for unsignedTx')
+
+  const fromGroup = groupFromHint(unsignedTx.inputs[0].hint)
+
+  let toGroup = fromGroup
+  for (const output of unsignedTx.fixedOutputs) {
+    const outputGroup = groupOfLockupScript(output.lockupScript)
+    if (outputGroup !== fromGroup) {
+      toGroup = outputGroup
+      break
+    }
+  }
+
+  return [fromGroup, toGroup]
+}
+
+function groupFromHint(hint: number): number {
+  const hash = xorByte(hint)
+  return hash % TOTAL_NUMBER_OF_GROUPS
+}

package/src/utils/utils.ts

@@ -156,6 +156,14 @@ export function concatBytes(arrays: Uint8Array[]): Uint8Array {
   return result
 }
 
+export function xorByte(intValue: number): number {
+  const byte0 = (intValue >> 24) & 0xff
+  const byte1 = (intValue >> 16) & 0xff
+  const byte2 = (intValue >> 8) & 0xff
+  const byte3 = intValue & 0xff
+  return (byte0 ^ byte1 ^ byte2 ^ byte3) & 0xff
+}
+
 type _Eq<X, Y> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? true : false
 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