Merge branch 'main' of github.com:helix-bridge/xtoken-monorepo

helix-bridge · Jan 2, 2025 · fc184ba · fc184ba
2 parents 0b2cd13 + 66dc0f1
commit fc184ba
Show file tree

Hide file tree

Showing 33 changed files with 150 additions and 115 deletions.
diff --git a/.github/workflows/xtoken-home-dev.yml b/.github/workflows/xtoken-home-dev.yml
@@ -29,6 +29,4 @@ jobs:
           alias_domain: "xtoken-home-dev"
           enable_cache: true
           enable_notify_comment: true
-          enable_notify_slack: true
-          slack_channel: helix-ui
           slack_webhook: ${{ secrets.SLACK_INCOMING_WEBHOOK_URL }}
diff --git a/.github/workflows/xtoken-home-prd.yml b/.github/workflows/xtoken-home-prd.yml
@@ -34,5 +34,5 @@ jobs:
           enable_cache: true
           enable_notify_comment: true
           enable_notify_slack: true
-          slack_channel: helix-ui
+          slack_channel: helixbox-ui
           slack_webhook: ${{ secrets.SLACK_INCOMING_WEBHOOK_URL }}
diff --git a/.github/workflows/xtoken-ui-dev.yml b/.github/workflows/xtoken-ui-dev.yml
@@ -31,8 +31,6 @@ jobs:
           script_build: npm run build:mainnet -w xtoken-ui
           dist_path: packages/xtoken-ui/dist
           enable_notify_comment: true
-          enable_notify_slack: true
-          slack_channel: helix-ui
           slack_webhook: ${{ secrets.SLACK_INCOMING_WEBHOOK_URL }}
 
       - uses: ./.github/actions/smart-vercel
@@ -49,6 +47,4 @@ jobs:
           alias_domain: "xtokenui-dev-testnet"
           enable_cache: true
           enable_notify_comment: true
-          enable_notify_slack: true
-          slack_channel: helix-ui
           slack_webhook: ${{ secrets.SLACK_INCOMING_WEBHOOK_URL }}
diff --git a/.github/workflows/xtoken-ui-prd.yml b/.github/workflows/xtoken-ui-prd.yml
@@ -35,7 +35,7 @@ jobs:
           prod_mode: true
           enable_cache: true
           enable_notify_slack: true
-          slack_channel: helix-ui
+          slack_channel: helixbox-ui
           slack_webhook: ${{ secrets.SLACK_INCOMING_WEBHOOK_URL }}
 
       - uses: ./.github/actions/smart-vercel
@@ -53,5 +53,5 @@ jobs:
           prod_mode: true
           enable_cache: true
           enable_notify_slack: true
-          slack_channel: helix-ui
+          slack_channel: helixbox-ui
           slack_webhook: ${{ secrets.SLACK_INCOMING_WEBHOOK_URL }}
diff --git a/.github/workflows/xtoken-ui-stg.yml b/.github/workflows/xtoken-ui-stg.yml
@@ -32,8 +32,6 @@ jobs:
           project_name: xtoken-ui
           alias_domain: "xtokenui-stg-mainnet"
           enable_cache: true
-          enable_notify_slack: true
-          slack_channel: helix-ui
           slack_webhook: ${{ secrets.SLACK_INCOMING_WEBHOOK_URL }}
 
       - uses: ./.github/actions/smart-vercel
@@ -49,6 +47,4 @@ jobs:
           project_name: xtoken-ui-test
           alias_domain: "xtokenui-stg-testnet"
           enable_cache: true
-          enable_notify_slack: true
-          slack_channel: helix-ui
           slack_webhook: ${{ secrets.SLACK_INCOMING_WEBHOOK_URL }}
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
   "workspaces": [
     "packages/*"
   ],
