@alephium/web3 0.0.1-test.0 → 0.0.1-test.2

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

@@ -129,7 +129,10 @@ export interface BrokerInfo {
     /** @format int32 */
     brokerNum: number;
     /** @format inet-socket-address */
-    address: string;
+    address: {
+        addr: string;
+        port: number;
+    };
 }
 export interface BuildDeployContractTx {
     /** @format public-key */
@@ -447,7 +450,10 @@ export interface InterCliquePeerInfo {
     /** @format int32 */
     groupNumPerBroker: number;
     /** @format inet-socket-address */
-    address: string;
+    address: {
+        addr: string;
+        port: number;
+    };
     isSynced: boolean;
     clientVersion: string;
 }
@@ -468,7 +474,10 @@ export interface NodeInfo {
     buildInfo: BuildInfo;
     upnp: boolean;
     /** @format inet-socket-address */
-    externalAddress?: string;
+    externalAddress?: {
+        addr: string;
+        port: number;
+    };
 }
 export interface NodeVersion {
     version: ReleaseVersion;
@@ -836,7 +845,7 @@ export declare class HttpClient<SecurityDataType = unknown> {
 }
 /**
  * @title Alephium API
- * @version 1.4.1
+ * @version 1.4.2
  * @baseUrl {protocol}://{host}:{port}
  */
 export declare class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {

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

@@ -158,7 +158,7 @@ class HttpClient {
 exports.HttpClient = HttpClient;
 /**
  * @title Alephium API
- * @version 1.4.1
+ * @version 1.4.2
  * @baseUrl {protocol}://{host}:{port}
  */
 class Api extends HttpClient {

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

@@ -20,6 +20,8 @@ export declare function addressFromContractId(contractId: string): string;
 export declare function contractIdFromTx(txId: string, outputIndex: number): string;
 export declare function subContractId(parentContractId: string, pathInHex: string): string;
 export declare function stringToHex(str: string): string;
+export declare function hexToString(str: any): string;
+export declare function timeout(ms: number): Promise<unknown>;
 declare type _Eq<X, Y> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? true : false;
 export declare 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.stringToHex = exports.subContractId = exports.contractIdFromTx = exports.addressFromContractId = exports.addressFromPublicKey = exports.publicKeyFromPrivateKey = exports.binToHex = exports.hexToBinUnsafe = exports.tokenIdFromAddress = exports.contractIdFromAddress = exports.groupOfAddress = exports.isHexString = exports.signatureDecode = exports.signatureEncode = exports.convertHttpResponse = void 0;
+exports.assertType = exports.timeout = exports.hexToString = exports.stringToHex = exports.subContractId = exports.contractIdFromTx = exports.addressFromContractId = exports.addressFromPublicKey = exports.publicKeyFromPrivateKey = exports.binToHex = exports.hexToBinUnsafe = exports.tokenIdFromAddress = exports.contractIdFromAddress = exports.groupOfAddress = exports.isHexString = exports.signatureDecode = exports.signatureEncode = exports.convertHttpResponse = void 0;
 const elliptic_1 = require("elliptic");
 const bn_js_1 = __importDefault(require("bn.js"));
 const blakejs_1 = __importDefault(require("blakejs"));
@@ -194,6 +194,14 @@ function stringToHex(str) {
     return hex;
 }
 exports.stringToHex = stringToHex;
+function hexToString(str) {
+    return buffer_1.Buffer.from(str.toString(), 'hex').toString();
+}
+exports.hexToString = hexToString;
+function timeout(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+exports.timeout = timeout;
 // 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": "0.0.1-test.0",
+  "version": "0.0.1-test.2",
   "description": "A JS/TS library to interact with the Alephium platform",
   "license": "GPL",
   "main": "dist/src/index.js",

package/src/api/api-alephium.ts

@@ -185,7 +185,7 @@ export interface BrokerInfo {
   brokerNum: number
 
   /** @format inet-socket-address */
-  address: string
+  address: { addr: string; port: number }
 }
 
 export interface BuildDeployContractTx {
@@ -613,7 +613,7 @@ export interface InterCliquePeerInfo {
   groupNumPerBroker: number
 
   /** @format inet-socket-address */
-  address: string
+  address: { addr: string; port: number }
   isSynced: boolean
   clientVersion: string
 }
@@ -641,7 +641,7 @@ export interface NodeInfo {
   upnp: boolean
 
   /** @format inet-socket-address */
-  externalAddress?: string
+  externalAddress?: { addr: string; port: number }
 }
 
 export interface NodeVersion {
@@ -1264,7 +1264,7 @@ export class HttpClient<SecurityDataType = unknown> {
 
 /**
  * @title Alephium API
- * @version 1.4.1
+ * @version 1.4.2
  * @baseUrl {protocol}://{host}:{port}
  */
 export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {

package/src/utils/utils.test.ts

@@ -154,7 +154,8 @@ describe('utils', function () {
     ).toBe('293c948c81c5a9495178fff8b8c9f29f4f3e09e1728c40e9253c87adf5e18770')
   })
 
-  it('should convert from string to hex', () => {
+  it('should convert from string to hex and back', () => {
     expect(utils.stringToHex('Hello Alephium!')).toBe('48656c6c6f20416c65706869756d21')
+    expect(utils.hexToString('48656c6c6f20416c65706869756d21')).toBe('Hello Alephium!')
   })
 })

package/src/utils/utils.ts

@@ -203,6 +203,14 @@ export function stringToHex(str: string): string {
   return hex
 }
 
+export function hexToString(str: any): string {
+  return Buffer.from(str.toString(), 'hex').toString()
+}
+
+export function timeout(ms: number) {
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}
+
 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

package/test/events.test.ts

@@ -22,7 +22,7 @@ import { Contract, Script } from '../src/contract'
 import { NodeWallet, SignExecuteScriptTxParams } from '../src/signer'
 import { ContractEvent } from '../src/api/api-alephium'
 import { testWallet } from '../src/test'
-import { SubscribeOptions } from '../src/utils'
+import { SubscribeOptions, timeout } from '../src/utils'
 
 describe('events', function () {
   async function deployContract(provider: NodeProvider, signer: NodeWallet): Promise<[string, string]> {
@@ -78,7 +78,7 @@ describe('events', function () {
       signerAddress: (await signer.getAccounts())[0].address
     })
     await executeScript(scriptTxParams, signer, 3)
-    await new Promise((resolve) => setTimeout(resolve, 3000))
+    await timeout(3000)
 
     expect(events.length).toEqual(3)
     events.forEach((event) => {
@@ -117,7 +117,7 @@ describe('events', function () {
       initialFields: { addContractId: contractId }
     })
     await signer.submitTransaction(scriptTx0.unsignedTx, scriptTx0.txId)
-    await new Promise((resolve) => setTimeout(resolve, 1500))
+    await timeout(1500)
     subscription.unsubscribe()
 
     expect(events.length).toEqual(1)
@@ -132,7 +132,7 @@ describe('events', function () {
       initialFields: { addContractId: contractId }
     })
     await signer.submitTransaction(scriptTx1.unsignedTx, scriptTx1.txId)
-    await new Promise((resolve) => setTimeout(resolve, 1500))
+    await timeout(1500)
     expect(events.length).toEqual(1)
   })
 })

package/test/transaction.test.ts

@@ -21,7 +21,7 @@ import { subscribeToTxStatus } from '../src/transaction/status'
 import { Contract } from '../src/contract'
 import { TxStatus } from '../src/api/api-alephium'
 import { testWallet } from '../src/test'
-import { SubscribeOptions } from '../src/utils'
+import { SubscribeOptions, timeout } from '../src/utils'
 
 describe('transactions', function () {
   it('should subscribe transaction status', async () => {
@@ -53,11 +53,11 @@ describe('transactions', function () {
     const counterBeforeSubscribe = counter
 
     const subscription = subscribeToTxStatus(subscriptOptions, subDeployTx.txId)
-    await new Promise((resolve) => setTimeout(resolve, 1500))
+    await timeout(1500)
     expect(txStatus).toMatchObject({ type: 'TxNotFound' })
 
     const subSubmitResult = await signer.submitTransaction(subDeployTx.unsignedTx, subDeployTx.txId)
-    await new Promise((resolve) => setTimeout(resolve, 1500))
+    await timeout(1500)
     expect(txStatus).toMatchObject({ type: 'Confirmed' })
 
     expect(counterBeforeSubscribe).toBeLessThan(counter)
@@ -65,8 +65,8 @@ describe('transactions', function () {
     subscription.unsubscribe()
 
     const counterAfterUnsubscribe = counter
-    await new Promise((resolve) => setTimeout(resolve, 1500))
+    await timeout(1500)
     expect(txStatus).toMatchObject({ type: 'Confirmed' })
     expect(counterAfterUnsubscribe).toEqual(counter)
-  })
+  }, 10000)
 })