古い署名を削除 ＆ Streamで同期しない

Makefile

@@ -1,8 +1,16 @@
 build:
 	go build -o bin/oasvlfy .
 
+.PHONY: proto
+proto:
+	protoc --go_out=./proto/p2p/v1  \
+	./proto/p2p/v1/*.proto
+
 fmt:
 	go fmt ./...
 
+fmtproto:
+	clang-format -i ./proto/p2p/**/*.proto
+
 test:
 	go test -v ./...

cmd/config_loader.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"io/ioutil"
+	"os"
 	"strings"
 
 	"github.com/oasysgames/oasys-optimism-verifier/config"
@@ -139,20 +139,20 @@ func mustNewConfigLoader(cmd *cobra.Command) *configLoader {
 	return opts
 }
 
-func (opts *configLoader) load() (*config.Config, error) {
+func (opts *configLoader) load(enableStrictValidation bool) (*config.Config, error) {
 	// load config from the file
 	if !opts.fromCli {
 		path, err := opts.cmd.Flags().GetString(fileConfigFlag)
 		if err != nil {
 			return nil, err
 		}
 
-		input, err := ioutil.ReadFile(path)
+		input, err := os.ReadFile(path)
 		if err != nil {
 			return nil, err
 		}
 
-		conf, err := config.NewConfig(input)
+		conf, err := config.NewConfig(input, true)
 		if err != nil {
 			return nil, err
 		}
@@ -188,7 +188,7 @@ func (opts *configLoader) load() (*config.Config, error) {
 		}
 	}
 
-	if err := config.Validate(opts.cfg); err != nil {
+	if err := config.Validate(opts.cfg, enableStrictValidation); err != nil {
 		return nil, err
 	}
 

cmd/config_loader_test.go

@@ -57,11 +57,11 @@ func (s *ConfigLoaderTestSuite) TestLoadConfigFromYAML() {
 			address: '0xD244F03CA3e99C6093f6cBEFBD2f4508244C59D4'
 			password: %s
 			plain: '0xebf3a7f5f805e02c0bbbd599acd5c881f40db22caa95127d4bf48e2dde5fd7bb'
-	
+
 	hub_layer:
 		chain_id: 1
 		rpc: https://rpc.hub.example.com/
-	
+
 	verse_layer:
 		discovery:
 			endpoint: https://discovery.example.com/
@@ -71,7 +71,7 @@ func (s *ConfigLoaderTestSuite) TestLoadConfigFromYAML() {
 			  l1_contracts:
 			    StateCommitmentChain: '0x01E901F3c65fA7CBd4505F5eF3A88e4ce432e4B5'
 			    L2OutputOracle: '0x2489317FA6e003550111D5D196302Ba0879354e2'
-	
+
 	p2p:
 		listens:
 			- listen0
@@ -92,7 +92,7 @@ func (s *ConfigLoaderTestSuite) TestLoadConfigFromYAML() {
 	verifier:
 		enable: true
 		wallet: verifier
-	
+
 	submitter:
 		enable: true
 		confirmations: 10
@@ -123,7 +123,7 @@ func (s *ConfigLoaderTestSuite) TestLoadConfigFromYAML() {
 	})
 	rootCmd.Execute()
 
-	got, _ := globalConfigLoader.load()
+	got, _ := globalConfigLoader.load(false)
 	s.Equal(want, got)
 }
 
@@ -227,7 +227,8 @@ func (s *ConfigLoaderTestSuite) executeWithCliArgs(appendArgs []string) *config.
 	}, appendArgs...))
 	cmd.Execute()
 
-	conf, _ := opts.load()
+	conf, err := opts.load(false)
+	s.Require().NoError(err)
 	return conf
 }
 
@@ -336,6 +337,8 @@ func (s *ConfigLoaderTestSuite) configWithMinCliArgs() *config.Config {
 			StateCollectLimit:   defaults["verifier.state_collect_limit"].(int),
 			StateCollectTimeout: defaults["verifier.state_collect_timeout"].(time.Duration),
 			OptimizeInterval:    defaults["verifier.db_optimize_interval"].(time.Duration),
+			Confirmations:       defaults["verifier.confirmations"].(int),
+			StartBlockOffset:    defaults["verifier.start_block_offset"].(uint64),
 		},
 		Submitter: config.Submitter{
 			Enable:              false,

cmd/ping.go

@@ -16,7 +16,7 @@ var pingCmd = &cobra.Command{
 	Short: "Send ping via P2P to specified peer",
 	Long:  "Send ping via P2P to specified peer",
 	Run: func(cmd *cobra.Command, args []string) {
-		conf, err := globalConfigLoader.load()
+		conf, err := globalConfigLoader.load(true)
 		if err != nil {
 			util.Exit(1, "Failed to load configuration: %s\n", err)
 		}