@xchainjs/xchain-thorchain 0.28.8 → 0.28.9

package/lib/client.d.ts

@@ -1,5 +1,5 @@
 import cosmosclient from '@cosmos-client/core';
-import { AssetInfo, Balance, BaseXChainClient, Fees, Network, Tx, TxHash, TxHistoryParams, TxParams, TxsPage, XChainClient, XChainClientParams } from '@xchainjs/xchain-client';
+import { AssetInfo, Balance, BaseXChainClient, Fees, Network, PreparedTx, Tx, TxHash, TxHistoryParams, TxParams, TxsPage, XChainClient, XChainClientParams } from '@xchainjs/xchain-client';
 import { CosmosSDKClient, RPCTxResult } from '@xchainjs/xchain-cosmos';
 import { Address, Asset } from '@xchainjs/xchain-util';
 import BigNumber from 'bignumber.js';
@@ -220,6 +220,7 @@ declare class Client extends BaseXChainClient implements ThorchainClient, XChain
     /**
      * Transfer without broadcast balances with MsgSend
      *
+     * @deprecated use instead prepareTx
      * @param {TxOfflineParams} params The transfer offline options.
      * @returns {string} The signed transaction bytes.
      */
@@ -230,5 +231,16 @@ declare class Client extends BaseXChainClient implements ThorchainClient, XChain
      * @returns {Fees}
      */
     getFees(): Promise<Fees>;
+    /**
+     * Prepare transfer.
+     *
+     * @param {TxParams&Address&BigNumber} params The transfer options.
+     * @returns {PreparedTx} The raw unsigned transaction.
+     */
+    prepareTx({ sender, recipient, amount, memo, asset, gasLimit, sequence, }: TxParams & {
+        sender: Address;
+        gasLimit?: BigNumber;
+        sequence?: number;
+    }): Promise<PreparedTx>;
 }
 export { Client };

package/lib/index.esm.js

@@ -4354,56 +4354,64 @@ var indexMinimal = {};
 
 var minimal$1 = {};
 
-var aspromise = asPromise;
+var aspromise;
+var hasRequiredAspromise;
+
+function requireAspromise () {
+	if (hasRequiredAspromise) return aspromise;
+	hasRequiredAspromise = 1;
+	aspromise = asPromise;
 
-/**
- * Callback as used by {@link util.asPromise}.
- * @typedef asPromiseCallback
- * @type {function}
- * @param {Error|null} error Error, if any
- * @param {...*} params Additional arguments
- * @returns {undefined}
- */
+	/**
+	 * Callback as used by {@link util.asPromise}.
+	 * @typedef asPromiseCallback
+	 * @type {function}
+	 * @param {Error|null} error Error, if any
+	 * @param {...*} params Additional arguments
+	 * @returns {undefined}
+	 */
 
-/**
- * Returns a promise from a node-style callback function.
- * @memberof util
- * @param {asPromiseCallback} fn Function to call
- * @param {*} ctx Function context
- * @param {...*} params Function arguments
- * @returns {Promise<*>} Promisified function
- */
-function asPromise(fn, ctx/*, varargs */) {
-    var params  = new Array(arguments.length - 1),
-        offset  = 0,
-        index   = 2,
-        pending = true;
-    while (index < arguments.length)
-        params[offset++] = arguments[index++];
-    return new Promise(function executor(resolve, reject) {
-        params[offset] = function callback(err/*, varargs */) {
-            if (pending) {
-                pending = false;
-                if (err)
-                    reject(err);
-                else {
-                    var params = new Array(arguments.length - 1),
-                        offset = 0;
-                    while (offset < params.length)
-                        params[offset++] = arguments[offset];
-                    resolve.apply(null, params);
-                }
-            }
-        };
-        try {
-            fn.apply(ctx || null, params);
-        } catch (err) {
-            if (pending) {
-                pending = false;
-                reject(err);
-            }
-        }
-    });
+	/**
+	 * Returns a promise from a node-style callback function.
+	 * @memberof util
+	 * @param {asPromiseCallback} fn Function to call
+	 * @param {*} ctx Function context
+	 * @param {...*} params Function arguments
+	 * @returns {Promise<*>} Promisified function
+	 */
+	function asPromise(fn, ctx/*, varargs */) {
+	    var params  = new Array(arguments.length - 1),
+	        offset  = 0,
+	        index   = 2,
+	        pending = true;
+	    while (index < arguments.length)
+	        params[offset++] = arguments[index++];
+	    return new Promise(function executor(resolve, reject) {
+	        params[offset] = function callback(err/*, varargs */) {
+	            if (pending) {
+	                pending = false;
+	                if (err)
+	                    reject(err);
+	                else {
+	                    var params = new Array(arguments.length - 1),
+	                        offset = 0;
+	                    while (offset < params.length)
+	                        params[offset++] = arguments[offset];
+	                    resolve.apply(null, params);
+	                }
+	            }
+	        };
+	        try {
+	            fn.apply(ctx || null, params);
+	        } catch (err) {
+	            if (pending) {
+	                pending = false;
+	                reject(err);
+	            }
+	        }
+	    });
+	}
+	return aspromise;
 }
 
 var base64$1 = {};
@@ -4549,81 +4557,89 @@ var base64$1 = {};
 	}; 
 } (base64$1));
 
