Merge branch 'main' into thiago/fund-use-multicall3

tclemos · tclemos · commit c36365d30b5a · 2025-10-14T03:26:12.000-03:00
diff --git a/cmd/fixnoncegap/fixnoncegap.go b/cmd/fixnoncegap/fixnoncegap.go
@@ -115,14 +115,12 @@ func fixNonceGap(cmd *cobra.Command, args []string) error {
 	var maxNonce uint64
 	if inputFixNonceGapArgs.maxNonce != 0 {
 		maxNonce = inputFixNonceGapArgs.maxNonce
+		log.Info().Uint64("maxNonce", maxNonce).Msg("maxNonce loaded from --max-nonce flag")
 	} else {
-		maxNonce, err = getMaxNonceFromTxPool(addr)
+		log.Info().Msg("--max-nonce flag not set")
+		maxNonce, err = getMaxNonce(addr)
 		if err != nil {
-			if strings.Contains(err.Error(), "the method txpool_content does not exist/is not available") {
-				log.Error().Err(err).Msg("The RPC doesn't provide access to txpool_content, please check --help for more information about --max-nonce")
-				return nil
-			}
-			log.Error().Err(err).Msg("Unable to get max nonce from txpool")
+			log.Error().Err(err).Msg("Unable to get max nonce, please check --help for more information about --max-nonce")
 			return err
 		}
 	}
@@ -132,7 +130,11 @@ func fixNonceGap(cmd *cobra.Command, args []string) error {
 		log.Info().Stringer("addr", addr).Msg("There is no nonce gap.")
 		return nil
 	}
-	log.Info().Stringer("addr", addr).Msgf("Nonce gap found. Max nonce: %d", maxNonce)
+	log.Info().
+		Stringer("addr", addr).
+		Uint64("currentNonce", currentNonce).
+		Uint64("maxNonce", maxNonce).
+		Msg("Nonce gap found")
 
 	gasPrice, err := rpcClient.SuggestGasPrice(cmd.Context())
 	if err != nil {
@@ -273,6 +275,26 @@ func WaitMineTransaction(ctx context.Context, client *ethclient.Client, tx *type
 	}
 }
 
+func getMaxNonce(addr common.Address) (uint64, error) {
+	log.Info().Msg("getting max nonce from txpool_content")
+	maxNonce, err := getMaxNonceFromTxPool(addr)
+	if err == nil {
+		log.Info().Uint64("maxNonce", maxNonce).Msg("maxNonce loaded from txpool_content")
+		return maxNonce, nil
+	}
+	log.Warn().Err(err).Msg("unable to get max nonce from txpool_content")
+
+	log.Info().Msg("getting max nonce from pending nonce")
+	// if the error is not about txpool_content, falls back to PendingNonceAt
+	maxNonce, err = rpcClient.PendingNonceAt(context.Background(), addr)
+	if err != nil {
+		return 0, err
+	}
+
+	log.Info().Uint64("maxNonce", maxNonce).Msg("maxNonce loaded from pending nonce")
+	return maxNonce, nil
+}
+
 func getMaxNonceFromTxPool(addr common.Address) (uint64, error) {
 	var result PoolContent
 	err := rpcClient.Client().Call(&result, "txpool_content")
@@ -299,6 +321,7 @@ func getMaxNonceFromTxPool(addr common.Address) (uint64, error) {
 			nonceInt, ok := new(big.Int).SetString(nonce, 10)
 			if !ok {
 				err = fmt.Errorf("invalid nonce found: %s", nonce)
+				log.Warn().Err(err).Msg("unable to get txpool_content")
 				return 0, err
 			}
 
diff --git a/cmd/ulxly/bridge_service/aggkit/service.go b/cmd/ulxly/bridge_service/aggkit/service.go
@@ -57,32 +57,43 @@ func (s *BridgeService) GetDeposits(destinationAddress string, offset, limit int
 	return nil, 0, fmt.Errorf("GetDeposits is not supported by aggkit bridge service yet")
 }
 
-func (s *BridgeService) GetProof(depositNetwork, depositCount uint32, ger *common.Hash) (*bridge_service.Proof, error) {
-	var l1InfoTreeIndex uint32
+func (s *BridgeService) GetProof(depositNetwork, depositCount uint32) (*bridge_service.Proof, error) {
+	return s.getProof(depositNetwork, depositCount, nil)
+}
 
-	if ger != nil {
-		return nil, errors.New("getting proof by ger is not supported yet by Aggkit bridge service")
-	}
+func (s *BridgeService) GetProofByGer(depositNetwork, depositCount uint32, ger common.Hash) (*bridge_service.Proof, error) {
+	return nil, errors.New("getting proof by ger is not supported yet by Aggkit bridge service")
+}
 
-	timeout := time.After(time.Minute)
-out:
-	for {
-		idx, err := s.getL1InfoTreeIndex(depositNetwork, depositCount)
-		if err != nil && !errors.Is(err, bridge_service.ErrNotFound) {
-			return nil, err
-		} else if err == nil {
-			l1InfoTreeIndex = *idx
-			break out
-		}
-		select {
-		case <-timeout:
-			return nil, fmt.Errorf("timeout waiting for l1 info tree index")
-		default:
-			time.Sleep(time.Second)
+func (s *BridgeService) GetProofByL1InfoTreeIndex(depositNetwork, depositCount uint32, l1InfoTreeIndex uint32) (*bridge_service.Proof, error) {
+	return s.getProof(depositNetwork, depositCount, &l1InfoTreeIndex)
+}
+
+func (s *BridgeService) getProof(depositNetwork, depositCount uint32, l1InfoTreeIndex *uint32) (*bridge_service.Proof, error) {
+	var l1InfoTreeIndexValue uint32
+	if l1InfoTreeIndex != nil {
+		l1InfoTreeIndexValue = *l1InfoTreeIndex
+	} else {
+
+		timeout := time.After(time.Minute)
+	out:
+		for {
+			idx, err := s.getL1InfoTreeIndex(depositNetwork, depositCount)
+			if err != nil && !errors.Is(err, bridge_service.ErrNotFound) {
+				return nil, err
+			} else if err == nil {
+				l1InfoTreeIndexValue = *idx
+				break out
+			}
+			select {
+			case <-timeout:
+				return nil, fmt.Errorf("timeout waiting for l1 info tree index")
+			default:
+				time.Sleep(time.Second)
+			}
 		}
 	}
-
-	endpoint := fmt.Sprintf("%s/%s/claim-proof?network_id=%d&leaf_index=%d&deposit_count=%d", s.BridgeServiceBase.Url(), urlPath, depositNetwork, l1InfoTreeIndex, depositCount)
+	endpoint := fmt.Sprintf("%s/%s/claim-proof?network_id=%d&leaf_index=%d&deposit_count=%d", s.BridgeServiceBase.Url(), urlPath, depositNetwork, l1InfoTreeIndexValue, depositCount)
 	resp, respError, statusCode, err := httpjson.HTTPGetWithError[getClaimProofResponse, errorResponse](s.httpClient, endpoint)
 	if err != nil {
 		return nil, err
diff --git a/cmd/ulxly/bridge_service/interface.go b/cmd/ulxly/bridge_service/interface.go
@@ -15,7 +15,9 @@ var (
 type BridgeService interface {
 	GetDeposit(depositNetwork, depositCount uint32) (*Deposit, error)
 	GetDeposits(destinationAddress string, offset, limit int) (deposits []Deposit, total int, err error)
-	GetProof(depositNetwork, depositCount uint32, ger *common.Hash) (*Proof, error)
+	GetProof(depositNetwork, depositCount uint32) (*Proof, error)
+	GetProofByGer(depositNetwork, depositCount uint32, ger common.Hash) (*Proof, error)
+	GetProofByL1InfoTreeIndex(depositNetwork, depositCount uint32, l1InfoTreeIndex uint32) (*Proof, error)
 	Url() string
 }
 
diff --git a/cmd/ulxly/bridge_service/legacy/service.go b/cmd/ulxly/bridge_service/legacy/service.go
@@ -66,12 +66,21 @@ func (s *BridgeService) GetDeposits(destinationAddress string, offset, limit int
 
 }
 
-func (s *BridgeService) GetProof(depositNetwork, depositCount uint32, ger *common.Hash) (*bridge_service.Proof, error) {
+func (s *BridgeService) GetProof(depositNetwork, depositCount uint32) (*bridge_service.Proof, error) {
 	endpoint := fmt.Sprintf("%s/merkle-proof?net_id=%d&deposit_cnt=%d", s.BridgeServiceBase.Url(), depositNetwork, depositCount)
-	if ger != nil {
-		endpoint = fmt.Sprintf("%s/merkle-proof-by-ger?net_id=%d&deposit_cnt=%d&ger=%s", s.BridgeServiceBase.Url(), depositNetwork, depositCount, ger.String())
+
+	resp, _, err := httpjson.HTTPGet[GetProofResponse](s.httpClient, endpoint)
+	if err != nil {
+		return nil, err
 	}
 
+	proof := resp.Proof.ToProof()
+	return proof, nil
+}
+
+func (s *BridgeService) GetProofByGer(depositNetwork, depositCount uint32, ger common.Hash) (*bridge_service.Proof, error) {
+	endpoint := fmt.Sprintf("%s/merkle-proof-by-ger?net_id=%d&deposit_cnt=%d&ger=%s", s.BridgeServiceBase.Url(), depositNetwork, depositCount, ger.String())
+
 	resp, _, err := httpjson.HTTPGet[GetProofResponse](s.httpClient, endpoint)
 	if err != nil {
 		return nil, err
@@ -80,3 +89,7 @@ func (s *BridgeService) GetProof(depositNetwork, depositCount uint32, ger *commo
 	proof := resp.Proof.ToProof()
 	return proof, nil
 }
+
+func (s *BridgeService) GetProofByL1InfoTreeIndex(depositNetwork, depositCount uint32, l1InfoTreeIndex uint32) (*bridge_service.Proof, error) {
+	return nil, fmt.Errorf("GetProofByL1InfoTreeIndex is not supported in the legacy bridge service")
+}
diff --git a/cmd/ulxly/ulxly.go b/cmd/ulxly/ulxly.go
@@ -904,6 +904,7 @@ func claimAsset(cmd *cobra.Command) error {
 	depositNetwork := inputUlxlyArgs.depositNetwork
 	globalIndexOverride := inputUlxlyArgs.globalIndex
 	proofGERHash := inputUlxlyArgs.proofGER
+	proofL1InfoTreeIndex := inputUlxlyArgs.proofL1InfoTreeIndex
 	wait := inputUlxlyArgs.wait
 
 	// Dial Ethereum client
@@ -933,7 +934,7 @@ func claimAsset(cmd *cobra.Command) error {
 		deposit.GlobalIndex.SetString(globalIndexOverride, 10)
 	}
 
-	proof, err := getMerkleProofsExitRoots(bridgeService, *deposit, proofGERHash)
+	proof, err := getMerkleProofsExitRoots(bridgeService, *deposit, proofGERHash, proofL1InfoTreeIndex)
 	if err != nil {
 		log.Error().Err(err).Msg("error getting merkle proofs and exit roots from bridge service")
 		return err
@@ -959,6 +960,7 @@ func claimMessage(cmd *cobra.Command) error {
 	depositNetwork := inputUlxlyArgs.depositNetwork
 	globalIndexOverride := inputUlxlyArgs.globalIndex
 	proofGERHash := inputUlxlyArgs.proofGER
+	proofL1InfoTreeIndex := inputUlxlyArgs.proofL1InfoTreeIndex
 	wait := inputUlxlyArgs.wait
 
 	// Dial Ethereum client
@@ -988,7 +990,7 @@ func claimMessage(cmd *cobra.Command) error {
 		deposit.GlobalIndex.SetString(globalIndexOverride, 10)
 	}
 
-	proof, err := getMerkleProofsExitRoots(bridgeService, *deposit, proofGERHash)
+	proof, err := getMerkleProofsExitRoots(bridgeService, *deposit, proofGERHash, proofL1InfoTreeIndex)
 	if err != nil {
 		log.Error().Err(err).Msg("error getting merkle proofs and exit roots from bridge service")
 		return err
@@ -1242,7 +1244,7 @@ func claimSingleDeposit(cmd *cobra.Command, client *ethclient.Client, bridgeCont
 		return nil, fmt.Errorf("we don't have a bridge service url for network: %d", deposit.DestNet)
 	}
 
-	proof, err := getMerkleProofsExitRoots(bridgeServiceFromMap, deposit, "")
+	proof, err := getMerkleProofsExitRoots(bridgeServiceFromMap, deposit, "", 0)
 	if err != nil {
 		log.Error().Err(err).Msg("error getting merkle proofs and exit roots from bridge service")
 		return nil, err
@@ -1798,14 +1800,22 @@ func generateTransactionPayload(ctx context.Context, client *ethclient.Client, u
 	return bridgeV2, toAddress, opts, err
 }
 
-func getMerkleProofsExitRoots(bridgeService bridge_service.BridgeService, deposit bridge_service.Deposit, proofGERHash string) (*bridge_service.Proof, error) {
+func getMerkleProofsExitRoots(bridgeService bridge_service.BridgeService, deposit bridge_service.Deposit, proofGERHash string, l1InfoTreeIndex uint32) (*bridge_service.Proof, error) {
 	var ger *common.Hash
 	if len(proofGERHash) > 0 {
 		hash := common.HexToHash(proofGERHash)
 		ger = &hash
 	}
 
-	proof, err := bridgeService.GetProof(deposit.NetworkID, deposit.DepositCnt, ger)
+	var proof *bridge_service.Proof
+	var err error
+	if ger != nil {
+		proof, err = bridgeService.GetProofByGer(deposit.NetworkID, deposit.DepositCnt, *ger)
+	} else if l1InfoTreeIndex > 0 {
+		proof, err = bridgeService.GetProofByL1InfoTreeIndex(deposit.NetworkID, deposit.DepositCnt, l1InfoTreeIndex)
+	} else {
+		proof, err = bridgeService.GetProof(deposit.NetworkID, deposit.DepositCnt)
+	}
 	if err != nil {
 		return nil, fmt.Errorf("error getting proof for deposit %d on network %d: %w", deposit.DepositCnt, deposit.NetworkID, err)
 	}
@@ -2001,34 +2011,35 @@ var ulxlyClaimCmd = &cobra.Command{
 }
 
 type ulxlyArgs struct {
-	gasLimit            uint64
-	chainID             string
-	privateKey          string
-	addressOfPrivateKey string
-	value               string
-	rpcURL              string
-	bridgeAddress       string
-	destNetwork         uint32
-	destAddress         string
-	tokenAddress        string
-	forceUpdate         bool
-	callData            string
-	callDataFile        string
-	timeout             uint64
-	depositCount        uint32
-	depositNetwork      uint32
-	bridgeServiceURL    string
-	globalIndex         string
-	gasPrice            string
-	dryRun              bool
-	bridgeServiceURLs   []string
-	bridgeLimit         int
-	bridgeOffset        int
-	wait                time.Duration
-	concurrency         uint
-	insecure            bool
-	legacy              bool
-	proofGER            string
+	gasLimit             uint64
+	chainID              string
+	privateKey           string
+	addressOfPrivateKey  string
+	value                string
+	rpcURL               string
+	bridgeAddress        string
+	destNetwork          uint32
+	destAddress          string
+	tokenAddress         string
+	forceUpdate          bool
+	callData             string
+	callDataFile         string
+	timeout              uint64
+	depositCount         uint32
+	depositNetwork       uint32
+	bridgeServiceURL     string
+	globalIndex          string
+	gasPrice             string
+	dryRun               bool
+	bridgeServiceURLs    []string
+	bridgeLimit          int
+	bridgeOffset         int
+	wait                 time.Duration
+	concurrency          uint
+	insecure             bool
+	legacy               bool
+	proofGER             string
+	proofL1InfoTreeIndex uint32
 }
 
 var inputUlxlyArgs = ulxlyArgs{}
@@ -2098,6 +2109,7 @@ const (
 	ArgInsecure             = "insecure"
 	ArgLegacy               = "legacy"
 	ArgProofGER             = "proof-ger"
+	ArgProofL1InfoTreeIndex = "proof-l1-info-tree-index"
 )
 
 var (
@@ -2491,9 +2503,11 @@ or if it's actually an intermediate hash.`,
 	fClaim.StringVar(&inputUlxlyArgs.globalIndex, ArgGlobalIndex, "", "an override of the global index value")
 	fClaim.DurationVar(&inputUlxlyArgs.wait, ArgWait, time.Duration(0), "retry claiming until deposit is ready, up to specified duration (available for claim asset and claim message)")
 	fClaim.StringVar(&inputUlxlyArgs.proofGER, ArgProofGER, "", "if specified and using legacy mode, the proof will be generated against this GER")
+	fClaim.Uint32Var(&inputUlxlyArgs.proofL1InfoTreeIndex, ArgProofL1InfoTreeIndex, 0, "if specified and using aggkit mode, the proof will be generated against this L1 Info Tree Index")
 	fatalIfError(ulxlyClaimCmd.MarkPersistentFlagRequired(ArgDepositCount))
 	fatalIfError(ulxlyClaimCmd.MarkPersistentFlagRequired(ArgDepositNetwork))
 	fatalIfError(ulxlyClaimCmd.MarkPersistentFlagRequired(ArgBridgeServiceURL))
+	ulxlyClaimCmd.MarkFlagsMutuallyExclusive(ArgProofGER, ArgProofL1InfoTreeIndex)
 
 	// Claim Everything Helper Command
 	fClaimEverything := claimEverythingCommand.Flags()
diff --git a/doc/polycli_fund.md b/doc/polycli_fund.md
@@ -84,17 +84,24 @@ $ cast balance 0x5D8121cf716B70d3e345adB58157752304eED5C3
 ## Flags
 
 ```bash
-      --addresses strings         comma-separated list of wallet addresses to fund
-      --contract-address string   address of pre-deployed Funder contract
-      --eth-amount big.Int        amount of wei to send to each wallet (default 50000000000000000)
-  -f, --file string               output JSON file path for storing addresses and private keys of funded wallets (default "wallets.json")
-      --hd-derivation             derive wallets to fund from private key in deterministic way (default true)
-  -h, --help                      help for fund
-      --key-file string           file containing accounts private keys, one per line
-  -n, --number uint               number of wallets to fund (default 10)
-      --private-key string        hex encoded private key to use for sending transactions (default "0x42b6e34dc21598a807dc19d7784c71b2a7a01f6480dc6f58258f78e539f1a1fa")
-  -r, --rpc-url string            RPC endpoint URL (default "http://localhost:8545")
-      --seed string               seed string for deterministic wallet generation (e.g., 'ephemeral_test')
+      --addresses strings                  comma-separated list of wallet addresses to fund
+      --approve-amount big.Int             amount of ERC20 tokens to approve for the spender (default 1000000000000000000000)
+      --approve-spender string             address to approve for spending tokens from each funded wallet
+      --erc20-bulk-funder-address string   address of pre-deployed ERC20BulkFunder contract
+      --eth-amount big.Int                 amount of wei to send to each wallet (default 50000000000000000)
+  -f, --file string                        output JSON file path for storing addresses and private keys of funded wallets (default "wallets.json")
+      --funder-address string              address of pre-deployed funder contract
+      --hd-derivation                      derive wallets to fund from private key in deterministic way (default true)
+  -h, --help                               help for fund
+      --key-file string                    file containing accounts private keys, one per line
+      --multicall3-address string          address of pre-deployed multicall3 contract
+  -n, --number uint                        number of wallets to fund (default 10)
+      --private-key string                 hex encoded private key to use for sending transactions (default "0x42b6e34dc21598a807dc19d7784c71b2a7a01f6480dc6f58258f78e539f1a1fa")
+      --rate-limit float                   requests per second limit (use negative value to remove limit) (default 4)
+  -r, --rpc-url string                     RPC endpoint URL (default "http://localhost:8545")
+      --seed string                        seed string for deterministic wallet generation (e.g., 'ephemeral_test')
+      --token-address string               address of the ERC20 token contract to mint and fund (if provided, enables ERC20 mode)
+      --token-amount big.Int               amount of ERC20 tokens to mint and transfer to each wallet (default 1000000000000000000)
 ```
 
 The command also inherits flags from parent commands.
diff --git a/doc/polycli_ulxly_claim.md b/doc/polycli_ulxly_claim.md
@@ -16,13 +16,14 @@ Commands for claiming deposits on a particular chain.
 ## Flags
 
 ```bash
-      --bridge-service-url string   URL of the bridge service
-      --deposit-count uint32        deposit count of the bridge transaction
-      --deposit-network uint32      rollup ID of the network where the deposit was made
-      --global-index string         an override of the global index value
-  -h, --help                        help for claim
-      --proof-ger string            if specified and using legacy mode, the proof will be generated against this GER
-      --wait duration               retry claiming until deposit is ready, up to specified duration (available for claim asset and claim message)
+      --bridge-service-url string         URL of the bridge service
+      --deposit-count uint32              deposit count of the bridge transaction
+      --deposit-network uint32            rollup ID of the network where the deposit was made
+      --global-index string               an override of the global index value
+  -h, --help                              help for claim
+      --proof-ger string                  if specified and using legacy mode, the proof will be generated against this GER
+      --proof-l1-info-tree-index uint32   if specified and using aggkit mode, the proof will be generated against this L1 Info Tree Index
+      --wait duration                     retry claiming until deposit is ready, up to specified duration (available for claim asset and claim message)
 ```
 
 The command also inherits flags from parent commands.
diff --git a/doc/polycli_ulxly_claim_asset.md b/doc/polycli_ulxly_claim_asset.md
@@ -124,6 +124,7 @@ The command also inherits flags from parent commands.
       --pretty-logs                        output logs in pretty format instead of JSON (default true)
       --private-key string                 hex encoded private key for sending transaction
       --proof-ger string                   if specified and using legacy mode, the proof will be generated against this GER
+      --proof-l1-info-tree-index uint32    if specified and using aggkit mode, the proof will be generated against this L1 Info Tree Index
       --rpc-url string                     RPC URL to send the transaction
       --transaction-receipt-timeout uint   timeout in seconds to wait for transaction receipt confirmation (default 60)
   -v, --verbosity string                   log level (string or int):
diff --git a/doc/polycli_ulxly_claim_message.md b/doc/polycli_ulxly_claim_message.md
diff --git a/scripts/mitm/fake_mitm_override.py b/scripts/mitm/fake_mitm_override.py
