From d826e886eba989c35b3f28145f815642684f84d7 Mon Sep 17 00:00:00 2001 From: Korbinian Date: Tue, 26 Mar 2024 01:15:00 +0100 Subject: [PATCH 1/8] fix(bridge-ui): canonical check can use wrong chain, incorrect supported chain check (#16526) --- .../Transactions/Dialogs/Claim.svelte | 45 +----------- .../Dialogs/ClaimDialog/ClaimDialog.svelte | 73 +++++++++++++++---- packages/bridge-ui/src/i18n/en.json | 8 +- .../libs/token/getCanonicalInfoForToken.ts | 13 +++- .../src/libs/token/getTokenAddresses.ts | 2 + packages/bridge-ui/src/libs/wagmi/watcher.ts | 10 +-- 6 files changed, 83 insertions(+), 68 deletions(-) diff --git a/packages/bridge-ui/src/components/Transactions/Dialogs/Claim.svelte b/packages/bridge-ui/src/components/Transactions/Dialogs/Claim.svelte index 03484e7f50..db38f7d7b3 100644 --- a/packages/bridge-ui/src/components/Transactions/Dialogs/Claim.svelte +++ b/packages/bridge-ui/src/components/Transactions/Dialogs/Claim.svelte @@ -2,18 +2,9 @@ import { switchChain } from '@wagmi/core'; import { log } from 'debug'; import { createEventDispatcher } from 'svelte'; - import { t } from 'svelte-i18n'; - import { ContractFunctionExecutionError, UserRejectedRequestError } from 'viem'; - import { errorToast, warningToast } from '$components/NotificationToast/NotificationToast.svelte'; import { bridges, type BridgeTransaction } from '$libs/bridge'; - import { - InsufficientBalanceError, - InvalidProofError, - NotConnectedError, - ProcessMessageError, - RetryError, - } from '$libs/error'; + import { NotConnectedError } from '$libs/error'; import { getConnectedWallet } from '$libs/util/getConnectedWallet'; import { config } from '$libs/wagmi'; import { account } from '$stores/account'; @@ -62,41 +53,7 @@ dispatch('claimingTxSent', { txHash, type: 'claim' }); } catch (err) { - handleClaimError(err); - dispatch('error', { error: err, action: 'claim' }); } }; - - const handleClaimError = (err: unknown) => { - switch (true) { - case err instanceof NotConnectedError: - warningToast({ title: $t('messages.account.required') }); - break; - case err instanceof UserRejectedRequestError: - warningToast({ title: $t('transactions.actions.claim.rejected.title') }); - break; - case err instanceof InsufficientBalanceError: - dispatch('insufficientFunds', { tx: bridgeTx }); - break; - case err instanceof InvalidProofError: - errorToast({ title: $t('common.error'), message: $t('bridge.errors.invalid_proof_provided') }); - break; - case err instanceof ProcessMessageError: - errorToast({ title: $t('bridge.errors.process_message_error') }); - break; - case err instanceof RetryError: - errorToast({ title: $t('bridge.errors.retry_error') }); - break; - case err instanceof ContractFunctionExecutionError: - console.error('!========= ContractFunctionExecutionError', err); - break; - default: - errorToast({ - title: $t('bridge.errors.unknown_error.title'), - message: $t('bridge.errors.unknown_error.message'), - }); - break; - } - }; diff --git a/packages/bridge-ui/src/components/Transactions/Dialogs/ClaimDialog/ClaimDialog.svelte b/packages/bridge-ui/src/components/Transactions/Dialogs/ClaimDialog/ClaimDialog.svelte index ba3fcb1228..a5c9405fef 100644 --- a/packages/bridge-ui/src/components/Transactions/Dialogs/ClaimDialog/ClaimDialog.svelte +++ b/packages/bridge-ui/src/components/Transactions/Dialogs/ClaimDialog/ClaimDialog.svelte @@ -1,16 +1,28 @@ @@ -74,7 +87,7 @@

{@html statusTitle}

- {@html statusDescription} + {@html successDescription} {:else if claiming} diff --git a/packages/bridge-ui/src/components/Transactions/Dialogs/RetryDialog/RetryDialog.svelte b/packages/bridge-ui/src/components/Transactions/Dialogs/RetryDialog/RetryDialog.svelte index 63a7b7edf9..697168c4c0 100644 --- a/packages/bridge-ui/src/components/Transactions/Dialogs/RetryDialog/RetryDialog.svelte +++ b/packages/bridge-ui/src/components/Transactions/Dialogs/RetryDialog/RetryDialog.svelte @@ -1,61 +1,103 @@ @@ -67,30 +109,52 @@
-

{$t('token_dropdown.label')}

- {item} - handlePreviousStep()}> - {$t('bridge.step.import.title')} +

{$t('transactions.retry.steps.title')}

+ {$t('bridge.step.review.title')} + isActive={activeStep === RetrySteps.SELECT}>{$t('transactions.retry.steps.select.title')} {$t('bridge.step.confirm.title')} + isActive={activeStep === RetrySteps.REVIEW}>{$t('common.review')} + {$t('common.confirm')} -

- Lorem ipsum dolor sit amet consectetur adipisicing elit. A inventore, beatae aliquid quidem consectetur fuga? - Inventore ab dolorum reprehenderit possimus quidem voluptatem, rem repellat, laudantium fugit doloribus - aspernatur esse perferendis! -

-
- - + + {#if activeStep === RetrySteps.SELECT} + + {:else if activeStep === RetrySteps.REVIEW} + + {:else if activeStep === RetrySteps.CONFIRM} + + {/if} +
+
+ +
{:else if bridgeTxStatus === MessageStatus.RETRIABLE} - {:else if bridgeTxStatus === MessageStatus.DONE} {$t('transactions.status.claimed.name')} {:else if bridgeTxStatus === MessageStatus.FAILED} - {:else} @@ -162,7 +167,8 @@ {/if}
- + + here.", "title": "Transaction completed" }, "tx": { @@ -472,7 +473,7 @@ } }, "review": { - "name": "Prerequisites", + "name": "Review", "title": "Claim Transaction details" }, "title": "Claim your assets" @@ -507,6 +508,14 @@ "explorer_short": "View" }, "no_transactions": "No transactions found", + "retry": { + "steps": { + "select": { + "title": "Select" + }, + "title": "Retry claiming" + } + }, "status": { "claim": { "description": "Your asset is now ready for claiming on the destination chain and requires a transaction. If you have set a processing fee, the relayer will automatically handle the claiming process on your behalf.", From 3e3f529163e9e1a1e344c9dd1a7e60c53abc8d73 Mon Sep 17 00:00:00 2001 From: xiaodino Date: Wed, 27 Mar 2024 14:53:13 -0700 Subject: [PATCH 8/8] feat(relayer): add one more prometheus target for rabbitmq queue (#16539) Co-authored-by: Korbinian --- packages/relayer/docker-compose/prometheus.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/relayer/docker-compose/prometheus.yml b/packages/relayer/docker-compose/prometheus.yml index 578890489c..ca10d4ddf5 100644 --- a/packages/relayer/docker-compose/prometheus.yml +++ b/packages/relayer/docker-compose/prometheus.yml @@ -10,3 +10,8 @@ scrape_configs: - job_name: "rabbitmq" static_configs: - targets: ["host.docker.internal:15692"] + + - job_name: "rabbitmq_queue" + metrics_path: /metrics/per-object + static_configs: + - targets: ["host.docker.internal:15692"]