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

package/package.json

@@ -2,7 +2,7 @@
   "name": "@bitpay-labs/bitcore-wallet-service",
   "description": "A service for Mutisig HD Bitcoin Wallets",
   "author": "BitPay Inc",
-  "version": "11.9.0",
+  "version": "11.10.1",
   "license": "MIT",
   "main": "ts_build/src/index.js",
   "types": "./ts_build/src/index.d.ts",
@@ -44,8 +44,8 @@
   },
   "dependencies": {
     "@bitpay-labs/bitcore-logging": "^11.8.1",
-    "@bitpay-labs/bitcore-tss": "^11.9.0",
-    "@bitpay-labs/crypto-wallet-core": "^11.9.0",
+    "@bitpay-labs/bitcore-tss": "^11.10.0",
+    "@bitpay-labs/crypto-wallet-core": "^11.10.0",
     "@sendgrid/mail": "6.5.4",
     "abi-decoder": "2.4.0",
     "async": "0.9.2",
@@ -126,5 +126,5 @@
       "email": "kjoseph@bitpay.com"
     }
   ],
-  "gitHead": "3491bf1216d3c6b103c591564726333d55ad8c6d"
+  "gitHead": "efb35cf0d7a9f4f5e773f63ade0168321bbea84f"
 }

package/src/externalservices/moonpay.ts

