From 3b097db106bf8ca4c59e227bb69ae8a1d871d2d0 Mon Sep 17 00:00:00 2001 From: Jay Date: Thu, 19 Oct 2023 13:02:54 +0800 Subject: [PATCH] Support RING transfer from Arbitrum to Ethereum (#538) * support ring transfer from arbitrum to ethereum * update deploy-dev.yml * update dev domain * enable production relayer navigation * fix footer testnet label * improve bridge-select dropdown content text style --- .github/workflows/deploy-dev.yml | 2 +- README.md | 2 +- packages/apps/src/bridges/lnbridge-opposite.ts | 4 ++-- packages/apps/src/components/bridge-select.tsx | 2 +- packages/apps/src/components/footer.tsx | 6 +++--- packages/apps/src/components/header.tsx | 2 +- packages/apps/src/config/chains/arbitrum.ts | 4 +--- 7 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 38190b862..c1073e2ac 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -21,7 +21,7 @@ jobs: vercel_token: ${{ secrets.VERCEL_TOKEN }} vercel_group: itering preview_output: true - alias_domain: "helix-dev" + alias_domain: "helix-dev-main" project_name: "helix-apps" script_run: false dist_path: . diff --git a/README.md b/README.md index ece6d8bc5..e38d651be 100644 --- a/README.md +++ b/README.md @@ -14,5 +14,5 @@ ### Development -- mainnet: https://helix-dev.vercel.app/ +- mainnet: https://helix-dev-main.vercel.app/ - testnet: https://helix-dev-test.vercel.app/ diff --git a/packages/apps/src/bridges/lnbridge-opposite.ts b/packages/apps/src/bridges/lnbridge-opposite.ts index 3f7f2c8e5..6ace527f2 100644 --- a/packages/apps/src/bridges/lnbridge-opposite.ts +++ b/packages/apps/src/bridges/lnbridge-opposite.ts @@ -24,8 +24,8 @@ export class LnBridgeOpposite extends LnBridgeBase { private initContract() { if (this.sourceChain?.id === ChainID.ARBITRUM && this.targetChain?.id === ChainID.ETHEREUM) { this.contract = { - sourceAddress: "0xD1B10B114f1975d8BCc6cb6FC43519160e2AA978", - targetAddress: "0xeAb1F01a8f4A2687023B159c2063639Adad5304E", + sourceAddress: "0x9e523234D36973f9e38642886197D023C88e307e", + targetAddress: "0x9469D013805bFfB7D3DEBe5E7839237e535ec483", }; } else { this.contract = { diff --git a/packages/apps/src/components/bridge-select.tsx b/packages/apps/src/components/bridge-select.tsx index a4b5b0ca1..aa054af98 100644 --- a/packages/apps/src/components/bridge-select.tsx +++ b/packages/apps/src/components/bridge-select.tsx @@ -29,7 +29,7 @@ export default function BridgeSelect({ options, value, onChange = () => undefine onClick={() => { onChange(c); }} - className="px-middle py-small text-start text-sm font-light text-white transition-colors hover:bg-white/10" + className="px-middle py-small text-start text-sm text-white transition-colors hover:bg-white/10" > {b?.getName() || "-"} diff --git a/packages/apps/src/components/footer.tsx b/packages/apps/src/components/footer.tsx index 636d4e369..15954c4b2 100644 --- a/packages/apps/src/components/footer.tsx +++ b/packages/apps/src/components/footer.tsx @@ -15,10 +15,10 @@ export default function Footer() { setMainnetOrTestnet({ label: "Testnet", link: "https://helix-stg-test.vercel.app" }); } else if (window.location.hostname === "helix-stg-test.vercel.app") { setMainnetOrTestnet({ label: "Mainnet", link: "https://helix-stg.vercel.app" }); - } else if (window.location.hostname === "helix-dev.vercel.app") { - setMainnetOrTestnet({ label: "Mainnet", link: "https://helix-dev-test.vercel.app" }); + } else if (window.location.hostname === "helix-dev-main.vercel.app") { + setMainnetOrTestnet({ label: "Testnet", link: "https://helix-dev-test.vercel.app" }); } else if (window.location.hostname === "helix-dev-test.vercel.app") { - setMainnetOrTestnet({ label: "Mainnet", link: "https://helix-dev.vercel.app" }); + setMainnetOrTestnet({ label: "Mainnet", link: "https://helix-dev-main.vercel.app" }); } }, []); diff --git a/packages/apps/src/components/header.tsx b/packages/apps/src/components/header.tsx index f06b19c7c..4df50eaca 100644 --- a/packages/apps/src/components/header.tsx +++ b/packages/apps/src/components/header.tsx @@ -34,7 +34,7 @@ export default function Header() { return [ { href: "/", label: "Transfer" }, { href: "/records", label: "Explorer" }, - { href: "/relayer/overview", label: "Relayer", soon: isProduction() }, + { href: "/relayer/overview", label: "Relayer" }, { href: "https://docs.helixbridge.app/", label: "Docs", external: true }, ]; } diff --git a/packages/apps/src/config/chains/arbitrum.ts b/packages/apps/src/config/chains/arbitrum.ts index 63d9dc858..9c929eaa6 100644 --- a/packages/apps/src/config/chains/arbitrum.ts +++ b/packages/apps/src/config/chains/arbitrum.ts @@ -41,9 +41,7 @@ export const arbitrumChain: ChainConfig = { type: "erc20", address: "0x9e523234D36973f9e38642886197D023C88e307e", logo: "ring.svg", - cross: [ - { target: { network: "ethereum", symbol: "RING" }, bridge: { category: "lnbridgev20-opposite" }, hidden: true }, - ], + cross: [{ target: { network: "ethereum", symbol: "RING" }, bridge: { category: "lnbridgev20-opposite" } }], }, ], };