carbon-js-sdk 0.2.7-beta.2 → 0.2.7-beta.3

package/lib/clients/CarbonQueryClient.js

@@ -43,7 +43,7 @@ class CarbonQueryClient {
     constructor(tmClient) {
         this.tmClient = tmClient;
         this.baseClient = new stargate_1.QueryClient(this.tmClient);
-        const rpcClient = (0, stargate_1.createProtobufRpcClient)(this.baseClient);
+        const rpcClient = stargate_1.createProtobufRpcClient(this.baseClient);
         this.chain = BlockchainClient_1.default.connectWithTm(this.tmClient);
         this.adl = new query_1.QueryClientImpl(rpcClient);
         this.book = new query_2.QueryClientImpl(rpcClient);

package/lib/clients/ETHClient.js

@@ -40,13 +40,13 @@ class ETHClient {
         return __awaiter(this, void 0, void 0, function* () {
             const tokenQueryResults = yield api.token.getAllTokens();
             const lockProxyAddress = this.getLockProxyAddress().toLowerCase();
-            const tokens = tokenQueryResults.filter((token) => (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber()) == this.blockchain &&
+            const tokens = tokenQueryResults.filter((token) => blockchain_1.blockchainForChainId(token.chainId.toNumber()) == this.blockchain &&
                 token.tokenAddress.length == 40 &&
-                token.bridgeAddress.toLowerCase() == (0, generic_1.stripHexPrefix)(lockProxyAddress) &&
+                token.bridgeAddress.toLowerCase() == generic_1.stripHexPrefix(lockProxyAddress) &&
                 (!whitelistDenoms || whitelistDenoms.includes(token.denom)) &&
-                this.verifyChecksum((0, generic_1.appendHexPrefix)(token.tokenAddress)));
+                this.verifyChecksum(generic_1.appendHexPrefix(token.tokenAddress)));
             const assetIds = tokens.map((token) => {
-                return this.verifyChecksum((0, generic_1.appendHexPrefix)(token.tokenAddress));
+                return this.verifyChecksum(generic_1.appendHexPrefix(token.tokenAddress));
             });
             const provider = this.getProvider();
             const contractAddress = this.getBalanceReaderAddress();
@@ -95,14 +95,14 @@ class ETHClient {
                 throw new Error("Invalid recovery address");
             }
             const fromTokenId = fromToken.id;
-            const fromTokenAddress = (0, generic_1.appendHexPrefix)(fromToken.tokenAddress);
+            const fromTokenAddress = generic_1.appendHexPrefix(fromToken.tokenAddress);
             const toTokenDenom = toToken.denom;
             const recoveryAddressHex = ethers_1.ethers.utils.hexlify(util_1.AddressUtils.SWTHAddress.getAddressBytes(recoveryAddress, CarbonSDK_1.default.Network.MainNet));
             const fromAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(fromTokenId));
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(toTokenDenom));
             const nonce = yield rpcProvider.getTransactionCount(fromAddress);
             const contract = new ethers_1.ethers.Contract(this.getBridgeEntranceAddr(), eth_1.ABIs.bridgeEntrance, rpcProvider);
-            const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
+            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
             const tokenCreator = fromToken.creator;
             const targetAddressBytes = util_1.AddressUtils.SWTHAddress.getAddressBytes(tokenCreator, CarbonSDK_1.default.Network.MainNet);
             const targetProxyHash = ethers_1.ethers.utils.hexlify(targetAddressBytes);
@@ -137,9 +137,9 @@ class ETHClient {
                 throw new Error("Minimum gas required: 150,000");
             }
             const networkConfig = this.getNetworkConfig();
-            const assetId = (0, generic_1.appendHexPrefix)(token.tokenAddress);
-            const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(token));
-            const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
+            const assetId = generic_1.appendHexPrefix(token.tokenAddress);
+            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(token));
+            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(token.id));
             const swthAddress = ethers_1.ethers.utils.hexlify(address);
             const contractAddress = this.getLockProxyAddress();
@@ -190,16 +190,16 @@ class ETHClient {
                 return "insufficient balance";
             }
             const networkConfig = this.getNetworkConfig();
