add current instance tx hash check, inform when mobile response is invalid

Author: SteveMieskoski

CHANGELOG.md

@@ -1,3 +1,9 @@
+### Release 2.1.23-beta.4
+- Add a current instance cache for transaction hashes to prevent multiple send attempts 
+- Add notice when malformed response is received from mobile
+- Add a current instance timer to stop checking for transaction hash after 60 minutes
+
+
 ### Release 2.1.23-beta.3
 - Fix EIP-1193 disconnect event name typo (disconnected -> disconnect)
 - Add wallet connected checks for eth_signTransaction, eth_sendTransaction

example/app/src/App.vue

@@ -25,6 +25,23 @@
         </button>
         {{ signedTxNonStandard }}
       </li>
+      <li>
+        <hr />
+        <h3>Send</h3>
+        <label for="toAmount1">
+          to amount
+          <input
+              id="toAmount1"
+              v-model="toAmount"
+              placeholder="amount"
+          /> </label
+        ><br />
+        <!--        <button v-show="userAddress !== ''" @click="sendTx">send</button>-->
+        <button  @click="sendTx">send</button>
+        <h6>Sends to the connected wallet address</h6>
+        <h3>Tx Hash:</h3>
+        {{ txHash }}
+      </li>
       <li>
         <hr />
         <h3>Send</h3>
@@ -35,9 +52,25 @@
             v-model="toAmount"
             placeholder="amount"
           /> </label
+        >
+        <label for="altNonce">
+         alt nonce
+          <input
+              id="altNonce"
+              v-model="altNonce"
+              placeholder="altNonce"
+          /> </label
+        >
+        <label for="altGasPrice">
+          altGasPrice
+          <input
+              id="altGasPrice"
+              v-model="altGasPrice"
+              placeholder="altGasPrice"
+          /> </label
         ><br />
 <!--        <button v-show="userAddress !== ''" @click="sendTx">send</button>-->
-        <button  @click="sendTx">send</button>
+        <button  @click="sendTx2">send alt-nonce</button>
         <h6>Sends to the connected wallet address</h6>
         <h3>Tx Hash:</h3>
         {{ txHash }}
@@ -351,7 +384,9 @@ export default {
       fromAddressDetailed: '',
       thing: false,
       checker: false,
-      checkOne: ''
+      checkOne: '',
+      altNonce: '',
+      altGasPrice: ''
     };
   },
   mounted() {
@@ -367,10 +402,11 @@ export default {
     // 859569f6decc4446a5da1bb680e7e9cf
     this.connect = new mewConnect.Provider({
       windowClosedError: true,
-      chainId: 1,
-      // chainId: 3,
+      // chainId: 1,
+      chainId: 3,
      // rpcUrl: 'https://mainnet.infura.io/v3/' //'wss://mainnet.infura.io/ws/v3/'
-      rpcUrl: 'HTTP://127.0.0.1:7545'
+     //  rpcUrl: 'HTTP://127.0.0.1:7545'
+      rpcUrl: 'https://ropsten.infura.io/v3/c9b249497d074ab59c47a97bdfe6b401'
      //  rpcUrl: 'ws://127.0.0.1:8545'
      //  infuraId: '7d06294ad2bd432887eada360c5e1986'
     });
@@ -588,6 +624,44 @@ export default {
         });
       });
     },
