fix edge case. If claim isMessage

Author: ARR552

cmd/ulxly/balanceTreeUsage.md

@@ -7,7 +7,9 @@ Example usage:
 polycli ulxly compute-balance-tree \
         --l2-claims-file l2-claims-0-to-11454081.ndjson \
         --l2-deposits-file l2-deposits-0-to-11454081.ndjson \
-        --l2-network-id 3 | jq '.'
+        --l2-network-id 3
+        --bridge-address 0x528e26b25a34a4A5d0dbDa1d57D318153d2ED582 \
+        --rpc-url http://localhost:8213 | jq '.'
 ```
 
 In this case we are assuming we have two files

cmd/ulxly/balanceandnullifiertreehelper.go

@@ -1,12 +1,16 @@
 package ulxly
 
 import (
+	"bytes"
 	"fmt"
 	"math/big"
 	"strings"
 
+	"github.com/0xPolygon/cdk-rpc/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/golang-collections/collections/stack"
 	"github.com/rs/zerolog/log"
 )
 
@@ -40,10 +44,10 @@ func (t *TokenInfo) ToBits() []bool {
 }
 
 func (t *TokenInfo) String() string {
-    return fmt.Sprintf("%s-%s", t.OriginNetwork.String(), t.OriginTokenAddress.Hex())
+	return fmt.Sprintf("%s-%s", t.OriginNetwork.String(), t.OriginTokenAddress.Hex())
 }
 
-func TokenInfoStringToStruct(key string) (TokenInfo, error){
+func TokenInfoStringToStruct(key string) (TokenInfo, error) {
 	parts := strings.Split(key, "-")
 	if len(parts) != 2 {
 		return TokenInfo{}, fmt.Errorf("invalid key format: %s", key)
@@ -102,7 +106,7 @@ func NewBalanceTree() (*Balancer, error) {
 	var depth uint8 = 192
 	zeroHashes := generateZeroHashes(depth)
 	initRoot := crypto.Keccak256Hash(zeroHashes[depth-1].Bytes(), zeroHashes[depth-1].Bytes())
-	log.Info().Msg("Initial Root: "+ initRoot.String())
+	log.Info().Msg("Initial Root: " + initRoot.String())
 	return &Balancer{
 		tree: Tree{
 			zeroHashes: zeroHashes,
@@ -132,7 +136,7 @@ func NewNullifierTree() (*Nullifier, error) {
 	var depth uint8 = 64
 	zeroHashes := generateZeroHashes(depth)
 	initRoot := crypto.Keccak256Hash(zeroHashes[depth-1].Bytes(), zeroHashes[depth-1].Bytes())
-	log.Info().Msg("Initial Root: "+ initRoot.String())
+	log.Info().Msg("Initial Root: " + initRoot.String())
 	return &Nullifier{
 		tree: Tree{
 			zeroHashes: zeroHashes,
@@ -226,3 +230,62 @@ func (t *Tree) insertHelper(
 
 	return newHash, nil
 }
+
+var methodIDClaimMessage = common.Hex2Bytes("f5efcd79")
+
+func IsMessageClaim(input []byte) (bool, error) {
+	methodID := input[:4]
+	// Ignore ClaimAsset method
+	if bytes.Equal(methodID, methodIDClaimMessage) {
+		return true, nil
+	} else {
+		return false, nil
+	}
+}
+
+type call struct {
+	To    common.Address `json:"to"`
+	Value *types.ArgBig  `json:"value"`
+	Err   *string        `json:"error"`
+	Input types.ArgBytes `json:"input"`
+	Calls []call         `json:"calls"`
+}
+
+type tracerCfg struct {
+	Tracer string `json:"tracer"`
+}
+
+func checkClaimCalldata(client *ethclient.Client, bridge common.Address, claimHash common.Hash) (bool, error) {
+	c := &call{}
+	err := client.Client().Call(c, "debug_traceTransaction", claimHash, tracerCfg{Tracer: "callTracer"})
+	if err != nil {
+		return false, err
+	}
+
+	// find the claim linked to the event using DFS
+	callStack := stack.New()
+	callStack.Push(*c)
+	for {
+		if callStack.Len() == 0 {
+			break
+		}
+
+		currentCallInterface := callStack.Pop()
+		currentCall, ok := currentCallInterface.(call)
+		if !ok {
+			return false, fmt.Errorf("unexpected type for 'currentCall'. Expected 'call', got '%T'", currentCallInterface)
+		}
+
+		if currentCall.To == bridge {
+			isMessage, err := IsMessageClaim(currentCall.Input)
+			if err != nil {
+				return false, err
+			}
+			return isMessage, err
+		}
+		for _, c := range currentCall.Calls {
+			callStack.Push(c)
+		}
+	}
+	return false, fmt.Errorf("claim not found")
+}

cmd/ulxly/nullifierAndBalanceTreeUsage.md

@@ -7,7 +7,9 @@ Example usage:
 polycli ulxly compute-balance-nullifier-tree \
         --l2-claim-file l2-claim-0-to-11454081.ndjson \
         --l2-deposits-file l2-deposits-0-to-11454081.ndjson \
-        --l2-network-id 3 | jq '.'
+        --l2-network-id 3
+        --bridge-address 0x528e26b25a34a4A5d0dbDa1d57D318153d2ED582 \
+        --rpc-url http://localhost:8213 | jq '.'
 ```
 
 In this case we are assuming we have two files