-  "author": "Helix Bridge",
+  "author": "Helixbox",
   "license": "ISC",
   "bugs": {
     "url": "https://github.com/helix-bridge/xtoken-monorepo/issues"

diff --git a/packages/xtoken-home/public/logo.svg b/packages/xtoken-home/public/logo.svg
diff --git a/packages/xtoken-home/public/social/twitter.svg b/packages/xtoken-home/public/social/twitter.svg
diff --git a/packages/xtoken-home/public/social/x.svg b/packages/xtoken-home/public/social/x.svg
diff --git a/packages/xtoken-home/src/app/page.tsx b/packages/xtoken-home/src/app/page.tsx
@@ -6,16 +6,16 @@ export default function Home() {
     <main className="relative flex min-h-screen flex-col items-center justify-center overflow-hidden">
       <div className="container flex flex-col items-center justify-center gap-12 px-3 lg:flex-row lg:justify-between lg:gap-3">
         <div className="flex flex-col">
-          <Image alt="Logo" width={210} height={56} src="/logo.svg" className="shrink-0" />
+          <Image alt="Logo" width={267.5} height={50} src="/logo.svg" className="shrink-0" />
           <span className="mt-11 inline-block text-3xl font-bold text-white lg:w-[32.8rem]">
-            XToken, Helix&apos;s Bridge as a Service Open Platform
+            XToken, Helixbox&apos;s Bridge as a Service Open Platform
           </span>
           <span className="mt-5 inline-block text-sm font-normal leading-6 text-white/60 lg:w-[36rem]">
-            XToken BAAS(Bridge as a Service) offers professional cross-chain token mapping bridge services tailored for
+            XToken BaaS(Bridge as a Service) offers professional cross-chain token mapping bridge services tailored for
             cryptocurrency token issuance projects or custodial applications. Clients maintain full control over
-            contracts and asset permissions. Our comprehensive services include BAAS solution consulting, contract
+            contracts and asset permissions. Our comprehensive services include BaaS solution consulting, contract
             deployment, indexing, and UI cloud services. Custom domain provisioning is also available. For inquiries,
-            please contact hello@helixbridge.app.
+            please contact hello@helix.box.
           </span>
         </div>
         <div className="flex items-center gap-8">

diff --git a/packages/xtoken-home/src/components/footer.tsx b/packages/xtoken-home/src/components/footer.tsx
@@ -10,18 +10,18 @@ export default function Footer({ className }: Props) {
     <div
       className={`${className} lg:h-15 flex h-10 w-full items-center justify-center px-3 lg:justify-between lg:px-5`}
     >
-      <span className="text-xs font-semibold text-white/50">{`© ${new Date().getFullYear()} Developed by Helix Bridge Team`}</span>
+      <span className="text-xs font-semibold text-white/50">{`© ${new Date().getFullYear()} Developed by Helixbox Team`}</span>
       <div className="hidden items-center gap-5 lg:flex">
         <Social href="https://github.com/helix-bridge">
           <Image width={16} height={16} alt="Github" src="/social/github.svg" />
         </Social>
-        <Social href="https://twitter.com/helixbridges">
-          <Image width={16} height={16} alt="Twitter" src="/social/twitter.svg" />
+        <Social href="https://x.com/HelixboxLabs">
+          <Image width={15.3} height={14} alt="Twitter" src="/social/x.svg" />
         </Social>
         <Social href="https://discord.gg/6XyyNGugdE">
           <Image width={20} height={20} alt="Discord" src="/social/discord.svg" />
         </Social>
-        <Social href="mailto:hello@helixbridge.app">
+        <Social href="mailto:hello@helix.box">
           <Image width={16} height={16} alt="Email" src="/social/email.svg" />
         </Social>
       </div>

diff --git a/packages/xtoken-ui/package.json b/packages/xtoken-ui/package.json
@@ -23,7 +23,7 @@
   "keywords": [
     "xtoken",
     "xtoken-monorepo",
-    "helixbridge"
+    "helixbox-bridge"
   ],
   "license": "MIT",
   "bugs": {

diff --git a/packages/xtoken-ui/src/bridges/base.ts b/packages/xtoken-ui/src/bridges/base.ts
@@ -23,6 +23,7 @@ import {
 import { Address, PublicClient as ViemPublicClient, TransactionReceipt, createPublicClient, http } from "viem";
 import { PublicClient as WagmiPublicClient, WalletClient } from "wagmi";
 import erc20Abi from "../abi/erc20";
+import { TX_CONFIRMATIONS } from "../config";
 
 export abstract class BaseBridge {
   protected logo: BridgeLogo = { symbol: "", horizontal: "" };
@@ -254,7 +255,7 @@ export abstract class BaseBridge {
         account: owner,
       });
       const hash = await this.walletClient.writeContract(request);
-      return this.publicClient.waitForTransactionReceipt({ hash });
+      return this.publicClient.waitForTransactionReceipt({ hash, confirmations: TX_CONFIRMATIONS });
     }
   }
 

diff --git a/packages/xtoken-ui/src/bridges/helix-lpbridge.ts b/packages/xtoken-ui/src/bridges/helix-lpbridge.ts
@@ -2,6 +2,7 @@ import { BridgeConstructorArgs, GetFeeArgs, TransferOptions } from "../types/bri
 import { BaseBridge } from "./base";
 import { Address, TransactionReceipt } from "viem";
 import { HistoryRecord } from "../types/graphql";
+import { TX_CONFIRMATIONS } from "../config";
 
 export class HelixLpBridge extends BaseBridge {
   private readonly prefix = BigInt("0x6878000000000000");
@@ -77,7 +78,7 @@ export class HelixLpBridge extends BaseBridge {
         const hash = await (this.sourceToken?.type === "native"
           ? this.walletClient.writeContract(nativeParams)
           : this.walletClient.writeContract(defaultParams));
-        return this.sourcePublicClient.waitForTransactionReceipt({ hash });
+        return this.sourcePublicClient.waitForTransactionReceipt({ hash, confirmations: TX_CONFIRMATIONS });
       }
     }
   }
@@ -104,7 +105,7 @@ export class HelixLpBridge extends BaseBridge {
         value: await this.getBridgeFee(),
         gas: this.getTxGasLimit(),
       });
-      return this.publicClient.waitForTransactionReceipt({ hash });
+      return this.publicClient.waitForTransactionReceipt({ hash, confirmations: TX_CONFIRMATIONS });
     }
   }
 