-var eventemitter = EventEmitter;
+var eventemitter;
+var hasRequiredEventemitter;
+
+function requireEventemitter () {
+	if (hasRequiredEventemitter) return eventemitter;
+	hasRequiredEventemitter = 1;
+	eventemitter = EventEmitter;
 
-/**
- * Constructs a new event emitter instance.
- * @classdesc A minimal event emitter.
- * @memberof util
- * @constructor
- */
-function EventEmitter() {
+	/**
+	 * Constructs a new event emitter instance.
+	 * @classdesc A minimal event emitter.
+	 * @memberof util
+	 * @constructor
+	 */
+	function EventEmitter() {
 
-    /**
-     * Registered listeners.
-     * @type {Object.<string,*>}
-     * @private
-     */
-    this._listeners = {};
-}
+	    /**
+	     * Registered listeners.
+	     * @type {Object.<string,*>}
+	     * @private
+	     */
+	    this._listeners = {};
+	}
 
-/**
- * Registers an event listener.
- * @param {string} evt Event name
- * @param {function} fn Listener
- * @param {*} [ctx] Listener context
- * @returns {util.EventEmitter} `this`
- */
-EventEmitter.prototype.on = function on(evt, fn, ctx) {
-    (this._listeners[evt] || (this._listeners[evt] = [])).push({
-        fn  : fn,
-        ctx : ctx || this
-    });
-    return this;
-};
+	/**
+	 * Registers an event listener.
+	 * @param {string} evt Event name
+	 * @param {function} fn Listener
+	 * @param {*} [ctx] Listener context
+	 * @returns {util.EventEmitter} `this`
+	 */
+	EventEmitter.prototype.on = function on(evt, fn, ctx) {
+	    (this._listeners[evt] || (this._listeners[evt] = [])).push({
+	        fn  : fn,
+	        ctx : ctx || this
+	    });
+	    return this;
+	};
 
-/**
- * Removes an event listener or any matching listeners if arguments are omitted.
- * @param {string} [evt] Event name. Removes all listeners if omitted.
- * @param {function} [fn] Listener to remove. Removes all listeners of `evt` if omitted.
- * @returns {util.EventEmitter} `this`
- */
-EventEmitter.prototype.off = function off(evt, fn) {
-    if (evt === undefined)
-        this._listeners = {};
-    else {
-        if (fn === undefined)
-            this._listeners[evt] = [];
-        else {
-            var listeners = this._listeners[evt];
-            for (var i = 0; i < listeners.length;)
-                if (listeners[i].fn === fn)
-                    listeners.splice(i, 1);
-                else
-                    ++i;
-        }
-    }
-    return this;
-};
+	/**
+	 * Removes an event listener or any matching listeners if arguments are omitted.
+	 * @param {string} [evt] Event name. Removes all listeners if omitted.
+	 * @param {function} [fn] Listener to remove. Removes all listeners of `evt` if omitted.
+	 * @returns {util.EventEmitter} `this`
+	 */
+	EventEmitter.prototype.off = function off(evt, fn) {
+	    if (evt === undefined)
+	        this._listeners = {};
+	    else {
+	        if (fn === undefined)
+	            this._listeners[evt] = [];
+	        else {
+	            var listeners = this._listeners[evt];
+	            for (var i = 0; i < listeners.length;)
+	                if (listeners[i].fn === fn)
+	                    listeners.splice(i, 1);
+	                else
+	                    ++i;
+	        }
+	    }
+	    return this;
+	};
 
-/**
- * Emits an event by calling its listeners with the specified arguments.
- * @param {string} evt Event name
- * @param {...*} args Arguments
- * @returns {util.EventEmitter} `this`
- */
-EventEmitter.prototype.emit = function emit(evt) {
-    var listeners = this._listeners[evt];
-    if (listeners) {
-        var args = [],
-            i = 1;
-        for (; i < arguments.length;)
-            args.push(arguments[i++]);
-        for (i = 0; i < listeners.length;)
-            listeners[i].fn.apply(listeners[i++].ctx, args);
-    }
-    return this;
-};
+	/**
+	 * Emits an event by calling its listeners with the specified arguments.
+	 * @param {string} evt Event name
+	 * @param {...*} args Arguments
+	 * @returns {util.EventEmitter} `this`
+	 */
+	EventEmitter.prototype.emit = function emit(evt) {
+	    var listeners = this._listeners[evt];
+	    if (listeners) {
+	        var args = [],
+	            i = 1;
+	        for (; i < arguments.length;)
+	            args.push(arguments[i++]);
+	        for (i = 0; i < listeners.length;)
+	            listeners[i].fn.apply(listeners[i++].ctx, args);
+	    }
+	    return this;
+	};
+	return eventemitter;
+}
 
 var float = factory(factory);
 
