feat!: revert passing operator address on InitChain (#617)

block/initchain.go

@@ -2,98 +2,31 @@ package block
 
 import (
 	"context"
-	"os"
 
-	"github.com/cosmos/cosmos-sdk/codec"
-
-	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
-	"github.com/cosmos/cosmos-sdk/crypto/keyring"
-	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
-	"github.com/evmos/evmos/v12/crypto/hd"
-	"github.com/ignite/cli/ignite/pkg/cosmosaccount"
 	tmtypes "github.com/tendermint/tendermint/types"
 )
 
 func (m *Manager) RunInitChain(ctx context.Context) error {
-
-	// We pass an initial val set which is actually the consensus and operator addresses of the proposer.
-	// This is a hack to make sure the chain can get both addresses without us needing to change comet signatures:
-	//  The RDK will save a sequencer, and delete the extra validator after initChain, so we also delete it here
-	//  to keep the state in sync.
-
 	//get the proposer's consensus pubkey
 	proposer := m.settlementClient.GetProposer()
 	tmPubKey, err := cryptocodec.ToTmPubKeyInterface(proposer.PublicKey)
 	if err != nil {
 		return err
 	}
-	consensusPubkey := tmtypes.NewValidator(tmPubKey, 1)
-
-	//get the operator's pubkey
-	pubkey, err := getOperatorPubkey(m.conf.OperatorKeyringHomeDir, m.conf.OperatorKeyringBackend, m.conf.OperatorAccountName)
-	if err != nil {
-		return err
-	}
-	tmPubKey, err = cryptocodec.ToTmPubKeyInterface(pubkey)
-	if err != nil {
-		return err
-	}
-	operatorPubkey := tmtypes.NewValidator(tmPubKey, 1)
+	gensisValSet := []*tmtypes.Validator{tmtypes.NewValidator(tmPubKey, 1)}
 
 	//call initChain with both addresses
-	res, err := m.executor.InitChain(m.genesis, []*tmtypes.Validator{consensusPubkey, operatorPubkey})
+	res, err := m.executor.InitChain(m.genesis, gensisValSet)
 	if err != nil {
 		return err
 	}
 
 	//update the state with only the consensus pubkey
-	m.executor.UpdateStateAfterInitChain(&m.lastState, res, []*tmtypes.Validator{consensusPubkey})
+	m.executor.UpdateStateAfterInitChain(&m.lastState, res, gensisValSet)
 	if _, err := m.store.UpdateState(m.lastState, nil); err != nil {
 		return err
 	}
 
 	return nil
 }
-
-func getOperatorPubkey(keyDir, keyringBackend, accountName string) (cryptotypes.PubKey, error) {
-	// open keyring
-	c, err := cosmosaccount.New(
-		cosmosaccount.WithKeyringBackend(cosmosaccount.KeyringBackend(keyringBackend)),
-		cosmosaccount.WithHome(keyDir),
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	interfaceRegistry := codectypes.NewInterfaceRegistry()
-	cryptocodec.RegisterInterfaces(interfaceRegistry)
-	cdc := codec.NewProtoCodec(interfaceRegistry)
-
-	customKeyring, err := keyring.New("operatorAddr", keyringBackend, keyDir, os.Stdin, cdc, hd.EthSecp256k1Option())
-	if err != nil {
-		return nil, err
-	}
-	c.Keyring = customKeyring
-
-	// If the keyring is in memory, ensure the default account exists to be used in tests
-	if keyringBackend == "memory" {
-		err := c.EnsureDefaultAccount()
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	// Get account from the keyring
-	account, err := c.GetByName(accountName)
-	if err != nil {
-		return nil, err
-	}
-
-	pubkey, err := account.Record.GetPubKey()
-	if err != nil {
-		return nil, err
-	}
-
-	return pubkey, nil
-}

block/testutil.go

@@ -151,7 +151,5 @@ func getManagerConfig() config.BlockManagerConfig {
 		BatchSubmitMaxTime:      30 * time.Minute,
 		NamespaceID:             "0102030405060708",
 		GossipedBlocksCacheSize: 50,
-		OperatorKeyringBackend:  "memory",
-		OperatorAccountName:     "default",
 	}
 }

config/config.go

@@ -53,11 +53,6 @@ type BlockManagerConfig struct {
 	BlockBatchMaxSizeBytes uint64 `mapstructure:"block_batch_max_size_bytes"`
 	// The number of messages cached by gossipsub protocol
 	GossipedBlocksCacheSize int `mapstructure:"gossiped_blocks_cache_size"`
-
-	// Parameters to get the sequencer's operator address
-	OperatorKeyringBackend string `mapstructure:"operator_keyring_backend"`
-	OperatorAccountName    string `mapstructure:"operator_account_name"`
-	OperatorKeyringHomeDir string `mapstructure:"operator_keyring_home_dir"`
 }
 
 // GetViperConfig reads configuration parameters from Viper instance.

config/defaults.go

@@ -69,11 +69,6 @@ func DefaultConfig(home, chainId string) *NodeConfig {
 	}
 	cfg.SettlementConfig = defaultSLconfig
 
-	// set operator address
-	cfg.OperatorKeyringBackend = defaultSLconfig.KeyringBackend
-	cfg.OperatorKeyringHomeDir = defaultSLconfig.KeyringHomeDir
-	cfg.OperatorAccountName = defaultSLconfig.DymAccountName
-
 	//Setting default params for da grpc mock
 	defaultDAGrpc := grpc.Config{
 		Host: "127.0.0.1",

config/toml.go

@@ -111,11 +111,6 @@ keyring_home_dir = "{{ .SettlementConfig.KeyringHomeDir }}"
 dym_account_name = "{{ .SettlementConfig.DymAccountName }}"
 
 
-#keyring and key name to be used as sequencer's operator address on the rollapp  
-operator_keyring_backend = "{{ .BlockManagerConfig.OperatorKeyringBackend }}"
-operator_keyring_home_dir = "{{ .BlockManagerConfig.OperatorKeyringHomeDir }}"
-operator_account_name = "{{ .BlockManagerConfig.OperatorAccountName }}"
-
 #######################################################
 ###       Instrumentation Configuration Options     ###
 #######################################################

node/integration_test.go

@@ -53,8 +53,6 @@ func TestAggregatorMode(t *testing.T) {
 		BlockBatchMaxSizeBytes:  1000,
 		NamespaceID:             "0102030405060708",
 		GossipedBlocksCacheSize: 50,
-		OperatorKeyringBackend:  "memory",
-		OperatorAccountName:     "default",
 	}
 
 	nodeConfig := config.NodeConfig{

node/testutils.go

@@ -33,8 +33,6 @@ func CreateNode(isAggregator bool, blockManagerConfig *config.BlockManagerConfig
 			BatchSubmitMaxTime:      60 * time.Second,
 			BlockBatchMaxSizeBytes:  1000,
 			GossipedBlocksCacheSize: 50,
-			OperatorKeyringBackend:  "memory",
-			OperatorAccountName:     "default",
 		}
 	}
 	nodeConfig.BlockManagerConfig = *blockManagerConfig

rpc/client/client_test.go

@@ -442,8 +442,6 @@ func TestTx(t *testing.T) {
 			BatchSubmitMaxTime:      60 * time.Second,
 			BlockBatchMaxSizeBytes:  1000,
 			GossipedBlocksCacheSize: 50,
-			OperatorKeyringBackend:  "memory",
-			OperatorAccountName:     "default",
 		},
 		BootstrapTime:    30 * time.Second,
 		SettlementConfig: settlement.Config{ProposerPubKey: hex.EncodeToString(pubKeybytes)},
@@ -713,8 +711,6 @@ func TestValidatorSetHandling(t *testing.T) {
 			BatchSubmitMaxTime:      60 * time.Second,
 			BlockBatchMaxSizeBytes:  1000,
 			GossipedBlocksCacheSize: 50,
-			OperatorKeyringBackend:  "memory",
-			OperatorAccountName:     "default",
 		},
 		BootstrapTime:    30 * time.Second,
 		SettlementConfig: settlement.Config{ProposerPubKey: hex.EncodeToString(proposerPubKeyBytes)},

rpc/json/service_test.go

@@ -304,8 +304,6 @@ func getRPC(t *testing.T) (*mocks.Application, *client.Client) {
 			BlockBatchSize:          10000,
 			BlockBatchMaxSizeBytes:  1000,
 			GossipedBlocksCacheSize: 50,
-			OperatorKeyringBackend:  "memory",
-			OperatorAccountName:     "default",
 		},
 		SettlementConfig: settlement.Config{
 			ProposerPubKey: hex.EncodeToString(proposerPubKeyBytes)},