Merge pull request #413 from shutter-network/schmir/upgrade-go-ethereum

Schmir/upgrade go ethereum

Author: konradkonrad

docker/02-init-chain.sh

@@ -60,15 +60,15 @@ for num in 0 1 2 3; do
     sentry_node=$(cat data/${sentry_cmd}/config/node_key.json.id)@${sentry_cmd}:${TM_P2P_PORT}
 
     # set seed node for sentry
-    ${BB} sed -i "/^persistent-peers =/c\persistent-peers = \"${seed_node}\"" data/${sentry_cmd}/config/config.toml
+    ${BB} sed -i "/^persistent_peers =/c\persistent_peers = \"${seed_node}\"" data/${sentry_cmd}/config/config.toml
     # set validator node for sentry
-    ${BB} sed -i "/^private-peer-ids =/c\private-peer-ids = \"${validator_id}\"" data/${sentry_cmd}/config/config.toml
-    ${BB} sed -i "/^unconditional-peer-ids =/c\unconditional-peer-ids = \"${validator_id}\"" data/${sentry_cmd}/config/config.toml
-    ${BB} sed -i "/^external-address =/c\external-address = \"${sentry_cmd}:${TM_P2P_PORT}\"" data/${sentry_cmd}/config/config.toml
+    ${BB} sed -i "/^private_peer_ids =/c\private_peer_ids = \"${validator_id}\"" data/${sentry_cmd}/config/config.toml
+    ${BB} sed -i "/^unconditional_peer_ids =/c\unconditional_peer_ids = \"${validator_id}\"" data/${sentry_cmd}/config/config.toml
+    ${BB} sed -i "/^external_address =/c\external_address = \"${sentry_cmd}:${TM_P2P_PORT}\"" data/${sentry_cmd}/config/config.toml
 
     # set sentry node for validator
-    ${BB} sed -i "/^persistent-peers =/c\persistent-peers = \"${sentry_node}\"" data/${validator_cmd}/config/config.toml
-    ${BB} sed -i "/^external-address =/c\external-address = \"${validator_cmd}:${TM_P2P_PORT}\"" data/${validator_cmd}/config/config.toml
+    ${BB} sed -i "/^persistent_peers =/c\persistent_peers = \"${sentry_node}\"" data/${validator_cmd}/config/config.toml
+    ${BB} sed -i "/^external_address =/c\external_address = \"${validator_cmd}:${TM_P2P_PORT}\"" data/${validator_cmd}/config/config.toml
 done
 
 $DC stop -t 30

play/src/sht/dkg_test.clj

@@ -149,7 +149,7 @@
         m (-> m
               (assoc-in [:rpc :laddr] (format "tcp://127.0.0.1:%d" (rpc-laddr-port n)))
               (assoc-in [:p2p :laddr] (format "tcp://127.0.0.1:%d" (+ 27000 n)))
-              (assoc-in [:p2p :persistent-peers] seeds))]
+              (assoc-in [:p2p :persistent_peers] seeds))]
     (spit path (toml-writer/dump m))))
 
 (defn- sys-chain-config-path

rolling-shutter/Makefile

@@ -69,7 +69,7 @@ ${GOPATH}/bin/go-enum:
 install-go-enum: ${GOPATH}/bin/go-enum
 
 ${GOPATH}/bin/abigen:
-	${GO} install github.com/ethereum/go-ethereum/cmd/abigen@v1.10.26
+	${GO} install github.com/ethereum/go-ethereum/cmd/abigen@v1.12.0
 install-abigen: ${GOPATH}/bin/abigen
 
 

rolling-shutter/app/app.go

@@ -273,6 +273,25 @@ func (app *ShutterApp) BeginBlock(req abcitypes.RequestBeginBlock) abcitypes.Res
 	return abcitypes.ResponseBeginBlock{Events: events}
 }
 
