Merge branch 'Etna_upgrade' into 'main'

Etna upgrade

See merge request flarenetwork/network/flare-p-chain-indexer!5

Author: mboben

README.md

@@ -69,10 +69,10 @@ api_key = ""    # API key (in case the node is protected by API key), adds ?x-ap
 private_key_file = "../credentials/pk.txt"  # file containing the private key of an account (for voting and mirroring clients), in hex
 
 [p_chain_indexer]
-enabled = true         # enable p-chain indexing
-timeout = "1000ms"     # call avalanche p-chain indexer every ...
-batch_size = 10        # batch size to fetch from the node
-start_index = 0        # start indexing at this block height
+enabled = true          # enable p-chain indexing
+timeout = "1000ms"      # call avalanche p-chain indexer every ...
+batch_size = 10         # batch size to fetch from the node
+start_index = 0         # start indexing at this block height
 
 [uptime_cronjob]
 enabled = false         # enable uptime monitoring cronjob
@@ -85,16 +85,30 @@ uptime_threshold = 0.8  # minimum uptime ratio in the epoch for a validator to b
 delete_old_uptimes_epoch_threshold = 5  # delete uptimes older than this epoch
 
 [voting_cronjob]
-enabled = false          # enable voting client
-timeout = "10s"          # check for new epochs every ...
-first = 12345            # first epoch to vote for
-delay = "10s"            # min delay in seconds to send the vote after the epoch ends
+enabled = false         # enable voting client
+timeout = "10s"         # check for new epochs every ...
+first = 12345           # first epoch to vote for
+delay = "10s"           # min delay in seconds to send the vote after the epoch ends
+
+[voting_cronjob.gas]
+gas_limit = 120000      # Gas limit to set for the transaction execution (empty = estimate)
+
+# type 0 transaction options
+# gas_price = ...         # Create type 0 transaction: gas price to use for the transaction execution (empty = gas price oracle)
+
+# type 2 transaction (EIP-1559) options
+# gas_fee_cap = ...       # Gas fee cap to use for the 1559 transaction (type 2) execution (empty = gas price oracle)
+# gas_tip_cap = ...       # Gas priority fee cap to use for the 1559 transaction (type 2) execution (empty = gas price oracle)
 
 [mirroring_cronjob]
-enabled = false       # enable mirroring client
-timeout = "10s"       # check for new epochs every ... seconds
-first = 12345         # first epoch to mirror
-delay = "10s"         # min delay in seconds to send the vote after the epoch ends
+enabled = false         # enable mirroring client
+timeout = "10s"         # check for new epochs every ... seconds
+first = 12345           # first epoch to mirror
+delay = "10s"           # min delay in seconds to send the vote after the epoch ends
+
+[mirroring_cronjob.gas]
+gas_limit = 1000000
+# see voting_cronjob.gas for other gas options
 
 [contract_addresses]
 voting = "0xf956df3800379fdFA31D0A45FDD5001D02F4109c"       # voting contract address

config.toml

@@ -58,12 +58,32 @@ timeout = "10s"
 # first epoch to be voted for (do not leave this empty since the first epoch is well back in time)
 first = 1111
 
+[voting_cronjob.gas]
+gas_limit = 120000
+
+# type 0
+# gas_price = 
+
+# type 2
+# gas_fee_cap =
+# gas_tip_cap =
+
 [mirroring_cronjob]
 enabled = false
 timeout = "10s"
 # first epoch to be voted for (do not leave this empty since the first epoch is well back in time)
 first = 1111
 
+[mirroring_cronjob.gas]
+gas_limit = 1000000
+
+# type 0
+# gas_price = 
+
+# type 2
+# gas_fee_cap = 
+# gas_tip_cap = 
+
 [contract_addresses]
 mirroring = "0x0000000"
 voting = "0x0000000"