cmd/ulxly/ulxly.go

@@ -319,11 +319,16 @@ func proof(args []string) error {
 
 func balanceTree() error {
 	l2NetworkID := balanceTreeOptions.L2NetworkID
+	bridgeAddress := common.HexToAddress(balanceTreeOptions.BridgeAddress)
+	client, err := ethclient.DialContext(context.Background(), balanceTreeOptions.RpcURL)
+	if err != nil {
+		return err
+	}
 	l2RawClaimsData, l2RawDepositsData, err := getBalanceTreeData()
 	if err != nil {
 		return err
 	}
-	root, err := computeBalanceTree(l2RawClaimsData, l2NetworkID, l2RawDepositsData)
+	root, err := computeBalanceTree(client, bridgeAddress, l2RawClaimsData, l2NetworkID, l2RawDepositsData)
 	if err != nil {
 		return err
 	}
@@ -354,11 +359,16 @@ func nullifierTree(args []string) error {
 
 func nullifierAndBalanceTree(args []string) error {
 	l2NetworkID := balanceTreeOptions.L2NetworkID
+	bridgeAddress := common.HexToAddress(balanceTreeOptions.BridgeAddress)
+	client, err := ethclient.DialContext(context.Background(), balanceTreeOptions.RpcURL)
+	if err != nil {
+		return err
+	}
 	l2RawClaimsData, l2RawDepositsData, err := getBalanceTreeData()
 	if err != nil {
 		return err
 	}
-	balanceTreeRoot, err := computeBalanceTree(l2RawClaimsData, l2NetworkID, l2RawDepositsData)
+	balanceTreeRoot, err := computeBalanceTree(client, bridgeAddress, l2RawClaimsData, l2NetworkID, l2RawDepositsData)
 	if err != nil {
 		return err
 	}
@@ -405,15 +415,15 @@ func computeNullifierTree(rawClaims []byte) (common.Hash, error) {
 		}
 		root, err = nTree.UpdateNullifierTree(nullifierKey)
 		if err != nil {
-			log.Error().Err(err).Uint32("OriginNetwork: ", claim.OriginNetwork).Msg("error computing nullifierTree. Claim information: GlobalIndex: "+claim.GlobalIndex.String()+", OriginAddress: "+claim.OriginAddress.String()+", Amount: "+claim.Amount.String())
+			log.Error().Err(err).Uint32("OriginNetwork: ", claim.OriginNetwork).Msg("error computing nullifierTree. Claim information: GlobalIndex: " + claim.GlobalIndex.String() + ", OriginAddress: " + claim.OriginAddress.String() + ", Amount: " + claim.Amount.String())
 			return common.Hash{}, err
 		}
 	}
 	log.Info().Msgf("Final nullifierTree root: %s", root.String())
 	return root, nil
 }
 
-func computeBalanceTree(l2RawClaims []byte, l2NetworkID uint32, l2RawDeposits []byte) (common.Hash, error) {
+func computeBalanceTree(client *ethclient.Client, bridgeAddress common.Address, l2RawClaims []byte, l2NetworkID uint32, l2RawDeposits []byte) (common.Hash, error) {
 	buf := bytes.NewBuffer(l2RawClaims)
 	scanner := bufio.NewScanner(buf)
 	scannerBuf := make([]byte, 0)
@@ -433,7 +443,15 @@ func computeBalanceTree(l2RawClaims []byte, l2NetworkID uint32, l2RawDeposits []
 			OriginNetwork:      big.NewInt(0).SetUint64(uint64(l2Claim.OriginNetwork)),
 			OriginTokenAddress: l2Claim.OriginAddress,
 		}
-		log.Info().Msgf("L2 Claim. OriginNetwork: %d. TokenAddress: %s. Amount: %s", token.OriginNetwork, token.OriginTokenAddress.String(), l2Claim.Amount.String())
+		isMessage, err := checkClaimCalldata(client, bridgeAddress, l2Claim.Raw.TxHash)
+		if err != nil {
+			return common.Hash{}, err
+		}
+		if isMessage {
+			token.OriginNetwork = big.NewInt(0)
+			token.OriginTokenAddress = common.Address{}
+		}
+		log.Info().Msgf("L2 Claim. isMessage: %v OriginNetwork: %d. TokenAddress: %s. Amount: %s", isMessage, token.OriginNetwork, token.OriginTokenAddress.String(), l2Claim.Amount.String())
 		if _, ok := balances[token.String()]; !ok {
 			balances[token.String()] = big.NewInt(0)
 		}
@@ -2017,13 +2035,15 @@ func (o *FileOptions) AddFlags(cmd *cobra.Command) {
 }
 
 type BalanceTreeOptions struct {
-	L2ClaimsFile, L2DepositsFile string
-	L2NetworkID uint32
+	L2ClaimsFile, L2DepositsFile, BridgeAddress, RpcURL string
+	L2NetworkID                                         uint32
 }
 
 func (o *BalanceTreeOptions) AddFlags(cmd *cobra.Command) {
 	cmd.Flags().StringVarP(&o.L2ClaimsFile, ArgL2ClaimsFileName, "", "", "An ndjson file with l2 claim events data")
 	cmd.Flags().StringVarP(&o.L2DepositsFile, ArgL2DepositsFileName, "", "", "An ndjson file with l2 deposit events data")
+	cmd.Flags().StringVarP(&o.BridgeAddress, ArgBridgeAddress, "", "", "Bridge Address")
+	cmd.Flags().StringVarP(&o.RpcURL, ArgRPCURL, "r", "", "RPC URL")
 	cmd.Flags().Uint32VarP(&o.L2NetworkID, ArgL2NetworkID, "", 0, "The L2 networkID")
 }
 

go.mod

@@ -163,6 +163,7 @@ require (
 	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
 	cloud.google.com/go/iam v1.5.0 // indirect
 	cloud.google.com/go/longrunning v0.6.6 // indirect
+	github.com/0xPolygon/cdk-rpc v0.0.0-20250213125803-179882ad6229
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.3.4
 	github.com/cockroachdb/fifo v0.0.0-20240816210425-c5d0cb0b6fc0 // indirect
@@ -179,6 +180,7 @@ require (
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
 	github.com/golang/glog v1.2.4 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/btree v1.1.3 // indirect

go.sum

@@ -17,6 +17,8 @@ cloud.google.com/go/longrunning v0.6.6 h1:XJNDo5MUfMM05xK3ewpbSdmt7R2Zw+aQEMbdQR
 cloud.google.com/go/longrunning v0.6.6/go.mod h1:hyeGJUrPHcx0u2Uu1UFSoYZLn4lkMrccJig0t4FI7yw=
 github.com/0xPolygon/cdk-contracts-tooling v0.0.1 h1:2HH8KpO1CZRl1zHfn0IYwJhPA7l91DOWrjdExmaB9Kk=
 github.com/0xPolygon/cdk-contracts-tooling v0.0.1/go.mod h1:mFlcEjsm2YBBsu8atHJ3zyVnwM+Z/fMXpVmIJge+WVU=
+github.com/0xPolygon/cdk-rpc v0.0.0-20250213125803-179882ad6229 h1:6YhqNQVcXkoxqs5zQVg1bREuoeKvwpffpfoL8QQT+u4=
+github.com/0xPolygon/cdk-rpc v0.0.0-20250213125803-179882ad6229/go.mod h1:2scWqMMufrQXu7TikDgQ3BsyaKoX8qP26D6E262vSOg=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/DataDog/zstd v1.5.6 h1:LbEglqepa/ipmmQJUDnSsfvA8e8IStVcGaFWDuxvGOY=
 github.com/DataDog/zstd v1.5.6/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
@@ -190,6 +192,8 @@ github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E=
 github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 h1:zN2lZNZRflqFyxVaTIU61KNKQ9C0055u9CAfpmqUvo4=
+github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3/go.mod h1:nPpo7qLxd6XL3hWJG/O60sR8ZKfMCiIoNap5GvD12KU=
 github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
 github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=