From da41401afbc7349f4165394f3d7da4f50e98d7c2 Mon Sep 17 00:00:00 2001 From: Louis Date: Mon, 20 Feb 2023 10:26:17 +0100 Subject: [PATCH 1/9] signTx without LDK --- dist/commitmentSign.js | 16 ++-- dist/commitmentSign.js.map | 2 +- dist/ldk.d.ts | 4 +- dist/ldk.js | 124 ++++++------------------------- dist/ldk.js.map | 2 +- dist/package.json | 28 ------- dist/utils/utils.d.ts | 4 - dist/utils/utils.js | 57 -------------- dist/utils/utils.js.map | 1 - dist/wallet/IWallet.d.ts | 10 +-- dist/wallet/index.d.ts | 10 +-- dist/wallet/index.js | 2 +- dist/wallet/index.js.map | 2 +- dist/wallet/marina/marina.d.ts | 13 ++-- dist/wallet/marina/marina.js | 16 +--- dist/wallet/marina/marina.js.map | 2 +- package.json | 9 +-- src/commitmentSign.ts | 18 ++--- src/ldk.ts | 101 +++---------------------- src/utils/utils.ts | 54 -------------- src/wallet/IWallet.ts | 10 +-- src/wallet/index.ts | 12 +-- src/wallet/marina/marina.ts | 26 ++----- 23 files changed, 95 insertions(+), 428 deletions(-) delete mode 100644 dist/package.json delete mode 100644 dist/utils/utils.d.ts delete mode 100644 dist/utils/utils.js delete mode 100644 dist/utils/utils.js.map delete mode 100644 src/utils/utils.ts diff --git a/dist/commitmentSign.js b/dist/commitmentSign.js index 2b3a279..0d8396c 100644 --- a/dist/commitmentSign.js +++ b/dist/commitmentSign.js @@ -41,7 +41,7 @@ var case1 = function (wallet, inputAmount, calculatedAmountWithSlippage, pool, c ? (0, commitmentOutput_1.commitmentOutputTapscript)(pool.id, publicKey).taprootResult.address.testnet : (0, commitmentOutput_1.commitmentOutputTapscript)(pool.id, publicKey).taprootResult.address.mainnet; var totalFee = config.baseFee.number + config.commitmentTxFee.number + config.serviceFee.number + config.defaultOrderingFee.number; - var receipents = [ + var recipients = [ { value: totalFee, address: address, @@ -53,7 +53,7 @@ var case1 = function (wallet, inputAmount, calculatedAmountWithSlippage, pool, c asset: pool.quote.assetHash, }, ]; - return (0, ldk_1.signTx)(wallet, callData, receipents, isTestnet); + return (0, ldk_1.signTx)(wallet, callData, recipients, isTestnet); }; exports.case1 = case1; var case2 = function (wallet, inputAmount, calculatedAmountWithSlippage, pool, config, publicKey, feeAssetHash, isTestnet) { @@ -67,7 +67,7 @@ var case2 = function (wallet, inputAmount, calculatedAmountWithSlippage, pool, c ? (0, commitmentOutput_1.commitmentOutputTapscript)(pool.id, publicKey).taprootResult.address.testnet : (0, commitmentOutput_1.commitmentOutputTapscript)(pool.id, publicKey).taprootResult.address.mainnet; var totalFee = config.baseFee.number + config.commitmentTxFee.number + config.serviceFee.number + config.defaultOrderingFee.number; - var receipents = [ + var recipients = [ { value: totalFee, address: address, @@ -79,7 +79,7 @@ var case2 = function (wallet, inputAmount, calculatedAmountWithSlippage, pool, c asset: pool.token.assetHash, }, ]; - return (0, ldk_1.signTx)(wallet, callData, receipents, isTestnet); + return (0, ldk_1.signTx)(wallet, callData, recipients, isTestnet); }; exports.case2 = case2; var case3 = function (wallet, inputAmountPair1, inputAmountPair2, pool, config, publicKey, feeAssetHash, isTestnet) { @@ -95,7 +95,7 @@ var case3 = function (wallet, inputAmountPair1, inputAmountPair2, pool, config, ? (0, commitmentOutput_1.commitmentOutputTapscript)(pool.id, publicKey).taprootResult.address.testnet : (0, commitmentOutput_1.commitmentOutputTapscript)(pool.id, publicKey).taprootResult.address.mainnet; var totalFee = config.baseFee.number + config.commitmentTxFee.number + config.serviceFee.number + config.defaultOrderingFee.number; - var receipents = [ + var recipients = [ { value: totalFee, address: address, @@ -112,7 +112,7 @@ var case3 = function (wallet, inputAmountPair1, inputAmountPair2, pool, config, asset: pool.token.assetHash, }, ]; - return (0, ldk_1.signTx)(wallet, callData, receipents, isTestnet); + return (0, ldk_1.signTx)(wallet, callData, recipients, isTestnet); }; exports.case3 = case3; var case4 = function (wallet, lpAmount, pool, config, publicKey, feeAssetHash, isTestnet) { @@ -126,7 +126,7 @@ var case4 = function (wallet, lpAmount, pool, config, publicKey, feeAssetHash, i ? (0, commitmentOutput_1.commitmentOutputTapscript)(pool.id, publicKey).taprootResult.address.testnet : (0, commitmentOutput_1.commitmentOutputTapscript)(pool.id, publicKey).taprootResult.address.mainnet; var totalFee = config.baseFee.number + config.commitmentTxFee.number + config.serviceFee.number + config.defaultOrderingFee.number; - var receipents = [ + var recipients = [ { value: totalFee, address: address, @@ -138,7 +138,7 @@ var case4 = function (wallet, lpAmount, pool, config, publicKey, feeAssetHash, i asset: pool.lp.assetHash, }, ]; - return (0, ldk_1.signTx)(wallet, callData, receipents, isTestnet); + return (0, ldk_1.signTx)(wallet, callData, recipients, isTestnet); }; exports.case4 = case4; //# sourceMappingURL=commitmentSign.js.map \ No newline at end of file diff --git a/dist/commitmentSign.js.map b/dist/commitmentSign.js.map index e0aa112..dd5d7aa 100644 --- a/dist/commitmentSign.js.map +++ b/dist/commitmentSign.js.map @@ -1 +1 @@ -{"version":3,"file":"commitmentSign.js","sourceRoot":"","sources":["../src/commitmentSign.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"commitmentSign.js","sourceRoot":"","sources":["../src/commitmentSign.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/ldk.d.ts b/dist/ldk.d.ts index e160b27..630497d 100644 --- a/dist/ldk.d.ts +++ b/dist/ldk.d.ts @@ -1,3 +1,3 @@ -import { RecipientInterface } from "ldk"; import { Wallet } from "./wallet"; -export declare const signTx: (marina: Wallet, callData: string, recipients: RecipientInterface[], isTestnet?: boolean) => Promise; +import { AddressRecipient } from "marina-provider"; +export declare const signTx: (marina: Wallet, callData: string, recipients: AddressRecipient[], isTestnet?: boolean) => Promise; diff --git a/dist/ldk.js b/dist/ldk.js index 088c2a1..cd1ace7 100644 --- a/dist/ldk.js +++ b/dist/ldk.js @@ -1,27 +1,4 @@ "use strict"; -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; -}; 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) { @@ -58,98 +35,39 @@ var __generator = (this && this.__generator) || function (thisArg, body) { if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; } }; +var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { + if (ar || !(i in from)) { + if (!ar) ar = Array.prototype.slice.call(from, 0, i); + ar[i] = from[i]; + } + } + return to.concat(ar || Array.prototype.slice.call(from)); +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.signTx = void 0; -var ldk_1 = require("ldk"); var liquidjs_lib_1 = require("liquidjs-lib"); -var psbt_1 = require("liquidjs-lib/src/psbt"); -var ecc = __importStar(require("tiny-secp256k1")); -var utils_1 = require("./utils/utils"); -var helper_1 = require("./utils/helper"); var signTx = function (marina, callData, recipients, isTestnet) { if (isTestnet === void 0) { isTestnet = false; } return __awaiter(void 0, void 0, void 0, function () { - var coins, pset, feeAsset, tx, makeGetter, assets, uniqueAssets, changeAddressGetter, unsignedTx, ptx, inputBlindingMap, outputBlindingMap, signedTx, finalTx, rawHex, txFinal, error_1, error_2; + var network, lbtc, dataRecipient, sent; return __generator(this, function (_a) { switch (_a.label) { - case 0: return [4 /*yield*/, marina.getCoins()]; + case 0: + network = isTestnet ? liquidjs_lib_1.networks.testnet : liquidjs_lib_1.networks.liquid; + lbtc = network.assetHash; + dataRecipient = { + asset: lbtc, + value: 0, + data: callData, + }; + return [4 /*yield*/, marina.sendTransaction(__spreadArray(__spreadArray([], recipients, true), [dataRecipient], false))]; case 1: - coins = _a.sent(); - pset = new psbt_1.Psbt({ network: isTestnet ? liquidjs_lib_1.networks.testnet : liquidjs_lib_1.networks.liquid }); - feeAsset = isTestnet ? liquidjs_lib_1.networks.testnet.assetHash : liquidjs_lib_1.networks.liquid.assetHash; - tx = pset.toBase64(); - makeGetter = makeAssetChangeGetter(marina); - assets = recipients.map(function (r) { return r.asset; }); - uniqueAssets = (0, helper_1.uniqueArray)(assets); - return [4 /*yield*/, makeGetter(uniqueAssets)]; - case 2: - changeAddressGetter = _a.sent(); - _a.label = 3; - case 3: - _a.trys.push([3, 10, , 11]); - unsignedTx = (0, ldk_1.craftMultipleRecipientsPset)({ - psetBase64: tx, - unspents: coins, - recipients: recipients, - coinSelector: (0, ldk_1.greedyCoinSelector)(), - changeAddressByAsset: changeAddressGetter, - addFee: true, - }); - ptx = psbt_1.Psbt.fromBase64(unsignedTx); - ptx.addOutput({ - script: liquidjs_lib_1.script.compile([liquidjs_lib_1.script.OPS.OP_RETURN, Buffer.from(callData, "hex")]), - value: ldk_1.confidential.satoshiToConfidentialValue(0), - asset: liquidjs_lib_1.AssetHash.fromHex(feeAsset, false).bytes, - nonce: Buffer.alloc(0), - }); - inputBlindingMap = (0, utils_1.inputBlindingDataMap)(unsignedTx, coins); - outputBlindingMap = (0, utils_1.outPubKeysMap)(unsignedTx, [changeAddressGetter(feeAsset), recipients[0].address]); - return [4 /*yield*/, ptx.blindOutputsByIndex(psbt_1.Psbt.ECCKeysGenerator(ecc), inputBlindingMap, outputBlindingMap)]; - case 4: - _a.sent(); - return [4 /*yield*/, marina.signTransaction(ptx.toBase64())]; - case 5: - signedTx = _a.sent(); - finalTx = psbt_1.Psbt.fromBase64(signedTx); - finalTx.finalizeAllInputs(); - rawHex = finalTx.extractTransaction().toHex(); - _a.label = 6; - case 6: - _a.trys.push([6, 8, , 9]); - return [4 /*yield*/, marina.broadcastTransaction(rawHex)]; - case 7: - txFinal = _a.sent(); - return [2 /*return*/, txFinal.txid]; - case 8: - error_1 = _a.sent(); - console.log(rawHex); - throw error_1; - case 9: return [3 /*break*/, 11]; - case 10: - error_2 = _a.sent(); - console.error(error_2); - return [3 /*break*/, 11]; - case 11: return [2 /*return*/, ""]; + sent = _a.sent(); + return [2 /*return*/, sent.txid]; } }); }); }; exports.signTx = signTx; -var makeAssetChangeGetter = function (marina) { - return function (assets) { return __awaiter(void 0, void 0, void 0, function () { - var addresses; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: return [4 /*yield*/, Promise.all(assets.map(function (_) { return marina.getNextChangeAddress(); }))]; - case 1: - addresses = _a.sent(); - return [2 /*return*/, function (asset) { - console.log(asset); - var index = assets.findIndex(function (a) { return a === asset; }); - return addresses[index].confidentialAddress; - }]; - } - }); - }); }; -}; //# sourceMappingURL=ldk.js.map \ No newline at end of file diff --git a/dist/ldk.js.map b/dist/ldk.js.map index 5f0ee9f..9214652 100644 --- a/dist/ldk.js.map +++ b/dist/ldk.js.map @@ -1 +1 @@ -{"version":3,"file":"ldk.js","sourceRoot":"","sources":["../src/ldk.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ldk.js","sourceRoot":"","sources":["../src/ldk.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAwC;AAIjC,IAAM,MAAM,GAAG,UAAO,MAAc,EAAE,QAAgB,EAAE,UAA8B,EAAE,SAAiB;IAAjB,0BAAA,EAAA,iBAAiB;;;;;;oBACxG,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,uBAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAQ,CAAC,MAAM,CAAC;oBACzD,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC;oBAEzB,aAAa,GAAkB;wBACnC,KAAK,EAAE,IAAI;wBACX,KAAK,EAAE,CAAC;wBACR,IAAI,EAAE,QAAQ;qBACf,CAAA;oBAEY,qBAAM,MAAM,CAAC,eAAe,iCAAK,UAAU,UAAE,aAAa,UAAE,EAAA;;oBAAnE,IAAI,GAAG,SAA4D;oBACzE,sBAAO,IAAI,CAAC,IAAI,EAAC;;;;CAClB,CAAC;AAZW,QAAA,MAAM,UAYjB"} \ No newline at end of file diff --git a/dist/package.json b/dist/package.json deleted file mode 100644 index 3e75eae..0000000 --- a/dist/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "@bitmatrix/lib", - "version": "0.1.16", - "description": "", - "main": "index.js", - "scripts": { - "npm-publish": "npm version patch && npm publish --access public" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/bit-matrix/bit-matrix-lib.git" - }, - "author": "", - "license": "ISC", - "bugs": { - "url": "https://github.com/bit-matrix/bit-matrix-lib/issues" - }, - "homepage": "https://github.com/bit-matrix/bit-matrix-lib#readme", - "dependencies": { - "@bitmatrix/esplora-api-client": "^0.0.8", - "@bitmatrix/models": "^0.1.47", - "@script-wiz/lib": "^0.1.82", - "@script-wiz/lib-core": "^0.0.48", - "ldk": "^0.5.8", - "marina-provider": "^1.7.2", - "tiny-secp256k1": "^1.1.6" - } -} diff --git a/dist/utils/utils.d.ts b/dist/utils/utils.d.ts deleted file mode 100644 index 1fd1616..0000000 --- a/dist/utils/utils.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -/// -import { confidential, UnblindedOutput } from "ldk"; -export declare function inputBlindingDataMap(pset: string, utxos: UnblindedOutput[]): Map; -export declare function outPubKeysMap(pset: string, outputAddresses: string[]): Map; diff --git a/dist/utils/utils.js b/dist/utils/utils.js deleted file mode 100644 index 8a44822..0000000 --- a/dist/utils/utils.js +++ /dev/null @@ -1,57 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.outPubKeysMap = exports.inputBlindingDataMap = void 0; -var ldk_1 = require("ldk"); -function inputBlindingDataMap(pset, utxos) { - var inputBlindingData = new Map(); - var txidToBuffer = function (txid) { - return Buffer.from(txid, "hex").reverse(); - }; - var index = -1; - var _loop_1 = function (input) { - index++; - var utxo = utxos.find(function (u) { return txidToBuffer(u.txid).equals(input.hash) && u.vout === input.index; }); - // only add unblind data if the prevout of the input is confidential - if (utxo && utxo.unblindData && (0, ldk_1.isConfidentialOutput)(utxo.prevout)) { - inputBlindingData.set(index, utxo.unblindData); - } - }; - for (var _i = 0, _a = (0, ldk_1.psetToUnsignedTx)(pset).ins; _i < _a.length; _i++) { - var input = _a[_i]; - _loop_1(input); - } - return inputBlindingData; -} -exports.inputBlindingDataMap = inputBlindingDataMap; -function outPubKeysMap(pset, outputAddresses) { - var outPubkeys = new Map(); - for (var _i = 0, outputAddresses_1 = outputAddresses; _i < outputAddresses_1.length; _i++) { - var outAddress = outputAddresses_1[_i]; - var index = outputIndexFromAddress(pset, outAddress); - if (index === -1) - continue; - if (isConfidentialAddress(outAddress)) { - outPubkeys.set(index, blindingKeyFromAddress(outAddress)); - } - } - return outPubkeys; -} -exports.outPubKeysMap = outPubKeysMap; -function outputIndexFromAddress(tx, addressToFind) { - var utx = (0, ldk_1.psetToUnsignedTx)(tx); - var recipientScript = ldk_1.address.toOutputScript(addressToFind); - return utx.outs.findIndex(function (out) { return out.script.equals(recipientScript); }); -} -var isConfidentialAddress = function (addr) { - try { - ldk_1.address.fromConfidential(addr); - return true; - } - catch (ignore) { - return false; - } -}; -var blindingKeyFromAddress = function (addr) { - return ldk_1.address.fromConfidential(addr).blindingKey; -}; -//# sourceMappingURL=utils.js.map \ No newline at end of file diff --git a/dist/utils/utils.js.map b/dist/utils/utils.js.map deleted file mode 100644 index 24e35a8..0000000 --- a/dist/utils/utils.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":";;;AAAA,2BAAqG;AAErG,SAAgB,oBAAoB,CAAC,IAAY,EAAE,KAAwB;IACzE,IAAM,iBAAiB,GAAG,IAAI,GAAG,EAA4C,CAAC;IAC9E,IAAM,YAAY,GAAG,UAAU,IAAY;QACzC,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;IAC5C,CAAC,CAAC;IAEF,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC;4BACJ,KAAK;QACd,KAAK,EAAE,CAAC;QACR,IAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,KAAK,EAAjE,CAAiE,CAAC,CAAC;QAElG,oEAAoE;QACpE,IAAI,IAAI,IAAI,IAAI,CAAC,WAAW,IAAI,IAAA,0BAAoB,EAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAClE,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;SAChD;;IAPH,KAAoB,UAA0B,EAA1B,KAAA,IAAA,sBAAgB,EAAC,IAAI,CAAC,CAAC,GAAG,EAA1B,cAA0B,EAA1B,IAA0B;QAAzC,IAAM,KAAK,SAAA;gBAAL,KAAK;KAQf;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAlBD,oDAkBC;AAED,SAAgB,aAAa,CAAC,IAAY,EAAE,eAAyB;IACnE,IAAM,UAAU,GAAwB,IAAI,GAAG,EAAE,CAAC;IAElD,KAAyB,UAAe,EAAf,mCAAe,EAAf,6BAAe,EAAf,IAAe,EAAE;QAArC,IAAM,UAAU,wBAAA;QACnB,IAAM,KAAK,GAAG,sBAAsB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACvD,IAAI,KAAK,KAAK,CAAC,CAAC;YAAE,SAAS;QAC3B,IAAI,qBAAqB,CAAC,UAAU,CAAC,EAAE;YACrC,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,sBAAsB,CAAC,UAAU,CAAC,CAAC,CAAC;SAC3D;KACF;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAZD,sCAYC;AAED,SAAS,sBAAsB,CAAC,EAAU,EAAE,aAAqB;IAC/D,IAAM,GAAG,GAAG,IAAA,sBAAgB,EAAC,EAAE,CAAC,CAAC;IACjC,IAAM,eAAe,GAAG,aAAO,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;IAC9D,OAAO,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,UAAC,GAAG,IAAK,OAAA,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,EAAlC,CAAkC,CAAC,CAAC;AACzE,CAAC;AAED,IAAM,qBAAqB,GAAG,UAAC,IAAY;IACzC,IAAI;QACF,aAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,MAAM,EAAE;QACf,OAAO,KAAK,CAAC;KACd;AACH,CAAC,CAAC;AAEF,IAAM,sBAAsB,GAAG,UAAC,IAAY;IAC1C,OAAO,aAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC;AACpD,CAAC,CAAC"} \ No newline at end of file diff --git a/dist/wallet/IWallet.d.ts b/dist/wallet/IWallet.d.ts index d57be01..79655fd 100644 --- a/dist/wallet/IWallet.d.ts +++ b/dist/wallet/IWallet.d.ts @@ -1,4 +1,4 @@ -import { AddressInterface, Balance, EventListenerID, MarinaEventType, NetworkString, Recipient, SentTransaction, Utxo } from "marina-provider"; +import { Address, Balance, EventListenerID, MarinaEventType, NetworkString, Recipient, SentTransaction, Utxo } from "marina-provider"; export interface IWallet { exist(): boolean; on(type: MarinaEventType, callback: (payload: any) => void): EventListenerID; @@ -6,12 +6,12 @@ export interface IWallet { isEnabled(): Promise; enable(): Promise; disable(): Promise; - getNextAddress(): Promise; - getAddresses(): Promise; + getNextAddress(): Promise
; + getAddresses(): Promise; sendTransaction(recipients: Recipient[]): Promise; getBalances(): Promise; - getNextChangeAddress(): Promise; - reloadCoins(): Promise; + getNextChangeAddress(): Promise
; + blindTransaction(pset: string): Promise; getCoins(): Promise; getNetwork(): Promise; signTransaction(pset: string): Promise; diff --git a/dist/wallet/index.d.ts b/dist/wallet/index.d.ts index 7b2b010..9be2fa7 100644 --- a/dist/wallet/index.d.ts +++ b/dist/wallet/index.d.ts @@ -1,9 +1,10 @@ -import { AddressInterface, Balance, EventListenerID, MarinaEventType, MarinaProvider, NetworkString, Recipient, SentTransaction, Utxo } from "marina-provider"; +import { Address, Balance, EventListenerID, MarinaEventType, MarinaProvider, NetworkString, Recipient, SentTransaction, Utxo } from "marina-provider"; import { IWallet } from "./IWallet"; import { WALLET_NAME } from "./WALLET_NAME"; export declare class Wallet implements IWallet { private wallet; constructor(marina: MarinaProvider, walletName?: WALLET_NAME); + blindTransaction: (pset: string) => Promise; signTransaction: (pset: string) => Promise; broadcastTransaction: (signedTxHex: string) => Promise; off: (listenerId: EventListenerID) => void; @@ -12,12 +13,11 @@ export declare class Wallet implements IWallet { isEnabled: () => Promise; enable: () => Promise; disable: () => Promise; - getNextAddress: () => Promise; - getAddresses: () => Promise; + getNextAddress: () => Promise
; + getAddresses: () => Promise; sendTransaction: (recipients: Recipient[]) => Promise; getBalances: () => Promise; - getNextChangeAddress: () => Promise; - reloadCoins: () => Promise; + getNextChangeAddress: () => Promise
; getCoins: () => Promise; getNetwork: () => Promise; } diff --git a/dist/wallet/index.js b/dist/wallet/index.js index f2b9a11..e05608f 100644 --- a/dist/wallet/index.js +++ b/dist/wallet/index.js @@ -10,6 +10,7 @@ var Wallet = /** @class */ (function () { function Wallet(marina, walletName) { if (walletName === void 0) { walletName = WALLET_NAME_1.WALLET_NAME.MARINA; } var _this = this; + this.blindTransaction = function (pset) { return _this.wallet.blindTransaction(pset); }; this.signTransaction = function (pset) { return _this.wallet.signTransaction(pset); }; this.broadcastTransaction = function (signedTxHex) { return _this.wallet.broadcastTransaction(signedTxHex); }; this.off = function (listenerId) { return _this.wallet.off(listenerId); }; @@ -23,7 +24,6 @@ var Wallet = /** @class */ (function () { this.sendTransaction = function (recipients) { return _this.wallet.sendTransaction(recipients); }; this.getBalances = function () { return _this.wallet.getBalances(); }; this.getNextChangeAddress = function () { return _this.wallet.getNextChangeAddress(); }; - this.reloadCoins = function () { return _this.wallet.reloadCoins(); }; this.getCoins = function () { return _this.wallet.getCoins(); }; this.getNetwork = function () { return _this.wallet.getNetwork(); }; if (walletName === WALLET_NAME_1.WALLET_NAME.MARINA) diff --git a/dist/wallet/index.js.map b/dist/wallet/index.js.map index b343d15..38e02c6 100644 --- a/dist/wallet/index.js.map +++ b/dist/wallet/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/wallet/index.ts"],"names":[],"mappings":";;;;;;AAEA,2DAAqC;AACrC,6CAA4C;AAE5C;IAGE,gBAAY,MAAsB,EAAE,UAA4C;QAA5C,2BAAA,EAAA,aAA0B,yBAAW,CAAC,MAAM;QAAhF,iBAIC;QAEM,oBAAe,GAAG,UAAC,IAAY,IAAsB,OAAA,KAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,EAAjC,CAAiC,CAAC;QAEvF,yBAAoB,GAAG,UAAC,WAAmB,IAA+B,OAAA,KAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,WAAW,CAAC,EAA7C,CAA6C,CAAC;QAExH,QAAG,GAAG,UAAC,UAA2B,IAAW,OAAA,KAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,EAA3B,CAA2B,CAAC;QAEzE,OAAE,GAAG,UAAC,IAAqB,EAAE,QAAgC,IAAa,OAAA,KAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,EAA9B,CAA8B,CAAC;QAEzG,UAAK,GAAG,cAAe,OAAA,KAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAnB,CAAmB,CAAC;QAE3C,cAAS,GAAG,cAAwB,OAAA,KAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAAvB,CAAuB,CAAC;QAE5D,WAAM,GAAG,cAAqB,OAAA,KAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAApB,CAAoB,CAAC;QAEnD,YAAO,GAAG,cAAqB,OAAA,KAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAArB,CAAqB,CAAC;QAErD,mBAAc,GAAG,cAAiC,OAAA,KAAI,CAAC,MAAM,CAAC,cAAc,EAAE,EAA5B,CAA4B,CAAC;QAE/E,iBAAY,GAAG,cAAmC,OAAA,KAAI,CAAC,MAAM,CAAC,YAAY,EAAE,EAA1B,CAA0B,CAAC;QAE7E,oBAAe,GAAG,UAAC,UAAuB,IAA+B,OAAA,KAAI,CAAC,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,EAAvC,CAAuC,CAAC;QAEjH,gBAAW,GAAG,cAA0B,OAAA,KAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAzB,CAAyB,CAAC;QAElE,yBAAoB,GAAG,cAAiC,OAAA,KAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,EAAlC,CAAkC,CAAC;QAE3F,gBAAW,GAAG,cAAqB,OAAA,KAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAzB,CAAyB,CAAC;QAE7D,aAAQ,GAAG,cAAuB,OAAA,KAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAtB,CAAsB,CAAC;QAEzD,eAAU,GAAG,cAA8B,OAAA,KAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAxB,CAAwB,CAAC;QAnCzE,IAAI,UAAU,KAAK,yBAAW,CAAC,MAAM;YAAE,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAM,CAAC,MAAM,CAAC,CAAC;QACxE,sBAAsB;;YACjB,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAM,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAiCH,aAAC;AAAD,CAAC,AAxCD,IAwCC;AAxCY,wBAAM"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/wallet/index.ts"],"names":[],"mappings":";;;;;;AAEA,2DAAqC;AACrC,6CAA4C;AAE5C;IAGE,gBAAY,MAAsB,EAAE,UAA4C;QAA5C,2BAAA,EAAA,aAA0B,yBAAW,CAAC,MAAM;QAAhF,iBAIC;QAEM,qBAAgB,GAAG,UAAC,IAAY,IAAsB,OAAA,KAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAlC,CAAkC,CAAC;QAEzF,oBAAe,GAAG,UAAC,IAAY,IAAsB,OAAA,KAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,EAAjC,CAAiC,CAAC;QAEvF,yBAAoB,GAAG,UAAC,WAAmB,IAA+B,OAAA,KAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,WAAW,CAAC,EAA7C,CAA6C,CAAC;QAExH,QAAG,GAAG,UAAC,UAA2B,IAAW,OAAA,KAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,EAA3B,CAA2B,CAAC;QAEzE,OAAE,GAAG,UAAC,IAAqB,EAAE,QAAgC,IAAa,OAAA,KAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,EAA9B,CAA8B,CAAC;QAEzG,UAAK,GAAG,cAAe,OAAA,KAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAnB,CAAmB,CAAC;QAE3C,cAAS,GAAG,cAAwB,OAAA,KAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAAvB,CAAuB,CAAC;QAE5D,WAAM,GAAG,cAAqB,OAAA,KAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAApB,CAAoB,CAAC;QAEnD,YAAO,GAAG,cAAqB,OAAA,KAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAArB,CAAqB,CAAC;QAErD,mBAAc,GAAG,cAAwB,OAAA,KAAI,CAAC,MAAM,CAAC,cAAc,EAAE,EAA5B,CAA4B,CAAC;QAEtE,iBAAY,GAAG,cAA0B,OAAA,KAAI,CAAC,MAAM,CAAC,YAAY,EAAE,EAA1B,CAA0B,CAAC;QAEpE,oBAAe,GAAG,UAAC,UAAuB,IAA+B,OAAA,KAAI,CAAC,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,EAAvC,CAAuC,CAAC;QAEjH,gBAAW,GAAG,cAA0B,OAAA,KAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAzB,CAAyB,CAAC;QAElE,yBAAoB,GAAG,cAAwB,OAAA,KAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,EAAlC,CAAkC,CAAC;QAElF,aAAQ,GAAG,cAAuB,OAAA,KAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAtB,CAAsB,CAAC;QAEzD,eAAU,GAAG,cAA8B,OAAA,KAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAxB,CAAwB,CAAC;QAnCzE,IAAI,UAAU,KAAK,yBAAW,CAAC,MAAM;YAAE,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAM,CAAC,MAAM,CAAC,CAAC;QACxE,sBAAsB;;YACjB,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAM,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAiCH,aAAC;AAAD,CAAC,AAxCD,IAwCC;AAxCY,wBAAM"} \ No newline at end of file diff --git a/dist/wallet/marina/marina.d.ts b/dist/wallet/marina/marina.d.ts index bdf2667..52d3d19 100644 --- a/dist/wallet/marina/marina.d.ts +++ b/dist/wallet/marina/marina.d.ts @@ -1,8 +1,7 @@ -import { AccountInfo, AddressInterface, Balance, EventListenerID, MarinaEventType, MarinaProvider, NetworkString, Recipient, SentTransaction, SignedMessage, Template, Transaction, Utxo } from "marina-provider"; +import { AccountInfo, Address, Balance, EventListenerID, MarinaEventType, MarinaProvider, NetworkString, Recipient, SentTransaction, SignedMessage, Transaction, Utxo } from "marina-provider"; export default class Marina implements MarinaProvider { private marina; constructor(marina: MarinaProvider); - importTemplate(template: Template, changeTemplate?: Template | undefined): Promise; getAccountInfo(accountID: string): Promise; getAccountsIDs(): Promise; signTransaction(pset: string): Promise; @@ -13,16 +12,14 @@ export default class Marina implements MarinaProvider { isEnabled: () => Promise; enable: () => Promise; disable: () => Promise; - getNextAddress(): Promise; - getAddresses(): Promise; + getNextAddress(): Promise
; + getAddresses(): Promise; sendTransaction(recipients: Recipient[]): Promise; - getNextChangeAddress(): Promise; + getNextChangeAddress(): Promise
; getBalances(): Promise; - reloadCoins(): Promise; getCoins(): Promise; getNetwork(): Promise; - setAccount(): Promise; - blindTransaction(): Promise; + blindTransaction(pset: string): Promise; signMessage(): Promise; getTransactions(): Promise; getFeeAssets(): Promise; diff --git a/dist/wallet/marina/marina.js b/dist/wallet/marina/marina.js index 28254f0..0076974 100644 --- a/dist/wallet/marina/marina.js +++ b/dist/wallet/marina/marina.js @@ -33,9 +33,6 @@ var Marina = /** @class */ (function () { }; this.marina = marina; } - Marina.prototype.importTemplate = function (template, changeTemplate) { - throw new Error("Method not implemented."); - }; Marina.prototype.getAccountInfo = function (accountID) { throw new Error("Method not implemented."); }; @@ -81,11 +78,6 @@ var Marina = /** @class */ (function () { // else throw "Install Marina first"; throw new Error("Marina wallet disabled."); }; - Marina.prototype.reloadCoins = function () { - if (this.exist() && this.marina) - return this.marina.reloadCoins(); - return Promise.reject("Marina wallet disabled."); - }; Marina.prototype.getCoins = function () { if (this.exist() && this.marina) return this.marina.getCoins(); @@ -96,11 +88,9 @@ var Marina = /** @class */ (function () { return this.marina.getNetwork(); return Promise.reject("Marina wallet disabled."); }; - Marina.prototype.setAccount = function ( /*account: number*/) { - throw new Error("Method not implemented."); - }; - Marina.prototype.blindTransaction = function ( /*pset: string*/) { - throw new Error("Method not implemented."); + Marina.prototype.blindTransaction = function (pset) { + var _a; + return ((_a = this.marina) === null || _a === void 0 ? void 0 : _a.blindTransaction(pset)) || Promise.reject("Marina wallet disabled."); }; Marina.prototype.signMessage = function ( /*message: string*/) { throw new Error("Method not implemented."); diff --git a/dist/wallet/marina/marina.js.map b/dist/wallet/marina/marina.js.map index 7edbd26..43a617e 100644 --- a/dist/wallet/marina/marina.js.map +++ b/dist/wallet/marina/marina.js.map @@ -1 +1 @@ -{"version":3,"file":"marina.js","sourceRoot":"","sources":["../../../src/wallet/marina/marina.ts"],"names":[],"mappings":";;AAgBA;IAGE,gBAAY,MAAsB;QAAlC,iBAEC;QAwBD,OAAE,GAAG,UAAC,IAAqB,EAAE,QAAgC;YAC3D,IAAI,KAAI,CAAC,KAAK,EAAE,IAAI,KAAI,CAAC,MAAM;gBAAE,OAAO,KAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAEvE,OAAO,yBAAyB,CAAC;QACnC,CAAC,CAAC;QAEF,QAAG,GAAG,UAAC,UAA2B;YAChC,IAAI,KAAI,CAAC,KAAK,EAAE,IAAI,KAAI,CAAC,MAAM;gBAAE,KAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC/D,CAAC,CAAC;QAEF,UAAK,GAAG,cAAe,OAAA,OAAO,KAAI,CAAC,MAAM,KAAK,WAAW,EAAlC,CAAkC,CAAC;QAE1D,cAAS,GAAG;YACV,IAAI,KAAI,CAAC,KAAK,EAAE,IAAI,KAAI,CAAC,MAAM;gBAAE,OAAO,KAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YAChE,gCAAgC;YAChC,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC,CAAC;QAEF,WAAM,GAAG;YACP,IAAI,KAAI,CAAC,KAAK,EAAE,IAAI,KAAI,CAAC,MAAM;gBAAE,OAAO,KAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YAC7D,qCAAqC;YACrC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC,CAAC;QAEF,YAAO,GAAG;YACR,IAAI,KAAI,CAAC,KAAK,EAAE,IAAI,KAAI,CAAC,MAAM;gBAAE,OAAO,KAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAC9D,qCAAqC;YACrC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC,CAAC;QArDA,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IACD,+BAAc,GAAd,UAAe,QAAuB,EAAE,cAA0C;QAChF,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,+BAAc,GAAd,UAAe,SAAiB;QAC9B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,+BAAc,GAAd;QACE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,gCAAe,GAAf,UAAgB,IAAY;QAC1B,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAE1E,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,qCAAoB,GAApB,UAAqB,WAAmB;QACtC,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QAEtF,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAgCD,+BAAc,GAAd;QACE,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;QACrE,qCAAqC;QACrC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,6BAAY,GAAZ;QACE,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;QACnE,qCAAqC;QACrC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,gCAAe,GAAf,UAAgB,UAAuB;QACrC,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAChF,qCAAqC;QACrC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,qCAAoB,GAApB;QACE,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC;QAE3E,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,4BAAW,GAAX;QACE,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QAClE,qCAAqC;QACrC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,4BAAW,GAAX;QACE,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QAElE,OAAO,OAAO,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC;IACnD,CAAC;IAED,yBAAQ,GAAR;QACE,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC/D,OAAO,OAAO,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC;IACnD,CAAC;IAED,2BAAU,GAAV;QACE,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACjE,OAAO,OAAO,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC;IACnD,CAAC;IAED,2BAAU,GAAV,WAAW,mBAAmB;QAC5B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,iCAAgB,GAAhB,WAAiB,gBAAgB;QAC/B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,4BAAW,GAAX,WAAY,mBAAmB;QAC7B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,gCAAe,GAAf;QACE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,6BAAY,GAAZ;QACE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,wBAAO,GAAP;QACE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,mCAAkB,GAAlB;QACE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,8BAAa,GAAb,UAAc,WAAmB;QAC/B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,2BAAU,GAAV,UAAW,OAAe;QACxB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACH,aAAC;AAAD,CAAC,AA5ID,IA4IC"} \ No newline at end of file +{"version":3,"file":"marina.js","sourceRoot":"","sources":["../../../src/wallet/marina/marina.ts"],"names":[],"mappings":";;AAeA;IAGE,gBAAY,MAAsB;QAAlC,iBAEC;QAqBD,OAAE,GAAG,UAAC,IAAqB,EAAE,QAAgC;YAC3D,IAAI,KAAI,CAAC,KAAK,EAAE,IAAI,KAAI,CAAC,MAAM;gBAAE,OAAO,KAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAEvE,OAAO,yBAAyB,CAAC;QACnC,CAAC,CAAC;QAEF,QAAG,GAAG,UAAC,UAA2B;YAChC,IAAI,KAAI,CAAC,KAAK,EAAE,IAAI,KAAI,CAAC,MAAM;gBAAE,KAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC/D,CAAC,CAAC;QAEF,UAAK,GAAG,cAAe,OAAA,OAAO,KAAI,CAAC,MAAM,KAAK,WAAW,EAAlC,CAAkC,CAAC;QAE1D,cAAS,GAAG;YACV,IAAI,KAAI,CAAC,KAAK,EAAE,IAAI,KAAI,CAAC,MAAM;gBAAE,OAAO,KAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YAChE,gCAAgC;YAChC,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC,CAAC;QAEF,WAAM,GAAG;YACP,IAAI,KAAI,CAAC,KAAK,EAAE,IAAI,KAAI,CAAC,MAAM;gBAAE,OAAO,KAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YAC7D,qCAAqC;YACrC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC,CAAC;QAEF,YAAO,GAAG;YACR,IAAI,KAAI,CAAC,KAAK,EAAE,IAAI,KAAI,CAAC,MAAM;gBAAE,OAAO,KAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAC9D,qCAAqC;YACrC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC,CAAC;QAlDA,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IACD,+BAAc,GAAd,UAAe,SAAiB;QAC9B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,+BAAc,GAAd;QACE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,gCAAe,GAAf,UAAgB,IAAY;QAC1B,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAE1E,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,qCAAoB,GAApB,UAAqB,WAAmB;QACtC,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QAEtF,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAgCD,+BAAc,GAAd;QACE,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;QACrE,qCAAqC;QACrC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,6BAAY,GAAZ;QACE,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;QACnE,qCAAqC;QACrC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,gCAAe,GAAf,UAAgB,UAAuB;QACrC,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAChF,qCAAqC;QACrC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,qCAAoB,GAApB;QACE,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC;QAE3E,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,4BAAW,GAAX;QACE,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QAClE,qCAAqC;QACrC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,yBAAQ,GAAR;QACE,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC/D,OAAO,OAAO,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC;IACnD,CAAC;IAED,2BAAU,GAAV;QACE,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACjE,OAAO,OAAO,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC;IACnD,CAAC;IAED,iCAAgB,GAAhB,UAAiB,IAAY;;QAC3B,OAAO,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,gBAAgB,CAAC,IAAI,CAAC,KAAI,OAAO,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC;IAC1F,CAAC;IAED,4BAAW,GAAX,WAAY,mBAAmB;QAC7B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,gCAAe,GAAf;QACE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,6BAAY,GAAZ;QACE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,wBAAO,GAAP;QACE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,mCAAkB,GAAlB;QACE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,8BAAa,GAAb,UAAc,WAAmB;QAC/B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,2BAAU,GAAV,UAAW,OAAe;QACxB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACH,aAAC;AAAD,CAAC,AA/HD,IA+HC"} \ No newline at end of file diff --git a/package.json b/package.json index 9184a48..7d67e7a 100644 --- a/package.json +++ b/package.json @@ -31,14 +31,11 @@ "dependencies": { "@bitmatrix/esplora-api-client": "^0.0.8", "@bitmatrix/models": "0.1.47", + "@ionio-lang/ionio": "^0.3.0", "@script-wiz/lib": "^0.1.82", "@script-wiz/lib-core": "^0.0.48", - "ldk": "0.5.8", - "marina-provider": "1.7.2", + "liquidjs-lib": "^6.0.2-liquid.23", + "marina-provider": "git+https://github.com/louisinger/marina-provider#new-provider", "tiny-secp256k1": "1.1.6" - }, - "resolutions": { - "liquidjs-lib": "6.0.2-liquid.7", - "ecpair": "2.0.1" } } diff --git a/src/commitmentSign.ts b/src/commitmentSign.ts index 742681f..cc51424 100644 --- a/src/commitmentSign.ts +++ b/src/commitmentSign.ts @@ -3,10 +3,10 @@ import { Wallet } from "./wallet"; import WizData, { hexLE } from "@script-wiz/wiz-data"; import { convertion } from "@script-wiz/lib-core"; -import { RecipientInterface } from "ldk"; import { commitmentOutputTapscript } from "./commitmentOutput"; import { signTx } from "./ldk"; import { calculateAmountTotal } from "./utils/helper"; +import { AddressRecipient } from "marina-provider"; export const case1 = ( wallet: Wallet, @@ -31,7 +31,7 @@ export const case1 = ( const totalFee = config.baseFee.number + config.commitmentTxFee.number + config.serviceFee.number + config.defaultOrderingFee.number; - const receipents: RecipientInterface[] = [ + const recipients: AddressRecipient[] = [ { value: totalFee, address, @@ -44,7 +44,7 @@ export const case1 = ( }, ]; - return signTx(wallet, callData, receipents, isTestnet); + return signTx(wallet, callData, recipients, isTestnet); }; export const case2 = ( @@ -70,7 +70,7 @@ export const case2 = ( const totalFee = config.baseFee.number + config.commitmentTxFee.number + config.serviceFee.number + config.defaultOrderingFee.number; - const receipents: RecipientInterface[] = [ + const recipients: AddressRecipient[] = [ { value: totalFee, address, @@ -83,7 +83,7 @@ export const case2 = ( }, ]; - return signTx(wallet, callData, receipents, isTestnet); + return signTx(wallet, callData, recipients, isTestnet); }; export const case3 = ( @@ -113,7 +113,7 @@ export const case3 = ( const totalFee = config.baseFee.number + config.commitmentTxFee.number + config.serviceFee.number + config.defaultOrderingFee.number; - const receipents: RecipientInterface[] = [ + const recipients: AddressRecipient[] = [ { value: totalFee, address, @@ -131,7 +131,7 @@ export const case3 = ( }, ]; - return signTx(wallet, callData, receipents, isTestnet); + return signTx(wallet, callData, recipients, isTestnet); }; export const case4 = (wallet: Wallet, lpAmount: number, pool: Pool, config: BmConfig, publicKey: string, feeAssetHash: string, isTestnet = false): Promise => { @@ -149,7 +149,7 @@ export const case4 = (wallet: Wallet, lpAmount: number, pool: Pool, config: BmCo const totalFee = config.baseFee.number + config.commitmentTxFee.number + config.serviceFee.number + config.defaultOrderingFee.number; - const receipents: RecipientInterface[] = [ + const recipients: AddressRecipient[] = [ { value: totalFee, address, @@ -162,5 +162,5 @@ export const case4 = (wallet: Wallet, lpAmount: number, pool: Pool, config: BmCo }, ]; - return signTx(wallet, callData, receipents, isTestnet); + return signTx(wallet, callData, recipients, isTestnet); }; diff --git a/src/ldk.ts b/src/ldk.ts index fa6662c..35f42b8 100644 --- a/src/ldk.ts +++ b/src/ldk.ts @@ -1,94 +1,17 @@ -import { ChangeAddressFromAssetGetter, confidential, craftMultipleRecipientsPset, greedyCoinSelector, RecipientInterface, UnblindedOutput } from "ldk"; -import { AssetHash, networks, script } from "liquidjs-lib"; -import { Psbt } from "liquidjs-lib/src/psbt"; +import { networks } from "liquidjs-lib"; import { Wallet } from "./wallet"; -import * as ecc from "tiny-secp256k1"; -import { MarinaProvider } from "marina-provider"; -import { inputBlindingDataMap, outPubKeysMap } from "./utils/utils"; -import { uniqueArray } from "./utils/helper"; +import { AddressRecipient, DataRecipient } from "marina-provider"; -export const signTx = async (marina: Wallet, callData: string, recipients: RecipientInterface[], isTestnet = false): Promise => { - const coins = await marina.getCoins(); +export const signTx = async (marina: Wallet, callData: string, recipients: AddressRecipient[], isTestnet = false): Promise => { + const network = isTestnet ? networks.testnet : networks.liquid; + const lbtc = network.assetHash; - // 1. create an empty psbt object - const pset = new Psbt({ network: isTestnet ? networks.testnet : networks.liquid }); - const feeAsset = isTestnet ? networks.testnet.assetHash : networks.liquid.assetHash; - - // // 2. add a custom OP_RETURN output to psbt - // pset.addOutput({ - // script: script.compile([script.OPS.OP_RETURN, Buffer.from(callData, "hex")]), - // value: confidential.satoshiToConfidentialValue(0), - // asset: AssetHash.fromHex(networks.testnet.assetHash, false).bytes, - // nonce: Buffer.alloc(0), - // }); - - // 3. add P2TR address(es) as recipient(s) to psbt - - // 4. Serialize as base64 the psbt to be passed to LDK - const tx = pset.toBase64(); - - const makeGetter = makeAssetChangeGetter(marina as unknown as MarinaProvider); - - const assets = recipients.map((r) => r.asset); - - const uniqueAssets = uniqueArray(assets); - - //todo - const changeAddressGetter = await makeGetter(uniqueAssets); - - // 5. Craft the transaction with multiple outputs and add fee & change output to the psbt - const unsignedTx = craftMultipleRecipientsPset({ - psetBase64: tx, - unspents: coins as UnblindedOutput[], - recipients, - coinSelector: greedyCoinSelector(), - changeAddressByAsset: changeAddressGetter, - addFee: true, - }); - - // deserialize and inspect the transaction - const ptx = Psbt.fromBase64(unsignedTx); - - ptx.addOutput({ - script: script.compile([script.OPS.OP_RETURN, Buffer.from(callData, "hex")]), - value: confidential.satoshiToConfidentialValue(0), - asset: AssetHash.fromHex(feeAsset, false).bytes, - nonce: Buffer.alloc(0), - }); - - const inputBlindingMap = inputBlindingDataMap(unsignedTx, coins); - - const outputBlindingMap = outPubKeysMap(unsignedTx, [changeAddressGetter(feeAsset), recipients[0].address]); - - await ptx.blindOutputsByIndex(Psbt.ECCKeysGenerator(ecc), inputBlindingMap, outputBlindingMap); - - // 7. Sign the transaction's inputs with Marina - const signedTx = await marina.signTransaction(ptx.toBase64()); - - // 7. Broadcast the transaction to the network (need to ba added to Marina) - const finalTx = Psbt.fromBase64(signedTx); - - finalTx.finalizeAllInputs(); - - const rawHex = finalTx.extractTransaction().toHex(); - - try { - const txFinal = await marina.broadcastTransaction(rawHex); - return txFinal.txid; - } catch (error: any) { - console.log(rawHex); - throw error; + const dataRecipient: DataRecipient = { + asset: lbtc, + value: 0, + data: callData, } -}; -const makeAssetChangeGetter = - (marina: MarinaProvider) => - async (assets: Array): Promise => { - const addresses = await Promise.all(assets.map((_) => marina.getNextChangeAddress())); - - return (asset: string) => { - console.log(asset); - const index = assets.findIndex((a) => a === asset); - return addresses[index].confidentialAddress; - }; - }; + const sent = await marina.sendTransaction([...recipients, dataRecipient]); + return sent.txid; +}; diff --git a/src/utils/utils.ts b/src/utils/utils.ts deleted file mode 100644 index c7cd8b5..0000000 --- a/src/utils/utils.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { psetToUnsignedTx, address, confidential, UnblindedOutput, isConfidentialOutput } from "ldk"; - -export function inputBlindingDataMap(pset: string, utxos: UnblindedOutput[]): Map { - const inputBlindingData = new Map(); - const txidToBuffer = function (txid: string) { - return Buffer.from(txid, "hex").reverse(); - }; - - let index = -1; - for (const input of psetToUnsignedTx(pset).ins) { - index++; - const utxo = utxos.find((u) => txidToBuffer(u.txid).equals(input.hash) && u.vout === input.index); - - // only add unblind data if the prevout of the input is confidential - if (utxo && utxo.unblindData && isConfidentialOutput(utxo.prevout)) { - inputBlindingData.set(index, utxo.unblindData); - } - } - - return inputBlindingData; -} - -export function outPubKeysMap(pset: string, outputAddresses: string[]): Map { - const outPubkeys: Map = new Map(); - - for (const outAddress of outputAddresses) { - const index = outputIndexFromAddress(pset, outAddress); - if (index === -1) continue; - if (isConfidentialAddress(outAddress)) { - outPubkeys.set(index, blindingKeyFromAddress(outAddress)); - } - } - - return outPubkeys; -} - -function outputIndexFromAddress(tx: string, addressToFind: string): number { - const utx = psetToUnsignedTx(tx); - const recipientScript = address.toOutputScript(addressToFind); - return utx.outs.findIndex((out) => out.script.equals(recipientScript)); -} - -const isConfidentialAddress = (addr: string): boolean => { - try { - address.fromConfidential(addr); - return true; - } catch (ignore) { - return false; - } -}; - -const blindingKeyFromAddress = (addr: string): Buffer => { - return address.fromConfidential(addr).blindingKey; -}; diff --git a/src/wallet/IWallet.ts b/src/wallet/IWallet.ts index 66ca677..e9e720c 100644 --- a/src/wallet/IWallet.ts +++ b/src/wallet/IWallet.ts @@ -1,4 +1,4 @@ -import { AddressInterface, Balance, EventListenerID, MarinaEventType, NetworkString, Recipient, SentTransaction, Utxo } from "marina-provider"; +import { Address, Balance, EventListenerID, MarinaEventType, NetworkString, Recipient, SentTransaction, Utxo } from "marina-provider"; export interface IWallet { exist(): boolean; @@ -13,17 +13,17 @@ export interface IWallet { disable(): Promise; - getNextAddress(): Promise; + getNextAddress(): Promise
; - getAddresses(): Promise; + getAddresses(): Promise; sendTransaction(recipients: Recipient[]): Promise; getBalances(): Promise; - getNextChangeAddress(): Promise; + getNextChangeAddress(): Promise
; - reloadCoins(): Promise; + blindTransaction(pset: string): Promise; getCoins(): Promise; diff --git a/src/wallet/index.ts b/src/wallet/index.ts index 7edd137..1aa7727 100644 --- a/src/wallet/index.ts +++ b/src/wallet/index.ts @@ -1,4 +1,4 @@ -import { AddressInterface, Balance, EventListenerID, MarinaEventType, MarinaProvider, NetworkString, Recipient, SentTransaction, Utxo } from "marina-provider"; +import { Address, Balance, EventListenerID, MarinaEventType, MarinaProvider, NetworkString, Recipient, SentTransaction, Utxo } from "marina-provider"; import { IWallet } from "./IWallet"; import Marina from "./marina/marina"; import { WALLET_NAME } from "./WALLET_NAME"; @@ -11,6 +11,8 @@ export class Wallet implements IWallet { // TODO default wallet else this.wallet = new Marina(marina); } + + public blindTransaction = (pset: string): Promise => this.wallet.blindTransaction(pset); public signTransaction = (pset: string): Promise => this.wallet.signTransaction(pset); @@ -28,17 +30,15 @@ export class Wallet implements IWallet { public disable = (): Promise => this.wallet.disable(); - public getNextAddress = (): Promise => this.wallet.getNextAddress(); + public getNextAddress = (): Promise
=> this.wallet.getNextAddress(); - public getAddresses = (): Promise => this.wallet.getAddresses(); + public getAddresses = (): Promise => this.wallet.getAddresses(); public sendTransaction = (recipients: Recipient[]): Promise => this.wallet.sendTransaction(recipients); public getBalances = (): Promise => this.wallet.getBalances(); - public getNextChangeAddress = (): Promise => this.wallet.getNextChangeAddress(); - - public reloadCoins = (): Promise => this.wallet.reloadCoins(); + public getNextChangeAddress = (): Promise
=> this.wallet.getNextChangeAddress(); public getCoins = (): Promise => this.wallet.getCoins(); diff --git a/src/wallet/marina/marina.ts b/src/wallet/marina/marina.ts index 71fbcf2..67e86da 100644 --- a/src/wallet/marina/marina.ts +++ b/src/wallet/marina/marina.ts @@ -1,6 +1,6 @@ import { AccountInfo, - AddressInterface, + Address, Balance, EventListenerID, MarinaEventType, @@ -9,7 +9,6 @@ import { Recipient, SentTransaction, SignedMessage, - Template, Transaction, Utxo, } from "marina-provider"; @@ -20,9 +19,6 @@ export default class Marina implements MarinaProvider { constructor(marina: MarinaProvider) { this.marina = marina; } - importTemplate(template: Template, changeTemplate?: Template | undefined): Promise { - throw new Error("Method not implemented."); - } getAccountInfo(accountID: string): Promise { throw new Error("Method not implemented."); } @@ -73,13 +69,13 @@ export default class Marina implements MarinaProvider { return Promise.resolve(); }; - getNextAddress(): Promise { + getNextAddress(): Promise
{ if (this.exist() && this.marina) return this.marina.getNextAddress(); // else throw "Install Marina first"; throw new Error("Marina wallet disabled."); } - getAddresses(): Promise { + getAddresses(): Promise { if (this.exist() && this.marina) return this.marina.getAddresses(); // else throw "Install Marina first"; throw new Error("Marina wallet disabled."); @@ -91,7 +87,7 @@ export default class Marina implements MarinaProvider { throw new Error("Marina wallet disabled."); } - getNextChangeAddress(): Promise { + getNextChangeAddress(): Promise
{ if (this.exist() && this.marina) return this.marina.getNextChangeAddress(); throw new Error("Marina wallet disabled."); @@ -103,12 +99,6 @@ export default class Marina implements MarinaProvider { throw new Error("Marina wallet disabled."); } - reloadCoins(): Promise { - if (this.exist() && this.marina) return this.marina.reloadCoins(); - - return Promise.reject("Marina wallet disabled."); - } - getCoins(): Promise { if (this.exist() && this.marina) return this.marina.getCoins(); return Promise.reject("Marina wallet disabled."); @@ -119,12 +109,8 @@ export default class Marina implements MarinaProvider { return Promise.reject("Marina wallet disabled."); } - setAccount(/*account: number*/): Promise { - throw new Error("Method not implemented."); - } - - blindTransaction(/*pset: string*/): Promise { - throw new Error("Method not implemented."); + blindTransaction(pset: string): Promise { + return this.marina?.blindTransaction(pset) || Promise.reject("Marina wallet disabled."); } signMessage(/*message: string*/): Promise { From 5fb7bd3974ff8e2f1b5c30572a56ded43dbc0180 Mon Sep 17 00:00:00 2001 From: Louis Date: Mon, 20 Feb 2023 11:05:52 +0100 Subject: [PATCH 2/9] move ionio type import into devDeps --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7d67e7a..d9a6e54 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "@babel/core": "^7.7.7", "@babel/preset-env": "^7.7.7", "@babel/preset-typescript": "^7.13.0", + "@ionio-lang/ionio": "^0.3.0", "@types/bn.js": "^5.1.0", "@types/crypto-js": "^4.0.2", "@types/jest": "^26.0.23", @@ -31,7 +32,6 @@ "dependencies": { "@bitmatrix/esplora-api-client": "^0.0.8", "@bitmatrix/models": "0.1.47", - "@ionio-lang/ionio": "^0.3.0", "@script-wiz/lib": "^0.1.82", "@script-wiz/lib-core": "^0.0.48", "liquidjs-lib": "^6.0.2-liquid.23", From 324c046b7e35828a2a376a9c06090d7152616c0f Mon Sep 17 00:00:00 2001 From: Louis Singer Date: Wed, 24 May 2023 10:06:51 +0200 Subject: [PATCH 3/9] rename 'ldk.ts' --> 'signer.ts' --- src/commitmentSign.ts | 2 +- src/index.ts | 2 +- src/{ldk.ts => signer.ts} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/{ldk.ts => signer.ts} (100%) diff --git a/src/commitmentSign.ts b/src/commitmentSign.ts index cc51424..5fa636a 100644 --- a/src/commitmentSign.ts +++ b/src/commitmentSign.ts @@ -4,7 +4,7 @@ import WizData, { hexLE } from "@script-wiz/wiz-data"; import { convertion } from "@script-wiz/lib-core"; import { commitmentOutputTapscript } from "./commitmentOutput"; -import { signTx } from "./ldk"; +import { signTx } from "./signer"; import { calculateAmountTotal } from "./utils/helper"; import { AddressRecipient } from "marina-provider"; diff --git a/src/index.ts b/src/index.ts index e60eee8..b5dbd7c 100644 --- a/src/index.ts +++ b/src/index.ts @@ -3,7 +3,7 @@ import * as commitmentOutput from "./commitmentOutput"; import * as commitmentSign from "./commitmentSign"; import * as commitmentTx from "./commitmentTx"; import * as convertion from "./convertion"; -import * as ldk from "./ldk"; +import * as ldk from "./signer"; import * as pool from "./pool"; import * as poolDeployment from "./poolDeployment"; import { validatePoolTx } from "./validatePoolTx"; diff --git a/src/ldk.ts b/src/signer.ts similarity index 100% rename from src/ldk.ts rename to src/signer.ts From de5a42602b4036795fff5dfa54c6c8c516be4409 Mon Sep 17 00:00:00 2001 From: Louis Singer Date: Wed, 24 May 2023 10:13:33 +0200 Subject: [PATCH 4/9] remove tiny-secp256k1, bump liquidjs-lib --- package.json | 5 ++--- src/declaretion.d.ts | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 src/declaretion.d.ts diff --git a/package.json b/package.json index d9a6e54..749cc91 100644 --- a/package.json +++ b/package.json @@ -34,8 +34,7 @@ "@bitmatrix/models": "0.1.47", "@script-wiz/lib": "^0.1.82", "@script-wiz/lib-core": "^0.0.48", - "liquidjs-lib": "^6.0.2-liquid.23", - "marina-provider": "git+https://github.com/louisinger/marina-provider#new-provider", - "tiny-secp256k1": "1.1.6" + "liquidjs-lib": "^6.0.2-liquid.27", + "marina-provider": "^2.0.0" } } diff --git a/src/declaretion.d.ts b/src/declaretion.d.ts deleted file mode 100644 index 78de42f..0000000 --- a/src/declaretion.d.ts +++ /dev/null @@ -1 +0,0 @@ -declare module "tiny-secp256k1"; From afe5457a1bc909e9143868140100fea74fd82a08 Mon Sep 17 00:00:00 2001 From: Louis Singer Date: Wed, 24 May 2023 10:13:38 +0200 Subject: [PATCH 5/9] yarn build --- dist/commitmentSign.js | 10 +++--- dist/commitmentSign.js.map | 2 +- dist/index.d.ts | 2 +- dist/index.js | 2 +- dist/index.js.map | 2 +- dist/signer.d.ts | 3 ++ dist/signer.js | 74 ++++++++++++++++++++++++++++++++++++++ dist/signer.js.map | 1 + src/signer.ts | 2 +- 9 files changed, 88 insertions(+), 10 deletions(-) create mode 100644 dist/signer.d.ts create mode 100644 dist/signer.js create mode 100644 dist/signer.js.map diff --git a/dist/commitmentSign.js b/dist/commitmentSign.js index 0d8396c..d034cfd 100644 --- a/dist/commitmentSign.js +++ b/dist/commitmentSign.js @@ -28,7 +28,7 @@ var models_1 = require("@bitmatrix/models"); var wiz_data_1 = __importStar(require("@script-wiz/wiz-data")); var lib_core_1 = require("@script-wiz/lib-core"); var commitmentOutput_1 = require("./commitmentOutput"); -var ldk_1 = require("./ldk"); +var signer_1 = require("./signer"); var helper_1 = require("./utils/helper"); var case1 = function (wallet, inputAmount, calculatedAmountWithSlippage, pool, config, publicKey, feeAssetHash, isTestnet) { if (isTestnet === void 0) { isTestnet = false; } @@ -53,7 +53,7 @@ var case1 = function (wallet, inputAmount, calculatedAmountWithSlippage, pool, c asset: pool.quote.assetHash, }, ]; - return (0, ldk_1.signTx)(wallet, callData, recipients, isTestnet); + return (0, signer_1.signTx)(wallet, callData, recipients, isTestnet); }; exports.case1 = case1; var case2 = function (wallet, inputAmount, calculatedAmountWithSlippage, pool, config, publicKey, feeAssetHash, isTestnet) { @@ -79,7 +79,7 @@ var case2 = function (wallet, inputAmount, calculatedAmountWithSlippage, pool, c asset: pool.token.assetHash, }, ]; - return (0, ldk_1.signTx)(wallet, callData, recipients, isTestnet); + return (0, signer_1.signTx)(wallet, callData, recipients, isTestnet); }; exports.case2 = case2; var case3 = function (wallet, inputAmountPair1, inputAmountPair2, pool, config, publicKey, feeAssetHash, isTestnet) { @@ -112,7 +112,7 @@ var case3 = function (wallet, inputAmountPair1, inputAmountPair2, pool, config, asset: pool.token.assetHash, }, ]; - return (0, ldk_1.signTx)(wallet, callData, recipients, isTestnet); + return (0, signer_1.signTx)(wallet, callData, recipients, isTestnet); }; exports.case3 = case3; var case4 = function (wallet, lpAmount, pool, config, publicKey, feeAssetHash, isTestnet) { @@ -138,7 +138,7 @@ var case4 = function (wallet, lpAmount, pool, config, publicKey, feeAssetHash, i asset: pool.lp.assetHash, }, ]; - return (0, ldk_1.signTx)(wallet, callData, recipients, isTestnet); + return (0, signer_1.signTx)(wallet, callData, recipients, isTestnet); }; exports.case4 = case4; //# sourceMappingURL=commitmentSign.js.map \ No newline at end of file diff --git a/dist/commitmentSign.js.map b/dist/commitmentSign.js.map index dd5d7aa..cca51af 100644 --- a/dist/commitmentSign.js.map +++ b/dist/commitmentSign.js.map @@ -1 +1 @@ -{"version":3,"file":"commitmentSign.js","sourceRoot":"","sources":["../src/commitmentSign.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"commitmentSign.js","sourceRoot":"","sources":["../src/commitmentSign.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/index.d.ts b/dist/index.d.ts index 4046dff..6a90bc1 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -3,7 +3,7 @@ import * as commitmentOutput from "./commitmentOutput"; import * as commitmentSign from "./commitmentSign"; import * as commitmentTx from "./commitmentTx"; import * as convertion from "./convertion"; -import * as ldk from "./ldk"; +import * as ldk from "./signer"; import * as pool from "./pool"; import * as poolDeployment from "./poolDeployment"; import { validatePoolTx } from "./validatePoolTx"; diff --git a/dist/index.js b/dist/index.js index 920527a..aebdf78 100644 --- a/dist/index.js +++ b/dist/index.js @@ -34,7 +34,7 @@ var commitmentTx = __importStar(require("./commitmentTx")); exports.commitmentTx = commitmentTx; var convertion = __importStar(require("./convertion")); exports.convertion = convertion; -var ldk = __importStar(require("./ldk")); +var ldk = __importStar(require("./signer")); exports.ldk = ldk; var pool = __importStar(require("./pool")); exports.pool = pool; diff --git a/dist/index.js.map b/dist/index.js.map index fa00f38..6404a40 100644 --- a/dist/index.js.map +++ b/dist/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAiC;AAaxB,sBAAK;AAZd,mEAAuD;AAYvC,4CAAgB;AAXhC,+DAAmD;AAWjB,wCAAc;AAVhD,2DAA+C;AAUG,oCAAY;AAT9D,uDAA2C;AASqB,gCAAU;AAR1E,yCAA6B;AAQ+C,kBAAG;AAP/E,2CAA+B;AAOkD,oBAAI;AANrF,+DAAmD;AAMoC,wCAAc;AALrG,mDAAkD;AAKqD,+FAL9F,+BAAc,OAK8F;AAJrH,yDAAyD;AACzD,mCAAkC;AAGqF,uFAH9G,eAAM,OAG8G;AAF7H,iDAAqC;AAE0F,0BAAO"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAiC;AAaxB,sBAAK;AAZd,mEAAuD;AAYvC,4CAAgB;AAXhC,+DAAmD;AAWjB,wCAAc;AAVhD,2DAA+C;AAUG,oCAAY;AAT9D,uDAA2C;AASqB,gCAAU;AAR1E,4CAAgC;AAQ4C,kBAAG;AAP/E,2CAA+B;AAOkD,oBAAI;AANrF,+DAAmD;AAMoC,wCAAc;AALrG,mDAAkD;AAKqD,+FAL9F,+BAAc,OAK8F;AAJrH,yDAAyD;AACzD,mCAAkC;AAGqF,uFAH9G,eAAM,OAG8G;AAF7H,iDAAqC;AAE0F,0BAAO"} \ No newline at end of file diff --git a/dist/signer.d.ts b/dist/signer.d.ts new file mode 100644 index 0000000..1a2f923 --- /dev/null +++ b/dist/signer.d.ts @@ -0,0 +1,3 @@ +import { Wallet } from "./wallet"; +import { AddressRecipient } from "marina-provider"; +export declare function signTx(marina: Wallet, callData: string, recipients: AddressRecipient[], isTestnet?: boolean): Promise; diff --git a/dist/signer.js b/dist/signer.js new file mode 100644 index 0000000..64d3d65 --- /dev/null +++ b/dist/signer.js @@ -0,0 +1,74 @@ +"use strict"; +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) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (this && this.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (g && (g = 0, op[0] && (_ = 0)), _) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; +var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { + if (ar || !(i in from)) { + if (!ar) ar = Array.prototype.slice.call(from, 0, i); + ar[i] = from[i]; + } + } + return to.concat(ar || Array.prototype.slice.call(from)); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.signTx = void 0; +var liquidjs_lib_1 = require("liquidjs-lib"); +function signTx(marina, callData, recipients, isTestnet) { + if (isTestnet === void 0) { isTestnet = false; } + return __awaiter(this, void 0, void 0, function () { + var network, lbtc, dataRecipient, sent; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + network = isTestnet ? liquidjs_lib_1.networks.testnet : liquidjs_lib_1.networks.liquid; + lbtc = network.assetHash; + dataRecipient = { + asset: lbtc, + value: 0, + data: callData, + }; + return [4 /*yield*/, marina.sendTransaction(__spreadArray(__spreadArray([], recipients, true), [dataRecipient], false))]; + case 1: + sent = _a.sent(); + return [2 /*return*/, sent.txid]; + } + }); + }); +} +exports.signTx = signTx; +; +//# sourceMappingURL=signer.js.map \ No newline at end of file diff --git a/dist/signer.js.map b/dist/signer.js.map new file mode 100644 index 0000000..c986cba --- /dev/null +++ b/dist/signer.js.map @@ -0,0 +1 @@ +{"version":3,"file":"signer.js","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAwC;AAIxC,SAAsB,MAAM,CAAC,MAAc,EAAE,QAAgB,EAAE,UAA8B,EAAE,SAAiB;IAAjB,0BAAA,EAAA,iBAAiB;;;;;;oBACxG,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,uBAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAQ,CAAC,MAAM,CAAC;oBACzD,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC;oBAEzB,aAAa,GAAkB;wBACnC,KAAK,EAAE,IAAI;wBACX,KAAK,EAAE,CAAC;wBACR,IAAI,EAAE,QAAQ;qBACf,CAAA;oBAEY,qBAAM,MAAM,CAAC,eAAe,iCAAK,UAAU,UAAE,aAAa,UAAE,EAAA;;oBAAnE,IAAI,GAAG,SAA4D;oBACzE,sBAAO,IAAI,CAAC,IAAI,EAAC;;;;CAClB;AAZD,wBAYC;AAAA,CAAC"} \ No newline at end of file diff --git a/src/signer.ts b/src/signer.ts index 35f42b8..3429191 100644 --- a/src/signer.ts +++ b/src/signer.ts @@ -2,7 +2,7 @@ import { networks } from "liquidjs-lib"; import { Wallet } from "./wallet"; import { AddressRecipient, DataRecipient } from "marina-provider"; -export const signTx = async (marina: Wallet, callData: string, recipients: AddressRecipient[], isTestnet = false): Promise => { +export async function signTx(marina: Wallet, callData: string, recipients: AddressRecipient[], isTestnet = false): Promise { const network = isTestnet ? networks.testnet : networks.liquid; const lbtc = network.assetHash; From 11723af9891638c93f6971e8a765e9becc10b5c1 Mon Sep 17 00:00:00 2001 From: Louis Singer Date: Wed, 24 May 2023 10:16:08 +0200 Subject: [PATCH 6/9] bump to latest ionio --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 749cc91..d1e8f29 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "@babel/core": "^7.7.7", "@babel/preset-env": "^7.7.7", "@babel/preset-typescript": "^7.13.0", - "@ionio-lang/ionio": "^0.3.0", + "@ionio-lang/ionio": "^0.4.1", "@types/bn.js": "^5.1.0", "@types/crypto-js": "^4.0.2", "@types/jest": "^26.0.23", From 010d658bde6553d7f89239fd32c1aaf0b1b6e6c6 Mon Sep 17 00:00:00 2001 From: Louis Singer Date: Wed, 24 May 2023 14:23:16 +0200 Subject: [PATCH 7/9] remove liquidjs-lib dependencie --- dist/commitmentSign.js | 8 ++++---- dist/commitmentSign.js.map | 2 +- dist/signer.d.ts | 12 +++++++++++- dist/signer.js | 20 ++++++++++++++------ dist/signer.js.map | 2 +- package.json | 1 - src/commitmentSign.ts | 8 ++++---- src/signer.ts | 16 ++++++++++++---- 8 files changed, 47 insertions(+), 22 deletions(-) diff --git a/dist/commitmentSign.js b/dist/commitmentSign.js index d034cfd..7bf8f8b 100644 --- a/dist/commitmentSign.js +++ b/dist/commitmentSign.js @@ -53,7 +53,7 @@ var case1 = function (wallet, inputAmount, calculatedAmountWithSlippage, pool, c asset: pool.quote.assetHash, }, ]; - return (0, signer_1.signTx)(wallet, callData, recipients, isTestnet); + return (0, signer_1.signTx)(wallet, callData, recipients, feeAssetHash); }; exports.case1 = case1; var case2 = function (wallet, inputAmount, calculatedAmountWithSlippage, pool, config, publicKey, feeAssetHash, isTestnet) { @@ -79,7 +79,7 @@ var case2 = function (wallet, inputAmount, calculatedAmountWithSlippage, pool, c asset: pool.token.assetHash, }, ]; - return (0, signer_1.signTx)(wallet, callData, recipients, isTestnet); + return (0, signer_1.signTx)(wallet, callData, recipients, feeAssetHash); }; exports.case2 = case2; var case3 = function (wallet, inputAmountPair1, inputAmountPair2, pool, config, publicKey, feeAssetHash, isTestnet) { @@ -112,7 +112,7 @@ var case3 = function (wallet, inputAmountPair1, inputAmountPair2, pool, config, asset: pool.token.assetHash, }, ]; - return (0, signer_1.signTx)(wallet, callData, recipients, isTestnet); + return (0, signer_1.signTx)(wallet, callData, recipients, feeAssetHash); }; exports.case3 = case3; var case4 = function (wallet, lpAmount, pool, config, publicKey, feeAssetHash, isTestnet) { @@ -138,7 +138,7 @@ var case4 = function (wallet, lpAmount, pool, config, publicKey, feeAssetHash, i asset: pool.lp.assetHash, }, ]; - return (0, signer_1.signTx)(wallet, callData, recipients, isTestnet); + return (0, signer_1.signTx)(wallet, callData, recipients, feeAssetHash); }; exports.case4 = case4; //# sourceMappingURL=commitmentSign.js.map \ No newline at end of file diff --git a/dist/commitmentSign.js.map b/dist/commitmentSign.js.map index cca51af..94ba749 100644 --- a/dist/commitmentSign.js.map +++ b/dist/commitmentSign.js.map @@ -1 +1 @@ -{"version":3,"file":"commitmentSign.js","sourceRoot":"","sources":["../src/commitmentSign.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"commitmentSign.js","sourceRoot":"","sources":["../src/commitmentSign.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/signer.d.ts b/dist/signer.d.ts index 1a2f923..d4b8cd1 100644 --- a/dist/signer.d.ts +++ b/dist/signer.d.ts @@ -1,3 +1,13 @@ import { Wallet } from "./wallet"; import { AddressRecipient } from "marina-provider"; -export declare function signTx(marina: Wallet, callData: string, recipients: AddressRecipient[], isTestnet?: boolean): Promise; +/** + * craft a transaction with OP_RETURN callData + recipients + * blind and sign the transaction + * broadcast the transaction via marina + * @param marina marina provider wallet + * @param callData data setup in OP_RETURN script + * @param recipients other recipients of the tx + * @param lbtc asset hash of the network lbtc asset (default: liquid lbtc) + * @returns the txid of the transaction + */ +export declare function signTx(marina: Wallet, callData: string, recipients: AddressRecipient[], lbtc?: string): Promise; diff --git a/dist/signer.js b/dist/signer.js index 64d3d65..1e12c54 100644 --- a/dist/signer.js +++ b/dist/signer.js @@ -46,16 +46,24 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { }; Object.defineProperty(exports, "__esModule", { value: true }); exports.signTx = void 0; -var liquidjs_lib_1 = require("liquidjs-lib"); -function signTx(marina, callData, recipients, isTestnet) { - if (isTestnet === void 0) { isTestnet = false; } +var LIQUID_LBTC = '6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d'; +/** + * craft a transaction with OP_RETURN callData + recipients + * blind and sign the transaction + * broadcast the transaction via marina + * @param marina marina provider wallet + * @param callData data setup in OP_RETURN script + * @param recipients other recipients of the tx + * @param lbtc asset hash of the network lbtc asset (default: liquid lbtc) + * @returns the txid of the transaction + */ +function signTx(marina, callData, recipients, lbtc) { + if (lbtc === void 0) { lbtc = LIQUID_LBTC; } return __awaiter(this, void 0, void 0, function () { - var network, lbtc, dataRecipient, sent; + var dataRecipient, sent; return __generator(this, function (_a) { switch (_a.label) { case 0: - network = isTestnet ? liquidjs_lib_1.networks.testnet : liquidjs_lib_1.networks.liquid; - lbtc = network.assetHash; dataRecipient = { asset: lbtc, value: 0, diff --git a/dist/signer.js.map b/dist/signer.js.map index c986cba..46eb9dc 100644 --- a/dist/signer.js.map +++ b/dist/signer.js.map @@ -1 +1 @@ -{"version":3,"file":"signer.js","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAwC;AAIxC,SAAsB,MAAM,CAAC,MAAc,EAAE,QAAgB,EAAE,UAA8B,EAAE,SAAiB;IAAjB,0BAAA,EAAA,iBAAiB;;;;;;oBACxG,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,uBAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAQ,CAAC,MAAM,CAAC;oBACzD,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC;oBAEzB,aAAa,GAAkB;wBACnC,KAAK,EAAE,IAAI;wBACX,KAAK,EAAE,CAAC;wBACR,IAAI,EAAE,QAAQ;qBACf,CAAA;oBAEY,qBAAM,MAAM,CAAC,eAAe,iCAAK,UAAU,UAAE,aAAa,UAAE,EAAA;;oBAAnE,IAAI,GAAG,SAA4D;oBACzE,sBAAO,IAAI,CAAC,IAAI,EAAC;;;;CAClB;AAZD,wBAYC;AAAA,CAAC"} \ No newline at end of file +{"version":3,"file":"signer.js","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,IAAM,WAAW,GAAG,kEAAkE,CAAA;AAEtF;;;;;;;;;GASG;AACH,SAAsB,MAAM,CAAC,MAAc,EAAE,QAAgB,EAAE,UAA8B,EAAE,IAAkB;IAAlB,qBAAA,EAAA,kBAAkB;;;;;;oBACzG,aAAa,GAAkB;wBACnC,KAAK,EAAE,IAAI;wBACX,KAAK,EAAE,CAAC;wBACR,IAAI,EAAE,QAAQ;qBACf,CAAA;oBAEY,qBAAM,MAAM,CAAC,eAAe,iCAAK,UAAU,UAAE,aAAa,UAAE,EAAA;;oBAAnE,IAAI,GAAG,SAA4D;oBACzE,sBAAO,IAAI,CAAC,IAAI,EAAC;;;;CAClB;AATD,wBASC;AAAA,CAAC"} \ No newline at end of file diff --git a/package.json b/package.json index d1e8f29..544e268 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,6 @@ "@bitmatrix/models": "0.1.47", "@script-wiz/lib": "^0.1.82", "@script-wiz/lib-core": "^0.0.48", - "liquidjs-lib": "^6.0.2-liquid.27", "marina-provider": "^2.0.0" } } diff --git a/src/commitmentSign.ts b/src/commitmentSign.ts index 5fa636a..d569894 100644 --- a/src/commitmentSign.ts +++ b/src/commitmentSign.ts @@ -44,7 +44,7 @@ export const case1 = ( }, ]; - return signTx(wallet, callData, recipients, isTestnet); + return signTx(wallet, callData, recipients, feeAssetHash); }; export const case2 = ( @@ -83,7 +83,7 @@ export const case2 = ( }, ]; - return signTx(wallet, callData, recipients, isTestnet); + return signTx(wallet, callData, recipients, feeAssetHash); }; export const case3 = ( @@ -131,7 +131,7 @@ export const case3 = ( }, ]; - return signTx(wallet, callData, recipients, isTestnet); + return signTx(wallet, callData, recipients, feeAssetHash); }; export const case4 = (wallet: Wallet, lpAmount: number, pool: Pool, config: BmConfig, publicKey: string, feeAssetHash: string, isTestnet = false): Promise => { @@ -162,5 +162,5 @@ export const case4 = (wallet: Wallet, lpAmount: number, pool: Pool, config: BmCo }, ]; - return signTx(wallet, callData, recipients, isTestnet); + return signTx(wallet, callData, recipients, feeAssetHash); }; diff --git a/src/signer.ts b/src/signer.ts index 3429191..5a4d448 100644 --- a/src/signer.ts +++ b/src/signer.ts @@ -1,11 +1,19 @@ -import { networks } from "liquidjs-lib"; import { Wallet } from "./wallet"; import { AddressRecipient, DataRecipient } from "marina-provider"; -export async function signTx(marina: Wallet, callData: string, recipients: AddressRecipient[], isTestnet = false): Promise { - const network = isTestnet ? networks.testnet : networks.liquid; - const lbtc = network.assetHash; +const LIQUID_LBTC = '6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d' +/** + * craft a transaction with OP_RETURN callData + recipients + * blind and sign the transaction + * broadcast the transaction via marina + * @param marina marina provider wallet + * @param callData data setup in OP_RETURN script + * @param recipients other recipients of the tx + * @param lbtc asset hash of the network lbtc asset (default: liquid lbtc) + * @returns the txid of the transaction + */ +export async function signTx(marina: Wallet, callData: string, recipients: AddressRecipient[], lbtc = LIQUID_LBTC): Promise { const dataRecipient: DataRecipient = { asset: lbtc, value: 0, From 233aaa1e8766174614bcf85a721953a0963d63c9 Mon Sep 17 00:00:00 2001 From: Louis Singer Date: Wed, 24 May 2023 15:44:26 +0200 Subject: [PATCH 8/9] add getAccountInfo in IWallet --- dist/wallet/IWallet.d.ts | 3 ++- dist/wallet/index.d.ts | 3 ++- dist/wallet/index.js | 1 + dist/wallet/index.js.map | 2 +- dist/wallet/marina/marina.js | 4 +++- dist/wallet/marina/marina.js.map | 2 +- src/wallet/IWallet.ts | 4 +++- src/wallet/index.ts | 4 +++- src/wallet/marina/marina.ts | 3 ++- 9 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dist/wallet/IWallet.d.ts b/dist/wallet/IWallet.d.ts index 79655fd..5f6f76e 100644 --- a/dist/wallet/IWallet.d.ts +++ b/dist/wallet/IWallet.d.ts @@ -1,4 +1,4 @@ -import { Address, Balance, EventListenerID, MarinaEventType, NetworkString, Recipient, SentTransaction, Utxo } from "marina-provider"; +import { AccountInfo, Address, Balance, EventListenerID, MarinaEventType, NetworkString, Recipient, SentTransaction, Utxo } from "marina-provider"; export interface IWallet { exist(): boolean; on(type: MarinaEventType, callback: (payload: any) => void): EventListenerID; @@ -16,4 +16,5 @@ export interface IWallet { getNetwork(): Promise; signTransaction(pset: string): Promise; broadcastTransaction(signedTxHex: string): Promise; + getAccountInfo(accountID: string): Promise; } diff --git a/dist/wallet/index.d.ts b/dist/wallet/index.d.ts index 9be2fa7..51dd283 100644 --- a/dist/wallet/index.d.ts +++ b/dist/wallet/index.d.ts @@ -1,4 +1,4 @@ -import { Address, Balance, EventListenerID, MarinaEventType, MarinaProvider, NetworkString, Recipient, SentTransaction, Utxo } from "marina-provider"; +import { AccountInfo, Address, Balance, EventListenerID, MarinaEventType, MarinaProvider, NetworkString, Recipient, SentTransaction, Utxo } from "marina-provider"; import { IWallet } from "./IWallet"; import { WALLET_NAME } from "./WALLET_NAME"; export declare class Wallet implements IWallet { @@ -20,4 +20,5 @@ export declare class Wallet implements IWallet { getNextChangeAddress: () => Promise
; getCoins: () => Promise; getNetwork: () => Promise; + getAccountInfo: (accountID: string) => Promise; } diff --git a/dist/wallet/index.js b/dist/wallet/index.js index e05608f..28cf0c9 100644 --- a/dist/wallet/index.js +++ b/dist/wallet/index.js @@ -26,6 +26,7 @@ var Wallet = /** @class */ (function () { this.getNextChangeAddress = function () { return _this.wallet.getNextChangeAddress(); }; this.getCoins = function () { return _this.wallet.getCoins(); }; this.getNetwork = function () { return _this.wallet.getNetwork(); }; + this.getAccountInfo = function (accountID) { return _this.wallet.getAccountInfo(accountID); }; if (walletName === WALLET_NAME_1.WALLET_NAME.MARINA) this.wallet = new marina_1.default(marina); // TODO default wallet diff --git a/dist/wallet/index.js.map b/dist/wallet/index.js.map index 38e02c6..e5fb2d2 100644 --- a/dist/wallet/index.js.map +++ b/dist/wallet/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/wallet/index.ts"],"names":[],"mappings":";;;;;;AAEA,2DAAqC;AACrC,6CAA4C;AAE5C;IAGE,gBAAY,MAAsB,EAAE,UAA4C;QAA5C,2BAAA,EAAA,aAA0B,yBAAW,CAAC,MAAM;QAAhF,iBAIC;QAEM,qBAAgB,GAAG,UAAC,IAAY,IAAsB,OAAA,KAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAlC,CAAkC,CAAC;QAEzF,oBAAe,GAAG,UAAC,IAAY,IAAsB,OAAA,KAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,EAAjC,CAAiC,CAAC;QAEvF,yBAAoB,GAAG,UAAC,WAAmB,IAA+B,OAAA,KAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,WAAW,CAAC,EAA7C,CAA6C,CAAC;QAExH,QAAG,GAAG,UAAC,UAA2B,IAAW,OAAA,KAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,EAA3B,CAA2B,CAAC;QAEzE,OAAE,GAAG,UAAC,IAAqB,EAAE,QAAgC,IAAa,OAAA,KAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,EAA9B,CAA8B,CAAC;QAEzG,UAAK,GAAG,cAAe,OAAA,KAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAnB,CAAmB,CAAC;QAE3C,cAAS,GAAG,cAAwB,OAAA,KAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAAvB,CAAuB,CAAC;QAE5D,WAAM,GAAG,cAAqB,OAAA,KAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAApB,CAAoB,CAAC;QAEnD,YAAO,GAAG,cAAqB,OAAA,KAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAArB,CAAqB,CAAC;QAErD,mBAAc,GAAG,cAAwB,OAAA,KAAI,CAAC,MAAM,CAAC,cAAc,EAAE,EAA5B,CAA4B,CAAC;QAEtE,iBAAY,GAAG,cAA0B,OAAA,KAAI,CAAC,MAAM,CAAC,YAAY,EAAE,EAA1B,CAA0B,CAAC;QAEpE,oBAAe,GAAG,UAAC,UAAuB,IAA+B,OAAA,KAAI,CAAC,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,EAAvC,CAAuC,CAAC;QAEjH,gBAAW,GAAG,cAA0B,OAAA,KAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAzB,CAAyB,CAAC;QAElE,yBAAoB,GAAG,cAAwB,OAAA,KAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,EAAlC,CAAkC,CAAC;QAElF,aAAQ,GAAG,cAAuB,OAAA,KAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAtB,CAAsB,CAAC;QAEzD,eAAU,GAAG,cAA8B,OAAA,KAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAxB,CAAwB,CAAC;QAnCzE,IAAI,UAAU,KAAK,yBAAW,CAAC,MAAM;YAAE,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAM,CAAC,MAAM,CAAC,CAAC;QACxE,sBAAsB;;YACjB,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAM,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAiCH,aAAC;AAAD,CAAC,AAxCD,IAwCC;AAxCY,wBAAM"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/wallet/index.ts"],"names":[],"mappings":";;;;;;AAEA,2DAAqC;AACrC,6CAA4C;AAE5C;IAGE,gBAAY,MAAsB,EAAE,UAA4C;QAA5C,2BAAA,EAAA,aAA0B,yBAAW,CAAC,MAAM;QAAhF,iBAIC;QAEM,qBAAgB,GAAG,UAAC,IAAY,IAAsB,OAAA,KAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAlC,CAAkC,CAAC;QAEzF,oBAAe,GAAG,UAAC,IAAY,IAAsB,OAAA,KAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,EAAjC,CAAiC,CAAC;QAEvF,yBAAoB,GAAG,UAAC,WAAmB,IAA+B,OAAA,KAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,WAAW,CAAC,EAA7C,CAA6C,CAAC;QAExH,QAAG,GAAG,UAAC,UAA2B,IAAW,OAAA,KAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,EAA3B,CAA2B,CAAC;QAEzE,OAAE,GAAG,UAAC,IAAqB,EAAE,QAAgC,IAAa,OAAA,KAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,EAA9B,CAA8B,CAAC;QAEzG,UAAK,GAAG,cAAe,OAAA,KAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAnB,CAAmB,CAAC;QAE3C,cAAS,GAAG,cAAwB,OAAA,KAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAAvB,CAAuB,CAAC;QAE5D,WAAM,GAAG,cAAqB,OAAA,KAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAApB,CAAoB,CAAC;QAEnD,YAAO,GAAG,cAAqB,OAAA,KAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAArB,CAAqB,CAAC;QAErD,mBAAc,GAAG,cAAwB,OAAA,KAAI,CAAC,MAAM,CAAC,cAAc,EAAE,EAA5B,CAA4B,CAAC;QAEtE,iBAAY,GAAG,cAA0B,OAAA,KAAI,CAAC,MAAM,CAAC,YAAY,EAAE,EAA1B,CAA0B,CAAC;QAEpE,oBAAe,GAAG,UAAC,UAAuB,IAA+B,OAAA,KAAI,CAAC,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,EAAvC,CAAuC,CAAC;QAEjH,gBAAW,GAAG,cAA0B,OAAA,KAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAzB,CAAyB,CAAC;QAElE,yBAAoB,GAAG,cAAwB,OAAA,KAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,EAAlC,CAAkC,CAAC;QAElF,aAAQ,GAAG,cAAuB,OAAA,KAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAtB,CAAsB,CAAC;QAEzD,eAAU,GAAG,cAA8B,OAAA,KAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAxB,CAAwB,CAAC;QAEpE,mBAAc,GAAG,UAAC,SAAiB,IAA2B,OAAA,KAAI,CAAC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,EAArC,CAAqC,CAAC;QArCzG,IAAI,UAAU,KAAK,yBAAW,CAAC,MAAM;YAAE,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAM,CAAC,MAAM,CAAC,CAAC;QACxE,sBAAsB;;YACjB,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAM,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAmCH,aAAC;AAAD,CAAC,AA1CD,IA0CC;AA1CY,wBAAM"} \ No newline at end of file diff --git a/dist/wallet/marina/marina.js b/dist/wallet/marina/marina.js index 0076974..b2ea757 100644 --- a/dist/wallet/marina/marina.js +++ b/dist/wallet/marina/marina.js @@ -34,7 +34,9 @@ var Marina = /** @class */ (function () { this.marina = marina; } Marina.prototype.getAccountInfo = function (accountID) { - throw new Error("Method not implemented."); + if (!this.exist() || !this.marina) + throw new Error("Marina wallet disabled."); + return this.marina.getAccountInfo(accountID); }; Marina.prototype.getAccountsIDs = function () { throw new Error("Method not implemented."); diff --git a/dist/wallet/marina/marina.js.map b/dist/wallet/marina/marina.js.map index 43a617e..6d84ede 100644 --- a/dist/wallet/marina/marina.js.map +++ b/dist/wallet/marina/marina.js.map @@ -1 +1 @@ -{"version":3,"file":"marina.js","sourceRoot":"","sources":["../../../src/wallet/marina/marina.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"marina.js","sourceRoot":"","sources":["../../../src/wallet/marina/marina.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/wallet/IWallet.ts b/src/wallet/IWallet.ts index e9e720c..00b0e40 100644 --- a/src/wallet/IWallet.ts +++ b/src/wallet/IWallet.ts @@ -1,4 +1,4 @@ -import { Address, Balance, EventListenerID, MarinaEventType, NetworkString, Recipient, SentTransaction, Utxo } from "marina-provider"; +import { AccountInfo, Address, Balance, EventListenerID, MarinaEventType, NetworkString, Recipient, SentTransaction, Utxo } from "marina-provider"; export interface IWallet { exist(): boolean; @@ -32,4 +32,6 @@ export interface IWallet { signTransaction(pset: string): Promise; broadcastTransaction(signedTxHex: string): Promise; + + getAccountInfo(accountID: string): Promise; } diff --git a/src/wallet/index.ts b/src/wallet/index.ts index 1aa7727..ad11a57 100644 --- a/src/wallet/index.ts +++ b/src/wallet/index.ts @@ -1,4 +1,4 @@ -import { Address, Balance, EventListenerID, MarinaEventType, MarinaProvider, NetworkString, Recipient, SentTransaction, Utxo } from "marina-provider"; +import { AccountInfo, Address, Balance, EventListenerID, MarinaEventType, MarinaProvider, NetworkString, Recipient, SentTransaction, Utxo } from "marina-provider"; import { IWallet } from "./IWallet"; import Marina from "./marina/marina"; import { WALLET_NAME } from "./WALLET_NAME"; @@ -43,4 +43,6 @@ export class Wallet implements IWallet { public getCoins = (): Promise => this.wallet.getCoins(); public getNetwork = (): Promise => this.wallet.getNetwork(); + + public getAccountInfo = (accountID: string): Promise => this.wallet.getAccountInfo(accountID); } diff --git a/src/wallet/marina/marina.ts b/src/wallet/marina/marina.ts index 67e86da..05156ab 100644 --- a/src/wallet/marina/marina.ts +++ b/src/wallet/marina/marina.ts @@ -20,7 +20,8 @@ export default class Marina implements MarinaProvider { this.marina = marina; } getAccountInfo(accountID: string): Promise { - throw new Error("Method not implemented."); + if (!this.exist() || !this.marina) throw new Error("Marina wallet disabled."); + return this.marina.getAccountInfo(accountID); } getAccountsIDs(): Promise { From 3fd217028ffcfa3ca2dd49e2cd4e4d313fd0d41f Mon Sep 17 00:00:00 2001 From: Louis Singer Date: Tue, 5 Sep 2023 08:42:37 +0200 Subject: [PATCH 9/9] bump marina to 3.0.1 --- dist/wallet/marina/marina.d.ts | 13 ++++--- dist/wallet/marina/marina.js | 67 ++++++++++++++++++-------------- dist/wallet/marina/marina.js.map | 2 +- package.json | 2 +- src/wallet/marina/marina.ts | 18 ++++++--- 5 files changed, 59 insertions(+), 43 deletions(-) diff --git a/dist/wallet/marina/marina.d.ts b/dist/wallet/marina/marina.d.ts index 52d3d19..13be40b 100644 --- a/dist/wallet/marina/marina.d.ts +++ b/dist/wallet/marina/marina.d.ts @@ -6,12 +6,12 @@ export default class Marina implements MarinaProvider { getAccountsIDs(): Promise; signTransaction(pset: string): Promise; broadcastTransaction(signedTxHex: string): Promise; - on: (type: MarinaEventType, callback: (payload: any) => void) => string; - off: (listenerId: EventListenerID) => void; - exist: () => boolean; - isEnabled: () => Promise; - enable: () => Promise; - disable: () => Promise; + on(type: MarinaEventType, callback: (payload: any) => void): string; + off(listenerId: EventListenerID): void; + exist(): boolean; + isEnabled(): Promise; + enable(): Promise; + disable(): Promise; getNextAddress(): Promise
; getAddresses(): Promise; sendTransaction(recipients: Recipient[]): Promise; @@ -27,4 +27,5 @@ export default class Marina implements MarinaProvider { getSelectedAccount(): Promise; createAccount(accountName: string): Promise; useAccount(account: string): Promise; + importScript(accountName: string, scriptHex: string, blindingPrivateKey?: string | undefined): Promise; } diff --git a/dist/wallet/marina/marina.js b/dist/wallet/marina/marina.js index b2ea757..1e65fb4 100644 --- a/dist/wallet/marina/marina.js +++ b/dist/wallet/marina/marina.js @@ -2,35 +2,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); var Marina = /** @class */ (function () { function Marina(marina) { - var _this = this; - this.on = function (type, callback) { - if (_this.exist() && _this.marina) - return _this.marina.on(type, callback); - return "Marina wallet disabled."; - }; - this.off = function (listenerId) { - if (_this.exist() && _this.marina) - _this.marina.off(listenerId); - }; - this.exist = function () { return typeof _this.marina !== "undefined"; }; - this.isEnabled = function () { - if (_this.exist() && _this.marina) - return _this.marina.isEnabled(); - // throw "Install Marina first"; - return Promise.resolve(false); - }; - this.enable = function () { - if (_this.exist() && _this.marina) - return _this.marina.enable(); - // else throw "Install Marina first"; - return Promise.resolve(); - }; - this.disable = function () { - if (_this.exist() && _this.marina) - return _this.marina.disable(); - // else throw "Install Marina first"; - return Promise.resolve(); - }; this.marina = marina; } Marina.prototype.getAccountInfo = function (accountID) { @@ -51,6 +22,41 @@ var Marina = /** @class */ (function () { return this.marina.broadcastTransaction(signedTxHex); throw new Error("Marina wallet disabled."); }; + Marina.prototype.on = function (type, callback) { + if (this.exist() && this.marina) + return this.marina.on(type, callback); + return "Marina wallet disabled."; + }; + ; + Marina.prototype.off = function (listenerId) { + if (this.exist() && this.marina) + this.marina.off(listenerId); + }; + ; + Marina.prototype.exist = function () { + return typeof this.marina !== "undefined"; + }; + Marina.prototype.isEnabled = function () { + if (this.exist() && this.marina) + return this.marina.isEnabled(); + // throw "Install Marina first"; + return Promise.resolve(false); + }; + ; + Marina.prototype.enable = function () { + if (this.exist() && this.marina) + return this.marina.enable(); + // else throw "Install Marina first"; + return Promise.resolve(); + }; + ; + Marina.prototype.disable = function () { + if (this.exist() && this.marina) + return this.marina.disable(); + // else throw "Install Marina first"; + return Promise.resolve(); + }; + ; Marina.prototype.getNextAddress = function () { if (this.exist() && this.marina) return this.marina.getNextAddress(); @@ -115,6 +121,9 @@ var Marina = /** @class */ (function () { Marina.prototype.useAccount = function (account) { throw new Error("Method not implemented."); }; + Marina.prototype.importScript = function (accountName, scriptHex, blindingPrivateKey) { + throw new Error("Method not implemented."); + }; return Marina; }()); exports.default = Marina; diff --git a/dist/wallet/marina/marina.js.map b/dist/wallet/marina/marina.js.map index 6d84ede..ae88aa1 100644 --- a/dist/wallet/marina/marina.js.map +++ b/dist/wallet/marina/marina.js.map @@ -1 +1 @@ -{"version":3,"file":"marina.js","sourceRoot":"","sources":["../../../src/wallet/marina/marina.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"marina.js","sourceRoot":"","sources":["../../../src/wallet/marina/marina.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 544e268..3e4c470 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,6 @@ "@bitmatrix/models": "0.1.47", "@script-wiz/lib": "^0.1.82", "@script-wiz/lib-core": "^0.0.48", - "marina-provider": "^2.0.0" + "marina-provider": "^3.0.1" } } diff --git a/src/wallet/marina/marina.ts b/src/wallet/marina/marina.ts index 05156ab..9e2acb2 100644 --- a/src/wallet/marina/marina.ts +++ b/src/wallet/marina/marina.ts @@ -40,31 +40,33 @@ export default class Marina implements MarinaProvider { throw new Error("Marina wallet disabled."); } - on = (type: MarinaEventType, callback: (payload: any) => void): string => { + on(type: MarinaEventType, callback: (payload: any) => void): string { if (this.exist() && this.marina) return this.marina.on(type, callback); return "Marina wallet disabled."; }; - off = (listenerId: EventListenerID): void => { + off(listenerId: EventListenerID): void { if (this.exist() && this.marina) this.marina.off(listenerId); }; - exist = (): boolean => typeof this.marina !== "undefined"; + exist(): boolean { + return typeof this.marina !== "undefined"; + } - isEnabled = (): Promise => { + isEnabled(): Promise { if (this.exist() && this.marina) return this.marina.isEnabled(); // throw "Install Marina first"; return Promise.resolve(false); }; - enable = (): Promise => { + enable(): Promise { if (this.exist() && this.marina) return this.marina.enable(); // else throw "Install Marina first"; return Promise.resolve(); }; - disable = (): Promise => { + disable(): Promise { if (this.exist() && this.marina) return this.marina.disable(); // else throw "Install Marina first"; return Promise.resolve(); @@ -141,4 +143,8 @@ export default class Marina implements MarinaProvider { useAccount(account: string): Promise { throw new Error("Method not implemented."); } + + importScript(accountName: string, scriptHex: string, blindingPrivateKey?: string | undefined): Promise { + throw new Error("Method not implemented."); + } }