Merge branch 'testnet' into 1566-docs-add-list-of-supported-strategies-and-contract-addresses

Author: JuArce

Makefile

@@ -838,11 +838,11 @@ explorer_recover_db: explorer_run_db
 
 explorer_fetch_old_batches:
 	@cd explorer && \
-	./scripts/fetch_old_batches.sh 1728056 1729806
+	./scripts/fetch_old_batches.sh $(FROM_BLOCK) $(TO_BLOCK)
 
-explorer_fetch_old_operators_strategies_restakes:
+explorer_fetch_old_operators_strategies_restakes: # recommended for prod: 19000000
 	@cd explorer && \
-	./scripts/fetch_old_operators_strategies_restakes.sh 0
+	./scripts/fetch_old_operators_strategies_restakes.sh $(FROM_BLOCK)
 
 explorer_create_env:
 	@cd explorer && \

core/chainio/avs_writer.go

@@ -100,7 +100,7 @@ func (w *AvsWriter) SendAggregatedResponse(batchIdentifierHash [32]byte, batchMe
 	// Set the nonce, as we might have to replace the transaction with a higher gas price
 	txNonce := big.NewInt(int64(simTx.Nonce()))
 	txOpts.Nonce = txNonce
-	txOpts.GasPrice = simTx.GasPrice()
+	txOpts.GasPrice = nil
 	txOpts.NoSend = false
 	i := 0
 
@@ -113,7 +113,16 @@ func (w *AvsWriter) SendAggregatedResponse(batchIdentifierHash [32]byte, batchMe
 		if err != nil {
 			return nil, err
 		}
-		previousTxGasPrice := txOpts.GasPrice
+
+		// if txOpts.GasPrice wasn't previously set use the fetched gasPrice
+		// this should happen on the first iteration only
+		var previousTxGasPrice *big.Int
+		if txOpts.GasPrice == nil {
+			previousTxGasPrice = gasPrice
+		} else {
+			previousTxGasPrice = txOpts.GasPrice
+		}
+
 		// in order to avoid replacement transaction underpriced
 		// the bumped gas price has to be at least 10% higher than the previous one.
 		minimumGasPriceBump := utils.CalculateGasPriceBumpBasedOnRetry(previousTxGasPrice, 10, 0, gasBumpPercentageLimit, 0)

explorer/lib/explorer/contract_managers/aligned_layer_service_manager.ex

@@ -37,7 +37,7 @@ defmodule AlignedLayerServiceManager do
   @first_block (case @environment do
                   "devnet" -> 0
                   "holesky" -> 1_728_056
-                  "mainnet" -> 20_020_000
+                  "mainnet" -> 19_000_000
                   _ -> raise("Invalid environment")
                 end)
 

explorer/lib/explorer/contract_managers/batcher_payment_service_manager.ex

@@ -7,7 +7,7 @@ defmodule BatcherPaymentServiceManager do
   @first_block (case @environment do
                   "devnet" -> 0
                   "holesky" -> 1_728_056
-                  "mainnet" -> 20_020_000
+                  "mainnet" -> 19_000_000
                   _ -> raise("Invalid environment")
                 end)
 

explorer/lib/explorer/contract_managers/delegation_manager.ex

@@ -6,7 +6,7 @@ defmodule DelegationManager do
   @first_block (case @environment do
                   "devnet" -> 0
                   "holesky" -> 1_210_000
-                  "mainnet" -> 20_020_000
+                  "mainnet" -> 19_000_000
                   _ -> raise("Invalid environment")
                 end)
 

explorer/lib/scripts/fetch_old_batches.ex

@@ -11,7 +11,7 @@ defmodule Scripts.FetchOldBatches do
 
   def fetch_old_events(fromBlock, toBlock) do
     "Fetching old events, from #{fromBlock} to #{toBlock}" |> Logger.debug()
-    chunk_size = 32 # do in smaller chunks, if there are too many blocks to process
+    chunk_size = 500 # do in smaller chunks, if there are too many blocks to process
     chunkify(fromBlock, toBlock, chunk_size) |> Enum.each(&make_request/1)
     "✅ Done fetching old events" |> Logger.debug()
   end

explorer/scripts/fetch_old_batches.sh

@@ -14,13 +14,15 @@ export ALIGNED_CONFIG_FILE=$ALIGNED_CONFIG_FILE
 
 if [ "$#" -eq 0 ]; then
     echo "Error, No arguments provided."
+    echo "Try running the make target with FROM_BLOCK=<n> TO_BLOCK=<m>"
     exit 1
 elif [ "$#" -eq 2 ]; then
     # Two arguments provided, use them
     FROM=$1
     TO=$2
 else
     echo "Please provide 2 arguments."
+    echo "Try running the make target with FROM_BLOCK=<n> TO_BLOCK=<m>"
     exit 1
 fi
 
@@ -29,4 +31,4 @@ echo "Running fetch_old_batches.sh from block: $FROM to block: $TO"
 
 mix compile --force #force recompile to get the latest .env values
 
-iex --sname fetch_old_batches --remsh explorer@$ELIXIR_HOSTNAME -S mix run -e "Scripts.FetchOldBatches.run($FROM, $TO)"
+iex --sname fetch_old_batches --remsh explorer@$ELIXIR_HOSTNAME -S mix run -e "Scripts.FetchOldBatches.run($FROM, $TO)"

explorer/scripts/fetch_old_operators_strategies_restakes.sh

@@ -14,6 +14,7 @@ export ALIGNED_CONFIG_FILE=$ALIGNED_CONFIG_FILE
 
 if [ "$#" -eq 0 ]; then
     echo "Error, No arguments provided."
+    echo "Try running the make target with FROM_BLOCK=<n>"
     exit 1
 elif [ "$#" -eq 1 ]; then
     # argument provided, use it

telemetry_api/lib/telemetry_api/contract_managers/delegation_manager.ex

@@ -7,7 +7,7 @@ defmodule TelemetryApi.ContractManagers.DelegationManager do
   @first_block (case @environment do
                   "devnet" -> 0
                   "holesky" -> 1_210_000
-                  "mainnet" -> 20_020_000
+                  "mainnet" -> 19_000_000
                   _ -> raise("Invalid environment")
                 end)
 
@@ -40,12 +40,17 @@ defmodule TelemetryApi.ContractManagers.DelegationManager do
     DelegationManager.EventFilters.operator_metadata_uri_updated(operator_address)
     |> Ethers.get_logs(fromBlock: @first_block)
     |> case do
+      {:ok, []} ->
+        Logger.warning("Url not found using first_block=#{@first_block}")
+        {:error, "Url not found using first_block=#{@first_block}"}
+
       {:ok, data} ->
         # The head (hd) is the most recent entry
         url = List.last(data).data |> hd()
         {:ok, url}
 
       {:error, reason} ->
+        Logger.warning("Error while fetching url: #{inspect(reason)}")
         {:error, reason}
 
       other ->