Revert "Fix data: null for backwards compatibility BWC <= 8.9.0"

This reverts commit dc040c9.

Author: Justin Kook

packages/bitcore-wallet-client/src/lib/common/utils.ts

@@ -355,10 +355,14 @@ export class Utils {
 
       return t;
     } else {
-      const { data, outputs, payProUrl, tokenAddress } = txp;
-      // Convert toAddress to address
-      outputs.forEach(output => {
-        output.address = output.toAddress;
+      const { data, outputs, payProUrl, tokenAddress } = txp;      
+      const recipients = outputs.map(output => {
+        return {
+          amount: output.amount,
+          address: output.toAddress,
+          data: output.data,
+          gasLimit: output.gasLimit
+        };
       });
       // Backwards compatibility BWC <= 8.9.0
       if (data) {
@@ -367,13 +371,13 @@ export class Utils {
       const unsignedTxs = [];
       const isERC20 = tokenAddress && !payProUrl;
       const chain = isERC20 ? 'ERC20' : this.getChain(coin);
-      for (let index = 0; index < outputs.length; index++) {
+      for (let index = 0; index < recipients.length; index++) {
         const rawTx = Transactions.create({
           ...txp,
-          ...outputs[index],
+          ...recipients[index],
           chain,
           nonce: Number(txp.nonce) + Number(index),
-          recipients: [outputs[index]]
+          recipients: [recipients[index]]
         });
         unsignedTxs.push(rawTx);
       }

packages/bitcore-wallet-service/src/lib/chain/eth/index.ts

@@ -140,22 +140,26 @@ export class EthChain implements IChain {
     const { data, outputs, payProUrl, tokenAddress } = txp;
     const isERC20 = tokenAddress && !payProUrl;
     const chain = isERC20 ? 'ERC20' : 'ETH';
-    // Convert toAddress to address
-    outputs.forEach(output => {
-        output.address = output.toAddress;
+    const recipients = outputs.map(output => {
+      return {
+        amount: output.amount,
+        address: output.toAddress,
+        data: output.data,
+        gasLimit: output.gasLimit
+      };
     });
     // Backwards compatibility BWC <= 8.9.0
     if (data) {
       outputs[0].data = data;
     }
     const unsignedTxs = [];
-    for (let index = 0; index < outputs.length; index++) {
+    for (let index = 0; index < recipients.length; index++) {
       const rawTx = Transactions.create({
         ...txp,
-        ...outputs[index],
+        ...recipients[index],
         chain,
         nonce: Number(txp.nonce) + Number(index),
-        recipients: [outputs[index]]
+        recipients: [recipients[index]]
       });
       unsignedTxs.push(rawTx);
     }

packages/bitcore-wallet-service/test/integration/server.js

@@ -3177,7 +3177,6 @@ describe('Wallet service', function() {
                 tx.gasPrice.should.equal(12300);
                 tx.nonce.should.equal('5');
                 tx.outputs.should.deep.equal([{
-                  address: addressStr,
                   toAddress: addressStr,
                   gasLimit: 21000,
                   amount: amount,
@@ -4957,7 +4956,6 @@ describe('#createTX ETH Only tests', () => {
         should.not.exist(err);
         should.exist(tx);
         tx.outputs.should.deep.equal([{
-          address: '0x37d7B3bBD88EFdE6a93cF74D2F5b0385D3E3B08A',
           toAddress: '0x37d7B3bBD88EFdE6a93cF74D2F5b0385D3E3B08A',
           gasLimit: 21000,
           amount: amount,