From ca20118d8f829a822cd942ffcdd5b09f5319860d Mon Sep 17 00:00:00 2001 From: Jack Chuma Date: Thu, 21 Nov 2024 11:59:21 -0500 Subject: [PATCH] change provers type to string --- .../log-fetcher/config/networks.yaml | 8 ++++---- .../log-fetcher/internal/chains/config.go | 4 ++-- .../internal/chains/config_test.go | 10 +++++----- .../log-fetcher/internal/config/provers.go | 19 ------------------- .../log-fetcher/internal/provers/provers.go | 9 +++++++++ .../internal/validator/validator.go | 2 +- .../internal/validator/validator_test.go | 4 ++-- 7 files changed, 23 insertions(+), 33 deletions(-) delete mode 100644 services/go-filler/log-fetcher/internal/config/provers.go create mode 100644 services/go-filler/log-fetcher/internal/provers/provers.go diff --git a/services/go-filler/log-fetcher/config/networks.yaml b/services/go-filler/log-fetcher/config/networks.yaml index 32e752f..89c5720 100644 --- a/services/go-filler/log-fetcher/config/networks.yaml +++ b/services/go-filler/log-fetcher/config/networks.yaml @@ -9,7 +9,7 @@ networks: contracts: inbox: 0xeE962eD1671F655a806cB22623eEA8A7cCc233bC outbox: 0xBCd5762cF9B07EF5597014c350CE2efB2b0DB2D2 - target-prover: 1 + target-prover: ArbitrumProver 84532: # Base Sepolia chain-id: 84532 prover-contracts: @@ -21,7 +21,7 @@ networks: contracts: inbox: 0xB482b292878FDe64691d028A2237B34e91c7c7ea outbox: 0xD7a5A114A07cC4B5ebd9C5e1cD1136a99fFA3d68 - target-prover: 2 + target-prover: OPStackProver 11155420: # Optimism Sepolia chain-id: 11155420 prover-contracts: @@ -31,7 +31,7 @@ networks: contracts: inbox: 0x49E2cDC9e81825B6C718ae8244fe0D5b062F4874 l2-message-passer: 0x4200000000000000000000000000000000000016 - target-prover: 2 + target-prover: OPStackProver 11155111: # Sepolia chain-id: 11155111 prover-contracts: @@ -39,4 +39,4 @@ networks: contracts: anchor-state-registry: 0x218CD9489199F321E1177b56385d333c5B598629 arb-rollup: 0xd80810638dbDF9081b72C1B33c65375e807281C8 - target-prover: 0 + target-prover: None diff --git a/services/go-filler/log-fetcher/internal/chains/config.go b/services/go-filler/log-fetcher/internal/chains/config.go index eed2aaa..ab79abc 100644 --- a/services/go-filler/log-fetcher/internal/chains/config.go +++ b/services/go-filler/log-fetcher/internal/chains/config.go @@ -4,7 +4,7 @@ import ( "fmt" "math/big" - "github.com/base-org/RIP-7755-poc/services/go-filler/log-fetcher/internal/config" + "github.com/base-org/RIP-7755-poc/services/go-filler/log-fetcher/internal/provers" "github.com/ethereum/go-ethereum/common" ) @@ -28,7 +28,7 @@ type ChainConfig struct { L2Oracle common.Address `yaml:"l2-oracle"` L2OracleStorageKey string `yaml:"l2-oracle-storage-key"` Contracts *Contracts `yaml:"contracts"` - TargetProver config.Prover `yaml:"target-prover"` + TargetProver provers.Prover `yaml:"target-prover"` } func (n *Networks) GetChainConfig(chainId *big.Int) (*ChainConfig, error) { diff --git a/services/go-filler/log-fetcher/internal/chains/config_test.go b/services/go-filler/log-fetcher/internal/chains/config_test.go index 6e7cd88..9030c51 100644 --- a/services/go-filler/log-fetcher/internal/chains/config_test.go +++ b/services/go-filler/log-fetcher/internal/chains/config_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/base-org/RIP-7755-poc/services/go-filler/log-fetcher/internal/config" + "github.com/base-org/RIP-7755-poc/services/go-filler/log-fetcher/internal/provers" "github.com/ethereum/go-ethereum/common" ) @@ -22,7 +22,7 @@ func TestGetChainConfig(t *testing.T) { expected: &ChainConfig{ ChainId: big.NewInt(421614), ProverContracts: map[string]common.Address{ - config.OPStackProver.String(): common.HexToAddress("0x062fBdCfd17A0346D2A9d89FE233bbAdBd1DC14C"), + string(provers.OPStackProver): common.HexToAddress("0x062fBdCfd17A0346D2A9d89FE233bbAdBd1DC14C"), }, RpcUrl: "https://arb-sepolia.example.com", L2Oracle: common.HexToAddress("0xd80810638dbDF9081b72C1B33c65375e807281C8"), @@ -31,13 +31,13 @@ func TestGetChainConfig(t *testing.T) { Inbox: common.HexToAddress("0xeE962eD1671F655a806cB22623eEA8A7cCc233bC"), Outbox: common.HexToAddress("0xBCd5762cF9B07EF5597014c350CE2efB2b0DB2D2"), }, - TargetProver: config.ArbitrumProver, + TargetProver: provers.ArbitrumProver, }, networks: Networks{ "421614": { ChainId: big.NewInt(421614), ProverContracts: map[string]common.Address{ - config.OPStackProver.String(): common.HexToAddress("0x062fBdCfd17A0346D2A9d89FE233bbAdBd1DC14C"), + string(provers.OPStackProver): common.HexToAddress("0x062fBdCfd17A0346D2A9d89FE233bbAdBd1DC14C"), }, RpcUrl: "https://arb-sepolia.example.com", L2Oracle: common.HexToAddress("0xd80810638dbDF9081b72C1B33c65375e807281C8"), @@ -46,7 +46,7 @@ func TestGetChainConfig(t *testing.T) { Inbox: common.HexToAddress("0xeE962eD1671F655a806cB22623eEA8A7cCc233bC"), Outbox: common.HexToAddress("0xBCd5762cF9B07EF5597014c350CE2efB2b0DB2D2"), }, - TargetProver: config.ArbitrumProver, + TargetProver: provers.ArbitrumProver, }, }, }, diff --git a/services/go-filler/log-fetcher/internal/config/provers.go b/services/go-filler/log-fetcher/internal/config/provers.go deleted file mode 100644 index c1fc2ca..0000000 --- a/services/go-filler/log-fetcher/internal/config/provers.go +++ /dev/null @@ -1,19 +0,0 @@ -package config - -type Prover int - -const ( - NilProver Prover = iota - ArbitrumProver - OPStackProver -) - -var proverName = map[Prover]string{ - NilProver: "None", - ArbitrumProver: "ArbitrumProver", - OPStackProver: "OPStackProver", -} - -func (ss Prover) String() string { - return proverName[ss] -} diff --git a/services/go-filler/log-fetcher/internal/provers/provers.go b/services/go-filler/log-fetcher/internal/provers/provers.go new file mode 100644 index 0000000..280b765 --- /dev/null +++ b/services/go-filler/log-fetcher/internal/provers/provers.go @@ -0,0 +1,9 @@ +package provers + +type Prover string + +const ( + NilProver Prover = "None" + ArbitrumProver Prover = "ArbitrumProver" + OPStackProver Prover = "OPStackProver" +) diff --git a/services/go-filler/log-fetcher/internal/validator/validator.go b/services/go-filler/log-fetcher/internal/validator/validator.go index 8c8fe0c..801f954 100644 --- a/services/go-filler/log-fetcher/internal/validator/validator.go +++ b/services/go-filler/log-fetcher/internal/validator/validator.go @@ -32,7 +32,7 @@ func (v *validator) ValidateLog(log *bindings.RIP7755OutboxCrossChainCallRequest return err } - proverName := dstChain.TargetProver.String() + proverName := string(dstChain.TargetProver) if proverName == "" { return errors.New("destination chain missing Prover name") } diff --git a/services/go-filler/log-fetcher/internal/validator/validator_test.go b/services/go-filler/log-fetcher/internal/validator/validator_test.go index 09f18ab..8487fd2 100644 --- a/services/go-filler/log-fetcher/internal/validator/validator_test.go +++ b/services/go-filler/log-fetcher/internal/validator/validator_test.go @@ -6,7 +6,7 @@ import ( "github.com/base-org/RIP-7755-poc/services/go-filler/bindings" "github.com/base-org/RIP-7755-poc/services/go-filler/log-fetcher/internal/chains" - "github.com/base-org/RIP-7755-poc/services/go-filler/log-fetcher/internal/config" + "github.com/base-org/RIP-7755-poc/services/go-filler/log-fetcher/internal/provers" "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/assert" ) @@ -24,7 +24,7 @@ var networksCfg chains.NetworksConfig = chains.NetworksConfig{ }, L2Oracle: common.HexToAddress("0x4C8BA32A5DAC2A720bb35CeDB51D6B067D104205"), L2OracleStorageKey: "0xa6eef7e35abe7026729641147f7915573c7e97b47efa546f5f6e3230263bcb49", - TargetProver: config.OPStackProver, + TargetProver: provers.OPStackProver, }, }, }