Merge pull request #786 from hubiinetwork/feature/1.2.6

1.2.6

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hubii-core",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "author": {
     "name": "hubii",
     "email": "info@hubii.com",

src/components/WalletItemCard/index.js

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import { injectIntl } from 'react-intl';
 import CopyToClipboard from 'react-copy-to-clipboard';
 
-import { trimDecimals, isHardwareWallet, isAddressMatch } from 'utils/wallet';
+import { isHardwareWallet } from 'utils/wallet';
 import { formatFiat } from 'utils/numberFormats';
 import WalletStatusIndicator from 'components/WalletStatusIndicator';
 import DeletionModal from 'components/DeletionModal';
@@ -166,7 +166,7 @@ export class WalletItemCard extends React.PureComponent {
         <AssetWrapper key={asset.currency}>
           <AssetAmountBubble
             name={asset.symbol}
-            amount={trimDecimals(asset.balance, asset.currency, this.props.priceInfo.find((c) => isAddressMatch(c.currency, asset.currency)))}
+            amount={asset.balance.toString()}
           />
         </AssetWrapper>
       ));
@@ -185,7 +185,7 @@ export class WalletItemCard extends React.PureComponent {
           <AssetWrapper key={asset.currency}>
             <AssetAmountBubble
               name={asset.symbol}
-              amount={trimDecimals(asset.balance, asset.currency, this.props.priceInfo.find((c) => isAddressMatch(c.currency, asset.currency)))}
+              amount={asset.balance.toString()}
             />
           </AssetWrapper>
         ));
@@ -378,7 +378,6 @@ WalletItemCard.propTypes = {
   isDecrypted: PropTypes.bool.isRequired,
   mnemonic: PropTypes.string,
   privateKey: PropTypes.string,
-  priceInfo: PropTypes.arrayOf(PropTypes.object),
   intl: PropTypes.object,
 };
 

src/containers/NahmiiHoc/saga.js