@@ -136,7 +137,7 @@ export class HelixLpBridge extends BaseBridge {
             value: fee,
           })
         : this.walletClient.writeContract({ address, abi, gas, functionName: "increaseFee", args: [transferId, fee] }));
-      return await this.publicClient.waitForTransactionReceipt({ hash });
+      return await this.publicClient.waitForTransactionReceipt({ hash, confirmations: TX_CONFIRMATIONS });
     }
   }
 

diff --git a/packages/xtoken-ui/src/bridges/helixbridge-dvmdvm.ts b/packages/xtoken-ui/src/bridges/helixbridge-dvmdvm.ts
@@ -2,6 +2,7 @@ import { BridgeConstructorArgs, TransferOptions } from "../types/bridge";
 import { BaseBridge } from "./base";
 import { Address, TransactionReceipt } from "viem";
 import { HistoryRecord } from "../types/graphql";
+import { TX_CONFIRMATIONS } from "../config";
 
 /**
  * DVM <=> DVM
@@ -95,7 +96,7 @@ export class HelixBridgeDVMDVM extends BaseBridge {
         const hash = await (this.sourceToken.type === "native"
           ? this.walletClient.writeContract(nativeParams)
           : this.walletClient.writeContract(defaultParams));
-        return this.sourcePublicClient.waitForTransactionReceipt({ hash });
+        return this.sourcePublicClient.waitForTransactionReceipt({ hash, confirmations: TX_CONFIRMATIONS });
       }
     }
   }
@@ -141,7 +142,7 @@ export class HelixBridgeDVMDVM extends BaseBridge {
         const hash = await (this.targetToken?.type === "native"
           ? this.walletClient.writeContract(nativeParams)
           : this.walletClient.writeContract(defaultParams));
-        return this.sourcePublicClient.waitForTransactionReceipt({ hash });
+        return this.sourcePublicClient.waitForTransactionReceipt({ hash, confirmations: TX_CONFIRMATIONS });
       }
     }
   }
@@ -207,7 +208,7 @@ export class HelixBridgeDVMDVM extends BaseBridge {
           args: [this.specVersion.source, this.gasLimit, messageNonce, sendTokenAddress, record.sender, sendAmount],
         });
       }
-      return hash && this.publicClient.waitForTransactionReceipt({ hash });
+      return hash && this.publicClient.waitForTransactionReceipt({ hash, confirmations: TX_CONFIRMATIONS });
     }
   }