taikoxyz · jscriptcoder · May 11, 2023 · May 4, 2023 · May 4, 2023 · May 4, 2023
diff --git a/packages/bridge-ui/.eslintignore b/packages/bridge-ui/.eslintignore
@@ -2,6 +2,7 @@ dist
 build
 coverage
 node_modules
+scripts
 example
 LICENSES
 public
diff --git a/packages/bridge-ui/.prettierignore b/packages/bridge-ui/.prettierignore
@@ -2,6 +2,7 @@ dist
 build
 coverage
 node_modules
+scripts
 example
 LICENSES
 public

diff --git a/packages/bridge-ui/package.json b/packages/bridge-ui/package.json
@@ -15,7 +15,8 @@
     "prettier:check": "pnpm run prettier '**/*.{js,ts,svelte}' --check",
     "lint": "pnpm exec eslint './**/*.{js,ts,svelte}' --ignore-path .eslintignore",
     "lint:fix": "pnpm exec eslint --fix './**/*.{js,ts,svelte}' --ignore-path .eslintignore",
-    "lint-staged": "lint-staged --allow-empty"
+    "lint-staged": "lint-staged --allow-empty",
+    "copy-abi": "node ./scripts/copy-abi.js"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.16.0",
@@ -36,6 +37,7 @@
     "eslint-plugin-jest": "^27.2.1",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-svelte3": "^4.0.0",
+    "fs-extra": "^11.1.1",
     "jest": "^27.5.1",
     "lint-staged": "^12.3.4",
     "node-sass": "^7.0.1",

diff --git a/packages/bridge-ui/scripts/copy-abi.js b/packages/bridge-ui/scripts/copy-abi.js
@@ -0,0 +1,36 @@
+import fs from 'fs-extra';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const protocolAbiPath = path.resolve(__dirname, '../../protocol/abi');
+const abiOutputPath = path.resolve(__dirname, '../src/constants/abi');
+
+const jsonFilesMap = {
+  Bridge: '/contracts/bridge/Bridge.sol/Bridge.json',
+  ERC20: '/@openzeppelin/contracts/token/ERC20/ERC20.sol/ERC20.json',
+  TokenVault: '/contracts/bridge/TokenVault.sol/TokenVault.json',
+  CrossChainSync: '/contracts/common/ICrossChainSync.sol/ICrossChainSync.json',
+  FreeMintERC20: '/contracts/test/erc20/FreeMintERC20.sol/FreeMintERC20.json',
+};
+
+// Remove all files within the directory but not the directory itself
+fs.emptyDirSync(abiOutputPath);
+
+Object.entries(jsonFilesMap).forEach(([name, jsonPath]) => {
+  try {
+    const jsonStr = fs.readFileSync(protocolAbiPath + jsonPath, {
+      encoding: 'utf8',
+    });
+
+    fs.writeFileSync(`${abiOutputPath}/${name}.json`, jsonStr, 'utf8');
+  } catch (e) {
+    if (e.code === 'ENOENT') {
+      console.error(`File not found: ${e.path}`);
+    } else {
+      console.error('Something really bad happened 😱', e);
+    }
+  }
+});
diff --git a/packages/bridge-ui/src/App.svelte b/packages/bridge-ui/src/App.svelte
@@ -19,7 +19,7 @@
   import SwitchEthereumChainModal from './components/modals/SwitchEthereumChainModal.svelte';
   import { ethers } from 'ethers';
   import { MessageStatus } from './domain/message';
