Support transfer from Goerli to ArbitrumGoerli through LnBridge (#499)

* Config network * Support transfer from Goerli to ArbitrumGoerli with LnBridge * Fix unit tests
helix-bridge · Aug 2, 2023 · 6d28964 · 6d28964
1 parent 587426c
commit 6d28964
Show file tree

Hide file tree

Showing 30 changed files with 1,426 additions and 34 deletions.
diff --git a/packages/apps/__tests__/bridge.spec.ts b/packages/apps/__tests__/bridge.spec.ts
@@ -52,7 +52,7 @@ describe('bridge utils', () => {
   });
 
   it('should support transfer count: ', () => {
-    expect(allDirections).toHaveLength(114);
+    expect(allDirections).toHaveLength(118);
   });
 
   it('Should correct bridge category name', () => {

diff --git a/packages/apps/__tests__/network.spec.ts b/packages/apps/__tests__/network.spec.ts
@@ -73,6 +73,7 @@ describe('network utils', () => {
         'arbitrum',
         'arbitrum',
         'arbitrum',
+        'arbitrum',
         'astar',
         'avalanche',
         'optimism',
@@ -101,7 +102,18 @@ describe('network utils', () => {
 
     expect(group).not.toEqual(undefined);
     expect(sort(group![1])).toEqual(
-      sort(['astar', 'avalanche', 'optimism', 'bsc', 'ethereum', 'ethereum', 'ethereum', 'ethereum', 'polygon'])
+      sort([
+        'astar',
+        'avalanche',
+        'optimism',
+        'bsc',
+        'ethereum',
+        'ethereum',
+        'ethereum',
+        'ethereum',
+        'ethereum',
+        'polygon',
+      ])
     );
   });
 

diff --git a/packages/apps/bridges/bridges.ts b/packages/apps/bridges/bridges.ts
@@ -25,6 +25,7 @@ import { ArbitrumEthereumBridge } from './helixlp/arbitrum-ethereum/utils';
 import { EthereumArbitrumBridgeL2 } from './l1tol2/ethereum-arbitrum/utils';
 import { HelixLpBridgeBridge } from './helixlp/helixLpBridge/utils';
 import { ArbitrumEthereumBridge as ArbitrumEthereumBridgeLnBridge } from './lnbridge/arbitrum-ethereum/utils';
+import { EthereumArbitrumBridge as EthereumArbitrumBridgeLnBridge } from './lnbridge/ethereum-arbitrum/utils';
 
 export const bridgeConstructors = [
   CBridgeBridge,
@@ -53,6 +54,7 @@ export const bridgeConstructors = [
   ArbitrumEthereumBridge,
   EthereumArbitrumBridgeL2,
   ArbitrumEthereumBridgeLnBridge,
+  EthereumArbitrumBridgeLnBridge,
 ];
 
 export function bridgeFactory<C extends BridgeConfig, O extends ChainConfig, T extends ChainConfig>(

diff --git a/packages/apps/bridges/index.ts b/packages/apps/bridges/index.ts
@@ -47,3 +47,5 @@ export { Arbitrum2EthereumLn, Ethereum2ArbitrumLn } from './helixlp/arbitrum-eth
 export { Ethereum2ArbitrumL2, Arbitrum2EthereumL2 } from './l1tol2/ethereum-arbitrum';
 
 export { Arbitrum2EthereumLnBridge } from './lnbridge/arbitrum-ethereum';
+
+export { Ethereum2ArbitrumLnBridge } from './lnbridge/ethereum-arbitrum';
diff --git a/packages/apps/bridges/l1tol2/ethereum-arbitrum/config/bridge.ts b/packages/apps/bridges/l1tol2/ethereum-arbitrum/config/bridge.ts
@@ -26,7 +26,7 @@ export const ethereumArbitrumL2 = new BridgeBase(ethereumConfig, arbitrumConfig,
   category: 'l1tol2',
 });
 
-export const arbitrumGoerliL2 = new BridgeBase(goerliConfig, arbitrumGoerliConfig, arbitrumGoerliGoerliConfig, {
+export const goerliArbitrumL2 = new BridgeBase(goerliConfig, arbitrumGoerliConfig, arbitrumGoerliGoerliConfig, {
   name: 'ethereum-arbitrum',
   category: 'l1tol2',
 });
diff --git a/packages/apps/bridges/lnbridge/ethereum-arbitrum/Arbitrum2EthereumLnBridge.tsx b/packages/apps/bridges/lnbridge/ethereum-arbitrum/Arbitrum2EthereumLnBridge.tsx
@@ -0,0 +1,10 @@
+import { CrossToken, DVMChainConfig } from 'shared/model';
+import { Bridge } from '../../../components/bridge/Bridge';
+import { CrossChainComponentProps } from '../../../model/component';
+import { EthereumArbitrumBridge } from './utils/bridge';
+
+export function Arbitrum2EthereumLnBridge(
+  props: CrossChainComponentProps<EthereumArbitrumBridge, CrossToken<DVMChainConfig>, CrossToken<DVMChainConfig>>
+) {
+  return <Bridge {...props} hideRecipient />;
+}
diff --git a/packages/apps/bridges/lnbridge/ethereum-arbitrum/Ethereum2ArbitrumLnBridge.tsx b/packages/apps/bridges/lnbridge/ethereum-arbitrum/Ethereum2ArbitrumLnBridge.tsx
@@ -0,0 +1,10 @@
+import { CrossToken, DVMChainConfig } from 'shared/model';
+import { Bridge } from '../../../components/bridge/Bridge';
+import { CrossChainComponentProps } from '../../../model/component';
+import { EthereumArbitrumBridge } from './utils/bridge';
+
+export function Ethereum2ArbitrumLnBridge(
+  props: CrossChainComponentProps<EthereumArbitrumBridge, CrossToken<DVMChainConfig>, CrossToken<DVMChainConfig>>
+) {
+  return <Bridge {...props} hideRecipient />;
+}