Revert "Revert "feat(bridge-ui-v2): L2 <-> L2 bridging with multi-hops (#15393)""

dantaik · dantaik · commit b7a965e03c8f · 2023-12-18T21:30:24.000+08:00
This reverts commit 5dbe398.
diff --git a/packages/bridge-ui-v2/.env.example b/packages/bridge-ui-v2/.env.example
@@ -9,7 +9,7 @@ export PUBLIC_WALLETCONNECT_PROJECT_ID=""
 
 # Enable NFT Bridge ("true" or "false")
 export PUBLIC_NFT_BRIDGE_ENABLED=""
-PUBLIC_NFT_BATCH_TRANSFERS_ENABLED=""
+export PUBLIC_NFT_BATCH_TRANSFERS_ENABLED=""
 
 # Sentry
 export PUBLIC_SENTRY_DSN=https://
diff --git a/packages/bridge-ui-v2/config/sample/configuredBridges.example b/packages/bridge-ui-v2/config/sample/configuredBridges.example
@@ -8,7 +8,7 @@
         "erc20VaultAddress": "",
         "erc721VaultAddress": "",
         "erc1155VaultAddress": "",
-        "crossChainSyncAddress": "",
+        "taikoAddress": "",
         "signalServiceAddress": ""
       }
     },
@@ -20,7 +20,7 @@
         "erc20VaultAddress": "",
         "erc721VaultAddress": "",
         "erc1155VaultAddress": "",
-        "crossChainSyncAddress": "",
+        "taikoAddress": "",
         "signalServiceAddress": ""
       }
     },
@@ -32,7 +32,7 @@
         "erc20VaultAddress": "",
         "erc721VaultAddress": "",
         "erc1155VaultAddress": "",
-        "crossChainSyncAddress": "",
+        "taikoAddress": "",
         "signalServiceAddress": ""
       }
     },
@@ -44,7 +44,7 @@
         "erc20VaultAddress": "",
         "erc721VaultAddress": "",
         "erc1155VaultAddress": "",
-        "crossChainSyncAddress": "",
+        "taikoAddress": "",
         "signalServiceAddress": ""
       }
     }
diff --git a/packages/bridge-ui-v2/config/schemas/configuredBridges.schema.json b/packages/bridge-ui-v2/config/schemas/configuredBridges.schema.json
@@ -31,20 +31,39 @@
               "erc1155VaultAddress": {
                 "type": "string"
               },
-              "crossChainSyncAddress": {
+              "taikoAddress": {
                 "type": "string"
               },
               "signalServiceAddress": {
                 "type": "string"
+              },
+              "hops": {
+                "type": "array",
+                "default": [],
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "chainId": {
+                      "type": "number"
+                    },
+                    "taikoAddress": {
+                      "type": "string"
+                    },
+                    "signalServiceAddress": {
+                      "type": "string"
+                    }
+                  }
+                }
               }
             },
             "required": [
               "bridgeAddress",
               "erc20VaultAddress",
               "erc721VaultAddress",
               "erc1155VaultAddress",
-              "crossChainSyncAddress",
-              "signalServiceAddress"
+              "taikoAddress",
+              "signalServiceAddress",
+              "hops"
             ],
             "additionalProperties": false
           }
diff --git a/packages/bridge-ui-v2/scripts/vite-plugins/generateBridgeConfig.ts b/packages/bridge-ui-v2/scripts/vite-plugins/generateBridgeConfig.ts
@@ -140,6 +140,9 @@ const _formatObjectToTsLiteral = (obj: RoutingMap): string => {
     if (typeof value === 'string') {
       return `"${value}"`;
     }
+    if (typeof value === 'object') {
+      return JSON.stringify(value);
+    }
     return String(value);
   };
 