@@ -456,7 +456,7 @@ export class MoonpayService {
 
       const headers = {
         'Content-Type': 'application/json',
-        Authorization: 'Api-Key ' + SECRET_KEY,
+        'X-Api-Key': SECRET_KEY,
       };
 
       const body: any = {
@@ -466,7 +466,7 @@ export class MoonpayService {
       if (req.body.email) body.email = req.body.email;
       if (req.body.phoneNumber) body.phoneNumber = req.body.phoneNumber;
 
-      const URL = API + '/platform/v1/session';
+      const URL = API + '/platform/v1/sessions';
 
       this.request.post(
         URL,
@@ -498,7 +498,7 @@ export class MoonpayService {
 
       const headers = {
         Accept: 'application/json',
-        Authorization: 'Api-Key ' + SECRET_KEY
+        'X-Api-Key': SECRET_KEY
       };
 
       const URL = API + '/platform/v1/sessions?externalCustomerId=' + encodeURIComponent(req.body.externalCustomerId);

package/src/lib/chain/eth/index.ts

@@ -3,13 +3,14 @@ import _ from 'lodash';
 import { IWallet } from 'src/lib/model';
 import { IAddress } from 'src/lib/model/address';
 import { WalletService } from 'src/lib/server';
-import { IChain } from '../../../types/chain';
 import { Common } from '../../common';
 import { ClientError } from '../../errors/clienterror';
 import { Errors } from '../../errors/errordefinitions';
 import logger from '../../logger';
 import { ERC20Abi } from './abi-erc20';
 import { InvoiceAbi } from './abi-invoice';
+import type { IChain } from '../../../types/chain';
+import type { TxProposal } from '../../model/txproposal';
 
 const {
   Constants,
@@ -98,24 +99,24 @@ export class EthChain implements IChain {
       // getPendingTxs returns all txps when given a native currency
       server.getPendingTxs(opts, (err, txps) => {
         if (err) return cb(err);
-        let fees = 0;
-        let amounts = 0;
+        let fees = 0n;
+        let amounts = 0n;
 
         txps.filter(txp => {
           // Add gas used for tokens when getting native balance
           if (!opts.tokenAddress) {
-            fees += txp.fee || 0;
+            fees += txp.fee ? BigInt(txp.fee) : 0n;
           }
           // Filter tokens when getting native balance
           if (txp.tokenAddress && !opts.tokenAddress) {
             return false;
           }
-          amounts += txp.amount;
+          amounts += txp.amount ? BigInt(txp.amount) : 0n;
           return true;
         });
 
         // TODO support big int
-        const lockedSum = (amounts + fees) || 0;  // previously set to 0 if opts.multisigContractAddress
+        const lockedSum = Number(amounts + fees) || 0;  // previously set to 0 if opts.multisigContractAddress
         const convertedBalance = this.convertBitcoreBalance(balance, lockedSum);
         server.storage.fetchAddresses(server.walletId, (err, addresses: IAddress[]) => {
           if (err) return cb(err);
@@ -286,7 +287,7 @@ export class EthChain implements IChain {
     });
   }
 
-  getBitcoreTx(txp, opts = { signed: true }) {
+  getBitcoreTx(txp: TxProposal, opts = { signed: true }) {
     const {
       data,
       outputs,

package/src/lib/chain/index.ts

@@ -94,7 +94,7 @@ class ChainProxy {
     return this.get(wallet.chain).getFee(server, wallet, opts);
   }
 
-  getBitcoreTx(txp: TxProposal, opts = { signed: true }) {
+  getBitcoreTx(txp: TxProposal<any>, opts = { signed: true }) {
     return this.get(txp.chain).getBitcoreTx(txp, { signed: opts.signed });
   }
 

package/src/lib/chain/sol/index.ts

@@ -56,18 +56,18 @@ export class SolChain implements IChain {
           const { fees, amounts } = txps.reduce((acc, txp) => {
             // Add gas used for tokens when getting native balance
             if (!opts.tokenAddress) {
-              acc.fees += txp.fee || 0;
+              acc.fees += txp.fee ? BigInt(txp.fee) : 0n;
             }
             
             // Filter tokens when getting native balance
             if (!(txp.tokenAddress && !opts.tokenAddress)) {
-              acc.amounts += txp.amount;
+              acc.amounts += txp.amount ? BigInt(txp.amount) : 0n;
             }
             
             return acc;
-          }, { fees: 0, amounts: 0 });
+          }, { fees: 0n, amounts: 0n });
 
-          const lockedSum = (amounts + fees) || 0;  // previously set to 0 if opts.multisigContractAddress
+          const lockedSum = Number(amounts + fees) || 0;  // previously set to 0 if opts.multisigContractAddress
           const reserveAmount = opts.tokenAddress ? 0 : reserve;
           const convertedBalance = this.convertBitcoreBalance(balance, lockedSum, reserveAmount);
           server.storage.fetchAddresses(server.walletId, (err, addresses: IAddress[]) => {

package/src/lib/chain/xrp/index.ts

@@ -65,9 +65,9 @@ export class XrpChain implements IChain {
         server.getPendingTxs(opts, (err, txps) => {
           if (err) return cb(err);
           const lockedSum = txps.reduce((sum, txp) => {
-            return sum + txp.amount + (txp.fee || 0);
-          }, 0) || 0;
-          const convertedBalance = this.convertBitcoreBalance(balance, lockedSum, reserve);
+            return sum + BigInt(txp.amount || 0) + BigInt(txp.fee || 0);
+          }, 0n) || 0n;
+          const convertedBalance = this.convertBitcoreBalance(balance, Number(lockedSum), reserve);
           server.storage.fetchAddresses(server.walletId, (err, addresses: IAddress[]) => {
             if (err) return cb(err);
             if (addresses.length > 0) {

package/src/lib/errors/errordefinitions.ts

@@ -61,6 +61,7 @@ interface Errors<T> {
   WALLET_NOT_FOUND: T;
   WALLET_NEED_SCAN: T;
   WRONG_SIGNING_METHOD: T;
+  INVALID_NUMBER_FORMAT: T;
   TSS_SESSION_NOT_FOUND: T;
   TSS_INVALID_PASSWORD: T;
   TSS_ROUND_ALREADY_DONE: T;
@@ -132,6 +133,7 @@ const errors: Errors<string> = {
   WALLET_NOT_FOUND: 'Wallet not found',
   WALLET_NEED_SCAN: 'Wallet needs addresses scan',
   WRONG_SIGNING_METHOD: 'Wrong signed method for coin/network',
+  INVALID_NUMBER_FORMAT: 'Invalid number format. Supported formats are: number, string, hex',
   TSS_SESSION_NOT_FOUND: 'Session not found',
   TSS_INVALID_PASSWORD: 'Invalid password',
   TSS_ROUND_ALREADY_DONE: 'Your message is for a round that has already finished',

package/src/lib/expressapp.ts

@@ -49,7 +49,8 @@ export class ExpressApp {
       getServerWithAuth,
       getServerWithMultiAuth,
       logDeprecated,
-      setPublicCache
+      setPublicCache,
+      checkNumberFormat
     } = createRouteHelpers(returnError);
 
     registerWalletRoutes(router, {
@@ -58,12 +59,14 @@ export class ExpressApp {
       getServerWithAuth,
       getServerWithMultiAuth,
       logDeprecated,
-      returnError
+      returnError,
+      checkNumberFormat
     });
 
     registerTransactionRoutes(router, {
       getServerWithAuth,
-      returnError
+      returnError,
+      checkNumberFormat
     });
 
     registerAdvertisementRoutes(router, {

package/src/lib/model/txnote.ts

@@ -16,6 +16,9 @@ export class TxNote {
   editedOn: number;
   editedBy: string;
 
+  // Non-persisted fields - populated when fetching from storage
+  editedByName?: string;
+
   static create(opts) {
     opts = opts || {};
 

package/src/lib/model/txproposal.ts

@@ -1,11 +1,13 @@
+import { Utils as CWCUtils } from '@bitpay-labs/crypto-wallet-core';
 import _ from 'lodash';
 import { singleton } from 'preconditions';
 import Uuid from 'uuid';
 import { ChainService } from '../chain/index';
 import { Common } from '../common';
 import logger from '../logger';
-import { IAddress } from './address';
-import { TxProposalLegacy } from './txproposal_legacy';
+import { type IAddress } from './address';
+import { type ITxNote, TxNote } from './txnote';
+import { type ITxProposalLegacy, TxProposalLegacy } from './txproposal_legacy';
 import { TxProposalAction } from './txproposalaction';
 
 const $ = singleton();
@@ -13,9 +15,9 @@ const { Constants, Defaults, Utils } = Common;
 
 type TxProposalStatus = 'temporary' | 'pending' | 'accepted' | 'rejected' | 'broadcasted';
 
-export interface ITxProposal {
+export interface ITxProposal<NumberType = number> {
+  version: number;
   type?: string;
-  creatorName: string;
   createdOn: number;
   txid: string;
   txids?: Array<string>;
@@ -28,19 +30,20 @@ export interface ITxProposal {
   message: string;
   payProUrl?: string;
   from: string;
-  changeAddress?: IAddress;
-  escrowAddress?: IAddress;
+  sendMax?: boolean;
+  changeAddress?: Partial<IAddress>;
+  escrowAddress?: Partial<IAddress>;
   inputs: any[];
   outputs: Array<{
-    amount: number;
-    address: string;
+    amount: NumberType;
+    address?: string;
     toAddress?: string;
     sourceAddress?: string;
     message?: string;
     data?: string;
-    gasLimit?: number;
+    gasLimit?: NumberType;
     script?: string;
-    satoshis?: number;
+    satoshis?: NumberType;
     tag?: number;
   }>;
   outputOrder: number[];
@@ -51,13 +54,12 @@ export interface ITxProposal {
   status: TxProposalStatus;
   actions: any[];
   feeLevel: string;
-  feePerKb: number;
+  feePerKb: NumberType;
   excludeUnconfirmedUtxos: boolean;
   addressType: string;
   customData: any;
-  amount: string;
-  fee: number;
-  version: number;
+  amount: NumberType;
+  fee: NumberType;
   broadcastedOn: number;
   inputPaths: string | any[];
   proposalSignature: string;
@@ -65,41 +67,51 @@ export interface ITxProposal {
   proposalSignaturePubKeySig: string;
   signingMethod: string;
   lowFees?: boolean;
-  nonce?: number | string;
+  raw?: Array<string> | string;
+  nonce?: NumberType | string;
   deferNonce?: boolean;
-  gasPrice?: number;
-  maxGasFee?: number;
-  priorityGasFee?: number;
+  gasPrice?: NumberType;
+  maxGasFee?: NumberType;
+  priorityGasFee?: NumberType;
   txType?: number | string;
-  gasLimit?: number; // Backward compatibility for BWC <= 8.9.0
+  gasLimit?: NumberType; // Backward compatibility for BWC <= 8.9.0
   data?: string; // Backward compatibility for BWC <= 8.9.0
   tokenAddress?: string;
   multisigContractAddress?: string;
+  multisigTxId?: string;
   destinationTag?: string;
   invoiceID?: string;
-  lockUntilBlockHeight?: number;
-  instantAcceptanceEscrow?: number;
+  lockUntilBlockHeight?: NumberType;
+  instantAcceptanceEscrow?: NumberType;
   isTokenSwap?: boolean;
+  multiSendContractAddress?: string;
   enableRBF?: boolean;
   replaceTxByFee?: boolean;
   multiTx?: boolean; // proposal contains multiple transactions
-  space?: number;
+  space?: NumberType;
   nonceAddress?: string;
   blockHash?: string;
-  blockHeight?: number;
+  blockHeight?: NumberType;
   category?: string;
-  priorityFee?: number;
-  computeUnits?: number;
+  priorityFee?: NumberType;
+  computeUnits?: NumberType;
   memo?: string;
   fromAta?: string;
   decimals?: number;
   refreshOnPublish?: boolean;
   prePublishRaw?: string;
+  
+  // Non-persistent fields - populated on fetch
+  creatorName: string;
+  derivationStrategy?: string;
+  note?: ITxNote;
 }
 
-export class TxProposal implements ITxProposal {
+export type NumberFormat = 'hex' | 'number' | 'string' | 'bigint';
+
+export class TxProposal<NumberType = number> implements ITxProposal<NumberType> {
+  version: number;
   type?: string;
-  creatorName: string;
   createdOn: number;
   id: string;
   txid: string;
@@ -112,19 +124,20 @@ export class TxProposal implements ITxProposal {
   message: string;
   payProUrl?: string;
   from: string;
-  changeAddress?: IAddress;
-  escrowAddress?: IAddress;
+  sendMax?: boolean;
+  changeAddress?: Partial<IAddress>;
+  escrowAddress?: Partial<IAddress>;
   inputs: any[];
   outputs: Array<{
-    amount: number;
-    address: string;
+    amount: NumberType;
+    address?: string;
     toAddress?: string;
     sourceAddress?: string;
     message?: string;
     data?: string;
-    gasLimit?: number;
+    gasLimit?: NumberType;
     script?: string;
-    satoshis?: number;
+    satoshis?: NumberType;
     tag?: number;
   }>;
   outputOrder: number[];
@@ -135,13 +148,12 @@ export class TxProposal implements ITxProposal {
   status: TxProposalStatus;
   actions: any[] = [];
   feeLevel: string;
-  feePerKb: number;
+  feePerKb: NumberType;
   excludeUnconfirmedUtxos: boolean;
   addressType: string;
   customData: any;
-  amount: string;
-  fee: number;
-  version: number;
+  amount: NumberType;
+  fee: NumberType;
   broadcastedOn: number;
   inputPaths: string | any[];
   proposalSignature: string;
@@ -150,38 +162,43 @@ export class TxProposal implements ITxProposal {
   signingMethod: string;
   lowFees?: boolean;
   raw?: Array<string> | string;
-  nonce?: number | string;
+  nonce?: NumberType;
   deferNonce?: boolean;
-  gasPrice?: number;
-  maxGasFee?: number;
-  priorityGasFee?: number;
+  gasPrice?: NumberType;
+  maxGasFee?: NumberType;
+  priorityGasFee?: NumberType;
   txType?: number | string;
-  gasLimit?: number; // Backward compatibility for BWC <= 8.9.0
+  gasLimit?: NumberType; // Backward compatibility for BWC <= 8.9.0
   data?: string; // Backward compatibility for BWC <= 8.9.0
   tokenAddress?: string;
   multisigContractAddress?: string;
   multisigTxId?: string;
   destinationTag?: string;
   invoiceID?: string;
-  lockUntilBlockHeight?: number;
-  instantAcceptanceEscrow?: number;
+  lockUntilBlockHeight?: NumberType;
+  instantAcceptanceEscrow?: NumberType;
   isTokenSwap?: boolean;
   multiSendContractAddress?: string;
   enableRBF?: boolean;
   replaceTxByFee?: boolean;
   multiTx?: boolean;
-  space?: number;
+  space?: NumberType;
   nonceAddress?: string;
   blockHash?: string;
-  blockHeight?: number;
+  blockHeight?: NumberType;
   category?: string;
-  priorityFee?: number;
-  computeUnits?: number;
+  priorityFee?: NumberType;
+  computeUnits?: NumberType;
   memo?: string;
   fromAta?: string;
   decimals?: number;
   refreshOnPublish?: boolean;
   prePublishRaw?: string;
+  
+  // Non-persistent fields - populated on fetch
+  creatorName: string;
+  derivationStrategy?: string;
+  note?: TxNote;
 
   static create(opts) {
     opts = opts || {};
@@ -211,6 +228,7 @@ export class TxProposal implements ITxProposal {
     x.signingMethod = opts.signingMethod;
     x.message = opts.message;
     x.payProUrl = opts.payProUrl;
+    x.sendMax = opts.sendMax;
     x.changeAddress = opts.changeAddress;
     x.escrowAddress = opts.escrowAddress;
     x.instantAcceptanceEscrow = opts.instantAcceptanceEscrow;
@@ -305,6 +323,8 @@ export class TxProposal implements ITxProposal {
     return x;
   }
 
+  static fromObj(obj: Partial<ITxProposal>): TxProposal;
+  static fromObj(obj: Partial<ITxProposalLegacy>): TxProposalLegacy;
   static fromObj(obj) {
     if (!(obj.version >= 3)) {
       return TxProposalLegacy.fromObj(obj);
@@ -317,6 +337,7 @@ export class TxProposal implements ITxProposal {
     x.id = obj.id;
     x.walletId = obj.walletId;
     x.creatorId = obj.creatorId;
+    x.creatorName = obj.creatorName;
     x.coin = obj.coin || Defaults.COIN;
     x.chain = obj.chain?.toLowerCase() || Utils.getChain(x.coin); // getChain -> backwards compatibility
     x.network = obj.network;
@@ -324,6 +345,8 @@ export class TxProposal implements ITxProposal {
     x.amount = obj.amount;
     x.message = obj.message;
     x.payProUrl = obj.payProUrl;
+    x.derivationStrategy = obj.derivationStrategy;
+    x.sendMax = obj.sendMax;
     x.changeAddress = obj.changeAddress;
     x.escrowAddress = obj.escrowAddress;
     x.instantAcceptanceEscrow = obj.instantAcceptanceEscrow;
@@ -337,9 +360,7 @@ export class TxProposal implements ITxProposal {
     x.txids = obj.txids;
     x.broadcastedOn = obj.broadcastedOn;
     x.inputPaths = obj.inputPaths;
-    x.actions = _.map(obj.actions, action => {
-      return TxProposalAction.fromObj(action);
-    });
+    x.actions = (obj.actions || []).map(action => TxProposalAction.fromObj(action));
     x.outputOrder = obj.outputOrder;
     x.fee = obj.fee;
     x.feeLevel = obj.feeLevel;
@@ -410,7 +431,7 @@ export class TxProposal implements ITxProposal {
 
   setInputs(inputs) {
     this.inputs = inputs || [];
-    this.inputPaths = _.map(inputs, 'path') || [];
+    this.inputPaths = this.inputs.map(input => input.path);
   }
 
   _updateStatus() {
@@ -440,8 +461,10 @@ export class TxProposal implements ITxProposal {
     return signatures;
   }
 
-  getRawTx() {
-    const t = ChainService.getBitcoreTx(this);
+  getRawTx(numberFormat?: NumberFormat) {
+    // Casting numberFormat to 'number' is to sidestep TS errors, but is not necessarily true.
+    const txp = numberFormat ? TxProposal.formatNumbers(this, numberFormat as 'number') : this as TxProposal<number>;
+    const t = ChainService.getBitcoreTx(txp);
     return t.uncheckedSerialize();
   }
 
@@ -451,7 +474,7 @@ export class TxProposal implements ITxProposal {
    * @return {Number} total amount of all outputs excluding change output
    */
   getTotalAmount() {
-    return Number((this.outputs || []).reduce((total, o) => total += BigInt(o.amount), 0n));
+    return Number(((this as TxProposal<number>).outputs || []).reduce((total, o) => total += BigInt(o.amount), 0n));
   }
 
   /**
@@ -460,7 +483,7 @@ export class TxProposal implements ITxProposal {
    * @return {String[]} copayerIds that performed actions in this proposal (accept / reject)
    */
   getActors() {
-    return _.map(this.actions, 'copayerId');
+    return (this.actions || []).map(a => a.copayerId);
   }
 
   /**
@@ -469,12 +492,9 @@ export class TxProposal implements ITxProposal {
    * @return {String[]} copayerIds that approved the tx proposal (accept)
    */
   getApprovers() {
-    return _.map(
-      _.filter(this.actions, a => {
-        return a.type == 'accept';
-      }),
-      'copayerId'
-    );
+    return (this.actions || [])
+      .filter(a => a.type == 'accept')
+      .map(a => a.copayerId);
   }
 
   /**
@@ -484,9 +504,7 @@ export class TxProposal implements ITxProposal {
    * @return {Object} type / createdOn
    */
   getActionBy(copayerId) {
-    return _.find(this.actions, {
-      copayerId
-    });
+    return (this.actions || []).find(a => a.copayerId == copayerId);
   }
 
   addAction(copayerId, type, comment, signatures?, xpub?) {
@@ -501,10 +519,11 @@ export class TxProposal implements ITxProposal {
     this._updateStatus();
   }
 
-  sign(copayerId, signatures, xpub) {
+  sign(copayerId, signatures, xpub, numberFormat?: NumberFormat) {
     try {
-      // Tests signatures are OK
-      const tx = ChainService.getBitcoreTx(this);
+      // numberFormat as 'number' is to sidestep TS errors, but is not necessarily true.
+      const txp = numberFormat ? TxProposal.formatNumbers(this, numberFormat as 'number') : this as TxProposal<number>;
+      const tx = ChainService.getBitcoreTx(txp);
       ChainService.addSignaturesToBitcoreTx(
         this.chain,
         tx,
@@ -570,4 +589,70 @@ export class TxProposal implements ITxProposal {
     this.status = 'broadcasted';
     this.broadcastedOn = Math.floor(Date.now() / 1000);
   }
+
+  
+  /**
+   * Replaces tx-building number values with the specified number format.
+   * This is to ensure consistency across BWC and BWS when handling large numbers, especially for chains like ETH and SOL.
+   * @param {TxProposal|ITxProposal} txp Transaction Proposal
+   * @param {'number'|'string'|'bigint'|'hex'} numberFormat The desired number format for the tx-building values. Can be 'number', 'string', 'bigint', or 'hex'.
+   */
+  static formatNumbers<T>(txp: TxProposal<T>, numberFormat: 'string'): TxProposal<string>;
+  static formatNumbers<T>(txp: TxProposal<T>, numberFormat: 'hex'): TxProposal<string>;
+  static formatNumbers<T>(txp: TxProposal<T>, numberFormat: 'bigint'): TxProposal<bigint>;
+  static formatNumbers<T>(txp: TxProposal<T>, numberFormat: 'number'): TxProposal<number>;
+  static formatNumbers<T>(txp: ITxProposal<T>, numberFormat: 'string'): ITxProposal<string>;
+  static formatNumbers<T>(txp: ITxProposal<T>, numberFormat: 'hex'): ITxProposal<string>;
+  static formatNumbers<T>(txp: ITxProposal<T>, numberFormat: 'bigint'): ITxProposal<bigint>;
+  static formatNumbers<T>(txp: ITxProposal<T>, numberFormat: 'number'): ITxProposal<number>;
+  static formatNumbers<T>(txp: TxProposal<T> | ITxProposal<T>, numberFormat: NumberFormat = 'number') {
+    let convertFn;
+    switch (numberFormat) {
+      case 'number':
+        convertFn = parseInt;
+        break;
+      case 'string':
+        convertFn = (n) => typeof n === 'string' && n.startsWith('0x') ? BigInt(n).toString() : n.toString();
+        break;
+      case 'hex':
+        convertFn = (n) => CWCUtils.toHex(n);
+        break;
+      case 'bigint':
+        convertFn = (n) => BigInt(n);
+        break;
+      default:
+        logger.warn(`Invalid numberFormat: ${numberFormat}, no conversion will be applied to tx proposal ${txp.id}`);
+        return txp;
+    }
+
+    const primitiveTypes = new Set(['number', 'string', 'bigint']);
+    const convert = (key, value) => {
+      if ((numberFormat === 'hex' || typeof value !== numberFormat) && primitiveTypes.has(typeof value)) {
+        try {
+          value = convertFn(value);
+        } catch (e) {
+          logger.warn(`Failed to convert ${txp.id} > ${key} with value ${value} to ${numberFormat}: ${e.message}`);
+        }
+      }
+      return value;
+    };
+
+    const _txp = txp instanceof TxProposal ? TxProposal.fromObj(txp.toObject()) : TxProposal.fromObj(txp as ITxProposal<number>).toObject();
+
+    const topKeys = ['amount', 'feePerKb', 'fee', 'nonce', 'gasPrice', 'maxGasFee', 'priorityGasFee', 'gasLimit', 'lockUntilBlockHeight', 'instantAcceptanceEscrow', 'space', 'blockHeight', 'computeUnits', 'decimals'];
+    for (const key of topKeys) {
+      const value = _txp[key];
+      _txp[key] = convert(key, value);
+    }
+
+    const outputKeys = ['amount', 'gasLimit', 'satoshis'];
+    for (let i = 0; i < _txp.outputs.length; i++) {
+      for (const key of outputKeys) {
+        const value = _txp.outputs[i][key];
+        _txp.outputs[i][key] = convert(`output.${i}.${key}`, value);
+      }
+    }
+
+    return _txp;
+  }
 }

package/src/lib/model/txproposal_legacy.ts

@@ -15,7 +15,7 @@ function throwUnsupportedError() {
   throw new Error(msg);
 }
 
-export interface ITxProposal {
+export interface ITxProposalLegacy {
   version: string;
   type: string;
   createdOn: number;
@@ -35,7 +35,7 @@ export interface ITxProposal {
   walletN: number;
   status: string;
   txid: string;
-  broadcastedOn: string;
+  broadcastedOn: number;
   inputPaths: string;
   actions: any[];
   outputOrder: number;
@@ -49,8 +49,9 @@ export interface ITxProposal {
   addressType: string;
   derivationStrategy: string;
   customData: any;
-}
-export class TxProposalLegacy {
+};
+
+export class TxProposalLegacy implements ITxProposalLegacy {
   version: string;
   type: string;
   createdOn: number;