feat: offchain in browser

EYBlockchain · Mar 9, 2022 · e589fcf · e589fcf
1 parent 5ad2d9b
commit e589fcf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/wallet/src/components/BridgeComponent/index.tsx b/wallet/src/components/BridgeComponent/index.tsx
@@ -89,7 +89,8 @@ const BridgeComponent = (props: any) => {
           },
           shieldContractAddress,
         );
-        return submitTransaction(rawTransaction, shieldContractAddress, 1);
+        await submitTransaction(rawTransaction, shieldContractAddress, 1);
+        break;
       }
 
       case 'withdraw': {
@@ -123,14 +124,16 @@ const BridgeComponent = (props: any) => {
             shieldContractAddress,
           );
           console.log('rawTransaction', rawTransaction);
-          return submitTransaction(rawTransaction, shieldContractAddress, 1);
+          await submitTransaction(rawTransaction, shieldContractAddress, 1);
+          break;
         }
         break;
       }
 
       default:
         break;
     }
+    handleCloseConfirmModal();
     handleClose();
     return true;
   }
@@ -423,7 +426,6 @@ const BridgeComponent = (props: any) => {
                   type="button"
                   className={stylesModal.continueTrasferButton}
                   id="Bridge_modal_continueTransferButton"
-                  // onClick={() => triggerTx()}
                   onClick={() => triggerTx()}
                 >
                   Send Transaction

diff --git a/wallet/src/components/TokenItem/index.jsx b/wallet/src/components/TokenItem/index.jsx
@@ -13,7 +13,7 @@ import metamaskIcon from '../../assets/svg/metamask.svg';
 import maticImg from '../../assets/img/polygon-chain.svg';
 import { UserContext } from '../../hooks/User/index.jsx';
 import transfer from '../../nightfall-browser/services/transfer';
-import { getContractAddress, submitTransaction } from '../../common-files/utils/contract';
+import { getContractAddress } from '../../common-files/utils/contract';
 
 const symbols = {
   matic,
@@ -36,8 +36,9 @@ export default function TokenItem({
 
   async function sendTx() {
     const { address: shieldContractAddress } = (await getContractAddress('Shield')).data;
-    const { rawTransaction } = await transfer(
+    await transfer(
       {
+        offchain: true,
         ercAddress: tokenAddress,
         tokenId: 0,
         recipientData: {
@@ -50,7 +51,8 @@ export default function TokenItem({
       },
       shieldContractAddress,
     );
-    return submitTransaction(rawTransaction, shieldContractAddress, 1);
+    console.log('Transfer Complete');
+    setShowSendModal(false);
   }
   const tokenNameId = `TokenItem_tokenName${symbol}`;
   const tokenBalanceId = `TokenItem_tokenBalance${symbol}`;

diff --git a/wallet/src/nightfall-browser/services/commitment-storage.js b/wallet/src/nightfall-browser/services/commitment-storage.js
@@ -279,14 +279,13 @@ export async function markNullifiedOnChain(
   if (filtered.length > 0) {
     return Promise.all(
       filtered.map(f => {
-        // const { isNullifiedOnChain: a, blockNumber: b } = f;
         return db.put(
           COMMITMENTS_COLLECTION,
           {
+            ...f,
             isNullifiedOnChain: Number(blockNumberL2),
             blockNumber,
             transactionHashNullifiedL1,
-            ...f,
           },
           f._id,
         );

diff --git a/wallet/src/nightfall-browser/services/withdraw.js b/wallet/src/nightfall-browser/services/withdraw.js
@@ -143,6 +143,7 @@ async function withdraw(withdrawParams, shieldContractAddress) {
       const th = optimisticWithdrawTransaction.transactionHash;
       delete optimisticWithdrawTransaction.transactionHash;
       optimisticWithdrawTransaction.transactionHash = th;
+      await markNullified(oldCommitment, optimisticWithdrawTransaction);
       await saveTransaction(optimisticWithdrawTransaction);
       return { transaction: optimisticWithdrawTransaction };
     }