+    sendTx2() {
+      this.web3.eth.getBalance(this.userAddress).then(bal => this.balance);
+      this.web3.eth.getGasPrice().then(gasPrice => {
+        if(this.altGasPrice !== '' ){
+          gasPrice = this.altGasPrice
+        }
+        console.log('gasPrice', gasPrice); // todo remove dev item
+        this.web3.eth.getTransactionCount(this.userAddress).then(nonce => {
+          if(this.altNonce !== '' ){
+            nonce = this.altNonce
+          }
+          console.log('nonce', nonce); // todo remove dev item
+          this.web3.eth
+              .sendTransaction({
+                from: this.userAddress,
+                to: this.userAddress,
+                nonce,
+                value: new BigNumber(this.toAmount)
+                    .times(new BigNumber(10).pow(18))
+                    .toFixed()
+                /*gasPrice: gasPrice ,
+                gasLimit: '0xa'// 21000*/
+              })
+              .once('transactionHash', hash => {
+                console.log(['Hash', hash]);
+                this.txHash = hash;
+              })
+              .once('receipt', res => {
+                console.log(['Receipt', res]);
+              })
+              .on('error', err => {
+                console.log(['Error', err]);
+              })
+              .then(txhash => console.log('THEN: ', txhash))
+              .catch(err => console.error(err));
+        });
+      });
+    },
     sendTxDetailed() {
       this.sendTxDetailed2()
 /*      // this.web3.eth.getBalance(this.userAddress).then(bal => this.balance);

src/connectClient/WebRtcCommunication.js

@@ -320,6 +320,7 @@ export default class WebRtcCommunication extends MewConnectCommon {
         });
       }
     } catch (e) {
+      this.uiCommunicator(this.lifeCycle.decryptError);
       logger.error(e);
       debug('onData ERROR: data=', data);
       debug('onData ERROR: data.toString()=', data.toString());

src/connectClient/constants/constants.js

@@ -71,7 +71,8 @@ const lifeCycle = {
   attemptedDisconnectedSend: 'attemptedDisconnectedSend',
   connected: 'connected',
   disconnected: 'disconnected',
-  ShowReload: 'ShowReload'
+  ShowReload: 'ShowReload',
+  decryptError: 'decryptError'
 };
 
 const communicationTypes = {

src/connectProvider/index.js

@@ -184,6 +184,7 @@ export default class Integration extends EventEmitter {
         this.popUpHandler.showConnectedNotice();
         this.popUpHandler.hideNotifier();
         this.createDisconnectNotifier();
+        this.createCommunicationError();
         debugConnectionState(MEWconnectWallet.getConnectionState());
       }
 
@@ -345,6 +346,18 @@ export default class Integration extends EventEmitter {
     );
   }
 
+  createCommunicationError(){
+    const connection = state.wallet.getConnection();
+    connection.webRtcCommunication.on(
+      connection.lifeCycle.decryptError,
+      () => {
+        this.popUpHandler.showNoticePersistentEnter(
+          messageConstants.communicationError
+        );
+      }
+    );
+  }
+
   disconnect() {
     try {
       if (this.runningInApp) {
@@ -375,6 +388,7 @@ export default class Integration extends EventEmitter {
   }
 
   setupListeners() {
+    const transactionCache = [];
     eventHub.on(EventNames.SHOW_TX_CONFIRM_MODAL, (tx, resolve) => {
       this.responseFunction = resolve;
       if (!state.wallet) {
@@ -387,8 +401,13 @@ export default class Integration extends EventEmitter {
         state.wallet
           .signTransaction(tx)
           .then(_response => {
+
+            if(!transactionCache.includes(_response.tx.hash)){
+              transactionCache.push(_response.tx.hash)
+
             this.popUpHandler.showNoticePersistentExit();
             resolve(_response);
+            }
           })
           .catch(err => {
             this.popUpHandler.showNoticePersistentExit();

src/connectProvider/web3Provider/web3-provider/methods/eth_sendTransaction.js

@@ -62,6 +62,7 @@ export default async (
     res(e);
     return;
   }
+  debug('RAW TX', tx);
   getSanitizedTx(tx)
     .then(_tx => {
       debug('TX', _tx);
@@ -88,18 +89,25 @@ export default async (
               };
               if (store.noSubs) {
                 const txHash = hash;
+                const start = Date.now();
                 const interval = setInterval(() => {
                   store.state.web3.eth
                     .getTransactionReceipt(txHash)
                     .then(result => {
                       if (result !== null) {
                         clearInterval(interval);
                         _promiObj.emit('receipt', res);
+                        return;
+                      }
+                      const cancelInterval =
+                        (Date.now() - start) / 1000 > 60 * 60;
+                      if (cancelInterval) {
+                        clearInterval(interval);
                       }
                     })
                     .catch(err => {
                       _promiObj.emit('error', err);
-                    })
+                    });
                 }, 1000);
               }
             }

src/connectWindow/messageCreator.js

@@ -1,6 +1,6 @@
 export function getMessage(text, extra) {
   const messages = {
-    decline: 'User declined action in MEW wallet app',
+    decline: 'User declined action in MEW wallet app',
     approveTx: 'Check your phone to approve transaction ',
     disconnect: 'Disconnected from MEW wallet',
     complete: 'Transaction completed',
@@ -11,7 +11,8 @@ export function getMessage(text, extra) {
     notConnected:
       'Phone not connected.  Please connect your phone and try again',
     defaultMessage: 'Check your phone to continue',
-    error: 'An error occurred while preparing the last action'
+    error: 'An error occurred while preparing the last action',
+    communicationError: 'Could not complete last response from MEW wallet. Nothing was sent. Please try to send or sign again.'
   };
 
   if (extra) {

src/messageConstants.js

@@ -8,7 +8,8 @@ const messages = {
   signMessage: 'signMessage',
   error: 'error',
   notConnected: 'notConnected',
-  declineMessage: 'declineSignMessage'
+  declineMessage: 'declineSignMessage',
+  communicationError: 'communicationError'
 };
 
 export default messages;