Return error on nil tokenID

blocknative · Feb 19, 2024 · 44f9915 · 44f9915
1 parent 0376980
commit 44f9915
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/eth/tracers/blocknative/decoder/evm_caller.go b/eth/tracers/blocknative/decoder/evm_caller.go
@@ -88,6 +88,10 @@ func evmCallMethodDecimals(evmCall evmCallFn, addr common.Address) (uint8, error
 
 // evmCallMethodTokenURI decodes the tokenURI of an asset from the EVM.
 func evmCallMethodTokenURI(evmCall evmCallFn, addr common.Address, tokenID *big.Int) (string, error) {
+	if tokenID == nil {
+		return "", fmt.Errorf("tokenID is nil")
+	}
+
 	tokenIDBytes := tokenID.Bytes()
 	if len(tokenIDBytes) > 32 {
 		return "", fmt.Errorf("tokenID is too large")
@@ -99,6 +103,10 @@ func evmCallMethodTokenURI(evmCall evmCallFn, addr common.Address, tokenID *big.
 
 // evmCallMethodURI decodes the URI of an asset from the EVM.
 func evmCallMethodURI(evmCall evmCallFn, addr common.Address, tokenID *big.Int) (string, error) {
+	if tokenID == nil {
+		return "", fmt.Errorf("tokenID is nil")
+	}
+
 	tokenIDBytes := common.LeftPadBytes(tokenID.Bytes(), 32)
 	input := append(methodIDURI, tokenIDBytes...)
 	return callAndDecodeString(evmCall, addr, input)

diff --git a/eth/tracers/blocknative/decoder/methods.go b/eth/tracers/blocknative/decoder/methods.go
@@ -5,6 +5,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+
 	"github.com/ethereum/go-ethereum/common"
 )
 
@@ -82,7 +83,7 @@ var methodSignatures = map[string]string{
 type MethodID []byte
 
 func (m MethodID) Is(other MethodID) bool {
-	return bytes.Compare(m, other) == 0
+	return bytes.Equal(m, other)
 }
 
 func (m MethodID) String() string {
@@ -113,7 +114,6 @@ func (m *MethodID) UnmarshalJSON(b []byte) error {
 	}
 
 	if len(b) > methodIDEncodedLen {
-		fmt.Println("sdfasdfasdf:", len(b), string(b), b)
 		return ErrMethodIDTooLong
 	}