TRON-36 - working core recover for trx

twtaylorbitgo · perrybitgo · commit efb765e8f912 · 2019-11-19T15:40:45.000-08:00
diff --git a/modules/core/src/v2/coins/trx.ts b/modules/core/src/v2/coins/trx.ts
@@ -3,15 +3,13 @@
  */
 import * as Bluebird from 'bluebird';
 import * as crypto from 'crypto';
-import { CoinFamily } from '@bitgo/statics';
+import { CoinFamily, BaseCoin as StaticsBaseCoin } from '@bitgo/statics';
 const co = Bluebird.coroutine;
 import * as bitgoAccountLib from '@bitgo/account-lib';
-import { HDNode } from 'bitgo-utxo-lib';
+import { HDNode, networks } from 'bitgo-utxo-lib';
 import * as request from 'superagent';
 import * as common from '../../common';
 
-import { BaseCoin as StaticsBaseCoin } from '@bitgo/statics';
-
 import {
   BaseCoin,
   KeyPair,
@@ -26,14 +24,11 @@ import {
   TransactionPrebuild as BaseTransactionPrebuild,
   TransactionExplanation,
 } from '../baseCoin';
-import * as utxoLib from 'bitgo-utxo-lib';
+
 import { BitGo } from '../../bitgo';
 import { NodeCallback } from '../types';
 import { TransactionBuilder } from '@bitgo/account-lib';
 
-import debug = require('debug');
-import {utxo} from "@bitgo/statics/dist/src/utxo";
-
 export interface TronSignTransactionOptions extends SignTransactionOptions {
   txPrebuild: TransactionPrebuild;
   prv: string;
@@ -44,6 +39,7 @@ export interface TxInfo {
   from: string;
   txid: string;
 }
+
 export interface TronTransactionExplanation extends TransactionExplanation {
   expiration: number;
   timestamp: number;
@@ -83,7 +79,6 @@ export enum NodeTypes {
   Solidity,
 }
 
-
 export class Trx extends BaseCoin {
   protected readonly _staticsCoin: Readonly<StaticsBaseCoin>;
 
@@ -157,7 +152,7 @@ export class Trx extends BaseCoin {
       // random. 512 bits is therefore the maximum entropy and gives us maximum security against cracking.
       seed = crypto.randomBytes(512 / 8);
     }
-    const hd = utxoLib.HDNode.fromSeedBuffer(seed);
+    const hd = HDNode.fromSeedBuffer(seed);
     return {
       pub: hd.neutered().toBase58(),
       prv: hd.toBase58(),
@@ -166,7 +161,7 @@ export class Trx extends BaseCoin {
 
   isValidXpub(xpub: string): boolean {
     try {
-      return utxoLib.HDNode.fromBase58(xpub).isNeutered();
+      return HDNode.fromBase58(xpub).isNeutered();
     } catch (e) {
       return false;
     }
@@ -284,38 +279,23 @@ export class Trx extends BaseCoin {
       throw new Error('invalid xpub');
     }
 
-    const hdNode = utxoLib.HDNode.fromBase58(xpub, this.bitcoinEncoding());
+    const hdNode = HDNode.fromBase58(xpub, networks.bitcoin);
     return hdNode.keyPair.__Q.getEncoded(false).toString('hex');
   }
 
   compressedPubToHexAddress(pub: string): string {
     const byteArrayAddr = bitgoAccountLib.Trx.Utils.getByteArrayFromHexAddress(pub);
     const rawAddress = bitgoAccountLib.Trx.Utils.getRawAddressFromPubKey(byteArrayAddr);
-    return Buffer.from(rawAddress).toString('hex').toUpperCase();
+    return bitgoAccountLib.Trx.Utils.getHexAddressFromByteArray(rawAddress);
   }
 
   xprvToCompressedPrv(xprv: string): string {
     if (!this.isValidXprv(xprv)) {
       throw new Error('invalid xprv');
     }
 
-    const hdNode = utxoLib.HDNode.fromBase58(xprv, this.bitcoinEncoding());
+    const hdNode = HDNode.fromBase58(xprv, networks.bitcoin);
     return hdNode.keyPair.d.toBuffer(32).toString('hex');
-  };
-
-  bitcoinEncoding(): any {
-    return {
-      messagePrefix: '\x18Bitcoin Signed Message:\n',
-      bech32: 'bc',
-      bip32: {
-        public: 0x0488b21e,
-        private: 0x0488ade4
-      },
-      pubKeyHash: 0x00,
-      scriptHash: 0x05,
-      wif: 0x80,
-      coin: 'btc',
-    };
   }
 
   /**
@@ -324,7 +304,7 @@ export class Trx extends BaseCoin {
    * @param callback
    * @returns {Object} response from Trongrid
    */
-  recoveryPost(query: { path: string, jsonObj: any, node: NodeTypes }, callback?: NodeCallback<any>): Bluebird<any> {
+  recoveryPost(query: { path: string; jsonObj: any; node: NodeTypes }, callback?: NodeCallback<any>): Bluebird<any> {
     const self = this;
     return co(function*() {
       let nodeUri = '';
@@ -340,16 +320,19 @@ export class Trx extends BaseCoin {
       }
 
       const response = yield request
-          .post(nodeUri + query.path)
-          .send(query.jsonObj);
+        .post(nodeUri + query.path)
+        .type('json')
+        .send(query.jsonObj);
 
       if (!response.ok) {
         throw new Error('could not reach Tron node');
       }
-      return response.body;
+
+      // unfortunately, it doesn't look like most TRON nodes return valid json as body
+      return JSON.parse(response.text);
     })
-        .call(this)
-        .asCallback(callback);
+      .call(this)
+      .asCallback(callback);
   }
 
   /**
@@ -387,15 +370,15 @@ export class Trx extends BaseCoin {
         path: '/wallet/createtransaction',
         jsonObj: {
           to_address: toAddr,
-          from_address: fromAddr,
-          amount: amount.toFixed(0),
+          owner_address: fromAddr,
+          amount,
         },
         node: NodeTypes.Full,
       });
-      return result.balance;
+      return result;
     })
-        .call(this)
-        .asCallback(callback);
+      .call(this)
+      .asCallback(callback);
   }
 
   /**
@@ -420,9 +403,9 @@ export class Trx extends BaseCoin {
       const bitgoAddress = self.compressedPubToHexAddress(self.xpubToCompressedPub(params.bitgoKey));
       const recoveryAddressHex = bitgoAccountLib.Trx.Utils.getHexAddressFromBase58Address(params.recoveryDestination);
 
+      // call the node to get our account balance
       const recoveryAmount = yield self.getAccountBalanceFromNode(bitgoAddress);
 
-      //const userPrv = HDKey.fromExtendedKey(keys[0]).privateKey;
       const userXPub = keys[0].neutered().toBase58();
       const userXPrv = keys[0].toBase58();
       const backupXPub = keys[1].neutered().toBase58();
@@ -431,18 +414,16 @@ export class Trx extends BaseCoin {
       const userHexAddr = self.compressedPubToHexAddress(self.xpubToCompressedPub(userXPub));
       const backupHexAddr = self.compressedPubToHexAddress(self.xpubToCompressedPub(backupXPub));
 
-      // TODO: some checks here about pubs being valid, for this wallet, etc.
-
-      // construct the tx
-      // TODO: recovery amount might not include fees, we'll have to figure out the max we can spend
-      //   sensitive to energy and tx cost amounts
+      // construct the tx -
       // there's an assumption here being made about fees: for a wallet that hasn't been used in awhile, the implication is
-      // it has maximum bandwidth. thus, a recovery should cost the minimum amount (1e6 sun)
+      // it has maximum bandwidth. thus, a recovery should cost the minimum amount (1e6 sun or 1 Tron)
       if (1e6 > recoveryAmount) {
         throw new Error('Amount of funds to recover wouldnt be able to fund a send');
       }
       const recoveryAmountMinusFees = recoveryAmount - 1e6;
-      const buildTx = self.getBuildTransaction(recoveryAddressHex, bitgoAddress, recoveryAmountMinusFees);
+      const buildTx = yield self.getBuildTransaction(recoveryAddressHex, bitgoAddress, recoveryAmountMinusFees);
+
+      // TODO: some checks here about pubs being valid, for this wallet, etc. from build transaction
 
       // construct our tx
       const txBuilder = new bitgoAccountLib.TransactionBuilder({ coinName: this.getChain() });
@@ -453,11 +434,11 @@ export class Trx extends BaseCoin {
         return txBuilder.build().toJson();
       }
 
-      // sign our tx
       txBuilder.sign({ key: userPrv });
 
+      // krs recoveries don't get signed
       if (!isKrsRecovery) {
-        const backupXPrv = keys[0].toBase58();
+        const backupXPrv = keys[1].toBase58();
         const backupPrv = self.xprvToCompressedPrv(backupXPrv);
 
         txBuilder.sign({ key: backupPrv });
diff --git a/modules/core/test/v2/unit/recovery.ts b/modules/core/test/v2/unit/recovery.ts
@@ -566,14 +566,21 @@ describe('Recovery:', function() {
       recoveryNocks.nockTronRecovery();
     });
 
-    it('should generate TRON recovery tx', co(function *() {
+    it('should generate TRON recovery tx from user and backup keys', co(function *() {
       const recoveryTx = yield baseCoin.recover({
         userKey: '{"iv":"QPX3xtGROshqHW8kGPAYCw==","v":1,"iter":10000,"ks":256,"ts":64,"mode":"ccm","adata":"","cipher":"aes","salt":"LJ4YYCyClRE=","ct":"hlJH8lWk/FaciymG8UsscxVFCnOduLRjoWxaK8xU7TjsqUDXsQjj0BpH7aNm64p6ldueaGoU2/VfrrzX9lWrcVmXspFp2oON5EyK45JbI13hirqG2dkOqoT8G8mrMydMp6zG5iOA+EtXRy69kYDCI1Re6mR7k1c="}',
         backupKey: '{"iv":"xbOCFaZVnrQLAYKcgMvdNw==","v":1,"iter":10000,"ks":256,"ts":64,"mode":"ccm","adata":"","cipher":"aes","salt":"86cZ+hT+S0Y=","ct":"RH7Uks/JjNARX9wuIw6r4Map2C9FtLlWYk4zjLcrjzkBuNTCUNQgxF7kU5/SWzD+tomVBj6P9CLkXYzPlR1NhVi+aT9mTW6LK9nJ+ErpLKXzbIAxBLezDjJ5xqUS5cGkjoHCtANL7qTZcDBvOfejLDrUjQdw2WQ="}',
         bitgoKey: 'xpub661MyMwAqRbcFcaxCPsEyhj79VUuVVThWinZnjhvAPnFLB1SBp7Yk4gvqWsGE3MHdw1tPRLnHRRQLNcrKqaCyBnFK5XTrZUrLyY94LXn4v9',
         walletPassphrase: TestBitGo.V2.TEST_RECOVERY_PASSCODE,
         recoveryDestination: 'TYBTURKpanKxnx91uyfvvtztNeHE3EQf6G',
       });
+
+      should.exist(recoveryTx);
+
+      recoveryTx.signature[0].should.equal('f4b0b12f1226765c7d4f775244693da0d95726cd4f9dc7c16c67a211a372390ad0fe9dde01dbd418c502c3282c7ac8417132f86544c37b64e1526ffa8b43dead01');
+      recoveryTx.signature[1].should.equal('1c637c8c317df0b815cdc27637e4403964d74e3b1751efda08c11acdf226c83263ef4c9f4b7731514ded6b19dc846efb58371b653bbadc8040ac18101cafedb501');
+      recoveryTx.txID.should.equal('55d76a068b97933a98e5d02e6fecd4c2971f1d37f0bb850a919b17def906a239');
+      recoveryTx.raw_data_hex.should.equal('0a023ffb2208c1647593403d263b40b8b2e6fce72d5a69080112650a2d747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e5472616e73666572436f6e747261637412340a15414d0941161d0f7e1da0c8989b1566c9d9b43e1226121541f3a3d6d514e7d43fbbf632a687acd65aafb8a50c18c0cdd6ac03709deae2fce72d');
     }));
 
     it('should generate TRON recovery tx with unencrypted keys', co(function *() {