@@ -4959,29 +4975,21 @@ function readUintBE(buf, pos) {
           | buf[pos + 3]) >>> 0;
 }
 
-var inquire_1;
-var hasRequiredInquire;
-
-function requireInquire () {
-	if (hasRequiredInquire) return inquire_1;
-	hasRequiredInquire = 1;
-	inquire_1 = inquire;
+var inquire_1 = inquire;
 
-	/**
-	 * Requires a module only if available.
-	 * @memberof util
-	 * @param {string} moduleName Module to require
-	 * @returns {?Object} Required module if available and not empty, otherwise `null`
-	 */
-	function inquire(moduleName) {
-	    try {
-	        var mod = eval("quire".replace(/^/,"re"))(moduleName); // eslint-disable-line no-eval
-	        if (mod && (mod.length || Object.keys(mod).length))
-	            return mod;
-	    } catch (e) {} // eslint-disable-line no-empty
-	    return null;
-	}
-	return inquire_1;
+/**
+ * Requires a module only if available.
+ * @memberof util
+ * @param {string} moduleName Module to require
+ * @returns {?Object} Required module if available and not empty, otherwise `null`
+ */
+function inquire(moduleName) {
+    try {
+        var mod = eval("quire".replace(/^/,"re"))(moduleName); // eslint-disable-line no-eval
+        if (mod && (mod.length || Object.keys(mod).length))
+            return mod;
+    } catch (e) {} // eslint-disable-line no-empty
+    return null;
 }
 
 var utf8$2 = {};
@@ -5373,19 +5381,19 @@ function requireMinimal () {
 		var util = exports;
 
 		// used to return a Promise where callback is omitted
-		util.asPromise = aspromise;
+		util.asPromise = requireAspromise();
 
 		// converts to / from base64 encoded strings
 		util.base64 = base64$1;
 
 		// base class of rpc.Service
-		util.EventEmitter = eventemitter;
+		util.EventEmitter = requireEventemitter();
 
 		// float handling accross browsers
 		util.float = float;
 
 		// requires modules optionally and hides the call from bundlers
-		util.inquire = requireInquire();
+		util.inquire = inquire_1;
 
 		// converts to / from utf8 encoded strings
 		util.utf8 = requireUtf8();
@@ -10673,7 +10681,8 @@ class Client extends BaseXChainClient {
     transfer({ walletIndex = 0, asset = AssetRuneNative, amount, recipient, memo, gasLimit = new BigNumber(DEFAULT_GAS_LIMIT_VALUE), sequence, }) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
-            const balances = yield this.getBalance(this.getAddress(walletIndex));
+            const sender = this.getAddress(walletIndex);
+            const balances = yield this.getBalance(sender);
             const runeBalance = (_b = (_a = balances.filter(({ asset }) => isAssetRuneNative(asset))[0]) === null || _a === void 0 ? void 0 : _a.amount) !== null && _b !== void 0 ? _b : baseAmount(0, RUNE_DECIMAL);
             const assetBalance = (_d = (_c = balances.filter(({ asset: assetInList }) => assetToString(assetInList) === assetToString(asset))[0]) === null || _c === void 0 ? void 0 : _c.amount) !== null && _d !== void 0 ? _d : baseAmount(0, RUNE_DECIMAL);
             const fee = (yield this.getFees()).average;
@@ -10689,35 +10698,25 @@ class Client extends BaseXChainClient {
                     throw new Error('insufficient funds');
                 }
             }
-            const privKey = this.getPrivateKey(walletIndex);
-            const from = this.getAddress(walletIndex);
-            const signerPubkey = privKey.pubKey();
-            const accAddress = cosmosclient.AccAddress.fromString(from);
-            const denom = getDenom(asset);
-            const txBody = yield buildTransferTx({
-                fromAddress: from,
-                toAddress: recipient,
-                memo: memo,
-                assetAmount: amount,
-                assetDenom: denom,
-                chainId: this.getChainId(),
-                nodeUrl: this.getClientUrl().node,
+            const unsignedTxData = yield this.prepareTx({
+                sender,
+                asset,
+                amount,
+                recipient,
+                memo,
+                gasLimit,
+                sequence,
             });
-            const account = yield this.getCosmosClient().getAccount(accAddress);
-            const { account_number: accountNumber } = account;
+            const decodedTx = cosmosclient.proto.cosmos.tx.v1beta1.TxRaw.decode(Buffer.from(unsignedTxData.rawUnsignedTx, 'base64'));
+            const txBuilder = new cosmosclient.TxBuilder(this.getCosmosClient().sdk, cosmosclient.proto.cosmos.tx.v1beta1.TxBody.decode(decodedTx.body_bytes), cosmosclient.proto.cosmos.tx.v1beta1.AuthInfo.decode(decodedTx.auth_info_bytes));
+            const { account_number: accountNumber } = yield this.getCosmosClient().getAccount(cosmosclient.AccAddress.fromString(sender));
             if (!accountNumber)
-                throw Error(`Deposit failed - could not get account number ${accountNumber}`);
-            const txBuilder = buildUnsignedTx({
-                cosmosSdk: this.getCosmosClient().sdk,
-                txBody: txBody,
-                gasLimit: Long$1.fromString(gasLimit.toString()),
-                signerPubkey: cosmosclient.codec.instanceToProtoAny(signerPubkey),
-                sequence: sequence ? Long$1.fromNumber(sequence) : account.sequence || Long$1.ZERO,
-            });
-            const txHash = yield this.cosmosClient.signAndBroadcast(txBuilder, privKey, accountNumber);
-            if (!txHash)
-                throw Error(`Invalid transaction hash: ${txHash}`);
-            return txHash;
+                throw Error(`Transfer failed - missing account number`);
+            const privKey = this.getCosmosClient().getPrivKeyFromMnemonic(this.phrase, this.getFullDerivationPath(walletIndex));
+            const signDocBytes = txBuilder.signDocBytes(accountNumber);
+            txBuilder.addSignature(privKey.sign(signDocBytes));
+            const signedTx = txBuilder.txBytes();
+            return this.broadcastTx(signedTx);
         });
     }
     broadcastTx(txHex) {
@@ -10728,6 +10727,7 @@ class Client extends BaseXChainClient {
     /**
      * Transfer without broadcast balances with MsgSend
      *
+     * @deprecated use instead prepareTx
      * @param {TxOfflineParams} params The transfer offline options.
      * @returns {string} The signed transaction bytes.
      */
@@ -10787,6 +10787,42 @@ class Client extends BaseXChainClient {
             }
         });
     }
