-
diff --git a/packages/xtoken-home/src/components/footer.tsx b/packages/xtoken-home/src/components/footer.tsx
index 6999ac7..a5132f8 100644
--- 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) {
- {`© ${new Date().getFullYear()} Developed by Helix Bridge Team`}
+ {`© ${new Date().getFullYear()} Developed by Helixbox Team`}
-
-
+
-
+
diff --git a/packages/xtoken-ui/package.json b/packages/xtoken-ui/package.json
index 154ce1a..45fd1c3 100644
--- 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
index a2662ef..54ee339 100644
--- 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
index bcba63f..47bfa32 100644
--- 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
index 524ee6d..fc070c5 100644
--- 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 });
}
}
diff --git a/packages/xtoken-ui/src/bridges/helixbridge-dvmevm.ts b/packages/xtoken-ui/src/bridges/helixbridge-dvmevm.ts
index 5c9235b..735eb2a 100644
--- a/packages/xtoken-ui/src/bridges/helixbridge-dvmevm.ts
+++ b/packages/xtoken-ui/src/bridges/helixbridge-dvmevm.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 <=> EVM
@@ -78,7 +79,7 @@ export class HelixBridgeDVMEVM 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 });
}
}
}
@@ -124,7 +125,7 @@ export class HelixBridgeDVMEVM 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 });
}
}
}
@@ -160,7 +161,7 @@ export class HelixBridgeDVMEVM extends BaseBridge {
],
gas: this.getTxGasLimit(),
});
- return this.publicClient.waitForTransactionReceipt({ hash });
+ return this.publicClient.waitForTransactionReceipt({ hash, confirmations: TX_CONFIRMATIONS });
}
}
@@ -207,7 +208,7 @@ export class HelixBridgeDVMEVM extends BaseBridge {
args: [transferId, sendTokenAddress, record.sender, sendAmount],
});
}
- return hash && this.publicClient.waitForTransactionReceipt({ hash });
+ return hash && this.publicClient.waitForTransactionReceipt({ hash, confirmations: TX_CONFIRMATIONS });
}
}
diff --git a/packages/xtoken-ui/src/bridges/l2bridge.ts b/packages/xtoken-ui/src/bridges/l2bridge.ts
index f621633..d580319 100644
--- a/packages/xtoken-ui/src/bridges/l2bridge.ts
+++ b/packages/xtoken-ui/src/bridges/l2bridge.ts
@@ -1,3 +1,4 @@
+import { TX_CONFIRMATIONS } from "../config";
import { BridgeConstructorArgs, TransferOptions } from "../types/bridge";
import { BaseBridge } from "./base";
import { Address, TransactionReceipt, encodeAbiParameters } from "viem";
@@ -73,7 +74,7 @@ export class L2ArbitrumBridge extends BaseBridge {
return this.sourcePublicClient.estimateContractGas(defaultParams);
} else if (this.walletClient) {
const hash = await this.walletClient.writeContract(defaultParams);
- return this.sourcePublicClient.waitForTransactionReceipt({ hash });
+ return this.sourcePublicClient.waitForTransactionReceipt({ hash, confirmations: TX_CONFIRMATIONS });
}
}
}
diff --git a/packages/xtoken-ui/src/bridges/xtoken-next.ts b/packages/xtoken-ui/src/bridges/xtoken-next.ts
index 3f47cf4..9fc724a 100644
--- a/packages/xtoken-ui/src/bridges/xtoken-next.ts
+++ b/packages/xtoken-ui/src/bridges/xtoken-next.ts
@@ -16,6 +16,7 @@ import {
isTronChain,
waitForTronTransactionReceipt,
} from "../utils";
+import { TX_CONFIRMATIONS } from "../config";
export class XTokenNextBridge extends BaseBridge {
constructor(args: BridgeConstructorArgs) {
@@ -261,7 +262,7 @@ export class XTokenNextBridge extends BaseBridge {
return this.sourcePublicClient.estimateContractGas(defaultParams);
} else if (this.walletClient) {
const hash = await this.walletClient.writeContract(defaultParams);
- return this.sourcePublicClient.waitForTransactionReceipt({ hash });
+ return this.sourcePublicClient.waitForTransactionReceipt({ hash, confirmations: TX_CONFIRMATIONS });
}
} else {
const defaultParams = {
@@ -287,7 +288,7 @@ export class XTokenNextBridge extends BaseBridge {
return this.sourcePublicClient.estimateContractGas(defaultParams);
} else if (this.walletClient) {
const hash = await this.walletClient.writeContract(defaultParams);
- return this.sourcePublicClient.waitForTransactionReceipt({ hash });
+ return this.sourcePublicClient.waitForTransactionReceipt({ hash, confirmations: TX_CONFIRMATIONS });
}
}
} else if (this.crossInfo?.action === "redeem" && this.sourcePublicClient && account) {
@@ -306,7 +307,7 @@ export class XTokenNextBridge extends BaseBridge {
return this.sourcePublicClient.estimateContractGas(defaultParams);
} else if (this.walletClient) {
const hash = await this.walletClient.writeContract(defaultParams);
- return this.sourcePublicClient.waitForTransactionReceipt({ hash });
+ return this.sourcePublicClient.waitForTransactionReceipt({ hash, confirmations: TX_CONFIRMATIONS });
}
} else {
const defaultParams = {
@@ -323,7 +324,7 @@ export class XTokenNextBridge extends BaseBridge {
return this.sourcePublicClient.estimateContractGas(defaultParams);
} else if (this.walletClient) {
const hash = await this.walletClient.writeContract(defaultParams);
- return this.sourcePublicClient.waitForTransactionReceipt({ hash });
+ return this.sourcePublicClient.waitForTransactionReceipt({ hash, confirmations: TX_CONFIRMATIONS });
}
}
}
@@ -473,7 +474,7 @@ export class XTokenNextBridge extends BaseBridge {
const guard = await this._getTargetGuard();
if (record.recvTokenAddress && guard && this.contract && this.walletClient && this.publicClient) {
- const hash = await this.walletClient.writeContract({
+ const { request } = await this.publicClient.simulateContract({
abi: (await import("../abi/guard-next")).default,
functionName: "claim",
args: [
@@ -488,7 +489,8 @@ export class XTokenNextBridge extends BaseBridge {
address: guard,
gas: this.getTxGasLimit(),
});
- return this.publicClient.waitForTransactionReceipt({ hash });
+ const hash = await this.walletClient.writeContract(request);
+ return this.publicClient.waitForTransactionReceipt({ hash, confirmations: TX_CONFIRMATIONS });
}
}
@@ -577,7 +579,7 @@ export class XTokenNextBridge extends BaseBridge {
gas: this.getTxGasLimit(),
value: feeAndParams.fee,
});
- return this.publicClient.waitForTransactionReceipt({ hash });
+ return this.publicClient.waitForTransactionReceipt({ hash, confirmations: TX_CONFIRMATIONS });
}
}
} else if (this.crossInfo?.action === "redeem") {
@@ -649,7 +651,7 @@ export class XTokenNextBridge extends BaseBridge {
gas: this.getTxGasLimit(),
value: feeAndParams.fee,
});
- return this.publicClient.waitForTransactionReceipt({ hash });
+ return this.publicClient.waitForTransactionReceipt({ hash, confirmations: TX_CONFIRMATIONS });
}
}
}
diff --git a/packages/xtoken-ui/src/bridges/xtoken-v3.ts b/packages/xtoken-ui/src/bridges/xtoken-v3.ts
index bb50636..93265a7 100644
--- a/packages/xtoken-ui/src/bridges/xtoken-v3.ts
+++ b/packages/xtoken-ui/src/bridges/xtoken-v3.ts
@@ -2,6 +2,7 @@ import { BridgeConstructorArgs, GetFeeArgs, HistoryRecord, Token, TransferOption
import { BaseBridge } from ".";
import { Address, Hex, TransactionReceipt, encodeFunctionData, isAddressEqual } from "viem";
import { fetchMsglineFeeAndParams, getMessagerAddress } from "../utils";
+import { TX_CONFIRMATIONS } from "../config";
export class XTokenV3Bridge extends BaseBridge {
constructor(args: BridgeConstructorArgs) {
@@ -72,7 +73,7 @@ export class XTokenV3Bridge extends BaseBridge {
return this.sourcePublicClient.estimateContractGas(defaultParams);
} else if (this.walletClient) {
const hash = await this.walletClient.writeContract(defaultParams);
- return this.sourcePublicClient.waitForTransactionReceipt({ hash });
+ return this.sourcePublicClient.waitForTransactionReceipt({ hash, confirmations: TX_CONFIRMATIONS });
}
} else if (this.crossInfo?.action === "redeem") {
const defaultParams = {
@@ -89,7 +90,7 @@ export class XTokenV3Bridge extends BaseBridge {
return this.sourcePublicClient.estimateContractGas(defaultParams);
} else if (this.walletClient) {
const hash = await this.walletClient.writeContract(defaultParams);
- return this.sourcePublicClient.waitForTransactionReceipt({ hash });
+ return this.sourcePublicClient.waitForTransactionReceipt({ hash, confirmations: TX_CONFIRMATIONS });
}
}
}
@@ -197,7 +198,7 @@ export class XTokenV3Bridge extends BaseBridge {
address: guardContract,
gas: this.getTxGasLimit(),
});
- return this.publicClient.waitForTransactionReceipt({ hash });
+ return this.publicClient.waitForTransactionReceipt({ hash, confirmations: TX_CONFIRMATIONS });
}
}
}
@@ -299,7 +300,7 @@ export class XTokenV3Bridge extends BaseBridge {
}
}
- return hash && this.publicClient.waitForTransactionReceipt({ hash });
+ return hash && this.publicClient.waitForTransactionReceipt({ hash, confirmations: TX_CONFIRMATIONS });
}
}
}
diff --git a/packages/xtoken-ui/src/components/faucet.tsx b/packages/xtoken-ui/src/components/faucet.tsx
index 6aaeeaa..f42cadc 100644
--- a/packages/xtoken-ui/src/components/faucet.tsx
+++ b/packages/xtoken-ui/src/components/faucet.tsx
@@ -8,6 +8,7 @@ import abi from "../abi/faucet";
import Tooltip from "../ui/tooltip";
import CountLoading from "../ui/count-loading";
import Modal from "../ui/modal";
+import { TX_CONFIRMATIONS } from "../config";
interface Props {
sourceChain: ChainConfig;
@@ -40,7 +41,7 @@ export default function Faucet({ sourceChain, sourceToken, onSuccess = () => und
functionName: "faucet",
args: [1n <= allow ? allow - 1n : allow],
});
- const receipt = await publicClient.waitForTransactionReceipt({ hash });
+ const receipt = await publicClient.waitForTransactionReceipt({ hash, confirmations: TX_CONFIRMATIONS });
notifyTransaction(receipt, sourceChain);
setBusy(false);
diff --git a/packages/xtoken-ui/src/components/footer.tsx b/packages/xtoken-ui/src/components/footer.tsx
index f35afaf..3562698 100644
--- a/packages/xtoken-ui/src/components/footer.tsx
+++ b/packages/xtoken-ui/src/components/footer.tsx
@@ -3,7 +3,7 @@ import { PropsWithChildren } from "react";
export default function Footer() {
return (
+ 
