Upgrade eth chain to support capella's fork (#253)

cosmology-tech · Sep 30, 2023 · 77d641a · 77d641a
1 parent 3c2ad66
commit 77d641a
Show file tree

Hide file tree

Showing 5 changed files with 144 additions and 81 deletions.
diff --git a/charts/devnet/defaults.yaml b/charts/devnet/defaults.yaml
@@ -595,66 +595,72 @@ defaultChains:
     genesisStateUrl: https://github.com/eth-clients/merge-testnets/blob/main/sepolia/genesis.ssz
     joinNetwork: false
     prysmCtl:
-      image: gcr.io/prysmaticlabs/prysm/cmd/prysmctl
+      image: gcr.io/prysmaticlabs/prysm/cmd/prysmctl:local-devnet
       command: ["/app/cmd/prysmctl/prysmctl"]
       args:
         - testnet
         - generate-genesis
-        - --num-validators=36
+        - --fork=capella
+        - --num-validators=64
         - --output-ssz=/ethereum/consensus/genesis.ssz
         - --chain-config-file=/etc/config/config.yml
+        - --geth-genesis-json-in=/etc/config/genesis.json
+        - --geth-genesis-json-out=/ethereum/consensus/genesis.json
     geth:
-      image: ethereum/client-go:v1.12.0
+      image: ethereum/client-go:latest
       args:
         - --nodiscover
         - --http
         - --http.api=eth,net,web3,debug
         - --http.addr=0.0.0.0
+        - --http.corsdomain=*
+        - --ws
+        - --ws.api=eth,net,web3
+        - --ws.addr=0.0.0.0
+        - --ws.origins=*
         - --http.vhosts=*
+        - --authrpc.vhosts=*
         - --authrpc.addr=0.0.0.0
         - --authrpc.jwtsecret=/etc/secrets/jwt.hex
         - --datadir=/ethereum/execution
         - --allow-insecure-unlock
         - --unlock=0x123463a4B065722E99115D6c222f267d9cABb524
         - --password=/dev/null
         - --syncmode=full
-        - --mine
-        - --miner.etherbase=0x123463a4b065722e99115d6c222f267d9cabb524
         - --networkid=32382
     beaconChain:
-      image: gcr.io/prysmaticlabs/prysm/beacon-chain:v4.0.7
+      image: gcr.io/prysmaticlabs/prysm/beacon-chain:v4.0.8
       command: ["/app/cmd/beacon-chain/beacon-chain"]
       args:
         - --datadir=/ethereum/consensus/beacon
         - --min-sync-peers=0
         - --genesis-state=/ethereum/consensus/genesis.ssz
         - --bootstrap-node=
+        - --interop-eth1data-votes
         - --chain-config-file=/etc/config/config.yml
-        - --config-file=/etc/config/config.yml
         - --chain-id=32382
         - --rpc-host=0.0.0.0
         - --contract-deployment-block=0
         - --grpc-gateway-host=0.0.0.0
         - --execution-endpoint=http://localhost:8551
         - --accept-terms-of-use
         - --jwt-secret=/etc/secrets/jwt.hex
-        - --contract-deployment-block=0
         - --suggested-fee-recipient=0x123463a4B065722E99115D6c222f267d9cABb524
+        - --minimum-peers-per-subnet=0
+        - --enable-debug-rpc-endpoints
     validator:
       enabled: false
-      image: gcr.io/prysmaticlabs/prysm/validator:v4.0.7
+      image: gcr.io/prysmaticlabs/prysm/validator:v4.0.8
       command: ["/app/cmd/validator/validator"]
       args:
         - --accept-terms-of-use
         - --beacon-rpc-provider=localhost:4000
         - --datadir=/ethereum/consensus/validator
-        - --interop-num-validators=36
+        - --interop-num-validators=64
         - --interop-start-index=0
         - --force-clear-db
         - --chain-config-file=/etc/config/config.yml
-        - --config-file=/etc/config/config.yml
         - --suggested-fee-recipient=0x0C46c2cAFE097b4f7e1BB868B89e5697eE65f934
-    contracts: []
 
 defaultRelayers:
   ts-relayer:

diff --git a/charts/devnet/templates/chains/virtual/eth/configmap.yaml b/charts/devnet/templates/chains/virtual/eth/configmap.yaml
diff --git a/charts/devnet/templates/chains/virtual/eth/service.yaml b/charts/devnet/templates/chains/virtual/eth/service.yaml
@@ -9,25 +9,30 @@ metadata:
   labels:
     app: prysm
 spec:
+  {{- if $chain.external }}
+  type: LoadBalancer
+  {{- else }}
   type: NodePort
+  {{- end }}
   selector:
     app: prysm
   ports:
     - name: beacon-api
       protocol: TCP
       port: 3500
       targetPort: 3500
-      nodePort: 30500
+    - name: beacon-grpc
+      protocol: TCP
+      port: 4000
+      targetPort: 4000
     - name: geth-http
       protocol: TCP
       port: 8545
       targetPort: 8545
-      nodePort: 30545
     - name: geth-authrpc
       protocol: TCP
       port: 8551
       targetPort: 8551
-      nodePort: 30551
 
 {{- end }}
 {{- end }}

diff --git a/charts/devnet/templates/chains/virtual/eth/statefulset.yaml b/charts/devnet/templates/chains/virtual/eth/statefulset.yaml
@@ -56,7 +56,7 @@ spec:
               readOnly: true
         - name: geth-genesis-init
           image: {{ $chain.geth.image }}
-          command: ['sh', '-c', "if [ -e /ethereum/.init ]; then exit 0; fi; geth init --datadir=/ethereum/execution /etc/config/genesis.json"]
+          command: ['sh', '-c', "if [ -e /ethereum/.init ]; then exit 0; fi; geth init --datadir=/ethereum/execution /ethereum/consensus/genesis.json"]
           volumeMounts:
             - name: ethereum
               mountPath: /ethereum
@@ -139,7 +139,7 @@ spec:
             - name: config
               mountPath: /etc/config
               readOnly: true
-          resources: {{- include "getResourceObject" $chain.beaconChain.resources | trim | nindent 12 }}
+          resources: {{- include "getResourceObject" $chain.validator.resources | trim | nindent 12 }}
       {{- end }}
       {{- include "imagePullSecrets" $chain | indent 6 }}
       volumes:

diff --git a/charts/devnet/values.schema.json b/charts/devnet/values.schema.json
@@ -133,7 +133,9 @@
               "simapp",
               "cheqd",
               "neutron",
-              "injective"
+              "injective",
+              "polymer",
+              "virtual"
             ]
           },
           "numValidators": {
@@ -167,9 +169,42 @@
           "coinType": {
             "type": "number"
           },
+          "metrics": {
+            "type": "boolean"
+          },
           "repo": {
             "type": "string"
           },
+          "storage": {
+            "type": "string"
+          },
+          "storageClassName": {
+            "type": "string"
+          },
+          "external": {
+            "type": "boolean"
+          },
+          "joinNetwork": {
+            "type": "boolean"
+          },
+          "geth": {
+            "type": "object"
+          },
+          "beaconChain": {
+            "type": "object"
+          },
+          "prysmCtl": {
+            "type": "object"
+          },
+          "validator": {
+            "type": "object"
+          },
+          "genesisStateUrl": {
+            "type": "string"
+          },
+          "subtype": {
+            "type": "string"
+          },
           "upgrade": {
             "type": "object",
             "properties": {