@exodus/bitcoin-api 2.4.0 → 2.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -40,6 +40,5 @@
   "devDependencies": {
     "@exodus/bitcoin-meta": "^1.0.1",
     "jest-when": "^3.5.1"
-  },
-  "gitHead": "de21cbd727cb6cbe4fac07b58cc6e3fa8af318ff"
+  }
 }

package/src/fee/get-fee-resolver.js

@@ -31,7 +31,7 @@ export class GetFeeResolver {
       assert(!brc20, 'brc20 must not be provided when nft is provided!!!')
     }
     if (brc20) {
-      assert(!amount, 'amount must not be provided when brc20 is provided!!!')
+      // assert(!amount, 'amount must not be provided when brc20 is provided!!!')
       assert(!isSendAll, 'isSendAll must not be provided when brc20 is provided!!!')
       assert(!nft, 'nft must not be provided when brc20 is provided!!!')
     }
@@ -43,7 +43,7 @@ export class GetFeeResolver {
       accountState,
       txSet,
       feeData,
-      amount,
+      amount: brc20 ? undefined : amount,
       customFee,
       isSendAll,
       inscriptionIds,

package/src/tx-send/index.js

@@ -132,7 +132,10 @@ export const createAndBroadcastTXFactory = ({
   getFeeEstimator,
   getSizeAndChangeScript = getSizeAndChangeScriptFactory(), // for decred customizations
   allowUnconfirmedRbfEnabledUtxos,
-}) => async ({ asset, walletAccount, address, amount, options }, { assetClientInterface }) => {
+}) => async (
+  { asset: maybeToken, walletAccount, address, amount: tokenAmount, options },
+  { assetClientInterface }
+) => {
   const {
     multipleAddressesEnabled,
     feePerKB,
@@ -143,9 +146,21 @@ export const createAndBroadcastTXFactory = ({
     bumpTxId,
     isRbfAllowed = true,
     nft,
-    brc20,
+    feeOpts,
   } = options
 
+  const brc20 = options.brc20 || feeOpts?.brc20 // feeOpts is the only way I've found atm to pass brc20 param without changing the tx-send hydra module
+
+  const asset = maybeToken.baseAsset
+
+  const isToken = maybeToken.name !== asset.name
+
+  if (isToken) {
+    assert(brc20, 'brc20 is required when sending bitcoin token')
+  }
+
+  const amount = isToken ? asset.currency.ZERO : tokenAmount
+
   const assetName = asset.name
 
   const accountState = await assetClientInterface.getAccountState({ assetName, walletAccount })
@@ -458,15 +473,21 @@ export const createAndBroadcastTXFactory = ({
     ? replaceTx.data.sent.concat([{ address: displayReceiveAddress, amount }])
     : [{ address: displayReceiveAddress, amount }]
 
+  const coinAmount = selfSend
+    ? maybeToken.currency.ZERO
+    : isToken
+    ? tokenAmount.abs().negate()
+    : totalAmount.abs().negate()
+
   await assetClientInterface.updateTxLogAndNotify({
-    assetName,
+    assetName: maybeToken.name,
     walletAccount,
     txs: [
       {
         txId,
         confirmations: 0,
-        coinAmount: selfSend ? currency.ZERO : totalAmount.abs().negate(),
-        coinName: assetName,
+        coinAmount,
+        coinName: maybeToken.name,
         feeAmount: fee,
         feeCoinName: assetName,
         selfSend,