@bitpay-labs/bitcore-wallet-service 11.9.0 → 11.10.1

package/src/lib/model/txproposalaction.ts

@@ -6,6 +6,9 @@ export interface ITxProposalAction {
   signatures: string[];
   xpub: string;
   comment: string;
+
+  // Non-persistent fields
+  copayerName?: string;
 }
 export class TxProposalAction {
   version: string;
@@ -16,6 +19,9 @@ export class TxProposalAction {
   xpub: string;
   comment: string;
 
+  // Non-persistent fields
+  copayerName?: string;
+
   static create(opts) {
     opts = opts || {};
 
@@ -43,6 +49,9 @@ export class TxProposalAction {
     x.xpub = obj.xpub;
     x.comment = obj.comment;
 
+    // copayerName is not stored in the actions collection, but it is returned by the server on fetchTxProposal, so we need to set it here.
+    x.copayerName = obj.copayerName; 
+
     return x;
   }
 }

package/src/lib/routes/context.ts

@@ -10,6 +10,7 @@ interface RouteHelpers {
   getServerWithMultiAuth: Types.GetServerWithMultiAuthFn;
   logDeprecated: Types.LogDeprecatedFn;
   setPublicCache: (res: express.Response, seconds: number) => void;
+  checkNumberFormat: Types.CheckNumberFormatFn;
 }
 
 export function createRouteHelpers(returnError: Types.ReturnErrorFn): RouteHelpers {
@@ -139,11 +140,19 @@ export function createRouteHelpers(returnError: Types.ReturnErrorFn): RouteHelpe
     res.setHeader('Cache-Control', `public, max-age=${seconds}, stale-if-error=${10 * seconds}`);
   };
 
+  const checkNumberFormat = (numberFormat: string | undefined, res: express.Response) => {
+    const validFormats = ['hex', 'string', 'number']; // bigint cannot be serialized to JSON, so it's not supported in the API response
+    if (numberFormat && !validFormats.includes(numberFormat)) {
+      return returnError(Errors.INVALID_NUMBER_FORMAT, res, null);
+    }
+  };
+
   return {
     getServer,
     getServerWithAuth,
     getServerWithMultiAuth,
     logDeprecated,
-    setPublicCache
+    setPublicCache,
+    checkNumberFormat
   };
 }

package/src/lib/routes/transactions.ts

@@ -5,10 +5,11 @@ import type * as Types from '../../types/expressapp';
 interface RouteContext {
   getServerWithAuth: Types.GetServerWithAuthFn;
   returnError: Types.ReturnErrorFn;
+  checkNumberFormat: Types.CheckNumberFormatFn;
 }
 
 export function registerTransactionRoutes(router: express.Router, context: RouteContext) {
-  const { getServerWithAuth, returnError } = context;
+  const { getServerWithAuth, returnError, checkNumberFormat } = context;
 
   router.get('/v1/txproposals/', (req, res) => {
     getServerWithAuth(req, res, server => {
@@ -21,7 +22,13 @@ export function registerTransactionRoutes(router: express.Router, context: Route
 
   router.get('/v2/txproposals/', (req, res) => {
     getServerWithAuth(req, res, server => {
-      server.getPendingTxs({}, (err, pendings) => {
+      checkNumberFormat(req.query.numberFormat, res);
+
+      const opts = {
+        numberFormat: req.query.numberFormat,
+      };
+
+      server.getPendingTxs(opts, (err, pendings) => {
         if (err) return returnError(err, res, req);
         res.json(pendings);
       });
@@ -45,7 +52,9 @@ export function registerTransactionRoutes(router: express.Router, context: Route
 
   router.post('/v3/txproposals/', (req, res) => {
     getServerWithAuth(req, res, server => {
+      checkNumberFormat(req.query.numberFormat, res);
       req.body.txpVersion = 3;
+      req.body.numberFormat = req.query.numberFormat;
       server.createTx(req.body, (err, txp) => {
         if (err) return returnError(err, res, req);
         res.json(txp);
@@ -67,9 +76,11 @@ export function registerTransactionRoutes(router: express.Router, context: Route
 
   router.post('/v2/txproposals/:id/signatures/', (req, res) => {
     getServerWithAuth(req, res, server => {
+      checkNumberFormat(req.query.numberFormat, res);
       req.body.txProposalId = req.params['id'];
       req.body.maxTxpVersion = 3;
       req.body.supportBchSchnorr = true;
+      req.body.numberFormat = req.query.numberFormat;
       server.signTx(req.body, (err, txp) => {
         if (err) return returnError(err, res, req);
         res.json(txp);
@@ -80,7 +91,9 @@ export function registerTransactionRoutes(router: express.Router, context: Route
 
   router.post('/v1/txproposals/:id/prepare/', (req, res) => {
     getServerWithAuth(req, res, server => {
+      checkNumberFormat(req.query.numberFormat, res);
       req.body.txProposalId = req.params['id'];
+      req.body.numberFormat = req.query.numberFormat;
       server.prepareTx(req.body, (err, txp) => {
         if (err) return returnError(err, res, req);
         res.json(txp);
@@ -103,7 +116,9 @@ export function registerTransactionRoutes(router: express.Router, context: Route
 
   router.post('/v2/txproposals/:id/publish/', (req, res) => {
     getServerWithAuth(req, res, server => {
+      checkNumberFormat(req.query.numberFormat, res);
       req.body.txProposalId = req.params['id'];
+      req.body.numberFormat = req.query.numberFormat;
       server.publishTx(req.body, (err, txp) => {
         if (err) return returnError(err, res, req);
         res.json(txp);

package/src/lib/routes/wallets.ts

@@ -15,6 +15,7 @@ interface RouteContext {
   getServerWithMultiAuth: Types.GetServerWithMultiAuthFn;
   logDeprecated: Types.LogDeprecatedFn;
   returnError: Types.ReturnErrorFn;
+  checkNumberFormat: Types.CheckNumberFormatFn;
 }
 
 function getServerOrReturnError(req, res, context: RouteContext): WalletService | null {
@@ -27,7 +28,7 @@ function getServerOrReturnError(req, res, context: RouteContext): WalletService
 }
 
 export function registerWalletRoutes(router: express.Router, context: RouteContext) {
-  const { createWalletLimiter, getServerWithAuth, getServerWithMultiAuth, logDeprecated, returnError } = context;
+  const { createWalletLimiter, getServerWithAuth, getServerWithMultiAuth, logDeprecated, returnError, checkNumberFormat } = context;
 
   router.post('/v1/wallets/', createWalletLimiter, (req, res) => {
     logDeprecated(req);
@@ -96,13 +97,15 @@ export function registerWalletRoutes(router: express.Router, context: RouteConte
 
   router.get('/v3/wallets/', (req, res) => {
     getServerWithAuth(req, res, server => {
+      checkNumberFormat(req.query.numberFormat, res);
       const opts = {
         includeExtendedInfo: false,
         twoStep: false,
         includeServerMessages: false,
         tokenAddress: req.query.tokenAddress,
         multisigContractAddress: req.query.multisigContractAddress,
-        network: req.query.network
+        network: req.query.network,
+        numberFormat: req.query.numberFormat
       };
       if (req.query.includeExtendedInfo == '1') opts.includeExtendedInfo = true;
       if (req.query.twoStep == '1') opts.twoStep = true;
@@ -121,6 +124,8 @@ export function registerWalletRoutes(router: express.Router, context: RouteConte
     const twoStep = req.query.twoStep == '1';
     const silentFailure = req.query.silentFailure == '1';
     const includeServerMessages = req.query.serverMessageArray == '1';
+    const numberFormat = req.query.numberFormat;
+    checkNumberFormat(numberFormat, res);
 
     const buildOpts = (request, copayerId) => {
       const getParam = (param, returnArray = false) => {
@@ -136,6 +141,7 @@ export function registerWalletRoutes(router: express.Router, context: RouteConte
         twoStep,
         silentFailure,
         includeServerMessages,
+        numberFormat,
         tokenAddresses: getParam('tokenAddress', true) as string[] | null,
         multisigContractAddress: getParam('multisigContractAddress') as string | null,
         network: getParam('network') as string | null

package/src/lib/server.ts

@@ -844,6 +844,7 @@ export class WalletService implements IWalletService {
    * @param {Object} opts.tokenAddress - (Optional) Token contract address to pass in getBalance
    * @param {Object} opts.multisigContractAddress - (Optional) Multisig ETH contract address to pass in getBalance
    * @param {Object} opts.network - (Optional ETH MULTISIG) Multisig ETH contract address network
+   * @param {string} opts.numberFormat Returns txp tx-build values as 'string', 'hex', or 'number' (default)
    * @returns {Object} status
    */
   getStatus(opts, cb) {
@@ -1879,7 +1880,7 @@ export class WalletService implements IWalletService {
         next => {
           utxoIndex = _.keyBy(allUtxos, utxoKey);
 
-          this.getPendingTxs({}, (err, txps) => {
+          this.getPendingTxs({ numberFormat: opts.numberFormat }, (err, txps) => {
             if (err) return next(err);
 
             const lockedInputs = txps.flatMap(t => t.inputs).map(utxoKey);
@@ -1888,7 +1889,7 @@ export class WalletService implements IWalletService {
                 utxoIndex[input].locked = true;
               }
             }
-            logger.debug(`Got  ${lockedInputs.length} locked utxos`);
+            logger.debug(`Got ${lockedInputs.length} locked utxos`);
             return next();
           });
         },
@@ -2689,6 +2690,17 @@ export class WalletService implements IWalletService {
     });
   }
 
+  createTx(opts, cb) {
+    this._createTx(opts, (err, txp) => {
+      if (err) return cb(err);
+      if (opts.numberFormat) {
+        txp = TxProposal.formatNumbers(txp, opts.numberFormat);
+      }
+      return cb(null, txp);
+    });
+  }
+
+
   /**
    * Creates a new transaction proposal.
    * @param {Object} opts
@@ -2736,7 +2748,7 @@ export class WalletService implements IWalletService {
    * @param {Boolean} opts.refreshOnPublish - Optional. Allows publish function to refresh txp data
    * @returns {TxProposal} Transaction proposal. outputs address format will use the same format as inpunt.
    */
-  createTx(opts, cb) {
+  private _createTx(opts, cb) {
     opts = opts ? _.clone(opts) : {};
 
     const checkTxpAlreadyExists = (txProposalId, cb) => {
@@ -2869,6 +2881,7 @@ export class WalletService implements IWalletService {
                       outputs: opts.outputs,
                       message: opts.message,
                       from: opts.from,
+                      sendMax: opts.sendMax,
                       changeAddress,
                       feeLevel: opts.feeLevel,
                       feePerKb,
@@ -3000,6 +3013,17 @@ export class WalletService implements IWalletService {
     );
   }
 
+
+  publishTx(opts, cb) {
+    this._publishTx(opts, (err, txp) => {
+      if (err) return cb(err);
+      if (opts.numberFormat) {
+        txp = TxProposal.formatNumbers(txp, opts.numberFormat);
+      }
+      return cb(null, txp);
+    });
+  }
+
   /**
    * Publish an already created tx proposal so inputs are locked and other copayers in the wallet can see it.
    * @param {Object} opts
@@ -3007,7 +3031,7 @@ export class WalletService implements IWalletService {
    * @param {string} opts.proposalSignature - S(raw tx). Used by other copayers to verify the proposal.
    * @param {Boolean} [opts.noCashAddr] - do not use cashaddress for bch
    */
-  publishTx(opts, cb) {
+  private _publishTx(opts, cb) {
     if (!checkRequired(opts, ['txProposalId', 'proposalSignature'], cb)) return;
 
     this._runLocked(cb, cb => {
@@ -3088,7 +3112,7 @@ export class WalletService implements IWalletService {
    * @param {string} opts.txProposalId - The tx proposal id.
    * @returns {Object} txProposal
    */
-  getTx(opts, cb) {
+  getTx(opts, cb: (err: any, txp?: TxProposal) => void) {
     this.storage.fetchTx(this.walletId, opts.txProposalId, (err, txp) => {
       if (err) return cb(err);
       if (!txp) return cb(Errors.TX_NOT_FOUND);
@@ -3287,6 +3311,7 @@ export class WalletService implements IWalletService {
    * @param {string} opts.signatures - The signatures of the inputs of this tx for this copayer (in appearance order)
    * @param {string} opts.maxTxpVersion - Client's maximum supported txp version
    * @param {boolean} opts.supportBchSchnorr - indication whether to use schnorr for signing tx
+   * @param {string} opts.numberFormat - Optional. If specified, the tx proposal will ensure the numbers are in the format specified (e.g. 'string'). This is to ensure precision handling matches the client's
    */
   signTx(opts, cb) {
     if (!checkRequired(opts, ['txProposalId', 'signatures'], cb)) return;
@@ -3343,7 +3368,7 @@ export class WalletService implements IWalletService {
           const xPubKey = wallet.tssKeyId ? wallet.clientDerivedPublicKey : copayer.xPubKey;
 
           try {
-            if (!txp.sign(this.copayerId, opts.signatures, xPubKey)) {
+            if (!txp.sign(this.copayerId, opts.signatures, xPubKey, opts.numberFormat)) {
               this.logw('Error signing transaction (BAD_SIGNATURES)');
               this.logw('Client version:', this.clientVersion);
               this.logw('Arguments:', JSON.stringify(opts));
@@ -3413,6 +3438,16 @@ export class WalletService implements IWalletService {
     });
   }
 
+  prepareTx(opts, cb) {
+    this._prepareTx(opts, (err, txp) => {
+      if (err) return cb(err);
+      if (opts.numberFormat) {
+        txp = TxProposal.formatNumbers(txp, opts.numberFormat);
+      }
+      return cb(null, txp);
+    });
+  }  
+
   /**
    * Prepare a transaction proposal for signing.
    * Assigns JIT values (nonce, and in the future: fee, gas) to a deferred txp.
@@ -3420,7 +3455,7 @@ export class WalletService implements IWalletService {
    * @param {Object} opts
    * @param {string} opts.txProposalId - The identifier of the transaction.
    */
-  prepareTx(opts, cb) {
+  private _prepareTx(opts, cb) {
     if (!checkRequired(opts, ['txProposalId'], cb)) return;
 
     this._runLocked(cb, cb => {
@@ -3635,16 +3670,34 @@ export class WalletService implements IWalletService {
     );
   }
 
+
+  /**
+   * Retrieves pending transaction proposals.
+   * @param {'number'|'string'|'hex'|'bigint'} opts.numberFormat The format to return numbers in. Not ALL numbers - just certain ones that are needed for tx building/verifying by the client.
+   * @param cb
+   */
+  async getPendingTxs(opts, cb) {
+    this._getPendingTxs(opts, (err, txps) => {
+      if (err) return cb(err);
+      if (opts.numberFormat) {
+        const formattedTxps = txps.map(t => TxProposal.formatNumbers(t, opts.numberFormat));
+        return cb(null, formattedTxps);
+      }
+      return cb(null, txps);
+    });
+  }
+
   /**
    * Retrieves pending transaction proposals.
    * @param {Object} opts
    * @param {Boolean} opts.noCashAddr (do not use cashaddr, only for backwards compat)
    * @param {String} opts.tokenAddress ERC20 Token Contract Address
    * @param {String} opts.multisigContractAddress MULTISIG ETH Contract Address
-   * @param {String} opts.network  The network of the MULTISIG ETH transactions
+   * @param {String} opts.network The network of the MULTISIG ETH transactions
+   * @param {String} opts.numberFormat Return numbers as format. 'number' (default), 'hex', or 'string'
    * @returns {TxProposal[]} Transaction proposal.
    */
-  async getPendingTxs(opts, cb) {
+  private async _getPendingTxs(opts, cb: (err: any, txps?: ITxProposal[]) => void) {
     if (opts.multisigContractAddress) {
       try {
         const multisigTxpsInfo = await this.getMultisigTxpsInfo(opts);

package/src/lib/storage.ts

@@ -310,24 +310,25 @@ export class Storage {
   }
 
   // TODO: should be done client-side
-  _completeTxData(walletId, txs, cb) {
+  _completeTxData(walletId: string, txs: TxProposal | TxProposal[], cb: (err?: any, txs?: TxProposal | TxProposal[]) => void) {
     this.fetchWallet(walletId, (err, wallet) => {
       if (err) return cb(err);
-      _.each([].concat(txs), tx => {
+      for (const tx of [].concat(txs) as TxProposal[]) {
         tx.derivationStrategy = wallet.derivationStrategy || 'BIP45';
         tx.creatorName = wallet.getCopayer(tx.creatorId).name;
-        _.each(tx.actions, action => {
+        for (const action of tx.actions) {
           action.copayerName = wallet.getCopayer(action.copayerId).name;
-        });
+        }
 
-        if (tx.status == 'accepted') tx.raw = tx.getRawTx();
-      });
+        if (tx.status == 'accepted')
+          tx.raw = tx.getRawTx();
+      }
       return cb(null, txs);
     });
   }
 
   // TODO: remove walletId from signature
-  fetchTx(walletId, txProposalId, cb) {
+  fetchTx(walletId: string, txProposalId: string, cb: (err?: any, tx?: TxProposal) => void) {
     if (!this.db) return cb();
 
     this.db.collection(collections.TXS).findOne(
@@ -385,7 +386,7 @@ export class Storage {
   }
 
   fetchEthPendingTxs(multisigTxpsInfo) {
-    return new Promise((resolve, reject) => {
+    return new Promise<TxProposal[]>((resolve, reject) => {
       this.db
         .collection(collections.TXS)
         .find({
@@ -1286,7 +1287,7 @@ export class Storage {
       });
   }
 
-  fetchTxNote(walletId, txid, cb) {
+  fetchTxNote(walletId, txid, cb: (err?: any, note?: TxNote) => void) {
     this.db.collection(collections.TX_NOTES).findOne(
       {
         walletId,
@@ -1301,12 +1302,12 @@ export class Storage {
   }
 
   // TODO: should be done client-side
-  _completeTxNotesData(walletId, notes, cb) {
+  _completeTxNotesData(walletId, notes: TxNote | TxNote[], cb: (err?: any, notes?: TxNote | TxNote[]) => void) {
     this.fetchWallet(walletId, (err, wallet) => {
       if (err) return cb(err);
-      _.each([].concat(notes), note => {
+      for (const note of [].concat(notes) as TxNote[]) {
         note.editedByName = wallet.getCopayer(note.editedBy).name;
-      });
+      }
       return cb(null, notes);
     });
   }

package/src/types/expressapp.d.ts

@@ -12,4 +12,5 @@ export type GetServerFn = (req: express.Request, res: express.Response) => Walle
 export type ServerCallback = (server: WalletService, err?: Error) => void;
 export type GetServerWithAuthFn = (req: express.Request, res: express.Response, opts?: ServerOpts | ServerCallback, cb?: ServerCallback) => Promise<WalletService | void>;
 export type GetServerWithMultiAuthFn = (req: express.Request, res: express.Response, opts?: ServerOpts) => Array<Promise<WalletService | void>>;
-export type CreateWalletLimiterFn = (req: express.Request, res: express.Response, next: express.NextFunction) => void;
+export type CreateWalletLimiterFn = (req: express.Request, res: express.Response, next: express.NextFunction) => void;
+export type CheckNumberFormatFn = (numberFormat: string | undefined, res: express.Response) => void;

package/test/chain/bch.test.ts

@@ -73,6 +73,11 @@ const aTXP = function() {
       version: '1.0.0',
       createdOn: 1424372337,
       address: '3CauZ5JUFfmSAx2yANvCRoNXccZ3YSUjXH',
+      walletId: 'thisdoesntmatter',
+      coin: 'bch',
+      chain: 'bch',
+      network: 'livenet',
+      type: 'P2SH',
       path: 'm/2147483647/1/0',
       publicKeys: ['030562cb099e6043dc499eb359dd97c9d500a3586498e4bcf0228a178cc20e6f16',
         '0367027d17dbdfc27b5e31f8ed70e14d47949f0fa392261e977db0851c8b0d6fac',
@@ -96,15 +101,17 @@ const aTXP = function() {
     requiredRejections: 1,
     walletN: 2,
     addressType: 'P2SH',
-    status: 'pending',
+    status: 'pending' as const,
     actions: [],
     fee: 10000,
     outputs: [{
       toAddress: 'qq0zkyfjkjfec47hgcu0acdzw36td4s2evqyyllszk',
+      address: 'qq0zkyfjkjfec47hgcu0acdzw36td4s2evqyyllszk',
       amount: 10000000,
       message: 'first message'
     }, {
       toAddress: 'qq0zkyfjkjfec47hgcu0acdzw36td4s2evqyyllszk',
+      address: 'qq0zkyfjkjfec47hgcu0acdzw36td4s2evqyyllszk',
       amount: 20000000,
       message: 'second message'
     }],

package/test/chain/btc.test.ts

@@ -262,7 +262,7 @@ const aTXP = function() {
     chain: 'btc',
     coin: 'btc',
     network: 'livenet',
-    amount: '30000000',
+    amount: 30000000,
     message: 'some message',
     proposalSignature: '7035022100896aeb8db75fec22fddb5facf791927a996eb3aee23ee6deaa15471ea46047de02204c0c33f42a9d3ff93d62738712a8c8a5ecd21b45393fdd144e7b01b5a186f1f9',
     changeAddress: {
@@ -328,4 +328,4 @@ const aTXP = function() {
   return txp;
 };
 
-const signedTxp = { 'actions': [{ 'version': '1.0.0', 'createdOn': 1588099987, 'copayerId': '671fee02a6c1c4de2e2609f9f9a6180dc03acfff6b759fe0b13a616ed4880065', 'type': 'accept', 'signatures': ['3045022100ace0efb22eaf21b77d5e4a31a491ad06fbcfe700ace5abe8453ec0328c714cba02205090a44975d4b65b5e2f4473da038e83875826b369fc79558a741268ed574bb0'], 'xpub': 'xpub6DVmxcjRgZdHNSEcXSiFtweVwMSTc3TMwRJ45nJYvyqvLbK1poPerupqh87rSoz27wvckb1CKnGZoLmLXSZyNGZtVd7neqSvdwJL6fceQpe', 'comment': null }], 'version': 3, 'createdOn': 1588099987, 'id': '7cea0d95-3308-48e7-a4be-3f16d66e1f5a', 'walletId': '7eaf4d32-c2fd-4262-864a-4c42fc9236f8', 'creatorId': '671fee02a6c1c4de2e2609f9f9a6180dc03acfff6b759fe0b13a616ed4880065', 'coin': 'bch', 'network': 'livenet', 'outputs': [{ 'amount': 80000000, 'toAddress': 'CPrtPWbp8cCftTQu5fzuLG5zPJNDHMMf8X' }], 'amount': 80000000, 'message': 'some message', 'payProUrl': null, 'changeAddress': { 'version': '1.0.0', 'createdOn': 1588099987, 'address': 'CWwtFMy3GMr5qMEtvEdUDjePfShzkJXCnh', 'walletId': '7eaf4d32-c2fd-4262-864a-4c42fc9236f8', 'isChange': true, 'path': 'm/1/0', 'publicKeys': ['02129acdcc600694b3ce55a2d05244186e806174eb0bafde20e5a6395ded647857'], 'coin': 'bch', 'network': 'livenet', 'type': 'P2PKH', 'hasActivity': null, 'beRegistered': null }, 'inputs': [{ 'txid': '4e7feb01fb039f3a719e9390c8f7cb501fb8a0a083f72a43b4cbb420d8505cc0', 'vout': 5, 'satoshis': 100000000, 'scriptPubKey': '76a914d391e62337ed194a1e428f32d14838e5d848180a88ac', 'address': 'qrfere3rxlk3jjs7g28n952g8rjasjqcpgx3axq70t', 'confirmations': 44, 'publicKeys': ['024d27ca79a3ed27a143cb9d1dff01e4e6445294679a700ca404ca449211d08aa7'], 'wallet': '7eaf4d32-c2fd-4262-864a-4c42fc9236f8', 'path': 'm/0/1' }], 'walletM': 1, 'walletN': 1, 'requiredSignatures': 1, 'requiredRejections': 1, 'status': 'accepted', 'txid': '8541ed35ac43e07e362a00ebab9448eefa63840c75ca38edff6785c223503a29', 'broadcastedOn': null, 'inputPaths': ['m/0/1'], 'outputOrder': [1, 0], 'fee': 2430, 'feeLevel': null, 'feePerKb': 10000, 'excludeUnconfirmedUtxos': false, 'addressType': 'P2PKH', 'customData': null, 'proposalSignature': '3045022100e8a1ac6eef882fb3e7311c725093317df99e5ed46f52fdee9064560bb757d1c902200b09f806a17d4c7950097b8714293725ce741c6de25914f81a8ca0ca1107fc4c', 'signingMethod': 'ecdsa', 'proposalSignaturePubKey': null, 'proposalSignaturePubKeySig': null, 'lockUntilBlockHeight': null, 'gasPrice': null, 'from': null, 'nonce': null, 'gasLimit': null, 'data': null, 'tokenAddress': null, 'destinationTag': null, 'invoiceID': null, 'derivationStrategy': 'BIP44', 'creatorName': 'copayer 1', 'raw': '0100000001c05c50d820b4cbb4432af783a0a0b81f50cbf7c890939e713a9f03fb01eb7f4e050000006b483045022100ace0efb22eaf21b77d5e4a31a491ad06fbcfe700ace5abe8453ec0328c714cba02205090a44975d4b65b5e2f4473da038e83875826b369fc79558a741268ed574bb04121024d27ca79a3ed27a143cb9d1dff01e4e6445294679a700ca404ca449211d08aa7ffffffff0282233101000000001976a9149edd2399faccf4e57df08bef78962fa0228741cf88ac00b4c404000000001976a91451224bca38efcaa31d5340917c3f3f713b8b20e488ac00000000', 'isPending': true } ;
+const signedTxp: ITxProposal = { 'actions': [{ 'version': '1.0.0', 'createdOn': 1588099987, 'copayerId': '671fee02a6c1c4de2e2609f9f9a6180dc03acfff6b759fe0b13a616ed4880065', 'type': 'accept', 'signatures': ['3045022100ace0efb22eaf21b77d5e4a31a491ad06fbcfe700ace5abe8453ec0328c714cba02205090a44975d4b65b5e2f4473da038e83875826b369fc79558a741268ed574bb0'], 'xpub': 'xpub6DVmxcjRgZdHNSEcXSiFtweVwMSTc3TMwRJ45nJYvyqvLbK1poPerupqh87rSoz27wvckb1CKnGZoLmLXSZyNGZtVd7neqSvdwJL6fceQpe', 'comment': null }], 'version': 3, 'createdOn': 1588099987, 'id': '7cea0d95-3308-48e7-a4be-3f16d66e1f5a', 'walletId': '7eaf4d32-c2fd-4262-864a-4c42fc9236f8', 'creatorId': '671fee02a6c1c4de2e2609f9f9a6180dc03acfff6b759fe0b13a616ed4880065', 'coin': 'bch', 'chain': 'bch', 'network': 'livenet', 'outputs': [{ 'amount': 80000000, 'toAddress': 'CPrtPWbp8cCftTQu5fzuLG5zPJNDHMMf8X' }], 'amount': 80000000, 'message': 'some message', 'payProUrl': null, 'changeAddress': { 'version': '1.0.0', 'createdOn': 1588099987, 'address': 'CWwtFMy3GMr5qMEtvEdUDjePfShzkJXCnh', 'walletId': '7eaf4d32-c2fd-4262-864a-4c42fc9236f8', 'isChange': true, 'path': 'm/1/0', 'publicKeys': ['02129acdcc600694b3ce55a2d05244186e806174eb0bafde20e5a6395ded647857'], 'coin': 'bch', 'network': 'livenet', 'type': 'P2PKH', 'hasActivity': null, 'beRegistered': null }, 'inputs': [{ 'txid': '4e7feb01fb039f3a719e9390c8f7cb501fb8a0a083f72a43b4cbb420d8505cc0', 'vout': 5, 'satoshis': 100000000, 'scriptPubKey': '76a914d391e62337ed194a1e428f32d14838e5d848180a88ac', 'address': 'qrfere3rxlk3jjs7g28n952g8rjasjqcpgx3axq70t', 'confirmations': 44, 'publicKeys': ['024d27ca79a3ed27a143cb9d1dff01e4e6445294679a700ca404ca449211d08aa7'], 'wallet': '7eaf4d32-c2fd-4262-864a-4c42fc9236f8', 'path': 'm/0/1' }], 'walletM': 1, 'walletN': 1, 'requiredSignatures': 1, 'requiredRejections': 1, 'status': 'accepted', 'txid': '8541ed35ac43e07e362a00ebab9448eefa63840c75ca38edff6785c223503a29', 'broadcastedOn': null, 'inputPaths': ['m/0/1'], 'outputOrder': [1, 0], 'fee': 2430, 'feeLevel': null, 'feePerKb': 10000, 'excludeUnconfirmedUtxos': false, 'addressType': 'P2PKH', 'customData': null, 'proposalSignature': '3045022100e8a1ac6eef882fb3e7311c725093317df99e5ed46f52fdee9064560bb757d1c902200b09f806a17d4c7950097b8714293725ce741c6de25914f81a8ca0ca1107fc4c', 'signingMethod': 'ecdsa', 'proposalSignaturePubKey': null, 'proposalSignaturePubKeySig': null, 'lockUntilBlockHeight': null, 'gasPrice': null, 'from': null, 'nonce': null, 'gasLimit': null, 'data': null, 'tokenAddress': null, 'destinationTag': null, 'invoiceID': null, 'creatorName': 'copayer 1', 'raw': '0100000001c05c50d820b4cbb4432af783a0a0b81f50cbf7c890939e713a9f03fb01eb7f4e050000006b483045022100ace0efb22eaf21b77d5e4a31a491ad06fbcfe700ace5abe8453ec0328c714cba02205090a44975d4b65b5e2f4473da038e83875826b369fc79558a741268ed574bb04121024d27ca79a3ed27a143cb9d1dff01e4e6445294679a700ca404ca449211d08aa7ffffffff0282233101000000001976a9149edd2399faccf4e57df08bef78962fa0228741cf88ac00b4c404000000001976a91451224bca38efcaa31d5340917c3f3f713b8b20e488ac00000000' };

package/test/chain/doge.test.ts

@@ -168,7 +168,7 @@ const aTXP = () => {
     coin: 'doge',
     chain: 'doge',
     network: 'livenet',
-    amount: (1.2550574e14).toString(),
+    amount: 1.2550574e14,
     message: 'some message',
     proposalSignature: '304402207e8ba2f9e88c1e7a76979f7e9df4d1cf43784d196b4b92f7f605386d0562216c022025356aae37397771a5fcb7520e97096fed197598a0e68883f6b30f3ccddd636c',
     changeAddress: {
@@ -240,7 +240,7 @@ const aTXP = () => {
   return txp;
 };
 
-const signedTxp = {
+const signedTxp: ITxProposal = {
   actions: [
     {
       version: '1.0.0',
@@ -261,6 +261,7 @@ const signedTxp = {
   walletId: 'd98853c7-5a4b-48de-9f6c-8fb36aa271f1',
   creatorId: '5a49148ea402f06943b511912f31bc9114153e6055c38642fe789f7b2c7bf9f8',
   coin: 'doge',
+  chain: 'doge',
   network: 'testnet',
   outputs: [
     {
@@ -339,9 +340,6 @@ const signedTxp = {
   multisigTxId: null,
   destinationTag: null,
   invoiceID: null,
-  derivationStrategy: 'BIP44',
   creatorName: 'copayer 1',
-  raw: '0100000001b8a1d4773add3d5ca38652537310e9bd64d812d771e16f62b4a6e33e79f85453000000006b483045022100a9bee101f13eeb8f6bdf1b6421974a17b2aeb0bcf080526df20e93483a67bbca022071ba69e707430136fb65488b1e5413eb54279770b74b7e15fe15aeac16770ceb012102f4526941f57f37b8f1cd4970091ebcd1701980a82d26a781b2e44b384609eb22ffffffff026c81c9f6160900001976a914aeb332ea003a7efb5dab0dcc56d19fed84e26afb88acf4cb5156010000001976a914afbf96bfb28815cad8205c8f2f5a86819136664c88ac00000000',
-  note: null,
-  isPending: false
+  raw: '0100000001b8a1d4773add3d5ca38652537310e9bd64d812d771e16f62b4a6e33e79f85453000000006b483045022100a9bee101f13eeb8f6bdf1b6421974a17b2aeb0bcf080526df20e93483a67bbca022071ba69e707430136fb65488b1e5413eb54279770b74b7e15fe15aeac16770ceb012102f4526941f57f37b8f1cd4970091ebcd1701980a82d26a781b2e44b384609eb22ffffffff026c81c9f6160900001976a914aeb332ea003a7efb5dab0dcc56d19fed84e26afb88acf4cb5156010000001976a914afbf96bfb28815cad8205c8f2f5a86819136664c88ac00000000'
 };

package/test/chain/ltc.test.ts

@@ -168,7 +168,7 @@ const aTXP = () => {
     coin: 'ltc',
     chain: 'ltc',
     network: 'livenet',
-    amount: '30000000',
+    amount: 30000000,
     message: 'some message',
     proposalSignature: '7035022100896aeb8db75fec22fddb5facf791927a996eb3aee23ee6deaa15471ea46047de02204c0c33f42a9d3ff93d62738712a8c8a5ecd21b45393fdd144e7b01b5a186f1f9',
     changeAddress: {
@@ -233,7 +233,7 @@ const aTXP = () => {
   return txp;
 };
 
-const signedTxp = {
+const signedTxp: ITxProposal = {
   actions: [
     {
       version: '1.0.0',
@@ -250,6 +250,7 @@ const signedTxp = {
   ],
   version: 3,
   createdOn: 1626385821,
+  creatorName: 'Ben',
   id: 'b89d4f4b-0c36-4054-8e09-0d3867f1fc89',
   walletId: '10f76944-ac95-494a-ba32-1eba9a581332',
   creatorId: '16f48373387600f00741e74488da2f82409e82105f515e6c7a856368cc95fc78',
@@ -261,7 +262,6 @@ const signedTxp = {
       amount: 10000,
       toAddress: 'mu2QPdDVzsuAJAcMKbhqWqZYfeWcAonGEf',
       message: null,
-      encryptedMessage: null
     }
   ],
   amount: 10000,
@@ -323,6 +323,5 @@ const signedTxp = {
   multisigContractAddress: undefined,
   multisigTxId: undefined,
   destinationTag: undefined,
-  invoiceID: undefined,
-  isPending: false
+  invoiceID: undefined
 };

package/test/chain/xrp.test.ts

@@ -91,7 +91,7 @@ const aTXP = function() {
     excludeUnconfirmedUtxos: true,
     addressType: 'P2PKH',
     customData: null,
-    amount: '1000000',
+    amount: 1000000,
     fee: 10,
     version: 3,
     broadcastedOn: 1763669150,
@@ -108,12 +108,11 @@ const aTXP = function() {
   return txp;
 };
 
-const signedTxp = {
+const signedTxp: ITxProposal = {
   creatorName: '{"iv":"aN+YwTvJRK73M7FfCFzIzA==","v":1,"iter":1,"ks":128,"ts":64,"mode":"ccm","adata":"","cipher":"aes","ct":"TqFvhWq2/F6ykA=="}',
   createdOn: 1763669147,
   id: 'a911faec-975e-4c53-a852-8ebf579ff1f6',
   txid: 'B6BB3DE3F87395619D108DC35E2CC88440C998D854A12E2E312BC5A8DC11F121',
-  txids: '',
   walletId: '093352fc-a597-4837-94ee-8b9e3f1a5039',
   creatorId: 'c10c8e84ac963c539d86451aea8ce6f92dfaeeebbef1f5dd212d324301ea278f',
   coin: 'xrp',
@@ -122,8 +121,6 @@ const signedTxp = {
   message: '',
   payProUrl: '',
   from: 'rPsaG3gUYCPdoN2X1EgynYfYbwKeSbdTCN',
-  changeAddress: '',
-  escrowAddress: '',
   inputs: [],
   outputs: [{
     amount: 1000000,
@@ -165,42 +162,10 @@ const signedTxp = {
   proposalSignaturePubKey: '',
   proposalSignaturePubKeySig: '',
   signingMethod: 'ecdsa',
-  lowFees: '',
   raw: [
     '12000022800000002400BF209C6140000000000F424068400000000000000A7321024DDE2306BEACF6D450495F40E69400824C99235FECEB742952FBA550C91F9C597446304402206188D1A90328D034F7D01E0ECEB6629AAEF47AF09EF33C4BF91871076AE60C81022056EE1DB7B90B7A701087FA8135E434616C5824F1CCC3FC87F741771E22BE9A138114F1B7FDA196A474A7A5CE0588E03B1BE41F8605978314D51E9EDD6905A6D2FDB4ADD86744C56323439285'
   ],
   nonce: 12525724,
-  gasPrice: '',
-  maxGasFee: '',
-  priorityGasFee: '',
-  txType: '',
-  gasLimit: '',
-  data: '',
-  tokenAddress: '',
-  multisigContractAddress: '',
-  multisigTxId: '',
-  destinationTag: '',
-  invoiceID: '',
-  lockUntilBlockHeight: '',
-  instantAcceptanceEscrow: '',
-  isTokenSwap: '',
-  multiSendContractAddress: '',
-  enableRBF: '',
-  replaceTxByFee: '',
-  multiTx: '',
-  space: '',
-  nonceAddress: '',
-  blockHash: '',
-  blockHeight: '',
-  category: '',
-  priorityFee: '',
-  computeUnits: '',
-  memo: '',
-  fromAta: '',
-  decimals: '',
-  refreshOnPublish: '',
-  prePublishRaw: '',
-  note: '',
-  derivationStrategy: 'BIP44',
-  isPending: false
+  destinationTag: null,
+  invoiceID: ''
 };