From 84080d4f2318b9742805deb9d680fa73760a44af Mon Sep 17 00:00:00 2001 From: polebug Date: Tue, 7 May 2024 10:05:55 +0800 Subject: [PATCH 1/3] fix(eventindexer): fix match logic for transferBatchSignatureHash (#17015) --- packages/eventindexer/indexer/filter.go | 2 +- packages/eventindexer/indexer/index_nft_transfers.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/eventindexer/indexer/filter.go b/packages/eventindexer/indexer/filter.go index 09a0e99ad62..d7849d3efee 100644 --- a/packages/eventindexer/indexer/filter.go +++ b/packages/eventindexer/indexer/filter.go @@ -36,7 +36,7 @@ func filterFunc( err = i.saveTransitionProvedEvents(ctx, chainID, transitionProvedEvents) if err != nil { - return errors.Wrap(err, "i.saveBlockProvenEvents") + return errors.Wrap(err, "i.saveTransitionProvedEvents") } return nil diff --git a/packages/eventindexer/indexer/index_nft_transfers.go b/packages/eventindexer/indexer/index_nft_transfers.go index 6f755ea8655..d27a35fdce1 100644 --- a/packages/eventindexer/indexer/index_nft_transfers.go +++ b/packages/eventindexer/indexer/index_nft_transfers.go @@ -177,7 +177,7 @@ func (i *Indexer) saveERC1155Transfer(ctx context.Context, chainID *big.Int, vLo } transfers = append(transfers, t) - } else if vLog.Topics[0].Hex() != transferBatchSignatureHash.Hex() { + } else if vLog.Topics[0].Hex() == transferBatchSignatureHash.Hex() { var t []transfer err = erc1155ABI.UnpackIntoInterface(&t, "TransferBatch", []byte(vLog.Data)) From 40e2b0cf547a2a053ca41ba0eea0cefa91c89454 Mon Sep 17 00:00:00 2001 From: bytenoob Date: Tue, 7 May 2024 10:36:51 +0800 Subject: [PATCH 2/3] chore(relayer): remove redundant code and add log for errTxReverted (#17012) Co-authored-by: Daniel Wang <99078276+dantaik@users.noreply.github.com> --- packages/relayer/processor/process_message.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/relayer/processor/process_message.go b/packages/relayer/processor/process_message.go index bc609f8a019..0ce7b430b61 100644 --- a/packages/relayer/processor/process_message.go +++ b/packages/relayer/processor/process_message.go @@ -98,15 +98,11 @@ func (p *Processor) processMessage( return false, msgBody.TimesRetried, err } - receipt, err := p.sendProcessMessageCall(ctx, msgBody.Event, encodedSignalProof) + _, err = p.sendProcessMessageCall(ctx, msgBody.Event, encodedSignalProof) if err != nil { return false, msgBody.TimesRetried, err } - if receipt.Status != types.ReceiptStatusSuccessful { - return false, msgBody.TimesRetried, err - } - messageStatus, err := p.destBridge.MessageStatus(&bind.CallOpts{ Context: ctx, }, msgBody.Event.MsgHash) @@ -412,6 +408,9 @@ func (p *Processor) sendProcessMessageCall( if receipt.Status != types.ReceiptStatusSuccessful { relayer.MessageSentEventsProcessedReverted.Inc() + slog.Warn("Transaction reverted", "txHash", hex.EncodeToString(receipt.TxHash.Bytes()), + "srcTxHash", event.Raw.TxHash.Hex(), + "status", receipt.Status) return nil, errTxReverted } From fcbc3463e623b81eb5ed9f73c5098e5fbea874ca Mon Sep 17 00:00:00 2001 From: ukurenov <154307006+ukurenov@users.noreply.github.com> Date: Tue, 7 May 2024 05:37:52 +0300 Subject: [PATCH 3/3] fix(bridge-ui): dropdown css and color css fix (#17000) Co-authored-by: Korbinian --- .../ImportStep/TokenInput/TokenInput.svelte | 6 +++--- .../ChainSelectors/SelectorDialogs/ChainsDialog.svelte | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/bridge-ui/src/components/Bridge/FungibleBridgeComponents/ImportStep/TokenInput/TokenInput.svelte b/packages/bridge-ui/src/components/Bridge/FungibleBridgeComponents/ImportStep/TokenInput/TokenInput.svelte index 8f81bbb7da8..f70cea6767a 100644 --- a/packages/bridge-ui/src/components/Bridge/FungibleBridgeComponents/ImportStep/TokenInput/TokenInput.svelte +++ b/packages/bridge-ui/src/components/Bridge/FungibleBridgeComponents/ImportStep/TokenInput/TokenInput.svelte @@ -231,7 +231,7 @@ - +
@@ -242,9 +242,9 @@ >{$t('recipient.label')}
{:else if showInsufficientBalanceAlert} - + {:else if showInvalidTokenAlert} - + {:else} {/if} diff --git a/packages/bridge-ui/src/components/ChainSelectors/SelectorDialogs/ChainsDialog.svelte b/packages/bridge-ui/src/components/ChainSelectors/SelectorDialogs/ChainsDialog.svelte index 2e1843a53d2..6317de54fa3 100644 --- a/packages/bridge-ui/src/components/ChainSelectors/SelectorDialogs/ChainsDialog.svelte +++ b/packages/bridge-ui/src/components/ChainSelectors/SelectorDialogs/ChainsDialog.svelte @@ -62,10 +62,10 @@