- {#if activeStep === RetrySteps.SELECT}
+ {#if activeStep === RetrySteps.CHECK}
+
diff --git a/packages/bridge-ui/src/components/Dialogs/RetryDialog/types.ts b/packages/bridge-ui/src/components/Dialogs/RetryDialog/types.ts
index 5d2562bc92d..182804cd24d 100644
--- a/packages/bridge-ui/src/components/Dialogs/RetryDialog/types.ts
+++ b/packages/bridge-ui/src/components/Dialogs/RetryDialog/types.ts
@@ -1,10 +1,11 @@
export const enum RetrySteps {
+ CHECK,
SELECT,
REVIEW,
CONFIRM,
}
-export const INITIAL_STEP = RetrySteps.SELECT;
+export const INITIAL_STEP = RetrySteps.CHECK;
export const enum RetryStatus {
PENDING,
diff --git a/packages/bridge-ui/src/components/Dialogs/ClaimDialog/ClaimSteps/ClaimPreCheck.svelte b/packages/bridge-ui/src/components/Dialogs/Shared/ClaimPreCheck.svelte
similarity index 50%
rename from packages/bridge-ui/src/components/Dialogs/ClaimDialog/ClaimSteps/ClaimPreCheck.svelte
rename to packages/bridge-ui/src/components/Dialogs/Shared/ClaimPreCheck.svelte
index e6fc289fe35..94e66690b83 100644
--- a/packages/bridge-ui/src/components/Dialogs/ClaimDialog/ClaimSteps/ClaimPreCheck.svelte
+++ b/packages/bridge-ui/src/components/Dialogs/Shared/ClaimPreCheck.svelte
@@ -1,23 +1,27 @@
@@ -76,7 +105,15 @@
-
{$t('transactions.claim.steps.pre_check.chain_check')}
+
+ {$t('transactions.claim.steps.pre_check.chain_check')}
+
+ {$t('transactions.claim.steps.pre_check.tooltip.chain.title')}
+
+ {$t('transactions.claim.steps.pre_check.tooltip.chain.description')}
+
+
+
{#if checkingPrerequisites}
{:else if correctChain}
@@ -86,7 +123,13 @@
{/if}
-
{$t('transactions.claim.steps.pre_check.funds_check')}
+
+ {$t('transactions.claim.steps.pre_check.funds_check')}
+
+ {$t('transactions.claim.steps.pre_check.tooltip.funds.title')}
+ {$t('transactions.claim.steps.pre_check.tooltip.funds.description')}
+
+
{#if checkingPrerequisites}
{:else if hasEnoughEth}
@@ -95,6 +138,24 @@
{/if}
+ {#if isL2Chain(Number(tx.srcChainId))}
+
+
+ {$t('transactions.claim.steps.pre_check.quota_check')}
+
+ {$t('transactions.claim.steps.pre_check.tooltip.quota.title')}
+ {$t('transactions.claim.steps.pre_check.tooltip.quota.description')}
+
+
+ {#if checkingPrerequisites}
+
+ {:else if hasEnoughQuota}
+
+ {:else}
+
+ {/if}
+
+ {/if}
{#if !canContinue && !correctChain}
diff --git a/packages/bridge-ui/src/components/Tooltip/Tooltip.svelte b/packages/bridge-ui/src/components/Tooltip/Tooltip.svelte
index 644ce3e0a70..cf779ef53af 100644
--- a/packages/bridge-ui/src/components/Tooltip/Tooltip.svelte
+++ b/packages/bridge-ui/src/components/Tooltip/Tooltip.svelte
@@ -7,11 +7,11 @@
import { uid } from '$libs/util/uid';
export let position: Position = 'top';
+ export let tooltipOpen = false;
let tooltipId = `tooltip-${uid()}`;
let tooltipClass = `block dialog-tooltip`;
- export let tooltipOpen = false;
- let classes = classNames('flex', $$props.class || 'relative');
+ let classes = classNames('flex z-10 ', $$props.class || 'relative');
const GAP = 10; // distance between trigger element and tooltip
let triggerElem: HTMLButtonElement;
diff --git a/packages/bridge-ui/src/i18n/en.json b/packages/bridge-ui/src/i18n/en.json
index 0a32cdb4acf..9479addf465 100644
--- a/packages/bridge-ui/src/i18n/en.json
+++ b/packages/bridge-ui/src/i18n/en.json
@@ -472,10 +472,25 @@
"pre_check": {
"chain_check": "Connected to the correct chain",
"funds_check": "Sufficient funds to claim",
+ "quota_check": "Sufficient daily quota",
"ready": "You can continue with the claim process!",
"step": "Claim step",
"switch_chain": "This transaction is bridging to
{chain} You need to be connected to this chain",
- "title": "Requirements"
+ "title": "Requirements",
+ "tooltip": {
+ "chain": {
+ "description": "You need to be connected to the chain you want to bridge your funds to.",
+ "title": "What is \"Connected to the correct chain\"?"
+ },
+ "funds": {
+ "description": "In order to claim the transaction yourself, you need enough funds on the destination chain. If you've kept the default processing fee, the relayer will likely claim for you soon.",
+ "title": "What is \"Sufficient funds to claim\"?"
+ },
+ "quota": {
+ "description": "Currently there is a daily limit of how much ETH can be bridged to L1. If the quota is reached, please try again the next day.",
+ "title": "What is \"Sufficient daily quota\"?"
+ }
+ }
},
"review": {
"name": "Review",
diff --git a/packages/bridge-ui/src/libs/bridge/ETHBridge.ts b/packages/bridge-ui/src/libs/bridge/ETHBridge.ts
index 881b2883646..625db1d1511 100644
--- a/packages/bridge-ui/src/libs/bridge/ETHBridge.ts
+++ b/packages/bridge-ui/src/libs/bridge/ETHBridge.ts
@@ -56,11 +56,13 @@ export class ETHBridge extends Bridge {
id: BigInt(0), // will be set in contract
};
- const minGasLimit = await bridgeContract.read.getMessageMinGasLimit([0n]);
- log('Min gas limit for message', minGasLimit);
+ if (processingFee !== 0n) {
+ const minGasLimit = await bridgeContract.read.getMessageMinGasLimit([0n]);
+ log('Min gas limit for message', minGasLimit);
- const gasLimit = minGasLimit + 1;
- message.gasLimit = gasLimit;
+ const gasLimit = minGasLimit + 1;
+ message.gasLimit = gasLimit;
+ }
log('Preparing transaction with message', message);
diff --git a/packages/bridge-ui/src/libs/bridge/checkBridgeQuota.ts b/packages/bridge-ui/src/libs/bridge/checkBridgeQuota.ts
new file mode 100644
index 00000000000..5224d0957cd
--- /dev/null
+++ b/packages/bridge-ui/src/libs/bridge/checkBridgeQuota.ts
@@ -0,0 +1,63 @@
+import { readContract } from '@wagmi/core';
+import { type Address, zeroAddress } from 'viem';
+
+import { quotaManagerAbi } from '$abi';
+import { isL2Chain } from '$libs/chain';
+import { getLogger } from '$libs/util/logger';
+import { config } from '$libs/wagmi';
+
+import { type BridgeTransaction, ContractType } from '.';
+import { getContractAddressByType } from './getContractAddressByType';
+
+const log = getLogger('bridge:checkBridgeQuota');
+
+export const checkBridgeQuota = async ({
+ transaction,
+ amount,
+}: {
+ transaction: BridgeTransaction;
+ tokenAddress?: Address;
+ amount: bigint;
+}) => {
+ log(
+ 'Checking bridge quota',
+ transaction.canonicalTokenAddress,
+ amount,
+ isL2Chain(Number(transaction.destChainId)),
+ transaction.destChainId,
+ transaction.srcChainId,
+ );
+
+ const tokenAddress =
+ transaction.canonicalTokenAddress && (transaction.canonicalTokenAddress as string) !== ''
+ ? transaction.canonicalTokenAddress
+ : zeroAddress;
+
+ if (isL2Chain(Number(transaction.destChainId))) {
+ // Quota only applies for transactions from L2-L1.
+ // So if the destination chain is an L2 chain, we can skip this check.
+ log('Skipping quota check for L2 chain');
+ return true;
+ }
+
+ const quotaManagerAddress = getContractAddressByType({
+ srcChainId: Number(transaction.destChainId),
+ destChainId: Number(transaction.srcChainId),
+ contractType: ContractType.QUOTAMANAGER,
+ });
+
+ const quota = await readContract(config, {
+ address: quotaManagerAddress,
+ abi: quotaManagerAbi,
+ chainId: Number(transaction.destChainId),
+ functionName: 'availableQuota',
+ args: [tokenAddress, 0n],
+ });
+
+ if (amount > quota) {
+ log('Not enough quota', quota, amount);
+ return false;
+ }
+ log('Quota:', quota, 'Amount:', amount, 'Has enough quota:', amount <= quota);
+ return true;
+};
diff --git a/packages/bridge-ui/src/libs/bridge/getContractAddressByType.ts b/packages/bridge-ui/src/libs/bridge/getContractAddressByType.ts
index 6ca431f2340..c39a835e67c 100644
--- a/packages/bridge-ui/src/libs/bridge/getContractAddressByType.ts
+++ b/packages/bridge-ui/src/libs/bridge/getContractAddressByType.ts
@@ -36,6 +36,12 @@ export const getContractAddressByType = (args: GetContractAddressType): Address
return addressConfig.signalServiceAddress;
case ContractType.CROSSCHAINSYNC:
return addressConfig.crossChainSyncAddress;
+ case ContractType.QUOTAMANAGER:
+ if (addressConfig.quotaManagerAddress) {
+ return addressConfig.quotaManagerAddress;
+ } else {
+ throw new Error('QuotaManager not configured for this chain pair');
+ }
default:
throw new Error('Invalid contract type');
}
diff --git a/packages/bridge-ui/src/libs/bridge/types.ts b/packages/bridge-ui/src/libs/bridge/types.ts
index cc3e656ac36..8a23cb4879a 100644
--- a/packages/bridge-ui/src/libs/bridge/types.ts
+++ b/packages/bridge-ui/src/libs/bridge/types.ts
@@ -108,6 +108,7 @@ export type BridgeTransaction = {
status?: MessageStatus;
receipt?: TransactionReceipt;
+ canonicalTokenAddress?: Address;
};
interface BaseBridgeTransferOp {
@@ -242,6 +243,7 @@ export type AddressConfig = {
erc1155VaultAddress: Address;
crossChainSyncAddress: Address;
signalServiceAddress: Address;
+ quotaManagerAddress?: Address;
hops?: Array
;
};
@@ -256,12 +258,13 @@ export enum ContractType {
VAULT,
SIGNALSERVICE,
CROSSCHAINSYNC,
+ QUOTAMANAGER,
}
export type GetContractAddressType = {
srcChainId: number;
destChainId: number;
- tokenType: TokenType;
+ tokenType?: TokenType;
contractType: ContractType;
};
diff --git a/packages/bridge-ui/src/libs/relayer/RelayerAPIService.ts b/packages/bridge-ui/src/libs/relayer/RelayerAPIService.ts
index c4e7fb8fe9e..02db6974cab 100644
--- a/packages/bridge-ui/src/libs/relayer/RelayerAPIService.ts
+++ b/packages/bridge-ui/src/libs/relayer/RelayerAPIService.ts
@@ -189,6 +189,7 @@ export class RelayerAPIService {
msgHash: tx.msgHash,
tokenType: _eventToTokenType(tx.eventType),
blockNumber: tx.data.Raw.blockNumber,
+ canonicalTokenAddress: tx.canonicalTokenAddress,
message: {
id: tx.data.Message.Id,
to: tx.data.Message.To,
diff --git a/packages/bridge-ui/wagmi.config.ts b/packages/bridge-ui/wagmi.config.ts
index cfbdfdcb209..f16bbd2c232 100644
--- a/packages/bridge-ui/wagmi.config.ts
+++ b/packages/bridge-ui/wagmi.config.ts
@@ -13,6 +13,7 @@ import ERC1155Vault from '../protocol/out/ERC1155Vault.sol/ERC1155Vault.json';
import FreeMintERC20 from '../protocol/out/FreeMintERC20.sol/FreeMintERC20.json';
import ICrossChainSync from '../protocol/out/ICrossChainSync.sol/ICrossChainSync.json';
import ISignalService from '../protocol/out/ISignalService.sol/ISignalService.json';
+import QuotaManager from '../protocol/out/QuotaManager.sol/QuotaManager.json';
export default defineConfig({
out: 'src/abi/index.ts',
@@ -57,5 +58,9 @@ export default defineConfig({
name: 'Erc1155',
abi: ERC1155.abi as Abi,
},
+ {
+ name: 'QuotaManager',
+ abi: QuotaManager.abi as Abi,
+ },
],
});