@alephium/web3 0.36.0 → 0.37.0

package/dist/src/api/api-alephium.d.ts

@@ -1002,7 +1002,7 @@ export declare class HttpClient<SecurityDataType = unknown> {
 }
 /**
  * @title Alephium API
- * @version 2.10.0
+ * @version 2.11.0
  * @baseUrl ../
  */
 export declare class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {

package/dist/src/api/api-alephium.js

@@ -151,7 +151,7 @@ class HttpClient {
 exports.HttpClient = HttpClient;
 /**
  * @title Alephium API
- * @version 2.10.0
+ * @version 2.11.0
  * @baseUrl ../
  */
 class Api extends HttpClient {

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

@@ -297,8 +297,8 @@ export interface CallContractResult<R> {
     events: ContractEvent[];
     debugMessages: DebugMessage[];
 }
-export declare const CreateContractEventAddress: string;
-export declare const DestroyContractEventAddress: string;
+export declare const CreateContractEventAddresses: string[];
+export declare const DestroyContractEventAddresses: string[];
 export type ContractCreatedEventFields = {
     address: Address;
     parentAddress?: Address;
@@ -323,8 +323,8 @@ export declare abstract class ContractInstance {
     constructor(address: Address);
 }
 export declare function fetchContractState<F extends Fields, I extends ContractInstance>(contract: ContractFactory<I, F>, instance: ContractInstance): Promise<ContractState<F>>;
-export declare function subscribeContractCreatedEvent(options: EventSubscribeOptions<ContractCreatedEvent>, fromCount?: number): EventSubscription;
-export declare function subscribeContractDestroyedEvent(options: EventSubscribeOptions<ContractDestroyedEvent>, fromCount?: number): EventSubscription;
+export declare function subscribeContractCreatedEvent(options: EventSubscribeOptions<ContractCreatedEvent>, fromGroup: number, fromCount?: number): EventSubscription;
+export declare function subscribeContractDestroyedEvent(options: EventSubscribeOptions<ContractDestroyedEvent>, fromGroup: number, fromCount?: number): EventSubscription;
 export declare function decodeEvent<F extends Fields, M extends ContractEvent<F>>(contract: Contract, instance: ContractInstance, event: node.ContractEvent, targetEventIndex: number): M;
 export declare function subscribeContractEvent<F extends Fields, M extends ContractEvent<F>>(contract: Contract, instance: ContractInstance, options: EventSubscribeOptions<M>, eventName: string, fromCount?: number): EventSubscription;
 export declare function subscribeContractEvents(contract: Contract, instance: ContractInstance, options: EventSubscribeOptions<ContractEvent<any>>, fromCount?: number): EventSubscription;

package/dist/src/contract/contract.js

@@ -43,7 +43,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tryGetCallResult = exports.getTokenIdFromUnsignedTx = exports.getContractIdFromUnsignedTx = exports.getContractEventsCurrentCount = exports.multicallMethods = exports.callMethod = exports.subscribeContractEvents = exports.subscribeContractEvent = exports.decodeEvent = exports.subscribeContractDestroyedEvent = exports.subscribeContractCreatedEvent = exports.fetchContractState = exports.ContractInstance = exports.testMethod = exports.addStdIdToFields = exports.subscribeEventsFromContract = exports.decodeContractDestroyedEvent = exports.decodeContractCreatedEvent = exports.DestroyContractEventAddress = exports.CreateContractEventAddress = exports.ExecutableScript = exports.ContractFactory = exports.randomTxId = exports.fromApiEventFields = exports.fromApiArray = exports.getDefaultValue = exports.fromApiFields = exports.Script = exports.Contract = exports.Artifact = exports.Project = exports.Struct = exports.ProjectArtifact = exports.DEFAULT_COMPILER_OPTIONS = exports.DEFAULT_NODE_COMPILER_OPTIONS = exports.StdIdFieldName = void 0;
+exports.tryGetCallResult = exports.getTokenIdFromUnsignedTx = exports.getContractIdFromUnsignedTx = exports.getContractEventsCurrentCount = exports.multicallMethods = exports.callMethod = exports.subscribeContractEvents = exports.subscribeContractEvent = exports.decodeEvent = exports.subscribeContractDestroyedEvent = exports.subscribeContractCreatedEvent = exports.fetchContractState = exports.ContractInstance = exports.testMethod = 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.Project = exports.Struct = exports.ProjectArtifact = exports.DEFAULT_COMPILER_OPTIONS = exports.DEFAULT_NODE_COMPILER_OPTIONS = exports.StdIdFieldName = void 0;
 const buffer_1 = require("buffer/");
 const fs_1 = __importDefault(require("fs"));
 const fs_2 = require("fs");
@@ -1129,13 +1129,14 @@ class ExecutableScript {
     }
 }
 exports.ExecutableScript = ExecutableScript;
-function specialContractAddress(n) {
+function specialContractAddress(eventIndex, groupIndex) {
     const bytes = new Uint8Array(32).fill(0);
-    bytes[31] = n;
+    bytes[30] = eventIndex;
+    bytes[31] = groupIndex;
     return (0, utils_1.addressFromContractId)((0, utils_1.binToHex)(bytes));
 }
-exports.CreateContractEventAddress = specialContractAddress(-1);
-exports.DestroyContractEventAddress = specialContractAddress(-2);
+exports.CreateContractEventAddresses = Array.from(Array(constants_1.TOTAL_NUMBER_OF_GROUPS).keys()).map((groupIndex) => specialContractAddress(Contract.ContractCreatedEventIndex, groupIndex));
+exports.DestroyContractEventAddresses = Array.from(Array(constants_1.TOTAL_NUMBER_OF_GROUPS).keys()).map((groupIndex) => specialContractAddress(Contract.ContractDestroyedEventIndex, groupIndex));
 function decodeSystemEvent(event, eventSig, eventIndex) {
     if (event.eventIndex !== eventIndex) {
         throw new Error(`Invalid event index: ${event.eventIndex}, expected: ${eventIndex}`);
@@ -1231,20 +1232,29 @@ async function fetchContractState(contract, instance) {
     };
 }
 exports.fetchContractState = fetchContractState;
-function subscribeContractCreatedEvent(options, fromCount) {
-    return subscribeEventsFromContract(options, exports.CreateContractEventAddress, Contract.ContractCreatedEventIndex, (event) => {
+function checkGroupIndex(groupIndex) {
+    if (groupIndex < 0 || groupIndex >= constants_1.TOTAL_NUMBER_OF_GROUPS) {
+        throw new Error(`Invalid group index ${groupIndex}, expected a value within the range [0, ${constants_1.TOTAL_NUMBER_OF_GROUPS})`);
+    }
+}
+function subscribeContractCreatedEvent(options, fromGroup, fromCount) {
+    checkGroupIndex(fromGroup);
+    const contractAddress = exports.CreateContractEventAddresses[`${fromGroup}`];
+    return subscribeEventsFromContract(options, contractAddress, Contract.ContractCreatedEventIndex, (event) => {
         return {
             ...decodeContractCreatedEvent(event),
-            contractAddress: exports.CreateContractEventAddress
+            contractAddress: contractAddress
         };
     }, fromCount);
 }
 exports.subscribeContractCreatedEvent = subscribeContractCreatedEvent;
-function subscribeContractDestroyedEvent(options, fromCount) {
-    return subscribeEventsFromContract(options, exports.DestroyContractEventAddress, Contract.ContractDestroyedEventIndex, (event) => {
+function subscribeContractDestroyedEvent(options, fromGroup, fromCount) {
+    checkGroupIndex(fromGroup);
+    const contractAddress = exports.DestroyContractEventAddresses[`${fromGroup}`];
+    return subscribeEventsFromContract(options, contractAddress, Contract.ContractDestroyedEventIndex, (event) => {
         return {
             ...decodeContractDestroyedEvent(event),
-            contractAddress: exports.DestroyContractEventAddress
+            contractAddress: contractAddress
         };
     }, fromCount);
 }

package/dist/src/contract/ralph.js

@@ -240,12 +240,12 @@ function encodeScriptField(tpe, value) {
         case 'U256':
             const u256 = (0, api_1.toApiNumber256)(value);
             return encodeScriptFieldU256(BigInt(u256));
-        case 'ByteVec':
-            const hexStr = (0, api_1.toApiByteVec)(value);
-            return new Uint8Array([Instruction.bytesConst, ...encodeByteVec(hexStr)]);
         case 'Address':
             const address = (0, api_1.toApiAddress)(value);
             return new Uint8Array([Instruction.addressConst, ...encodeAddress(address)]);
+        default: // ByteVec or Contract
+            const hexStr = (0, api_1.toApiByteVec)(value);
+            return new Uint8Array([Instruction.bytesConst, ...encodeByteVec(hexStr)]);
     }
     throw invalidScriptField(tpe, value);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alephium/web3",
-  "version": "0.36.0",
+  "version": "0.37.0",
   "description": "A JS/TS library to interact with the Alephium platform",
   "license": "GPL",
   "main": "dist/src/index.js",
@@ -27,7 +27,7 @@
   },
   "author": "Alephium dev <dev@alephium.org>",
   "config": {
-    "alephium_version": "2.10.0",
+    "alephium_version": "2.11.0",
     "explorer_backend_version": "1.17.0"
   },
   "type": "commonjs",

package/src/api/api-alephium.ts

@@ -1300,7 +1300,7 @@ export class HttpClient<SecurityDataType = unknown> {
 
 /**
  * @title Alephium API
- * @version 2.10.0
+ * @version 2.11.0
  * @baseUrl ../
  */
 export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {

package/src/contract/contract.ts

@@ -62,7 +62,7 @@ import {
 import { getCurrentNodeProvider } from '../global'
 import * as path from 'path'
 import { EventSubscribeOptions, EventSubscription, subscribeToEvents } from './events'
-import { ONE_ALPH } from '../constants'
+import { ONE_ALPH, TOTAL_NUMBER_OF_GROUPS } from '../constants'
 import * as blake from 'blakejs'
 import { parseError } from '../utils/error'
 import { isContractDebugMessageEnabled } from '../debug'
@@ -1722,14 +1722,19 @@ export interface CallContractResult<R> {
   debugMessages: DebugMessage[]
 }
 
-function specialContractAddress(n: number): string {
+function specialContractAddress(eventIndex: number, groupIndex: number): string {
   const bytes = new Uint8Array(32).fill(0)
-  bytes[31] = n
+  bytes[30] = eventIndex
+  bytes[31] = groupIndex
   return addressFromContractId(binToHex(bytes))
 }
 
-export const CreateContractEventAddress = specialContractAddress(-1)
-export const DestroyContractEventAddress = specialContractAddress(-2)
+export const CreateContractEventAddresses = Array.from(Array(TOTAL_NUMBER_OF_GROUPS).keys()).map((groupIndex) =>
+  specialContractAddress(Contract.ContractCreatedEventIndex, groupIndex)
+)
+export const DestroyContractEventAddresses = Array.from(Array(TOTAL_NUMBER_OF_GROUPS).keys()).map((groupIndex) =>
+  specialContractAddress(Contract.ContractDestroyedEventIndex, groupIndex)
+)
 
 export type ContractCreatedEventFields = {
   address: Address
@@ -1862,18 +1867,29 @@ export async function fetchContractState<F extends Fields, I extends ContractIns
   }
 }
 
+function checkGroupIndex(groupIndex: number) {
+  if (groupIndex < 0 || groupIndex >= TOTAL_NUMBER_OF_GROUPS) {
+    throw new Error(
+      `Invalid group index ${groupIndex}, expected a value within the range [0, ${TOTAL_NUMBER_OF_GROUPS})`
+    )
+  }
+}
+
 export function subscribeContractCreatedEvent(
   options: EventSubscribeOptions<ContractCreatedEvent>,
+  fromGroup: number,
   fromCount?: number
 ): EventSubscription {
+  checkGroupIndex(fromGroup)
+  const contractAddress = CreateContractEventAddresses[`${fromGroup}`]
   return subscribeEventsFromContract(
     options,
-    CreateContractEventAddress,
+    contractAddress,
     Contract.ContractCreatedEventIndex,
     (event) => {
       return {
         ...decodeContractCreatedEvent(event),
-        contractAddress: CreateContractEventAddress
+        contractAddress: contractAddress
       }
     },
     fromCount
@@ -1882,16 +1898,19 @@ export function subscribeContractCreatedEvent(
 
 export function subscribeContractDestroyedEvent(
   options: EventSubscribeOptions<ContractDestroyedEvent>,
+  fromGroup: number,
   fromCount?: number
 ): EventSubscription {
+  checkGroupIndex(fromGroup)
+  const contractAddress = DestroyContractEventAddresses[`${fromGroup}`]
   return subscribeEventsFromContract(
     options,
-    DestroyContractEventAddress,
+    contractAddress,
     Contract.ContractDestroyedEventIndex,
     (event) => {
       return {
         ...decodeContractDestroyedEvent(event),
-        contractAddress: DestroyContractEventAddress
+        contractAddress: contractAddress
       }
     },
     fromCount

package/src/contract/ralph.ts

@@ -236,12 +236,12 @@ export function encodeScriptField(tpe: string, value: Val): Uint8Array {
     case 'U256':
       const u256 = toApiNumber256(value)
       return encodeScriptFieldU256(BigInt(u256))
-    case 'ByteVec':
-      const hexStr = toApiByteVec(value)
-      return new Uint8Array([Instruction.bytesConst, ...encodeByteVec(hexStr)])
     case 'Address':
       const address = toApiAddress(value)
       return new Uint8Array([Instruction.addressConst, ...encodeAddress(address)])
+    default: // ByteVec or Contract
+      const hexStr = toApiByteVec(value)
+      return new Uint8Array([Instruction.bytesConst, ...encodeByteVec(hexStr)])
   }
 
   throw invalidScriptField(tpe, value)