-            const assetId = (0, generic_1.appendHexPrefix)(tokenWithExternalBalances.tokenAddress);
-            const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(tokenWithExternalBalances));
-            const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
+            const assetId = generic_1.appendHexPrefix(tokenWithExternalBalances.tokenAddress);
+            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(tokenWithExternalBalances));
+            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(tokenWithExternalBalances.id));
             const nonce = Math.floor(Math.random() * 1000000000); // random nonce to prevent replay attacks
             const message = ethers_1.ethers.utils.solidityKeccak256(["string", "address", "bytes", "bytes", "bytes", "uint256", "uint256", "uint256"], ["sendTokens", assetId, targetProxyHash, toAssetHash, feeAddress, amount, feeAmount, nonce]);
             // logger("sendDeposit message", message)
             let signatureResult;
             const { address, signature } = yield getSignatureCallback(message);
-            const signatureBytes = ethers_1.ethers.utils.arrayify((0, generic_1.appendHexPrefix)(signature));
+            const signatureBytes = ethers_1.ethers.utils.arrayify(generic_1.appendHexPrefix(signature));
             const rsv = ethers_1.ethers.utils.splitSignature(signatureBytes);
             // logger("sign result", address, signature)
             signatureResult = {
@@ -238,7 +238,7 @@ class ETHClient {
             if (!feeInfo.details.deposit.fee) {
                 throw new Error("unsupported token");
             }
-            if ((0, blockchain_1.blockchainForChainId)(token.chainId.toNumber()) !== this.blockchain) {
+            if (blockchain_1.blockchainForChainId(token.chainId.toNumber()) !== this.blockchain) {
                 throw new Error("unsupported token");
             }
             let feeAmount = ethers_1.ethers.BigNumber.from(feeInfo.details.deposit.fee);
@@ -304,7 +304,7 @@ class ETHClient {
     getTargetProxyHash(token) {
         const networkConfig = this.getNetworkConfig();
         const addressBytes = address_1.SWTHAddress.getAddressBytes(token.creator, networkConfig.network);
-        const addressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
+        const addressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
         return addressHex;
     }
     getProvider() {

package/lib/clients/HydrogenClient.js

@@ -29,7 +29,7 @@ exports.HydrogenEndpoints = {
 const formatDateField = (value) => {
     if (typeof value !== "string")
         return null;
-    return (0, dayjs_1.default)(value);
+    return dayjs_1.default(value);
 };
 const formatCrossChainTransfer = (value) => {
     var _a, _b;

package/lib/clients/NEOClient.js

@@ -1,23 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (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;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -37,8 +18,8 @@ const util_1 = require("../util");
 const address_1 = require("../util/address");
 const blockchain_1 = require("../util/blockchain");
 const generic_1 = require("../util/generic");
-const neon_core_1 = require("@cityofzion/neon-core");
-const neon_js_1 = __importStar(require("@cityofzion/neon-js"));
+const plugin_1 = __importDefault(require("@cityofzion/neon-api/lib/plugin"));
+const neon_core_1 = __importDefault(require("@cityofzion/neon-core"));
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const ethers_1 = require("ethers");
 const lodash_1 = require("lodash");
@@ -57,26 +38,26 @@ class NEOClient {
         if (!hex || typeof (hex) !== "string")
             return "0";
         const res = hex.length % 2 !== 0 ? `0${hex}` : hex;
-        return new bignumber_js_1.default(res ? neon_core_1.u.reverseHex(res) : "00", 16).shiftedBy(-exp).toString();
+        return new bignumber_js_1.default(res ? neon_core_1.default.u.reverseHex(res) : "00", 16).shiftedBy(-exp).toString();
     }
     getExternalBalances(sdk, address, url, whitelistDenoms) {
         return __awaiter(this, void 0, void 0, function* () {
             const tokenQueryResults = yield sdk.token.getAllTokens();
-            const account = new neon_core_1.wallet.Account(address);
-            const tokens = tokenQueryResults.filter(token => (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber()) == this.blockchain &&
+            const account = new neon_core_1.default.wallet.Account(address);
+            const tokens = tokenQueryResults.filter(token => blockchain_1.blockchainForChainId(token.chainId.toNumber()) == this.blockchain &&
                 token.tokenAddress.length == 40 &&
                 token.bridgeAddress.length == 40);
-            const client = new neon_core_1.rpc.RPCClient(url, "2.5.2"); // TODO: should we change the RPC version??
+            const client = new neon_core_1.default.rpc.RPCClient(url, "2.5.2"); // TODO: should we change the RPC version??
             // NOTE: fetching of tokens is chunked in sets of 15 as we may hit
             // the gas limit on the RPC node and error out otherwise
-            const promises = (0, lodash_1.chunk)(tokens, 75).map((partition) => __awaiter(this, void 0, void 0, function* () {
+            const promises = lodash_1.chunk(tokens, 75).map((partition) => __awaiter(this, void 0, void 0, function* () {
                 var _a, _b, _c;
                 let acc = {};
                 for (const token of partition) {
                     if (whitelistDenoms && !whitelistDenoms.includes(token.denom))
                         continue;
-                    const sb = new neon_core_1.sc.ScriptBuilder();
-                    sb.emitAppCall(neon_js_1.default.u.reverseHex(token.tokenAddress), "balanceOf", [neon_core_1.u.reverseHex(account.scriptHash)]);
+                    const sb = new neon_core_1.default.sc.ScriptBuilder();
+                    sb.emitAppCall(neon_core_1.default.u.reverseHex(token.tokenAddress), "balanceOf", [neon_core_1.default.u.reverseHex(account.scriptHash)]);
                     try {
                         const response = yield client.invokeScript(sb.str);
                         acc[token.denom.toUpperCase()] = ((_a = response.stack[0]) === null || _a === void 0 ? void 0 : _a.type) === "Integer" // Happens on polychain devnet
@@ -102,15 +83,15 @@ class NEOClient {
     }
     lockDeposit(token, feeAmountInput, swthAddress, neoPrivateKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            const account = neon_js_1.default.create.account(neoPrivateKey);
+            const account = new neon_core_1.default.wallet.Account(neoPrivateKey);
             const networkConfig = this.getNetworkConfig();
-            const scriptHash = neon_js_1.u.reverseHex(token.bridgeAddress);
+            const scriptHash = neon_core_1.default.u.reverseHex(token.bridgeAddress);
             const fromAssetHash = token.tokenAddress;
-            const fromAddress = neon_js_1.u.reverseHex(account.scriptHash);
+            const fromAddress = neon_core_1.default.u.reverseHex(account.scriptHash);
             const targetProxyHash = this.getTargetProxyHash(token);
-            const toAssetHash = neon_js_1.u.str2hexstring(token.id);
+            const toAssetHash = neon_core_1.default.u.str2hexstring(token.id);
             const addressBytes = address_1.SWTHAddress.getAddressBytes(swthAddress, networkConfig.network);
-            const toAddress = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
+            const toAddress = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
             const amount = ethers_1.ethers.BigNumber.from(token.externalBalance);
             const feeAmount = ethers_1.ethers.BigNumber.from(feeAmountInput !== null && feeAmountInput !== void 0 ? feeAmountInput : "100000000");
             const feeAddress = networkConfig.feeAddress;
@@ -118,7 +99,7 @@ class NEOClient {
             if (amount.lt(feeAmount)) {
                 return false;
             }
-            const sb = neon_js_1.default.create.scriptBuilder();
+            const sb = new neon_core_1.default.sc.ScriptBuilder();
             sb.emitAppCall(scriptHash, "lock", [
                 fromAssetHash,
                 fromAddress,
@@ -132,9 +113,9 @@ class NEOClient {
             ]);
             const rpcUrl = yield this.getProviderUrl();
             const apiProvider = networkConfig.network === CarbonSDK_1.default.Network.MainNet
-                ? new neon_js_1.api.neonDB.instance("https://api.switcheo.network")
-                : new neon_js_1.api.neoCli.instance(rpcUrl);
-            return neon_js_1.default.doInvoke({
+                ? new plugin_1.default.neonDB.instance("https://api.switcheo.network")
+                : new plugin_1.default.neoCli.instance(rpcUrl);
+            return plugin_1.default.doInvoke({
                 api: apiProvider,
                 url: rpcUrl,
                 account,
@@ -152,26 +133,26 @@ class NEOClient {
             }
             const publicKeyOutput = yield o3Wallet.getPublicKeyOutput();
             const networkConfig = this.getNetworkConfig();
-            const scriptHash = neon_js_1.u.reverseHex(token.bridgeAddress);
-            const fromAssetHash = neon_js_1.u.reverseHex(token.tokenAddress);
+            const scriptHash = neon_core_1.default.u.reverseHex(token.bridgeAddress);
+            const fromAssetHash = neon_core_1.default.u.reverseHex(token.tokenAddress);
             const fromAddress = util_1.AddressUtils.NEOAddress.publicKeyToAddress(publicKeyOutput.publicKey);
             const targetProxyHash = this.getTargetProxyHash(token);
-            const toAssetHash = neon_js_1.u.str2hexstring(token.id);
-            const toAddress = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(address));
+            const toAssetHash = neon_core_1.default.u.str2hexstring(token.id);
+            const toAddress = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(address));
             const nonce = Math.floor(Math.random() * 1000000);
             if (amount.lt(feeAmount)) {
                 throw new Error("Invalid amount");
             }
             const data = [
-                neon_js_1.sc.ContractParam.hash160(fromAssetHash),
-                neon_js_1.sc.ContractParam.hash160(fromAddress),
-                neon_js_1.sc.ContractParam.byteArray(targetProxyHash, "hex"),
-                neon_js_1.sc.ContractParam.byteArray(toAssetHash, "hex"),
-                neon_js_1.sc.ContractParam.byteArray(toAddress, "hex"),
-                neon_js_1.sc.ContractParam.integer(amount.toNumber()),
-                neon_js_1.sc.ContractParam.integer(feeAmount.toNumber()),
-                neon_js_1.sc.ContractParam.byteArray(networkConfig.feeAddress, "hex"),
-                neon_js_1.sc.ContractParam.integer(nonce),
+                neon_core_1.default.sc.ContractParam.hash160(fromAssetHash),
+                neon_core_1.default.sc.ContractParam.hash160(fromAddress),
+                neon_core_1.default.sc.ContractParam.byteArray(targetProxyHash, "hex"),
+                neon_core_1.default.sc.ContractParam.byteArray(toAssetHash, "hex"),
+                neon_core_1.default.sc.ContractParam.byteArray(toAddress, "hex"),
+                neon_core_1.default.sc.ContractParam.integer(amount.toNumber()),
+                neon_core_1.default.sc.ContractParam.integer(feeAmount.toNumber()),
+                neon_core_1.default.sc.ContractParam.byteArray(networkConfig.feeAddress, "hex"),
+                neon_core_1.default.sc.ContractParam.integer(nonce),
             ];
             const tx = yield o3Wallet.getDAPI().invoke({
                 scriptHash,
@@ -186,20 +167,20 @@ class NEOClient {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const { feeAmount, address, amount, token, ledger, signCompleteCallback, } = params;
-            const compressedPublicKey = neon_core_1.wallet.getPublicKeyEncoded(ledger.publicKey);
+            const compressedPublicKey = neon_core_1.default.wallet.getPublicKeyEncoded(ledger.publicKey);
             const networkConfig = this.getNetworkConfig();
-            const scriptHash = neon_js_1.u.reverseHex(token.bridgeAddress);
+            const scriptHash = neon_core_1.default.u.reverseHex(token.bridgeAddress);
             const fromAssetHash = token.tokenAddress;
             const fromAddress = ledger.scriptHash;
             const targetProxyHash = this.getTargetProxyHash(token);
-            const toAssetHash = neon_js_1.u.str2hexstring(token.id);
-            const toAddress = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(address));
+            const toAssetHash = neon_core_1.default.u.str2hexstring(token.id);
+            const toAddress = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(address));
             const feeAddress = networkConfig.feeAddress;
             const nonce = Math.floor(Math.random() * 1000000);
             if (amount.lt(feeAmount)) {
                 throw new Error("Invalid amount");
             }
-            const sb = neon_js_1.default.create.scriptBuilder();
+            const sb = new neon_core_1.default.sc.ScriptBuilder();
             const data = [
                 fromAssetHash,
                 fromAddress,
@@ -214,15 +195,15 @@ class NEOClient {
             sb.emitAppCall(scriptHash, "lock", data);
             const rpcUrl = yield this.getProviderUrl();
             const apiProvider = networkConfig.network === CarbonSDK_1.default.Network.MainNet
-                ? new neon_js_1.api.neonDB.instance("https://api.switcheo.network")
-                : new neon_js_1.api.neoCli.instance(rpcUrl);
+                ? new plugin_1.default.neonDB.instance("https://api.switcheo.network")
+                : new plugin_1.default.neoCli.instance(rpcUrl);
             let invokeTxConfig = {
-                account: Object.assign(Object.assign({}, neon_js_1.default.create.account("")), { 
+                account: Object.assign(Object.assign({}, new neon_core_1.default.wallet.Account("")), { 
                     // overwrite the address and public key to values provided by the ledger.
                     address: ledger.displayAddress, publicKey: compressedPublicKey }),
                 signingFunction: (tx, publicKey) => __awaiter(this, void 0, void 0, function* () {
                     const signature = yield ledger.sign(tx);
-                    const witness = neon_js_1.tx.Witness.fromSignature(signature, publicKey);
+                    const witness = neon_core_1.default.tx.Witness.fromSignature(signature, publicKey);
                     return witness.serialize();
                 }),
                 api: apiProvider,
@@ -233,16 +214,16 @@ class NEOClient {
             };
             // similar to Neon.doInvoke(invokeTxConfig), but
             // separates out sendTx to broadcast to several nodes
-            invokeTxConfig = yield neon_js_1.api.fillBalance(invokeTxConfig);
-            invokeTxConfig = yield neon_js_1.api.createInvocationTx(invokeTxConfig);
-            invokeTxConfig = yield neon_js_1.api.modifyTransactionForEmptyTransaction(invokeTxConfig);
-            invokeTxConfig = yield neon_js_1.api.signTx(invokeTxConfig);
+            invokeTxConfig = yield plugin_1.default.fillBalance(invokeTxConfig);
+            invokeTxConfig = yield plugin_1.default.createInvocationTx(invokeTxConfig);
+            invokeTxConfig = yield plugin_1.default.modifyTransactionForEmptyTransaction(invokeTxConfig);
+            invokeTxConfig = yield plugin_1.default.signTx(invokeTxConfig);
             // provide notification to caller that signature is
             // done and proceeding to broadcasting tx
             if (signCompleteCallback) {
                 signCompleteCallback();
             }
-            yield neon_js_1.api.sendTx(Object.assign(Object.assign({}, invokeTxConfig), { rpcUrl }));
+            yield plugin_1.default.sendTx(Object.assign(Object.assign({}, invokeTxConfig), { rpcUrl }));
             return (_a = invokeTxConfig.tx) === null || _a === void 0 ? void 0 : _a.hash;
         });
     }
@@ -250,37 +231,37 @@ class NEOClient {
         var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
             const url = this.getProviderUrl();
-            const sb = neon_js_1.default.create.scriptBuilder();
+            const sb = new neon_core_1.default.sc.ScriptBuilder();
             sb.emitAppCall(scriptHash, "symbol", []);
             sb.emitAppCall(scriptHash, "name", []);
             sb.emitAppCall(scriptHash, "decimals", []);
-            const response = yield neon_js_1.rpc.Query.invokeScript(sb.str).execute(url);
+            const response = yield neon_core_1.default.rpc.Query.invokeScript(sb.str).execute(url);
             if (((_a = response === null || response === void 0 ? void 0 : response.result) === null || _a === void 0 ? void 0 : _a.state) !== "HALT")
                 throw new Error("retrieve failed");
-            const symbol = neon_js_1.default.u.hexstring2str((_b = response.result.stack) === null || _b === void 0 ? void 0 : _b[0].value);
-            const name = neon_js_1.default.u.hexstring2str((_c = response.result.stack) === null || _c === void 0 ? void 0 : _c[1].value);
+            const symbol = neon_core_1.default.u.hexstring2str((_b = response.result.stack) === null || _b === void 0 ? void 0 : _b[0].value);
+            const name = neon_core_1.default.u.hexstring2str((_c = response.result.stack) === null || _c === void 0 ? void 0 : _c[1].value);
             const decimals = parseInt((_e = (_d = response.result.stack) === null || _d === void 0 ? void 0 : _d[2].value) !== null && _e !== void 0 ? _e : "0", 10);
             return { address: scriptHash, decimals, name, symbol };
         });
     }
     wrapNeoToNneo(neoAmount, neoPrivateKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            const account = neon_js_1.default.create.account(neoPrivateKey);
+            const account = new neon_core_1.default.wallet.Account(neoPrivateKey);
             const rpcUrl = yield this.getProviderUrl();
             const wrapperContractScriptHash = this.getConfig().wrapperScriptHash;
-            const wrapperContractAddress = neon_core_1.wallet.getAddressFromScriptHash(wrapperContractScriptHash);
+            const wrapperContractAddress = neon_core_1.default.wallet.getAddressFromScriptHash(wrapperContractScriptHash);
             // Build config
-            const intent = neon_js_1.api.makeIntent({ NEO: neoAmount.toNumber() }, wrapperContractAddress);
+            const intent = plugin_1.default.makeIntent({ NEO: neoAmount.toNumber() }, wrapperContractAddress);
             const props = {
                 scriptHash: wrapperContractScriptHash,
                 operation: "mintTokens",
                 args: []
             };
-            const script = neon_js_1.default.create.script(props);
+            const script = neon_core_1.default.sc.createScript(props);
             const networkConfig = this.getNetworkConfig();
             const apiProvider = networkConfig.network === CarbonSDK_1.default.Network.MainNet
-                ? new neon_js_1.api.neonDB.instance("https://api.switcheo.network")
-                : new neon_js_1.api.neoCli.instance(rpcUrl);
+                ? new plugin_1.default.neonDB.instance("https://api.switcheo.network")
+                : new plugin_1.default.neoCli.instance(rpcUrl);
             const config = {
                 api: apiProvider,
                 url: rpcUrl,
@@ -289,19 +270,19 @@ class NEOClient {
                 script: script
             };
             // Neon API
-            const response = yield neon_js_1.default.doInvoke(config);
+            const response = yield plugin_1.default.doInvoke(config);
             return response;
         });
     }
     formatWithdrawalAddress(address) {
         return __awaiter(this, void 0, void 0, function* () {
-            const isValidAddress = neon_core_1.wallet.isAddress(address);
+            const isValidAddress = neon_core_1.default.wallet.isAddress(address);
             if (!isValidAddress) {
                 throw new Error("invalid address");
             }
-            const scriptHash = neon_core_1.wallet.getScriptHashFromAddress(address);
+            const scriptHash = neon_core_1.default.wallet.getScriptHashFromAddress(address);
             // return the little endian version of the address
-            return neon_core_1.u.reverseHex(scriptHash);
+            return neon_core_1.default.u.reverseHex(scriptHash);
         });
     }
     /**
@@ -313,7 +294,7 @@ class NEOClient {
     getTargetProxyHash(token) {
         const networkConfig = this.getNetworkConfig();
         const addressBytes = address_1.SWTHAddress.getAddressBytes(token.creator, networkConfig.network);
-        const addressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
+        const addressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
         return addressHex;
     }
     getNetworkConfig() {

package/lib/clients/ZILClient.js

@@ -74,10 +74,10 @@ class ZILClient {
     getExternalBalances(sdk, address, whitelistDenoms) {
         return __awaiter(this, void 0, void 0, function* () {
             const tokenQueryResults = yield sdk.token.getAllTokens();
-            const tokens = tokenQueryResults.filter(token => (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber()) == this.blockchain &&
+            const tokens = tokenQueryResults.filter(token => blockchain_1.blockchainForChainId(token.chainId.toNumber()) == this.blockchain &&
                 token.tokenAddress.length == 40 &&
                 (!whitelistDenoms || whitelistDenoms.includes(token.denom)));
-            const requests = tokens.map(token => token.tokenAddress === zeroAddress ? (0, exports.balanceBatchRequest)(address.replace(/^0x/i, "")) : (0, exports.tokenBalanceBatchRequest)(token.tokenAddress, address));
+            const requests = tokens.map(token => token.tokenAddress === zeroAddress ? exports.balanceBatchRequest(address.replace(/^0x/i, "")) : exports.tokenBalanceBatchRequest(token.tokenAddress, address));
             const response = yield fetch(this.getProviderUrl(), {
                 method: "post",
                 headers: { "content-type": "application/json" },
@@ -102,7 +102,7 @@ class ZILClient {
             // if (!isValidAddress) {
             //   throw new Error("invalid address")
             // }
-            return (0, zilliqa_1.fromBech32Address)(bech32Address).toLowerCase().substr(2);
+            return zilliqa_1.fromBech32Address(bech32Address).toLowerCase().substr(2);
         });
     }
     // see examplesV2/zil_client.ts on how to confirm the transactions
@@ -148,7 +148,7 @@ class ZILClient {
                 zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
             }
             const deployedContract = (this.walletProvider || zilliqa).contracts.at(contractAddress);
-            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance((0, generic_1.stripHexPrefix)(zilAddress));
+            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance(generic_1.stripHexPrefix(zilAddress));
             if (balanceAndNonceResp.error !== undefined) {
                 throw new Error(balanceAndNonceResp.error.message);
             }
@@ -166,7 +166,7 @@ class ZILClient {
                     vname: 'spender',
                     type: 'ByStr20',
                     // TODO: Check if bridgeAddress corresponds to carbon token lock_proxy_hash
-                    value: spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : (0, generic_1.appendHexPrefix)(token.bridgeAddress),
+                    value: spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : generic_1.appendHexPrefix(token.bridgeAddress),
                 },
                 {
                     vname: 'amount',
@@ -184,7 +184,7 @@ class ZILClient {
     }
     checkAllowanceZRC2(token, owner, spender) {
         return __awaiter(this, void 0, void 0, function* () {
-            const contractAddress = (0, generic_1.appendHexPrefix)(token.tokenAddress);
+            const contractAddress = generic_1.appendHexPrefix(token.tokenAddress);
             const zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
             const resp = yield zilliqa.blockchain.getSmartContractSubState(contractAddress, "allowances", [owner, spender]);
             if (resp.error !== undefined) {
@@ -204,13 +204,13 @@ class ZILClient {
                 throw new Error("Invalid recovery address");
             }
             const fromTokenId = fromToken.id;
-            const fromTokenAddr = (0, generic_1.appendHexPrefix)(fromToken.tokenAddress);
+            const fromTokenAddr = generic_1.appendHexPrefix(fromToken.tokenAddress);
             const toTokenDenom = toToken.denom;
-            const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(fromToken));
+            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(fromToken));
             const recoveryAddressHex = ethers_1.ethers.utils.hexlify(index_1.AddressUtils.SWTHAddress.getAddressBytes(recoveryAddress, CarbonSDK_1.default.Network.MainNet));
             const fromAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(fromTokenId));
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(toTokenDenom));
-            const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
+            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
             const contractAddress = this.getBridgeEntranceAddr();
             let zilliqa;
             if (typeof signer === 'string') {
@@ -225,7 +225,7 @@ class ZILClient {
                 zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
             }
             const deployedContract = (this.walletProvider || zilliqa).contracts.at(contractAddress);
-            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance((0, generic_1.stripHexPrefix)(fromAddress));
+            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance(generic_1.stripHexPrefix(fromAddress));
             if (balanceAndNonceResp.error !== undefined) {
                 throw new Error(balanceAndNonceResp.error.message);
             }
@@ -302,13 +302,13 @@ class ZILClient {
         return __awaiter(this, void 0, void 0, function* () {
             const { address, amount, token, gasPrice, gasLimit, zilAddress, signer } = params;
             const networkConfig = this.getNetworkConfig();
-            const assetId = (0, generic_1.appendHexPrefix)(token.tokenAddress);
-            const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(token));
-            const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
+            const assetId = generic_1.appendHexPrefix(token.tokenAddress);
+            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(token));
+            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(token.id));
             const swthAddress = ethers_1.ethers.utils.hexlify(address);
             // TODO: Check if bridgeAddress corresponds to carbon token lock_proxy_hash
-            const contractAddress = (0, generic_1.appendHexPrefix)(token.bridgeAddress);
+            const contractAddress = generic_1.appendHexPrefix(token.bridgeAddress);
             let zilliqa;
             if (typeof signer === 'string') {
                 zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
@@ -322,7 +322,7 @@ class ZILClient {
                 zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
             }
             const deployedContract = (this.walletProvider || zilliqa).contracts.at(contractAddress);
-            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance((0, generic_1.stripHexPrefix)(zilAddress));
+            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance(generic_1.stripHexPrefix(zilAddress));
             if (balanceAndNonceResp.error !== undefined) {
                 throw new Error(balanceAndNonceResp.error.message);
             }
@@ -407,7 +407,7 @@ class ZILClient {
     getTargetProxyHash(token) {
         const networkConfig = this.getNetworkConfig();
         const addressBytes = address_1.SWTHAddress.getAddressBytes(token.creator, networkConfig.network);
-        const addressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
+        const addressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
         return addressHex;
     }
     getNetworkConfig() {

package/lib/codec/cosmos/gov/v1beta1/query.js

@@ -159,7 +159,7 @@ exports.QueryProposalsRequest = {
         const message = Object.assign({}, baseQueryProposalsRequest);
         message.proposalStatus =
             object.proposalStatus !== undefined && object.proposalStatus !== null
-                ? (0, gov_1.proposalStatusFromJSON)(object.proposalStatus)
+                ? gov_1.proposalStatusFromJSON(object.proposalStatus)
                 : 0;
         message.voter =
             object.voter !== undefined && object.voter !== null
@@ -178,7 +178,7 @@ exports.QueryProposalsRequest = {
     toJSON(message) {
         const obj = {};
         message.proposalStatus !== undefined &&
-            (obj.proposalStatus = (0, gov_1.proposalStatusToJSON)(message.proposalStatus));
+            (obj.proposalStatus = gov_1.proposalStatusToJSON(message.proposalStatus));
         message.voter !== undefined && (obj.voter = message.voter);
         message.depositor !== undefined && (obj.depositor = message.depositor);
         message.pagination !== undefined &&

package/lib/codec/cosmos/gov/v1beta1/tx.js

@@ -185,7 +185,7 @@ exports.MsgVote = {
                 : "";
         message.option =
             object.option !== undefined && object.option !== null
-                ? (0, gov_1.voteOptionFromJSON)(object.option)
+                ? gov_1.voteOptionFromJSON(object.option)
                 : 0;
         return message;
     },
@@ -195,7 +195,7 @@ exports.MsgVote = {
             (obj.proposalId = (message.proposalId || long_1.default.UZERO).toString());
         message.voter !== undefined && (obj.voter = message.voter);
         message.option !== undefined &&
-            (obj.option = (0, gov_1.voteOptionToJSON)(message.option));
+            (obj.option = gov_1.voteOptionToJSON(message.option));
         return obj;
     },
     fromPartial(object) {

package/lib/codec/cosmos/tx/v1beta1/tx.js

@@ -618,13 +618,13 @@ exports.ModeInfo_Single = {
         const message = Object.assign({}, baseModeInfo_Single);
         message.mode =
             object.mode !== undefined && object.mode !== null
-                ? (0, signing_1.signModeFromJSON)(object.mode)
+                ? signing_1.signModeFromJSON(object.mode)
                 : 0;
         return message;
     },
     toJSON(message) {
         const obj = {};
-        message.mode !== undefined && (obj.mode = (0, signing_1.signModeToJSON)(message.mode));
+        message.mode !== undefined && (obj.mode = signing_1.signModeToJSON(message.mode));
         return obj;
     },
     fromPartial(object) {

package/lib/constant/generic.js

@@ -12,7 +12,7 @@ exports.DEFAULT_FEE_DENOM = "swth";
 exports.DEFAULT_GAS_PRICE = new bignumber_js_1.default(10);
 exports.DEFAULT_GAS = new bignumber_js_1.default(10000000);
 exports.DEFAULT_FEE = {
-    amount: (0, proto_signing_1.coins)(exports.DEFAULT_GAS_PRICE.times(exports.DEFAULT_GAS).dp(0).toString(), "swth"),
+    amount: proto_signing_1.coins(exports.DEFAULT_GAS_PRICE.times(exports.DEFAULT_GAS).dp(0).toString(), "swth"),
     gas: exports.DEFAULT_GAS.toString(10),
 };
 exports.CURRENT_GAS_PRICE = 769.23077;