change provers type to string

base · Nov 21, 2024 · ca20118 · ca20118
1 parent ea4fc8d
commit ca20118
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 33 deletions.
diff --git 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,12 +31,12 @@ networks:
     contracts:
       inbox: 0x49E2cDC9e81825B6C718ae8244fe0D5b062F4874
       l2-message-passer: 0x4200000000000000000000000000000000000016
-    target-prover: 2
+    target-prover: OPStackProver
   11155111: # Sepolia
     chain-id: 11155111
     prover-contracts:
     rpc-url: ${SEPOLIA_RPC}
     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
@@ -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
@@ -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
diff --git a/services/go-filler/log-fetcher/internal/provers/provers.go 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
@@ -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
@@ -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,
 		},
 	},
 }