config/config.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"net/url"
@@ -10,7 +11,7 @@ import (
 	"github.com/BurntSushi/toml"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/kelseyhightower/envconfig"
+	"github.com/sethvargo/go-envconfig"
 )
 
 const (
@@ -36,24 +37,24 @@ type LoggerConfig struct {
 }
 
 type DBConfig struct {
-	Host       string `toml:"host" envconfig:"DB_HOST"`
-	Port       int    `toml:"port" envconfig:"DB_PORT"`
-	Database   string `toml:"database" envconfig:"DB_DATABASE"`
-	Username   string `toml:"username" envconfig:"DB_USERNAME"`
-	Password   string `toml:"password" envconfig:"DB_PASSWORD"`
+	Host       string `toml:"host" env:"DB_HOST"`
+	Port       int    `toml:"port" env:"DB_PORT"`
+	Database   string `toml:"database" env:"DB_DATABASE"`
+	Username   string `toml:"username" env:"DB_USERNAME"`
+	Password   string `toml:"password" env:"DB_PASSWORD"`
 	LogQueries bool   `toml:"log_queries"`
 }
 
 type ChainConfig struct {
-	NodeURL         string `toml:"node_url" envconfig:"CHAIN_NODE_URL"`
-	ChainAddressHRP string `toml:"address_hrp" envconfig:"CHAIN_ADDRESS_HRP"`
-	ChainID         int    `toml:"chain_id" envconfig:"CHAIN_ID"`
-	EthRPCURL       string `toml:"eth_rpc_url" envconfig:"ETH_RPC_URL"`
-	ApiKey          string `toml:"api_key" envconfig:"API_KEY"`
+	NodeURL         string `toml:"node_url" env:"CHAIN_NODE_URL"`
+	ChainAddressHRP string `toml:"address_hrp" env:"CHAIN_ADDRESS_HRP"`
+	ChainID         int    `toml:"chain_id" env:"CHAIN_ID"`
+	EthRPCURL       string `toml:"eth_rpc_url" env:"ETH_RPC_URL"`
+	ApiKey          string `toml:"api_key" env:"API_KEY"`
 	// setting the private key in config file is deprecated, except in development and testing
 	// use private_key_file instead
-	PrivateKey     string `toml:"private_key" envconfig:"PRIVATE_KEY"`
-	PrivateKeyFile string `toml:"private_key_file" envconfig:"PRIVATE_KEY_FILE"`
+	PrivateKey     string `toml:"private_key" env:"PRIVATE_KEY"`
+	PrivateKeyFile string `toml:"private_key_file" env:"PRIVATE_KEY_FILE"`
 }
 
 func (cfg ChainConfig) GetPrivateKey() (string, error) {
@@ -99,11 +100,11 @@ func (chain *ChainConfig) getRPCURL() (string, error) {
 }
 
 type EpochConfig struct {
-	First int64 `toml:"first" envconfig:"EPOCH_FIRST"`
+	First int64 `toml:"first" env:"EPOCH_FIRST"`
 }
 
 type ContractAddresses struct {
-	Voting common.Address `toml:"voting" envconfig:"VOTING_CONTRACT_ADDRESS"`
+	Voting common.Address `toml:"voting" env:"VOTING_CONTRACT_ADDRESS, default=0x0000000000000000000000000000000000000000"`
 }
 
 func ParseConfigFile(cfg interface{}, fileName string, allowMissing bool) error {
@@ -124,7 +125,7 @@ func ParseConfigFile(cfg interface{}, fileName string, allowMissing bool) error
 }
 
 func ReadEnv(cfg interface{}) error {
-	err := envconfig.Process("", cfg)
+	err := envconfig.Process(context.Background(), cfg)
 	if err != nil {
 		return fmt.Errorf("error reading env config: %w", err)
 	}

database/methods.go

@@ -23,19 +23,3 @@ func (out TxOutput) Tx() string {
 func (out TxOutput) Index() uint32 {
 	return out.Idx
 }
-
-func (in TxInput) Addr() string {
-	return in.Address
-}
-
-func (in TxInput) OutTx() string {
-	return in.OutTxID
-}
-
-func (in TxInput) OutIndex() uint32 {
-	return in.OutIdx
-}
-
-func (in *TxInput) UpdateAddr(addr string) {
-	in.Address = addr
-}

database/types.go

@@ -28,6 +28,11 @@ const (
 	PChainAddPermissionlessValidatorTx PChainTxType = "ADD_PERMISSIONLESS_VALIDATOR_TX"
 	PChainAddPermissionlessDelegatorTx PChainTxType = "ADD_PERMISSIONLESS_DELEGATOR_TX"
 	PChainBaseTx                       PChainTxType = "BASE_TX"
+	PChainConvertSubnetToL1Tx          PChainTxType = "CONVERT_SUBNET_TO_L1_TX"
+	PChainRegisterL1ValidatorTx        PChainTxType = "REGISTER_L1_VALIDATOR_TX"
+	PChainDisableL1ValidatorTx         PChainTxType = "DISABLE_L1_VALIDATOR_TX"
+	PChainSetL1ValidatorWeightTx       PChainTxType = "SET_L1_VALIDATOR_WEIGHT_TX"
+	PChainIncreaseL1ValidatorBalanceTx PChainTxType = "INCREASE_L1_VALIDATOR_BALANCE_TX"
 	PChainUnknownTx                    PChainTxType = "UNKNOWN_TX"
 )
 

docker/indexer/config_costwo_voting.toml

@@ -49,6 +49,8 @@ enabled = true
 timeout = "10s"
 first = 183585  # from env EPOCH_FIRST
 delay = "10s"
+
+[voting_cronjob.gas]
 gas_limit = 120000
 
 [contract_addresses]

docker/indexer/config_flare_voting.toml

@@ -50,6 +50,8 @@ enabled = true
 timeout = "10s"
 first = 211500
 delay = "10s"
+
+[voting_cronjob.gas]
 gas_limit = 120000
 
 [contract_addresses]

go.mod

@@ -1,25 +1,25 @@
 module flare-indexer
 
-go 1.22
+go 1.22.8
 
 require (
-	github.com/BurntSushi/toml v1.2.1
-	github.com/ava-labs/avalanchego v1.11.1
-	github.com/ava-labs/coreth v0.13.0-rc.0
+	github.com/BurntSushi/toml v1.5.0
+	github.com/ava-labs/avalanchego v1.12.0
+	github.com/ava-labs/coreth v0.13.9-rc.1
 	github.com/bradleyjkemp/cupaloy v2.3.0+incompatible
 	github.com/davidebianchi/gswagger v0.9.0
 	github.com/deckarep/golang-set/v2 v2.1.0
-	github.com/ethereum/go-ethereum v1.12.0
+	github.com/ethereum/go-ethereum v1.13.14
 	github.com/getkin/kin-openapi v0.115.0
 	github.com/go-playground/validator/v10 v10.12.0
 	github.com/go-sql-driver/mysql v1.7.0
 	github.com/google/go-cmp v0.6.0
 	github.com/gorilla/mux v1.8.0
-	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.14.0
+	github.com/prometheus/client_golang v1.16.0
 	github.com/rs/cors v1.8.3
-	github.com/stretchr/testify v1.8.4
+	github.com/sethvargo/go-envconfig v1.3.0
+	github.com/stretchr/testify v1.9.0
 	github.com/swaggest/swgui v1.6.3
 	github.com/ybbus/jsonrpc/v3 v3.1.1
 	go.uber.org/zap v1.26.0
@@ -31,33 +31,39 @@ require (
 
 require (
 	github.com/DataDog/zstd v1.5.2 // indirect
+	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/NYTimes/gziphandler v1.1.1 // indirect
-	github.com/VictoriaMetrics/fastcache v1.10.0 // indirect
+	github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/bits-and-blooms/bitset v1.10.0 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
 	github.com/btcsuite/btcd/btcutil v1.1.3 // indirect
-	github.com/cenkalti/backoff/v4 v4.2.0 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/consensys/bavard v0.1.13 // indirect
+	github.com/consensys/gnark-crypto v0.12.1 // indirect
+	github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
+	github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/swag v0.21.1 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-stack/stack v1.8.1 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
+	github.com/google/btree v1.1.2 // indirect
 	github.com/google/renameio/v2 v2.0.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/rpc v1.2.0 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 // indirect
-	github.com/holiman/uint256 v1.2.2-0.20230321075855-87b91420868c // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
+	github.com/holiman/uint256 v1.2.4 // indirect
 	github.com/iancoleman/orderedmap v0.2.0 // indirect
 	github.com/invopop/yaml v0.2.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
@@ -67,45 +73,47 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mia-platform/jsonschema v0.1.0 // indirect
+	github.com/mmcloughlin/addchain v0.4.0 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
 	github.com/perimeterx/marshmallow v1.1.4 // indirect
 	github.com/pires/go-proxyproto v0.6.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.39.0 // indirect
-	github.com/prometheus/procfs v0.9.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/procfs v0.10.1 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/shurcooL/httpgzip v0.0.0-20190720172056-320755c1c1b0 // indirect
-	github.com/supranational/blst v0.3.11 // indirect
-	github.com/tklauser/go-sysconf v0.3.11 // indirect
-	github.com/tklauser/numcpus v0.6.0 // indirect
+	github.com/supranational/blst v0.3.13 // indirect
+	github.com/tklauser/go-sysconf v0.3.12 // indirect
+	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	go.opentelemetry.io/otel v1.11.2 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.2 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.11.2 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.11.2 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.11.2 // indirect
-	go.opentelemetry.io/otel/sdk v1.11.2 // indirect
-	go.opentelemetry.io/otel/trace v1.11.2 // indirect
-	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
+	go.opentelemetry.io/otel v1.22.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect
+	go.opentelemetry.io/otel/metric v1.22.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.22.0 // indirect
+	go.opentelemetry.io/otel/trace v1.22.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
 	go.uber.org/mock v0.4.0 // indirect
-	go.uber.org/multierr v1.10.0 // indirect
-	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/net v0.19.0 // indirect
-	golang.org/x/sync v0.5.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
-	golang.org/x/term v0.15.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/crypto v0.26.0 // indirect
+	golang.org/x/mod v0.17.0 // indirect
+	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.24.0 // indirect
+	golang.org/x/term v0.23.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
 	gonum.org/v1/gonum v0.12.0 // indirect
-	google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
-	google.golang.org/grpc v1.58.3 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
-	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed // indirect
+	google.golang.org/grpc v1.66.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	rsc.io/tmplfunc v0.0.3 // indirect
 )