Merge pull request #2727 from manuelsc/nobids/fix_local

(NOBIDS) fix local deployment elconfig
gobitfly · Nov 24, 2023 · a75f1da · a75f1da
2 parents 91b2b05 + 6a5aab1
commit a75f1da
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,4 +30,5 @@ cmd/forkwatch
 **/.DS_Store
 _gitignore/
 local-deployment/config.yml
+local-deployment/elconfig.json
 local-deployment/.env
diff --git a/local-deployment/explorer-config-template.yml b/local-deployment/explorer-config-template.yml
@@ -1,5 +1,6 @@
 chain:
-  configPath: 'node'
+  clConfigPath: 'node'
+  elConfigPath: '' # Works for well known public networks like mainnet, prater, holesky, sepolia. Specify a file for custom chains
 readerDatabase:
   name: db
   host: {{.DBHost}}

diff --git a/local-deployment/provision-explorer-config.sh b/local-deployment/provision-explorer-config.sh
@@ -22,11 +22,20 @@ POSTGRES_PORT=$POSTGRES_PORT
 LBT_PORT=$LBT_PORT
 EOF
 
+touch elconfig.json
+cat >elconfig.json <<EOL
+{
+    "byzantiumBlock": 0,
+    "constantinopleBlock": 0
+}
+EOL
+
 touch config.yml
 
 cat >config.yml <<EOL
 chain:
   clConfigPath: 'node'
+  elConfigPath: 'local-deployment/elconfig.json'
 readerDatabase:
   name: db
   host: 127.0.0.1
@@ -99,11 +108,11 @@ echo "initializing bigtable schema"
 PROJECT="explorer"
 INSTANCE="explorer"
 HOST="127.0.0.1:$LBT_PORT"
-
-go run ../cmd/misc/main.go -config config.yml -command initBigtableSchema
+cd ..
+go run ./cmd/misc/main.go -config local-deployment/config.yml -command initBigtableSchema
 
 echo "bigtable schema initialization completed"
 
 echo "provisioning postgres db schema"
-go run ../cmd/misc/main.go -config config.yml -command applyDbSchema
+go run ./cmd/misc/main.go -config local-deployment/config.yml -command applyDbSchema
 echo "postgres db schema initialization completed"
diff --git a/utils/utils.go b/utils/utils.go
@@ -653,7 +653,7 @@ func ReadConfig(cfg *types.Config, path string) error {
 			return fmt.Errorf("error opening EL Chain Config file %v: %w", cfg.Chain.ElConfigPath, err)
 		}
 		var chainConfig *params.ChainConfig
-		decoder := yaml.NewDecoder(f)
+		decoder := json.NewDecoder(f)
 		err = decoder.Decode(&chainConfig)
 		if err != nil {
 			return fmt.Errorf("error decoding EL Chain Config file %v: %v", cfg.Chain.ElConfigPath, err)