Merge branch 'main' into message.processor

taikoxyz · May 7, 2024 · ba05167 · ba05167
2 parents 7d2eb01 + fcbc346
commit ba05167
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/...ui/src/components/Bridge/FungibleBridgeComponents/ImportStep/TokenInput/TokenInput.svelte b/...ui/src/components/Bridge/FungibleBridgeComponents/ImportStep/TokenInput/TokenInput.svelte
@@ -231,7 +231,7 @@
     </div>
 
     <!-- Token Dropdown -->
-    <TokenDropdown combined class="min-w-[151px] z-20 " {tokens} bind:value={$selectedToken} bind:disabled />
+    <TokenDropdown combined class="min-w-[151px] z-20" {tokens} bind:value={$selectedToken} bind:disabled />
   </div>
 
   <div class="flex mt-[8px] min-h-[24px]">
@@ -242,9 +242,9 @@
           >{$t('recipient.label')} <ProcessingFee textOnly class="text-tertiary-content" bind:hasEnoughEth /></span>
       </div>
     {:else if showInsufficientBalanceAlert}
-      <FlatAlert type="error" message={$t('bridge.errors.insufficient_balance.title')} class="relative " />
+      <FlatAlert type="error" message={$t('bridge.errors.insufficient_balance.title')} class="relative" />
     {:else if showInvalidTokenAlert}
-      <FlatAlert type="error" message={$t('bridge.errors.custom_token.not_found.message')} class="relative " />
+      <FlatAlert type="error" message={$t('bridge.errors.custom_token.not_found.message')} class="relative" />
     {:else}
       <LoadingText mask="" class="w-1/2" />
     {/if}

diff --git a/packages/bridge-ui/src/components/ChainSelectors/SelectorDialogs/ChainsDialog.svelte b/packages/bridge-ui/src/components/ChainSelectors/SelectorDialogs/ChainsDialog.svelte
@@ -62,10 +62,10 @@
         <li
           role="menuitem"
           tabindex="0"
-          class=" h-[64px] rounded-[10px]
-          {disabled ? 'opacity-50 ' : 'hover:bg-primary-brand cursor-pointer'}"
+          class="h-[64px] rounded-[10px] text-primary-content
+          {disabled ? 'opacity-50' : 'hover:bg-primary-brand hover:text-white'}"
           aria-disabled={disabled}>
-          <label class="f-row items-center w-full h-full p-[16px] text-primary-content hover:text-white">
+          <label class="f-row items-center w-full h-full p-[16px] {disabled ? 'cursor-not-allowed' : 'cursor-pointer'}">
             <input
               type="radio"
               name="nft-radio"

diff --git 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
@@ -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))

diff --git 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
 	}