diff --git a/packages/bridge-ui-v2/scripts/vite-plugins/generateChainConfig.ts b/packages/bridge-ui-v2/scripts/vite-plugins/generateChainConfig.ts
@@ -39,7 +39,7 @@ export function generateChainConfig() {
         const isValid = validateJsonAgainstSchema(configuredChainsConfigFile, configuredChainsSchema);
 
         if (!isValid) {
-          throw new Error('encoded configuredBridges.json is not valid.');
+          throw new Error('encoded configuredChains.json is not valid.');
         }
       } else {
         configuredChainsConfigFile = '';
diff --git a/packages/bridge-ui-v2/scripts/vite-plugins/generateCustomTokenConfig.ts b/packages/bridge-ui-v2/scripts/vite-plugins/generateCustomTokenConfig.ts
@@ -43,7 +43,7 @@ export function generateCustomTokenConfig() {
         const isValid = validateJsonAgainstSchema(configuredTokenConfigFile, configuredChainsSchema);
 
         if (!isValid) {
-          throw new Error('encoded configuredBridges.json is not valid.');
+          throw new Error('encoded configuredRelayer.json is not valid.');
         }
       }
       const tsFilePath = path.resolve(outputPath);
diff --git a/packages/bridge-ui-v2/scripts/vite-plugins/generateEventIndexerConfig.ts b/packages/bridge-ui-v2/scripts/vite-plugins/generateEventIndexerConfig.ts
@@ -44,7 +44,7 @@ export function generateEventIndexerConfig() {
         // Valide JSON against schema
         const isValid = validateJsonAgainstSchema(configuredEventIndexerConfigFile, configuredEventIndexerSchema);
         if (!isValid) {
-          throw new Error('encoded configuredBridges.json is not valid.');
+          throw new Error('encoded configuredEventIndexer.json is not valid.');
         }
       }
       // Path to where you want to save the generated Typ eScript file
diff --git a/packages/bridge-ui-v2/scripts/vite-plugins/generateRelayerConfig.ts b/packages/bridge-ui-v2/scripts/vite-plugins/generateRelayerConfig.ts
@@ -44,7 +44,7 @@ export function generateRelayerConfig() {
         // Valide JSON against schema
         const isValid = validateJsonAgainstSchema(configuredRelayerConfigFile, configuredRelayerSchema);
         if (!isValid) {
-          throw new Error('encoded configuredBridges.json is not valid.');
+          throw new Error('encoded configuredRelayer.json is not valid.');
         }
       }
       // Path to where you want to save the generated Typ eScript file
diff --git a/packages/bridge-ui-v2/src/components/Transactions/Status.svelte b/packages/bridge-ui-v2/src/components/Transactions/Status.svelte
@@ -87,7 +87,7 @@
     loading = LoadingState.CLAIMING;
 
     try {
-      const { msgHash, message } = bridgeTx;
+      const { msgHash, message, receipt } = bridgeTx;
 
       if (!msgHash || !message) {
         throw new Error('Missing msgHash or message');
@@ -109,7 +109,7 @@
       log(`Claiming ${bridgeTx.tokenType} for transaction`, bridgeTx);
 
       // Step 5: Call claim() method on the bridge
-      const txHash = await bridge.claim({ msgHash, message, wallet });
+      const txHash = await bridge.claim({ msgHash, message, receipt, wallet });
 
       const { explorer } = chainConfig[Number(bridgeTx.destChainId)].urls;
 
diff --git a/packages/bridge-ui-v2/src/libs/bridge/ERC1155Bridge.ts b/packages/bridge-ui-v2/src/libs/bridge/ERC1155Bridge.ts
@@ -210,8 +210,8 @@ export class ERC1155Bridge extends Bridge {
     const gasLimit = !isTokenAlreadyDeployed
       ? BigInt(bridgeService.noERC1155TokenDeployedGasLimit)
       : fee > 0
-        ? bridgeService.noOwnerGasLimit
-        : BigInt(0);
+      ? bridgeService.noOwnerGasLimit
+      : BigInt(0);
 
     const sendERC1155Args: NFTBridgeTransferOp = {
       destChainId: BigInt(destChainId),
diff --git a/packages/bridge-ui-v2/src/libs/bridge/ERC20Bridge.ts b/packages/bridge-ui-v2/src/libs/bridge/ERC20Bridge.ts
@@ -45,8 +45,8 @@ export class ERC20Bridge extends Bridge {
     const gasLimit = !isTokenAlreadyDeployed
       ? BigInt(bridgeService.noERC20TokenDeployedGasLimit)
       : fee > 0
-        ? bridgeService.noOwnerGasLimit
-        : BigInt(0);
+      ? bridgeService.noOwnerGasLimit
+      : BigInt(0);
 
     const sendERC20Args: BridgeTransferOp = {
       destChainId: BigInt(destChainId),
diff --git a/packages/bridge-ui-v2/src/libs/bridge/ERC721Bridge.ts b/packages/bridge-ui-v2/src/libs/bridge/ERC721Bridge.ts
@@ -216,8 +216,8 @@ export class ERC721Bridge extends Bridge {
     const gasLimit = !isTokenAlreadyDeployed
       ? BigInt(bridgeService.noERC721TokenDeployedGasLimit)
       : fee > 0
-        ? bridgeService.noOwnerGasLimit
-        : BigInt(0);
+      ? bridgeService.noOwnerGasLimit
+      : BigInt(0);
 
     const sendERC721Args: NFTBridgeTransferOp = {
       destChainId: BigInt(destChainId),
diff --git a/packages/bridge-ui-v2/src/libs/bridge/ETHBridge.ts b/packages/bridge-ui-v2/src/libs/bridge/ETHBridge.ts
@@ -109,12 +109,19 @@ export class ETHBridge extends Bridge {
     const { messageStatus, destBridgeContract } = await super.beforeClaiming(args);
 
     let txHash: Hash;
-    const { msgHash, message } = args;
+    const { msgHash, message, receipt } = args;
     const srcChainId = Number(message.srcChainId);
     const destChainId = Number(message.destChainId);
 
     if (messageStatus === MessageStatus.NEW) {
-      const proof = await this._prover.encodedSignalProof(msgHash, srcChainId, destChainId);
+      const hops = routingContractsMap[srcChainId][destChainId].hops;
+
+      let proof;
+      if (hops.length > 0) {
+        proof = await this._prover.encodedSignalProofWithHops(msgHash, receipt, srcChainId, destChainId);
+      } else {
+        proof = await this._prover.encodedSignalProof(msgHash, srcChainId, destChainId);
+      }
 
       try {
         txHash = await destBridgeContract.write.processMessage([message, proof]);
diff --git a/packages/bridge-ui-v2/src/libs/bridge/getContractAddressByType.test.ts b/packages/bridge-ui-v2/src/libs/bridge/getContractAddressByType.test.ts
@@ -17,7 +17,7 @@ vi.mock('$bridgeConfig', () => ({
         bridgeAddress: '0x00002',
         erc721VaultAddress: '0x00003',
         erc1155VaultAddress: '0x00004',
-        crossChainSyncAddress: '0x00005',
+        taikoAddress: '0x00005',
         signalServiceAddress: '0x00006',
       },
     },
@@ -27,7 +27,7 @@ vi.mock('$bridgeConfig', () => ({
         bridgeAddress: '0x00008',
         erc721VaultAddress: '0x00009',
         erc1155VaultAddress: '0x00010',
-        crossChainSyncAddress: '0x00011',
+        taikoAddress: '0x00011',
         signalServiceAddress: '0x00012',
       },
     },
@@ -120,7 +120,7 @@ describe('getContractAddressBasedOnType', () => {
       tokenType: TokenType.ERC20,
     };
 
-    const expectedAddress = routingContractsMap[SRC_CHAIN_ID][DEST_CHAIN_ID].crossChainSyncAddress;
+    const expectedAddress = routingContractsMap[SRC_CHAIN_ID][DEST_CHAIN_ID].taikoAddress;
 
     // When
     const address = getContractAddressByType(args);
diff --git a/packages/bridge-ui-v2/src/libs/bridge/getContractAddressByType.ts b/packages/bridge-ui-v2/src/libs/bridge/getContractAddressByType.ts
@@ -35,7 +35,7 @@ export const getContractAddressByType = (args: GetContractAddressType): Address
     case ContractType.SIGNALSERVICE:
       return addressConfig.signalServiceAddress;
     case ContractType.CROSSCHAINSYNC:
-      return addressConfig.crossChainSyncAddress;
+      return addressConfig.taikoAddress;
     default:
       throw new Error('Invalid contract type');
   }
diff --git a/packages/bridge-ui-v2/src/libs/bridge/isTransactionProcessable.ts b/packages/bridge-ui-v2/src/libs/bridge/isTransactionProcessable.ts
@@ -19,7 +19,7 @@ export async function isTransactionProcessable(bridgeTx: BridgeTransaction) {
   // TODO: do better job here as this is to make the UI happy
   if (status !== MessageStatus.NEW) return true;
 
-  const destCrossChainSyncAddress = routingContractsMap[Number(destChainId)][Number(srcChainId)].crossChainSyncAddress;
+  const destCrossChainSyncAddress = routingContractsMap[Number(destChainId)][Number(srcChainId)].taikoAddress;
 
   try {
     const destCrossChainSyncContract = getContract({
diff --git a/packages/bridge-ui-v2/src/libs/bridge/types.ts b/packages/bridge-ui-v2/src/libs/bridge/types.ts
@@ -171,6 +171,7 @@ export type RequireApprovalArgs = {
 export type ClaimArgs = {
   msgHash: Hash;
   message: Message;
+  receipt?: TransactionReceipt;
   wallet: WalletClient;
 };
 
@@ -198,7 +199,14 @@ export type AddressConfig = {
   etherVaultAddress?: Address;
   erc721VaultAddress: Address;
   erc1155VaultAddress: Address;
-  crossChainSyncAddress: Address;
+  taikoAddress: Address;
+  signalServiceAddress: Address;
+  hops: Array<HopAddressConfig>;
+};
+
+export type HopAddressConfig = {
+  chainId: number;
+  taikoAddress: Address;
   signalServiceAddress: Address;
 };
 
diff --git a/packages/bridge-ui-v2/src/libs/proof/BridgeProver.ts b/packages/bridge-ui-v2/src/libs/proof/BridgeProver.ts
diff --git a/packages/bridge-ui-v2/src/libs/proof/Prover.ts b/packages/bridge-ui-v2/src/libs/proof/Prover.ts
diff --git a/packages/bridge-ui-v2/src/libs/proof/index.ts b/packages/bridge-ui-v2/src/libs/proof/index.ts
diff --git a/packages/bridge-ui-v2/src/libs/proof/types.ts b/packages/bridge-ui-v2/src/libs/proof/types.ts
diff --git a/packages/bridge-ui-v2/src/libs/relayer/RelayerAPIService.ts b/packages/bridge-ui-v2/src/libs/relayer/RelayerAPIService.ts
diff --git a/packages/bridge-ui-v2/src/libs/token/checkOwnership.ts b/packages/bridge-ui-v2/src/libs/token/checkOwnership.ts
diff --git a/packages/bridge-ui-v2/src/libs/token/fetchNFTImageUrl.ts b/packages/bridge-ui-v2/src/libs/token/fetchNFTImageUrl.ts
diff --git a/packages/bridge-ui-v2/src/libs/token/getCrossChainAddress.ts b/packages/bridge-ui-v2/src/libs/token/getCrossChainAddress.ts

Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,9 @@ const _formatObjectToTsLiteral = (obj: RoutingMap): string => {`
`140`	`140`	`if (typeof value === 'string') {`
`141`	`141`	return `"${value}"`;
`142`	`142`	`}`
	`143`	`+ if (typeof value === 'object') {`
	`144`	`+ return JSON.stringify(value);`
	`145`	`+ }`
`143`	`146`	`return String(value);`
`144`	`147`	`};`
`145`	`148`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ export function generateChainConfig() {`
`39`	`39`	`const isValid = validateJsonAgainstSchema(configuredChainsConfigFile, configuredChainsSchema);`
`40`	`40`
`41`	`41`	`if (!isValid) {`
`42`		`- throw new Error('encoded configuredBridges.json is not valid.');`
	`42`	`+ throw new Error('encoded configuredChains.json is not valid.');`
`43`	`43`	`}`
`44`	`44`	`} else {`
`45`	`45`	`configuredChainsConfigFile = '';`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ export function generateCustomTokenConfig() {`
`43`	`43`	`const isValid = validateJsonAgainstSchema(configuredTokenConfigFile, configuredChainsSchema);`
`44`	`44`
`45`	`45`	`if (!isValid) {`
`46`		`- throw new Error('encoded configuredBridges.json is not valid.');`
	`46`	`+ throw new Error('encoded configuredRelayer.json is not valid.');`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`	`const tsFilePath = path.resolve(outputPath);`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ export function generateEventIndexerConfig() {`
`44`	`44`	`// Valide JSON against schema`
`45`	`45`	`const isValid = validateJsonAgainstSchema(configuredEventIndexerConfigFile, configuredEventIndexerSchema);`
`46`	`46`	`if (!isValid) {`
`47`		`- throw new Error('encoded configuredBridges.json is not valid.');`
	`47`	`+ throw new Error('encoded configuredEventIndexer.json is not valid.');`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`	`// Path to where you want to save the generated Typ eScript file`