@@ -64,6 +64,7 @@ import {
 
 function waitForTransaction(provider, ...args) { return provider.waitForTransaction(...args); }
 function getTransactionReceipt(provider, ...args) { return provider.getTransactionReceipt(...args); }
+function getTransactionCount(provider, ...args) { return provider.getTransactionCount(...args); }
 
 export function* deposit({ address, symbol, amount, options }) {
   try {
@@ -827,6 +828,14 @@ export function* reloadSettlementStates({ address, currency }) {
 
 export function* wrapProcessTxForNewSettlements(nahmiiProvider, tx, address, currency) {
   try {
+    const txCount = yield call(getTransactionCount, nahmiiProvider, address);
+    if (tx.nonce < txCount) {
+      const txReceipt = yield call(getTransactionReceipt, nahmiiProvider, tx.hash);
+      if (!txReceipt) {
+        yield put(actions.loadTxReceiptForPaymentChallengeError(address, currency, { transactionHash: tx.hash }));
+        throw new Error(getIntl().formatMessage({ id: 'settlement_tx_override' }));
+      }
+    }
     yield processTx('start-challenge', nahmiiProvider, tx, address, currency);
   } catch (error) {
     const errorMessage = logErrorMsg(error);

src/containers/NahmiiHoc/tests/saga.test.js

@@ -64,7 +64,7 @@ describe('nahmiiHocSaga', () => {
       .put(actions.loadBalancesError(address))
       .run({ silenceTimeout: true }));
   });
-  describe.only('#listenReceiptEvent()', () => {
+  describe('#listenReceiptEvent()', () => {
     const currency = '0x0000000000000000000000000000000000000000';
     const receipt = new nahmii.Receipt(nahmii.Payment.from({
       amount: '1',
@@ -538,7 +538,7 @@ describe('nahmiiHocSaga', () => {
     const options = { gasLimit: 1, gasPrice: 1 };
     const currency = '0x0000000000000000000000000000000000000001';
     const stageAmount = new BigNumber(10000000000000000000000);
-    const fakeTxs = [{ chainId: 3, hash: 'hash1' }, { chainId: 3, hash: 'hash2' }];
+    const fakeTxs = [{ chainId: 3, hash: 'hash1', nonce: 1 }, { chainId: 3, hash: 'hash2', nonce: 2 }];
     const fakeTxReceipts = [{ transactionHash: 'hash1', status: 1 }, { transactionHash: 'hash2', status: 1 }];
 
     describe('load settlement states', () => {
@@ -1328,6 +1328,9 @@ describe('nahmiiHocSaga', () => {
           )
           .provide({
             call(effect, next) {
+              if (effect.fn.name === 'getTransactionCount') {
+                return 0;
+              }
               if (effect.fn.name === 'waitForTransaction') {
                 return new Promise((resolve) => {
                   setTimeout(() => {
@@ -1358,6 +1361,9 @@ describe('nahmiiHocSaga', () => {
             )
             .provide({
               call(effect, next) {
+                if (effect.fn.name === 'getTransactionCount') {
+                  return 0;
+                }
                 if (effect.fn.name === 'waitForTransaction') {
                   return new Promise((resolve) => {
                     setTimeout(() => {
@@ -1391,6 +1397,9 @@ describe('nahmiiHocSaga', () => {
             )
             .provide({
               call(effect, next) {
+                if (effect.fn.name === 'getTransactionCount') {
+                  return 0;
+                }
                 if (effect.fn.name === 'waitForTransaction') {
                   return { transactionHash: fakeTxsWithTimestamp[0].hash };
                 }
@@ -1411,6 +1420,32 @@ describe('nahmiiHocSaga', () => {
               expect(tx).toEqual(undefined);
             });
         });
+        it('should remove pending tx from store if pending tx has been overridden', () => expectSaga(processPendingSettlementTransactions)
+          .withReducer(
+            withReducer,
+            storeMock.setIn(
+              ['nahmiiHoc', 'newSettlementPendingTxs', signerMock.address, currency, fakeTxsWithTimestamp[0].hash], fromJS(fakeTxsWithTimestamp[0]))
+          )
+          .provide({
+            call(effect, next) {
+              if (effect.fn.name === 'getTransactionCount') {
+                return 2;
+              }
+              if (effect.fn.name === 'getTransactionReceipt') {
+                return null;
+              }
+              return next();
+            },
+          })
+          .put(actions.loadTxReceiptForPaymentChallengeError(signerMock.address, currency, { transactionHash: fakeTxsWithTimestamp[0].hash }))
+          .put(actions.startChallengeError(signerMock.address, currency))
+          .run({ silenceTimeout: true })
+          .then((result) => {
+            const status = result.storeState.getIn(['nahmiiHoc', 'ongoingChallenges', signerMock.address, currency, 'status']);
+            const tx = result.storeState.getIn(['nahmiiHoc', 'newSettlementPendingTxs', signerMock.address, currency, fakeTxsWithTimestamp[0].hash]);
+            expect(status).toEqual('failed');
+            expect(tx).toEqual(undefined);
+          }));
         it('should not remove pending tx from store when the error is not caused by mining failure', () => expectSaga(processPendingSettlementTransactions)
           .withReducer(
             withReducer,
@@ -1419,6 +1454,9 @@ describe('nahmiiHocSaga', () => {
           )
           .provide({
             call(effect, next) {
+              if (effect.fn.name === 'getTransactionCount') {
+                return 0;
+              }
               if (effect.fn.name === 'waitForTransaction') {
                 throw new Error();
               }

src/translations/en.json

@@ -300,6 +300,7 @@
     "challenge_period": "Challenge period",
     "settlement_qualified": "Settlement qualified",
     "settlements_disabled": "Settlements are currently disabled",
+    "settlement_tx_override": "The settlement transaction has been overridden (canceled).",
     "withdrawable": "Withdrawable",
     "synchronising_settlement_status": "Synchronising settlement status...",
     "i_agree": "I agree with the ",

src/translations/zh.json

@@ -30,7 +30,7 @@
     "add_contact_tip": "请在在右上方点击“+ 创建联系人”",
     "delete_wallet": "删除钱包",
     "backup_wallet": "备份/导出钱包",
-    "edit_wallet": "Edit Wallet",
+    "edit_wallet": "编辑钱包",
     "wallet_name_max25_error": "钱包名称不能超过 25 字",
     "wallet_name_updated": "已更新钱包名称",
     "update_wallet_name_error": "无法编辑钱包: {message}",
@@ -300,6 +300,7 @@
     "challenge_period": "结算验证中",
     "settlement_qualified": "结算验证成功",
     "settlements_disabled": "当前结算功能被临时禁止",
+    "settlement_tx_override": "结算事务失败（被新的事务覆盖）",
     "withdrawable": "可取款",
     "synchronising_settlement_status": "同步结算状态...",
     "i_agree": "我同意",

src/utils/wallet.js

@@ -36,38 +36,6 @@ export const findWalletIndex = (state, address, scopedFatalError = fatalError) =
   }
 };
 
-/*
- * Trims the amount of decimals on 'amount' so that it is accurate up to 0.01 usd equivilent value
- */
-export const trimDecimals = (amount, currency, currencyPrices) => {
-  if (!currencyPrices) {
-    return '0';
-  }
-  // check to see if this currency is a test token, in which case give it an arbitrary price of $100
-  const usdPrice = currencyPrices.usd === '0' ? '100' : currencyPrices.usd;
-
-  // find what 0.01 usd is in the relevant currency. force ratio to be a decimal.
-  let ratio = new BigNumber(0.01).dividedBy(usdPrice).toString();
-  if (!ratio.includes('.')) ratio += '0.0001';
-  const ratioSplitByDot = ratio.split('.');
-  const amountSplitByDot = amount.toString().split('.');
-
-  // check to see if the amount was a whole value, in which case just return as there is no need for decimal alteration
-  if (amountSplitByDot.length === 1) {
-    return amount.toString();
-  }
-
-  // otherwise, find how many 0's there are after the decimal place on the ratio + 1, and minus that with the length of the
-  // number of digits after the decimal place on the ratio.
-  let decimalPlacement = (ratioSplitByDot[1].toString().length - parseFloat(ratioSplitByDot[1]).toString().length) + 1;
-  let trimmedAmount = `${amountSplitByDot[0]}.${amountSplitByDot[1].substr(0, decimalPlacement)}`;
-  while (new BigNumber(trimmedAmount).eq('0')) {
-    decimalPlacement += 1;
-    trimmedAmount = `${amountSplitByDot[0]}.${amountSplitByDot[1].substr(0, decimalPlacement)}`;
-  }
-  return new BigNumber(trimmedAmount).toString(); // remove any trailing 0s and return
-};
-
 export const getBreakdown = (balances, supportedAssets) => {
   // convert balances to Map if they're in array form
   let formattedBalances = balances;
@@ -93,11 +61,7 @@ export const getBreakdown = (balances, supportedAssets) => {
     return ({
       label: getCurrencySymbol(supportedAssets, asset),
       value: usdValue.toString(),
-      amount: trimDecimals(
-        amount,
-        asset,
-        { usd: usdValue.div(amount).toString() }
-      ),
+      amount: amount.toString(),
       percentage,
       color: supportedAssets.get('assets').find((a) => a.get('currency') === asset).get('color'),
     });