-  import BridgeABI from './constants/abi/Bridge';
+  import BridgeABI from './constants/abi/Bridge.json';
   import { userTokens } from './store/userToken';
   import { RelayerAPIService } from './relayer-api/RelayerAPIService';
   import {

diff --git a/packages/bridge-ui/src/bridge/ERC20Bridge.ts b/packages/bridge-ui/src/bridge/ERC20Bridge.ts
@@ -7,11 +7,11 @@ import type {
   ClaimOpts,
   ReleaseOpts,
 } from '../domain/bridge';
-import TokenVault from '../constants/abi/TokenVault';
-import ERC20 from '../constants/abi/ERC20';
+import TokenVaultABI from '../constants/abi/TokenVault.json';
+import ERC20_ABI from '../constants/abi/ERC20.json';
 import type { Prover } from '../domain/proof';
 import { MessageStatus } from '../domain/message';
-import BridgeABI from '../constants/abi/Bridge';
+import BridgeABI from '../constants/abi/Bridge.json';
 import { chains } from '../chain/chains';
 
 export class ERC20Bridge implements Bridge {
@@ -24,7 +24,7 @@ export class ERC20Bridge implements Bridge {
   static async prepareTransaction(opts: BridgeOpts) {
     const contract: Contract = new Contract(
       opts.tokenVaultAddress,
-      TokenVault,
+      TokenVaultABI,
       opts.signer,
     );
 
@@ -58,7 +58,7 @@ export class ERC20Bridge implements Bridge {
     amount: BigNumber,
     bridgeAddress: string,
   ): Promise<boolean> {
-    const contract: Contract = new Contract(tokenAddress, ERC20, signer);
+    const contract: Contract = new Contract(tokenAddress, ERC20_ABI, signer);
     const owner = await signer.getAddress();
     const allowance: BigNumber = await contract.allowance(owner, bridgeAddress);
 
@@ -88,7 +88,7 @@ export class ERC20Bridge implements Bridge {
 
     const contract: Contract = new Contract(
       opts.contractAddress,
-      ERC20,
+      ERC20_ABI,
       opts.signer,
     );
 
@@ -250,7 +250,7 @@ export class ERC20Bridge implements Bridge {
 
       const srcTokenVaultContract: Contract = new Contract(
         opts.srcTokenVaultAddress,
-        TokenVault,
+        TokenVaultABI,
         opts.signer,
       );
 

diff --git a/packages/bridge-ui/src/bridge/ETHBridge.ts b/packages/bridge-ui/src/bridge/ETHBridge.ts
@@ -8,7 +8,7 @@ import type {
   ReleaseOpts,
 } from '../domain/bridge';
 import type { Prover } from '../domain/proof';
-import BridgeABI from '../constants/abi/Bridge';
+import BridgeABI from '../constants/abi/Bridge.json';
 import { chains } from '../chain/chains';
 import { type Message, MessageStatus } from '../domain/message';
 

diff --git a/packages/bridge-ui/src/components/Transactions/Transaction.svelte b/packages/bridge-ui/src/components/Transactions/Transaction.svelte
@@ -13,10 +13,10 @@
 
   import { LottiePlayer } from '@lottiefiles/svelte-lottie-player';
   import { errorToast, successToast } from '../Toast.svelte';
-  import HeaderSyncABI from '../../constants/abi/ICrossChainSync';
-  import BridgeABI from '../../constants/abi/Bridge';
+  import CrossChainSyncABI from '../../constants/abi/CrossChainSync.json';
+  import BridgeABI from '../../constants/abi/Bridge.json';
   import ButtonWithTooltip from '../ButtonWithTooltip.svelte';
-  import TokenVaultABI from '../../constants/abi/TokenVault';
+  import TokenVaultABI from '../../constants/abi/TokenVault.json';
   import { chains } from '../../chain/chains';
   import { providers } from '../../provider/providers';
   import { bridges } from '../../bridge/bridges';
@@ -176,7 +176,7 @@
 
     const contract = new Contract(
       chains[transaction.toChainId].crossChainSyncAddress,
-      HeaderSyncABI,
+      CrossChainSyncABI,
       providers[chains[transaction.toChainId].id],
     );
 

diff --git a/packages/bridge-ui/src/components/buttons/SelectToken.svelte b/packages/bridge-ui/src/components/buttons/SelectToken.svelte
@@ -6,7 +6,7 @@
   import { BridgeType, type HTMLBridgeForm } from '../../domain/bridge';
   import { ChevronDown, PlusCircle } from 'svelte-heros-v2';
   import { ethers } from 'ethers';
-  import ERC20_ABI from '../../constants/abi/ERC20';
+  import ERC20_ABI from '../../constants/abi/ERC20.json';
   import { signer } from '../../store/signer';
   import { userTokens } from '../../store/userToken';
   import { fromChain, toChain } from '../../store/chain';

diff --git a/packages/bridge-ui/src/components/form/AddCustomERC20.svelte b/packages/bridge-ui/src/components/form/AddCustomERC20.svelte
@@ -9,7 +9,7 @@
   import Modal from '../modals/Modal.svelte';
   import { LottiePlayer } from '@lottiefiles/svelte-lottie-player';
   import { ethers } from 'ethers';
-  import ERC20 from '../../constants/abi/ERC20';
+  import ERC20 from '../../constants/abi/ERC20.json';
   import { ETHToken } from '../../token/tokens';
   import { errorToast } from '../Toast.svelte';
   import { tokenService } from '../../storage/services';

diff --git a/packages/bridge-ui/src/components/form/BridgeForm.svelte b/packages/bridge-ui/src/components/form/BridgeForm.svelte
@@ -20,8 +20,8 @@
     transactions as transactionsStore,
   } from '../../store/transactions';
   import Memo from './Memo.svelte';
-  import ERC20_ABI from '../../constants/abi/ERC20';
-  import TokenVaultABI from '../../constants/abi/TokenVault';
+  import ERC20_ABI from '../../constants/abi/ERC20.json';
+  import TokenVaultABI from '../../constants/abi/TokenVault.json';
   import type { BridgeTransaction } from '../../domain/transactions';
   import { MessageStatus } from '../../domain/message';
   import { Funnel } from 'svelte-heros-v2';

diff --git a/packages/bridge-ui/src/components/modals/FaucetModal.svelte b/packages/bridge-ui/src/components/modals/FaucetModal.svelte
@@ -3,7 +3,7 @@
   import { pendingTransactions } from '../../store/transactions';
   import { signer } from '../../store/signer';
   import { _ } from 'svelte-i18n';
-  import MintableERC20 from '../../constants/abi/MintableERC20';
+  import FreeMintERC20_ABI from '../../constants/abi/FreeMintERC20.json';
   import { fromChain } from '../../store/chain';
   import { fetchSigner, switchNetwork } from '@wagmi/core';
   import Modal from './Modal.svelte';
@@ -35,7 +35,7 @@
 
     const contract = new ethers.Contract(
       $token.addresses[0].address,
-      MintableERC20,
+      FreeMintERC20_ABI,
       $signer,
     );
 
@@ -70,7 +70,7 @@
       }
       const contract = new ethers.Contract(
         $token.addresses[0].address,
-        MintableERC20,
+        FreeMintERC20_ABI,
         $signer,
       );