Merge branch 'bitpay:master' into remove-dup-address-test

bitpay · Aug 19, 2021 · 3a6605d · 3a6605d
2 parents 048fa4c + e5e2bf3
commit 3a6605d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/packages/bitcore-wallet-client/src/lib/common/utils.ts b/packages/bitcore-wallet-client/src/lib/common/utils.ts
@@ -409,6 +409,7 @@ export class Utils {
 
       return t;
     } else {
+      // ETH ERC20 XRP
       const {
         data,
         destinationTag,
@@ -434,8 +435,13 @@ export class Utils {
       // If it is a token swap its an already created ERC20 transaction so we skip it and go directly to ETH transaction create
       const isERC20 = tokenAddress && !payProUrl && !isTokenSwap;
       const isETHMULTISIG = multisigContractAddress;
-      // using ETH as default since getChain returns undefined for custom tokens
-      const chain = isETHMULTISIG ? 'ETHMULTISIG' : isERC20 ? 'ERC20' : 'ETH';
+      const chain = isETHMULTISIG
+        ? 'ETHMULTISIG'
+        : isERC20
+        ? 'ERC20'
+        : txp.chain
+        ? txp.chain.toUpperCase()
+        : this.getChain(coin);
       for (let index = 0; index < recipients.length; index++) {
         const rawTx = Transactions.create({
           ...txp,

diff --git a/packages/bitcore-wallet-service/src/lib/storage.ts b/packages/bitcore-wallet-service/src/lib/storage.ts
@@ -106,10 +106,10 @@ export class Storage {
       walletId: 1,
       createdOn: 1
     });
-
     db.collection(collections.ADDRESSES).createIndex(
       {
-        address: 1
+        address: 1,
+        coin: 1
       },
       { unique: true }
     );