@alephium/web3 0.40.0 → 0.42.0

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

@@ -1,14 +1,13 @@
 import { node } from '../api';
 import { Subscription, SubscribeOptions } from '../utils';
 export interface EventSubscribeOptions<Message> extends SubscribeOptions<Message> {
-    onEventCountChanged?: (eventCount: number) => Promise<void>;
+    onEventCountChanged?: (eventCount: number) => Promise<void> | void;
 }
 export declare class EventSubscription extends Subscription<node.ContractEvent> {
     readonly contractAddress: string;
     private fromCount;
     private onEventCountChanged?;
     constructor(options: EventSubscribeOptions<node.ContractEvent>, contractAddress: string, fromCount?: number);
-    startPolling(): void;
     currentEventCount(): number;
     polling(): Promise<void>;
 }

package/dist/src/contract/events.js

@@ -16,9 +16,32 @@ GNU Lesser General Public License for more details.
 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/>.
 */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.subscribeToEvents = exports.EventSubscription = void 0;
-const __1 = require("..");
+const web3 = __importStar(require("../global"));
 const utils_1 = require("../utils");
 class EventSubscription extends utils_1.Subscription {
     constructor(options, contractAddress, fromCount) {
@@ -26,27 +49,16 @@ class EventSubscription extends utils_1.Subscription {
         this.contractAddress = contractAddress;
         this.fromCount = typeof fromCount === 'undefined' ? 0 : fromCount;
         this.onEventCountChanged = options.onEventCountChanged;
-        this.startPolling();
-    }
-    startPolling() {
-        this.eventEmitter.on('tick', async () => {
-            await this.polling();
-        });
-        this.eventEmitter.emit('tick');
     }
     currentEventCount() {
         return this.fromCount;
     }
     async polling() {
         try {
-            const events = await __1.web3.getCurrentNodeProvider().events.getEventsContractContractaddress(this.contractAddress, {
+            const events = await web3.getCurrentNodeProvider().events.getEventsContractContractaddress(this.contractAddress, {
                 start: this.fromCount
             });
-            if (this.cancelled) {
-                return;
-            }
             if (this.fromCount === events.nextStart) {
-                this.task = setTimeout(() => this.eventEmitter.emit('tick'), this.pollingInterval);
                 return;
             }
             const promises = events.events.map((event) => this.messageCallback(event));
@@ -64,6 +76,8 @@ class EventSubscription extends utils_1.Subscription {
 }
 exports.EventSubscription = EventSubscription;
 function subscribeToEvents(options, contractAddress, fromCount) {
-    return new EventSubscription(options, contractAddress, fromCount);
+    const subscription = new EventSubscription(options, contractAddress, fromCount);
+    subscription.subscribe();
+    return subscription;
 }
 exports.subscribeToEvents = subscribeToEvents;

package/dist/src/index.d.ts

@@ -9,3 +9,4 @@ export * as web3 from './global';
 export * as codec from './codec';
 export * as utils from './utils';
 export * from './debug';
+export * from './block';

package/dist/src/index.js

@@ -58,3 +58,4 @@ exports.web3 = __importStar(require("./global"));
 exports.codec = __importStar(require("./codec"));
 exports.utils = __importStar(require("./utils"));
 __exportStar(require("./debug"), exports);
+__exportStar(require("./block"), exports);

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

@@ -18,9 +18,9 @@ along with the library. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionBuilder = void 0;
-const __1 = require("..");
-const api_1 = require("../api");
 const utils_1 = require("../utils");
+const api_1 = require("../api");
+const utils_2 = require("../utils");
 const signer_1 = require("./signer");
 class TransactionBuilder {
     static from(param0, param1, customFetch) {
@@ -32,7 +32,7 @@ class TransactionBuilder {
         })();
     }
     static validatePublicKey(params, publicKey, keyType) {
-        const address = (0, utils_1.addressFromPublicKey)(publicKey, keyType);
+        const address = (0, utils_2.addressFromPublicKey)(publicKey, keyType);
         if (address !== params.signerAddress) {
             throw new Error('Unmatched public key');
         }
@@ -63,7 +63,7 @@ class TransactionBuilder {
             ...rest
         };
         const response = await this.nodeProvider.contracts.postContractsUnsignedTxDeployContract(data);
-        const contractId = __1.utils.binToHex(__1.utils.contractIdFromAddress(response.contractAddress));
+        const contractId = (0, utils_1.binToHex)((0, utils_1.contractIdFromAddress)(response.contractAddress));
         return { ...response, groupIndex: response.fromGroup, contractId, gasPrice: (0, api_1.fromApiNumber256)(response.gasPrice) };
     }
     async buildExecuteScriptTx(params, publicKey) {

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

@@ -1,2 +1,3 @@
 export * from './status';
 export * from './sign-verify';
+export * from './utils';

package/dist/src/transaction/index.js

@@ -33,3 +33,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./status"), exports);
 __exportStar(require("./sign-verify"), exports);
+__exportStar(require("./utils"), exports);

package/dist/src/transaction/status.js

@@ -16,9 +16,32 @@ GNU Lesser General Public License for more details.
 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/>.
 */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.subscribeToTxStatus = exports.TxStatusSubscription = void 0;
-const __1 = require("..");
+const web3 = __importStar(require("../global"));
 const utils_1 = require("../utils");
 class TxStatusSubscription extends utils_1.Subscription {
     constructor(options, txId, fromGroup, toGroup, confirmations) {
@@ -27,11 +50,10 @@ class TxStatusSubscription extends utils_1.Subscription {
         this.fromGroup = fromGroup;
         this.toGroup = toGroup;
         this.confirmations = confirmations ?? 1;
-        this.startPolling();
     }
     async polling() {
         try {
-            const txStatus = await __1.web3.getCurrentNodeProvider().transactions.getTransactionsStatus({
+            const txStatus = await web3.getCurrentNodeProvider().transactions.getTransactionsStatus({
                 txId: this.txId,
                 fromGroup: this.fromGroup,
                 toGroup: this.toGroup
@@ -48,6 +70,8 @@ class TxStatusSubscription extends utils_1.Subscription {
 }
 exports.TxStatusSubscription = TxStatusSubscription;
 function subscribeToTxStatus(options, txId, fromGroup, toGroup, confirmations) {
-    return new TxStatusSubscription(options, txId, fromGroup, toGroup, confirmations);
+    const subscription = new TxStatusSubscription(options, txId, fromGroup, toGroup, confirmations);
+    subscription.subscribe();
+    return subscription;
 }
 exports.subscribeToTxStatus = subscribeToTxStatus;

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

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

package/dist/src/transaction/utils.js

@@ -0,0 +1,34 @@
+"use strict";
+/*
+Copyright 2018 - 2022 The Alephium Authors
+This file is part of the alephium project.
+
+The library is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+The library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+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;
+const global_1 = require("../global");
+function isConfirmed(txStatus) {
+    return txStatus.type === 'Confirmed';
+}
+async function waitForTxConfirmation(txId, confirmations, requestInterval) {
+    const provider = (0, global_1.getCurrentNodeProvider)();
+    const status = await provider.transactions.getTransactionsStatus({ txId: txId });
+    if (isConfirmed(status) && status.chainConfirmations >= confirmations) {
+        return status;
+    }
+    await new Promise((r) => setTimeout(r, requestInterval));
+    return waitForTxConfirmation(txId, confirmations, requestInterval);
+}
+exports.waitForTxConfirmation = waitForTxConfirmation;

package/dist/src/utils/address.js

@@ -28,6 +28,9 @@ const blakejs_1 = __importDefault(require("blakejs"));
 const bs58_1 = __importDefault(require("./bs58"));
 const djb2_1 = __importDefault(require("./djb2"));
 const utils_1 = require("./utils");
+const lockup_script_codec_1 = require("../codec/lockup-script-codec");
+const buffer_1 = require("buffer/");
+const codec_1 = require("../codec");
 const ec = new elliptic_1.ec('secp256k1');
 var AddressType;
 (function (AddressType) {
@@ -52,9 +55,19 @@ function decodeAndValidateAddress(address) {
         throw new Error('Address is empty');
     const addressType = decoded[0];
     if (addressType === AddressType.P2MPKH) {
-        // [1, n, ...hashes, m]
-        if ((decoded.length - 3) % 32 === 0)
-            return decoded;
+        let multisig;
+        try {
+            multisig = lockup_script_codec_1.lockupScriptCodec.decode(buffer_1.Buffer.from(decoded)).script;
+        }
+        catch (_) {
+            throw new Error(`Invalid multisig address: ${address}`);
+        }
+        const n = multisig.publicKeyHashes.value.length;
+        const m = codec_1.compactSignedIntCodec.toI32(multisig.m);
+        if (n < m) {
+            throw new Error(`Invalid multisig address, n: ${n}, m: ${m}`);
+        }
+        return decoded;
     }
     else if (addressType === AddressType.P2PKH || addressType === AddressType.P2SH || addressType === AddressType.P2C) {
         // [type, ...hash]
@@ -150,27 +163,27 @@ exports.publicKeyFromPrivateKey = publicKeyFromPrivateKey;
 function addressFromPublicKey(publicKey, _keyType) {
     const keyType = _keyType ?? 'default';
     if (keyType === 'default') {
-        const addressType = Buffer.from([AddressType.P2PKH]);
-        const hash = Buffer.from(blakejs_1.default.blake2b(Buffer.from(publicKey, 'hex'), undefined, 32));
-        const bytes = Buffer.concat([addressType, hash]);
+        const addressType = buffer_1.Buffer.from([AddressType.P2PKH]);
+        const hash = buffer_1.Buffer.from(blakejs_1.default.blake2b(buffer_1.Buffer.from(publicKey, 'hex'), undefined, 32));
+        const bytes = buffer_1.Buffer.concat([addressType, hash]);
         return bs58_1.default.encode(bytes);
     }
     else {
-        const lockupScript = Buffer.from(`0101000000000458144020${publicKey}8685`, 'hex');
+        const lockupScript = buffer_1.Buffer.from(`0101000000000458144020${publicKey}8685`, 'hex');
         return addressFromScript(lockupScript);
     }
 }
 exports.addressFromPublicKey = addressFromPublicKey;
 function addressFromScript(script) {
     const scriptHash = blakejs_1.default.blake2b(script, undefined, 32);
-    const addressType = Buffer.from([AddressType.P2SH]);
-    return bs58_1.default.encode(Buffer.concat([addressType, scriptHash]));
+    const addressType = buffer_1.Buffer.from([AddressType.P2SH]);
+    return bs58_1.default.encode(buffer_1.Buffer.concat([addressType, scriptHash]));
 }
 exports.addressFromScript = addressFromScript;
 function addressFromContractId(contractId) {
-    const addressType = Buffer.from([AddressType.P2C]);
-    const hash = Buffer.from((0, utils_1.hexToBinUnsafe)(contractId));
-    const bytes = Buffer.concat([addressType, hash]);
+    const addressType = buffer_1.Buffer.from([AddressType.P2C]);
+    const hash = buffer_1.Buffer.from((0, utils_1.hexToBinUnsafe)(contractId));
+    const bytes = buffer_1.Buffer.concat([addressType, hash]);
     return bs58_1.default.encode(bytes);
 }
 exports.addressFromContractId = addressFromContractId;
@@ -181,7 +194,7 @@ function addressFromTokenId(tokenId) {
 exports.addressFromTokenId = addressFromTokenId;
 function contractIdFromTx(txId, outputIndex) {
     const txIdBin = (0, utils_1.hexToBinUnsafe)(txId);
-    const data = Buffer.concat([txIdBin, Buffer.from([outputIndex])]);
+    const data = buffer_1.Buffer.concat([txIdBin, buffer_1.Buffer.from([outputIndex])]);
     const hash = blakejs_1.default.blake2b(data, undefined, 32);
     return (0, utils_1.binToHex)(hash);
 }
@@ -190,10 +203,10 @@ function subContractId(parentContractId, pathInHex, group) {
     if (group < 0 || group >= constants_1.TOTAL_NUMBER_OF_GROUPS) {
         throw new Error(`Invalid group ${group}`);
     }
-    const data = Buffer.concat([(0, utils_1.hexToBinUnsafe)(parentContractId), (0, utils_1.hexToBinUnsafe)(pathInHex)]);
-    const bytes = Buffer.concat([
+    const data = buffer_1.Buffer.concat([(0, utils_1.hexToBinUnsafe)(parentContractId), (0, utils_1.hexToBinUnsafe)(pathInHex)]);
+    const bytes = buffer_1.Buffer.concat([
         blakejs_1.default.blake2b(blakejs_1.default.blake2b(data, undefined, 32), undefined, 32).slice(0, -1),
-        Buffer.from([group])
+        buffer_1.Buffer.from([group])
     ]);
     return (0, utils_1.binToHex)(bytes);
 }

package/dist/src/utils/exchange.js

@@ -18,11 +18,14 @@ along with the library. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAddressFromUnlockScript = exports.getSenderAddress = exports.getALPHDepositInfo = exports.isALPHTransferTx = exports.validateExchangeAddress = void 0;
-const __1 = require("..");
+const utils_1 = require("../utils");
+const unlock_script_codec_1 = require("../codec/unlock-script-codec");
+const buffer_1 = require("buffer/");
+const script_codec_1 = require("../codec/script-codec");
 function validateExchangeAddress(address) {
     let decoded;
     try {
-        decoded = __1.bs58.decode(address);
+        decoded = utils_1.bs58.decode(address);
     }
     catch (_) {
         throw new Error('Invalid base58 string');
@@ -30,7 +33,7 @@ function validateExchangeAddress(address) {
     if (decoded.length === 0)
         throw new Error('Address is empty');
     const addressType = decoded[0];
-    if (addressType !== __1.AddressType.P2PKH && addressType !== __1.AddressType.P2SH) {
+    if (addressType !== utils_1.AddressType.P2PKH && addressType !== utils_1.AddressType.P2SH) {
         throw new Error('Invalid address type');
     }
     if (decoded.length !== 33) {
@@ -83,27 +86,34 @@ var UnlockScriptType;
     UnlockScriptType[UnlockScriptType["P2SH"] = 2] = "P2SH";
 })(UnlockScriptType || (UnlockScriptType = {}));
 function getAddressFromUnlockScript(unlockScript) {
-    const decoded = (0, __1.hexToBinUnsafe)(unlockScript);
+    if (!(0, utils_1.isHexString)(unlockScript)) {
+        throw new Error(`Invalid unlock script ${unlockScript}, expected a hex string`);
+    }
+    const decoded = (0, utils_1.hexToBinUnsafe)(unlockScript);
     if (decoded.length === 0)
         throw new Error('UnlockScript is empty');
     const unlockScriptType = decoded[0];
     const unlockScriptBody = decoded.slice(1);
     if (unlockScriptType === UnlockScriptType.P2PKH) {
-        return (0, __1.addressFromPublicKey)((0, __1.binToHex)(unlockScriptBody));
+        if (unlockScriptBody.length !== 33) {
+            throw new Error(`Invalid p2pkh unlock script: ${unlockScript}`);
+        }
+        return (0, utils_1.addressFromPublicKey)((0, utils_1.binToHex)(unlockScriptBody));
     }
-    else if (unlockScriptType === UnlockScriptType.P2MPKH) {
+    if (unlockScriptType === UnlockScriptType.P2MPKH) {
         throw new Error('Naive multi-sig address is not supported for exchanges as it will be replaced by P2SH');
     }
-    else if (unlockScriptType === UnlockScriptType.P2SH) {
-        // FIXEME: for now we assume that the params is empty, so we need to
-        // remove the last byte from the `unlockScriptBody`, we can decode
-        // the unlock script once the codec PR is merged
-        const script = unlockScriptBody.slice(0, -1);
-        return (0, __1.addressFromScript)(script);
-    }
-    else {
-        throw new Error('Invalid unlock script type');
+    if (unlockScriptType === UnlockScriptType.P2SH) {
+        let p2sh;
+        try {
+            p2sh = unlock_script_codec_1.unlockScriptCodec.decode(buffer_1.Buffer.from(decoded)).script;
+        }
+        catch (_) {
+            throw new Error(`Invalid p2sh unlock script: ${unlockScript}`);
+        }
+        return (0, utils_1.addressFromScript)(script_codec_1.scriptCodec.encode(p2sh.script));
     }
+    throw new Error('Invalid unlock script type');
 }
 exports.getAddressFromUnlockScript = getAddressFromUnlockScript;
 function checkALPHOutput(tx) {

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

@@ -1,4 +1,4 @@
-import { Number256 } from '..';
+import { Number256 } from '../api/types';
 export declare const isNumeric: (numToCheck: any) => boolean;
 export interface IPrettifyNumberConfig {
     minDecimalPlaces: number;

package/dist/src/utils/sign.js

@@ -42,7 +42,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifySignature = exports.sign = void 0;
 const elliptic_1 = require("elliptic");
-const __1 = require("..");
+const utils_1 = require("../utils");
 const necc = __importStar(require("@noble/secp256k1"));
 const crypto_1 = require("crypto");
 const ec = new elliptic_1.ec('secp256k1');
@@ -63,11 +63,11 @@ function sign(hash, privateKey, _keyType) {
     if (keyType === 'default') {
         const key = ec.keyFromPrivate(privateKey);
         const signature = key.sign(hash);
-        return (0, __1.encodeSignature)(signature);
+        return (0, utils_1.encodeSignature)(signature);
     }
     else {
-        const signature = necc.schnorr.signSync((0, __1.hexToBinUnsafe)(hash), (0, __1.hexToBinUnsafe)(privateKey));
-        return (0, __1.binToHex)(signature);
+        const signature = necc.schnorr.signSync((0, utils_1.hexToBinUnsafe)(hash), (0, utils_1.hexToBinUnsafe)(privateKey));
+        return (0, utils_1.binToHex)(signature);
     }
 }
 exports.sign = sign;
@@ -76,10 +76,10 @@ function verifySignature(hash, publicKey, signature, _keyType) {
     try {
         if (keyType === 'default') {
             const key = ec.keyFromPublic(publicKey, 'hex');
-            return key.verify(hash, (0, __1.signatureDecode)(ec, signature));
+            return key.verify(hash, (0, utils_1.signatureDecode)(ec, signature));
         }
         else {
-            return necc.schnorr.verifySync((0, __1.hexToBinUnsafe)(signature), (0, __1.hexToBinUnsafe)(hash), (0, __1.hexToBinUnsafe)(publicKey));
+            return necc.schnorr.verifySync((0, utils_1.hexToBinUnsafe)(signature), (0, utils_1.hexToBinUnsafe)(hash), (0, utils_1.hexToBinUnsafe)(publicKey));
         }
     }
     catch (error) {

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

@@ -1,6 +1,6 @@
 import EventEmitter from 'eventemitter3';
-type MessageCallback<Message> = (message: Message) => Promise<void>;
-type ErrorCallback<Message> = (error: any, subscription: Subscription<Message>) => Promise<void>;
+type MessageCallback<Message> = (message: Message) => Promise<void> | void;
+type ErrorCallback<Message> = (error: any, subscription: Subscription<Message>) => Promise<void> | void;
 export interface SubscribeOptions<Message> {
     pollingInterval: number;
     messageCallback: MessageCallback<Message>;
@@ -14,9 +14,9 @@ export declare abstract class Subscription<Message> {
     protected eventEmitter: EventEmitter;
     protected cancelled: boolean;
     constructor(options: SubscribeOptions<Message>);
-    startPolling(): void;
+    subscribe(): void;
     unsubscribe(): void;
     isCancelled(): boolean;
-    abstract polling(): Promise<void>;
+    protected abstract polling(): Promise<void>;
 }
 export {};

package/dist/src/utils/subscription.js

@@ -31,7 +31,7 @@ class Subscription {
         this.cancelled = false;
         this.eventEmitter = new eventemitter3_1.default();
     }
-    startPolling() {
+    subscribe() {
         this.eventEmitter.on('tick', async () => {
             await this.polling();
             if (!this.cancelled) {

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@alephium/web3",
-  "version": "0.40.0",
+  "version": "0.42.0",
   "description": "A JS/TS library to interact with the Alephium platform",
   "license": "GPL",
   "main": "dist/src/index.js",
   "browser": "dist/alephium-web3.min.js",
   "types": "dist/src/index.d.ts",
   "exports": {
-    ".": "./dist/src/index.js",
-    "./test": "./dist/src/test/index.js"
+    "node": "./dist/src/index.js",
+    "default": "./dist/alephium-web3.min.js"
   },
   "typesVersions": {
     "*": {

package/src/api/node-provider.ts

@@ -28,7 +28,6 @@ import {
   requestWithLog
 } from './types'
 import { Api as NodeApi, CallContractFailed, CallContractSucceeded } from './api-alephium'
-import { tryGetCallResult } from '../contract'
 import {
   HexString,
   addressFromContractId,
@@ -38,6 +37,7 @@ import {
   isHexString,
   toNonNegativeBigInt
 } from '../utils'
+import * as node from '../api/api-alephium'
 
 function initializeNodeApi(baseUrl: string, apiKey?: string, customFetch?: typeof fetch): NodeApi<string> {
   const nodeApi = new NodeApi<string>({
@@ -253,3 +253,10 @@ export class NodeProvider implements NodeProviderApis {
     }
   }
 }
+
+export function tryGetCallResult(result: node.CallContractResult): node.CallContractSucceeded {
+  if (result.type === 'CallContractFailed') {
+    throw new Error(`Failed to call contract, error: ${(result as node.CallContractFailed).error}`)
+  }
+  return result as node.CallContractSucceeded
+}

package/src/api/utils.ts

@@ -17,7 +17,7 @@ along with the library. If not, see <http://www.gnu.org/licenses/>.
 */
 
 import 'cross-fetch/polyfill'
-import { node } from '..'
+import * as node from '../api/api-alephium'
 
 export function convertHttpResponse<T>(response: { status: number; data: T; error?: { detail: string } }): T {
   if (response.error) {