+    /**
+     * Prepare transfer.
+     *
+     * @param {TxParams&Address&BigNumber} params The transfer options.
+     * @returns {PreparedTx} The raw unsigned transaction.
+     */
+    prepareTx({ sender, recipient, amount, memo, asset = AssetRuneNative, gasLimit = new BigNumber(DEFAULT_GAS_LIMIT_VALUE), sequence, }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.validateAddress(sender))
+                throw Error('Invalid sender address');
+            if (!this.validateAddress(recipient))
+                throw Error('Invalid recipient address');
+            const denom = getDenom(asset);
+            const txBody = yield buildTransferTx({
+                fromAddress: sender,
+                toAddress: recipient,
+                memo,
+                assetAmount: amount,
+                assetDenom: denom,
+                chainId: this.getChainId(),
+                nodeUrl: this.getClientUrl().node,
+            });
+            const account = yield this.getCosmosClient().getAccount(cosmosclient.AccAddress.fromString(sender));
+            const { pub_key: pubkey } = account;
+            if (!pubkey)
+                throw Error(`Transfer failed - missing pub key`);
+            const txBuilder = buildUnsignedTx({
+                cosmosSdk: this.getCosmosClient().sdk,
+                txBody,
+                gasLimit: Long$1.fromString(gasLimit.toString()),
+                signerPubkey: pubkey,
+                sequence: sequence ? Long$1.fromNumber(sequence) : account.sequence || Long$1.ZERO,
+            });
+            return { rawUnsignedTx: txBuilder.txBytes() };
+        });
+    }
 }
 
 class MsgNativeTx {