should check chainId before deciamals

asilenced · Aug 25, 2022 · c165c66 · c165c66
1 parent d5166e9
commit c165c66
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/chains/substrate/event.go b/chains/substrate/event.go
@@ -20,6 +20,7 @@ import (
 
 var (
 	ValueNotStringError = errors.New("value not string")
+	SkipError           = errors.New("should skip")
 )
 
 type eventName string
@@ -52,7 +53,7 @@ func fungibleTransferHandler(evtI interface{}, log log15.Logger) (msg.Message, e
 }
 
 // FungibleTransfer(AccountId, ChainId, DepositNonce, ResourceId, U256, Vec<u8>)
-func FungibleTransferEventData(evt *substrate.ChainEvent, decimals map[string]decimal.Decimal) (*EventFungibleTransfer, error) {
+func (l *listener) FungibleTransferEventData(evt *substrate.ChainEvent, decimals map[string]decimal.Decimal) (*EventFungibleTransfer, error) {
 	if len(evt.Params) != 6 {
 		return nil, fmt.Errorf("EventFungibleTransfer params number not right: %d, expected: 6", len(evt.Params))
 	}
@@ -62,6 +63,10 @@ func FungibleTransferEventData(evt *substrate.ChainEvent, decimals map[string]de
 		return nil, fmt.Errorf("EventFungibleTransfer params[1] -> chainId error: %s", err)
 	}
 
+	if !l.router.SupportChainId(msg.ChainId(chainId)) {
+		return nil, SkipError
+	}
+
 	nonce, err := parseDepositNonce(evt.Params[2])
 	if err != nil {
 		return nil, fmt.Errorf("EventFungibleTransfer params[1] -> chainId error: %s", err)

diff --git a/chains/substrate/listener.go b/chains/substrate/listener.go
@@ -176,12 +176,16 @@ func (l *listener) processEvents(blockNum uint64) error {
 			continue
 		}
 
-		data, err := FungibleTransferEventData(evt, l.decimals)
+		data, err := l.FungibleTransferEventData(evt, l.decimals)
 		if err != nil {
-			if strings.Contains(err.Error(), "recipient error") {
+			switch {
+			case strings.Contains(err.Error(), "recipient error"):
 				l.log.Error("skip recipient err", "blockNumber", blockNum, "eventId", evt.EventId)
 				continue
+			case err == SkipError:
+				continue
 			}
+
 			return err
 		}
 		//skip event if not support chainId