+func (app *ShutterApp) PrepareProposal(req abcitypes.RequestPrepareProposal) abcitypes.ResponsePrepareProposal {
+	txs := make([][]byte, 0, len(req.Txs))
+	var totalBytes int64
+	for _, tx := range req.Txs {
+		totalBytes += int64(len(tx))
+		if totalBytes > req.MaxTxBytes {
+			break
+		}
+		txs = append(txs, tx)
+	}
+	return abcitypes.ResponsePrepareProposal{Txs: txs}
+}
+
+func (app *ShutterApp) ProcessProposal(_ abcitypes.RequestProcessProposal) abcitypes.ResponseProcessProposal {
+	return abcitypes.ResponseProcessProposal{
+		Status: abcitypes.ResponseProcessProposal_ACCEPT,
+	}
+}
+
 // decodeTx decodes the given transaction.  It's kind of strange that we have do URL decode the
 // message outselves instead of tendermint doing it for us.
 func (ShutterApp) decodeTx(tx []byte) (signer common.Address, msg *shmsg.MessageWithNonce, err error) {

rolling-shutter/cmd/bootstrap/bootstrap.go

@@ -94,7 +94,7 @@ func bootstrap(config *Config) error {
 		return err
 	}
 
-	shmcl, err := http.New(config.ShuttermintURL)
+	shmcl, err := http.New(config.ShuttermintURL, "/websocket")
 	if err != nil {
 		log.Fatal().Err(err).Msg("failed to connect to Shuttermint node")
 	}

rolling-shutter/cmd/chain/chain.go

@@ -9,9 +9,11 @@ import (
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	abciclient "github.com/tendermint/tendermint/abci/client"
 	cfg "github.com/tendermint/tendermint/config"
 	"github.com/tendermint/tendermint/node"
+	"github.com/tendermint/tendermint/p2p"
+	"github.com/tendermint/tendermint/privval"
+	"github.com/tendermint/tendermint/proxy"
 
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/app"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/shversion"
@@ -61,24 +63,27 @@ func (as *appService) Start(ctx context.Context, runner service.Runner) error {
 		return errors.Wrap(err, "failed to create tendermint logger")
 	}
 
-	nodeid, err := as.config.LoadNodeKeyID()
-	if err != nil {
-		return err
-	}
-	log.Info().Str("node-id", string(nodeid)).Msg("loaded node-id")
-
 	shapp, err := app.LoadShutterAppFromFile(
 		filepath.Join(as.config.DBDir(), "shutter.gob"),
 	)
 	if err != nil {
 		return err
 	}
+	nodeKey, err := p2p.LoadNodeKey(as.config.NodeKeyFile())
+	if err != nil {
+		return err
+	}
+	log.Info().Str("node-id", string(nodeKey.ID())).Msg("loaded node-id")
 
-	tmNode, err := node.New(
+	tmNode, err := node.NewNode(
 		as.config,
+		privval.LoadFilePV(as.config.PrivValidatorKeyFile(), as.config.PrivValidatorStateFile()),
+		nodeKey,
+		proxy.NewLocalClientCreator(&shapp),
+		node.DefaultGenesisDocProviderFunc(as.config),
+		node.DefaultDBProvider,
+		node.DefaultMetricsProvider(as.config.Instrumentation),
 		logger,
-		abciclient.NewLocalCreator(&shapp),
-		nil,
 	)
 	if err != nil {
 		return errors.Wrap(err, "failed to create new Tendermint node")

rolling-shutter/cmd/chain/init.go

@@ -3,7 +3,6 @@ package chain
 // This has been copied from tendermint's own init command
 
 import (
-	"context"
 	"encoding/hex"
 	"fmt"
 	"os"
@@ -19,10 +18,9 @@ import (
 	"github.com/spf13/viper"
 	"github.com/tendermint/go-amino"
 	cfg "github.com/tendermint/tendermint/config"
-	tmlog "github.com/tendermint/tendermint/libs/log"
 	tmos "github.com/tendermint/tendermint/libs/os"
 	tmrand "github.com/tendermint/tendermint/libs/rand"
-	tmtime "github.com/tendermint/tendermint/libs/time"
+	"github.com/tendermint/tendermint/p2p"
 	"github.com/tendermint/tendermint/privval"
 	"github.com/tendermint/tendermint/types"
 
@@ -107,7 +105,7 @@ func initFiles(_ *cobra.Command, config *Config, _ []string) error {
 	}
 
 	tendermintCfg := cfg.DefaultConfig()
-	tendermintCfg.LogLevel = tmlog.LogLevelError
+	tendermintCfg.BaseConfig.LogLevel = "error"
 	tendermintCfg.RPC.ListenAddress = config.ListenAddress
 
 	scaleToBlockTime(tendermintCfg, config.BlockTime)
@@ -126,7 +124,6 @@ func initFiles(_ *cobra.Command, config *Config, _ []string) error {
 	tendermintCfg.P2P.ListenAddress = p2pAddress
 
 	tendermintCfg.P2P.AllowDuplicateIP = true
-	tendermintCfg.Mode = cfg.ModeValidator
 
 	tendermintCfg.SetRoot(config.RootDir)
 	if err := tendermintCfg.ValidateBasic(); err != nil {
@@ -138,25 +135,19 @@ func initFiles(_ *cobra.Command, config *Config, _ []string) error {
 	switch config.Role {
 	case VALIDATOR:
 		tendermintCfg.P2P.PexReactor = false
-		tendermintCfg.Mode = cfg.ModeValidator
 		tendermintCfg.P2P.AddrBookStrict = false
-	case "sentry": // even though "sentry" nodes are documented, there is no special mode
+	case "sentry":
 		tendermintCfg.P2P.PexReactor = true
-		tendermintCfg.Mode = cfg.ModeFull
 		tendermintCfg.P2P.AddrBookStrict = false
 	case "seed":
 		tendermintCfg.P2P.PexReactor = true
-		tendermintCfg.Mode = cfg.ModeSeed
 		tendermintCfg.P2P.AddrBookStrict = false
 	default:
 		return errors.Errorf("illegal value for --role: %s", config.Role)
 	}
 	// EnsureRoot also write the config file but with the default config. We want our own, so
 	// let's overwrite it.
-	err = cfg.WriteConfigFile(config.RootDir, tendermintCfg)
-	if err != nil {
-		return err
-	}
+	cfg.WriteConfigFile(config.RootDir+"/config/config.toml", tendermintCfg)
 	appState := app.NewGenesisAppState(keypers, (2*len(keypers)+2)/3, config.InitialEon)
 
 	return initFilesWithConfig(tendermintCfg, config, appState)
@@ -179,80 +170,73 @@ func adjustPort(address string, keyperIndex int) (string, error) {
 
 func initFilesWithConfig(tendermintConfig *cfg.Config, config *Config, appState app.GenesisAppState) error {
 	var err error
-	if config.Role == VALIDATOR {
-		// private validator
-		privValKeyFile := tendermintConfig.PrivValidator.KeyFile()
-		privValStateFile := tendermintConfig.PrivValidator.StateFile()
-		var pv *privval.FilePV
-		if tmos.FileExists(privValKeyFile) {
-			pv, err = privval.LoadFilePV(privValKeyFile, privValStateFile)
-			if err != nil {
-				return err
-			}
-			log.Info().
-				Str("privValKeyFile", privValKeyFile).
-				Str("stateFile", privValStateFile).
-				Msg("Found private validator")
-		} else {
-			pv, err = privval.GenFilePV(privValKeyFile, privValStateFile, types.ABCIPubKeyTypeEd25519)
-			if err != nil {
-				return err
-			}
-			pv.Save()
-			log.Info().
-				Str("privValKeyFile", privValKeyFile).
-				Str("stateFile", privValStateFile).
-				Msg("Generated private validator")
-		}
+	// private validator
+	privValKeyFile := tendermintConfig.PrivValidatorKeyFile()
+	privValStateFile := tendermintConfig.PrivValidatorStateFile()
+	var pv *privval.FilePV
+	if tmos.FileExists(privValKeyFile) {
+		pv = privval.LoadFilePV(privValKeyFile, privValStateFile)
+		log.Info().
+			Str("privValKeyFile", privValKeyFile).
+			Str("stateFile", privValStateFile).
+			Msg("Found private validator")
+	} else {
+		pv = privval.GenFilePV(privValKeyFile, privValStateFile)
+		pv.Save()
+		log.Info().
+			Str("privValKeyFile", privValKeyFile).
+			Str("stateFile", privValStateFile).
+			Msg("Generated private validator")
+	}
+
+	validatorPubKeyPath := filepath.Join(tendermintConfig.RootDir, "config", "priv_validator_pubkey.hex")
+	validatorPublicKeyHex := hex.EncodeToString(pv.Key.PubKey.Bytes())
+	err = os.WriteFile(validatorPubKeyPath, []byte(validatorPublicKeyHex), 0o644)
+	if err != nil {
+		return errors.Wrapf(err, "Could not write to %s", validatorPubKeyPath)
+	}
+	log.Info().Str("path", validatorPubKeyPath).Str("validatorPublicKey", validatorPublicKeyHex).Msg("Saved private validator publickey")
 
-		validatorPubKeyPath := filepath.Join(tendermintConfig.RootDir, "config", "priv_validator_pubkey.hex")
-		validatorPublicKeyHex := hex.EncodeToString(pv.Key.PubKey.Bytes())
-		err = os.WriteFile(validatorPubKeyPath, []byte(validatorPublicKeyHex), 0o644)
+	// genesis file
+	genFile := tendermintConfig.GenesisFile()
+	if tmos.FileExists(genFile) {
+		log.Info().Str("path", genFile).Msg("Found genesis file")
+	} else {
+		appStateBytes, err := amino.NewCodec().MarshalJSONIndent(appState, "", "    ")
 		if err != nil {
-			return errors.Wrapf(err, "Could not write to %s", validatorPubKeyPath)
+			return err
 		}
-		log.Info().Str("path", validatorPubKeyPath).Str("validatorPublicKey", validatorPublicKeyHex).Msg("Saved private validator publickey")
-
-		// genesis file
-		genFile := tendermintConfig.GenesisFile()
-		if tmos.FileExists(genFile) {
-			log.Info().Str("path", genFile).Msg("Found genesis file")
-		} else {
-			appStateBytes, err := amino.NewCodec().MarshalJSONIndent(appState, "", "    ")
-			if err != nil {
-				return err
-			}
-			genDoc := types.GenesisDoc{
-				ChainID:         fmt.Sprintf("shutter-test-chain-%v", tmrand.Str(6)),
-				GenesisTime:     tmtime.Now(),
-				ConsensusParams: types.DefaultConsensusParams(),
-				AppState:        appStateBytes,
-			}
-			pubKey, err := pv.GetPubKey(context.Background())
-			if err != nil {
-				return errors.Wrap(err, "can't get pubkey")
-			}
-			genDoc.Validators = []types.GenesisValidator{{
-				Address: pubKey.Address(),
-				PubKey:  pubKey,
-				Power:   10,
-			}}
+		genDoc := types.GenesisDoc{
+			ChainID:         fmt.Sprintf("shutter-test-chain-%v", tmrand.Str(6)),
+			GenesisTime:     time.Now(),
+			ConsensusParams: types.DefaultConsensusParams(),
+			AppState:        appStateBytes,
+		}
+		pubKey, err := pv.GetPubKey()
+		if err != nil {
+			return errors.Wrap(err, "can't get pubkey")
+		}
+		genDoc.Validators = []types.GenesisValidator{{
+			Address: pubKey.Address(),
+			PubKey:  pubKey,
+			Power:   10,
+		}}
 
-			if err := genDoc.SaveAs(genFile); err != nil {
-				return err
-			}
-			log.Info().Str("path", genFile).Msg("Generated genesis file")
+		if err := genDoc.SaveAs(genFile); err != nil {
+			return err
 		}
+		log.Info().Str("path", genFile).Msg("Generated genesis file")
 	}
 
 	nodeKeyFile := tendermintConfig.NodeKeyFile()
 	if tmos.FileExists(nodeKeyFile) {
 		log.Info().Str("path", nodeKeyFile).Msg("Found node key")
 	} else {
-		nodeid, err := tendermintConfig.LoadOrGenNodeKeyID()
+		nodeKey, err := p2p.LoadOrGenNodeKey(nodeKeyFile)
 		if err != nil {
 			return err
 		}
+		nodeid := nodeKey.ID()
 		idpath := nodeKeyFile + ".id"
 		err = os.WriteFile(idpath, []byte(nodeid), 0o644)
 		if err != nil {