From 387844e352b604e3220f1ebc69da665781c311e7 Mon Sep 17 00:00:00 2001 From: rachid Date: Fri, 3 Nov 2023 14:15:16 +0100 Subject: [PATCH 1/2] feat: support secure grpc connections --- cmd/blobstream/base/config.go | 5 +++++ cmd/blobstream/common/helpers.go | 4 ++-- cmd/blobstream/deploy/cmd.go | 2 +- cmd/blobstream/deploy/config.go | 8 +++++++- cmd/blobstream/orchestrator/cmd.go | 2 +- cmd/blobstream/orchestrator/config.go | 7 +++++++ cmd/blobstream/query/cmd.go | 4 ++-- cmd/blobstream/query/config.go | 18 +++++++++++++----- cmd/blobstream/relayer/cmd.go | 2 +- cmd/blobstream/relayer/config.go | 7 +++++++ e2e/qgb_network.go | 16 ++++++++-------- e2e/relayer_test.go | 4 ++-- e2e/scripts/deploy_blobstream_contract.sh | 1 + ...art_orchestrator_after_validator_created.sh | 1 + e2e/scripts/start_relayer.sh | 1 + orchestrator/orchestrator_test.go | 2 +- rpc/app_querier.go | 15 +++++++++++++-- rpc/app_querier_test.go | 18 +++++++++--------- testing/qgb.go | 4 ++-- 19 files changed, 84 insertions(+), 37 deletions(-) diff --git a/cmd/blobstream/base/config.go b/cmd/blobstream/base/config.go index 4c09783a..b2a3583c 100644 --- a/cmd/blobstream/base/config.go +++ b/cmd/blobstream/base/config.go @@ -46,6 +46,7 @@ const ( FlagBootstrappers = "p2p.bootstrappers" FlagP2PListenAddress = "p2p.listen-addr" FlagP2PNickname = "p2p.nickname" + FlagGRPCInsecure = "grpc.insecure" ) func AddP2PNicknameFlag(cmd *cobra.Command) { @@ -59,3 +60,7 @@ func AddP2PListenAddressFlag(cmd *cobra.Command) { func AddBootstrappersFlag(cmd *cobra.Command) { cmd.Flags().String(FlagBootstrappers, "", "Comma-separated multiaddresses of p2p peers to connect to") } + +func AddGRPCInsecureFlag(cmd *cobra.Command) { + cmd.Flags().Bool(FlagGRPCInsecure, false, "allow gRPC over insecure channels, if not TLS the server must use TLS") +} diff --git a/cmd/blobstream/common/helpers.go b/cmd/blobstream/common/helpers.go index 934a2d3b..5962a996 100644 --- a/cmd/blobstream/common/helpers.go +++ b/cmd/blobstream/common/helpers.go @@ -24,7 +24,7 @@ import ( // NewTmAndAppQuerier helper function that creates a new TmQuerier and AppQuerier and registers their stop functions in the // stopFuncs slice. -func NewTmAndAppQuerier(logger tmlog.Logger, tendermintRPC string, celesGRPC string) (*rpc.TmQuerier, *rpc.AppQuerier, []func() error, error) { +func NewTmAndAppQuerier(logger tmlog.Logger, tendermintRPC string, celesGRPC string, grpcInsecure bool) (*rpc.TmQuerier, *rpc.AppQuerier, []func() error, error) { // load app encoding configuration encCfg := encoding.MakeConfig(app.ModuleEncodingRegisters...) @@ -45,7 +45,7 @@ func NewTmAndAppQuerier(logger tmlog.Logger, tendermintRPC string, celesGRPC str // creating the application querier appQuerier := rpc.NewAppQuerier(logger, celesGRPC, encCfg) - err = appQuerier.Start() + err = appQuerier.Start(grpcInsecure) if err != nil { return nil, nil, stopFuncs, err } diff --git a/cmd/blobstream/deploy/cmd.go b/cmd/blobstream/deploy/cmd.go index 211bbfa7..a84d75dc 100644 --- a/cmd/blobstream/deploy/cmd.go +++ b/cmd/blobstream/deploy/cmd.go @@ -44,7 +44,7 @@ func Command() *cobra.Command { encCfg := encoding.MakeConfig(app.ModuleEncodingRegisters...) querier := rpc.NewAppQuerier(logger, config.coreGRPC, encCfg) - err = querier.Start() + err = querier.Start(config.grpcInsecure) if err != nil { return err } diff --git a/cmd/blobstream/deploy/config.go b/cmd/blobstream/deploy/config.go index f84cdc3b..d926ec22 100644 --- a/cmd/blobstream/deploy/config.go +++ b/cmd/blobstream/deploy/config.go @@ -42,7 +42,7 @@ func addDeployFlags(cmd *cobra.Command) *cobra.Command { } cmd.Flags().String(base.FlagHome, homeDir, "The Blobstream deployer home directory") cmd.Flags().String(base.FlagEVMPassphrase, "", "the evm account passphrase (if not specified as a flag, it will be asked interactively)") - + base.AddGRPCInsecureFlag(cmd) return cmd } @@ -53,6 +53,7 @@ type deployConfig struct { evmAccAddress string startingNonce string evmGasLimit uint64 + grpcInsecure bool } func parseDeployFlags(cmd *cobra.Command) (deployConfig, error) { @@ -102,6 +103,10 @@ func parseDeployFlags(cmd *cobra.Command) (deployConfig, error) { if err != nil { return deployConfig{}, err } + grpcInsecure, err := cmd.Flags().GetBool(base.FlagGRPCInsecure) + if err != nil { + return deployConfig{}, err + } return deployConfig{ evmAccAddress: evmAccAddr, @@ -114,5 +119,6 @@ func parseDeployFlags(cmd *cobra.Command) (deployConfig, error) { Home: homeDir, EVMPassphrase: passphrase, }, + grpcInsecure: grpcInsecure, }, nil } diff --git a/cmd/blobstream/orchestrator/cmd.go b/cmd/blobstream/orchestrator/cmd.go index 41fd21bd..091a43d0 100644 --- a/cmd/blobstream/orchestrator/cmd.go +++ b/cmd/blobstream/orchestrator/cmd.go @@ -57,7 +57,7 @@ func Start() *cobra.Command { stopFuncs := make([]func() error, 0) - tmQuerier, appQuerier, stops, err := common.NewTmAndAppQuerier(logger, config.coreRPC, config.coreGRPC) + tmQuerier, appQuerier, stops, err := common.NewTmAndAppQuerier(logger, config.coreRPC, config.coreGRPC, config.grpcInsecure) stopFuncs = append(stopFuncs, stops...) if err != nil { return err diff --git a/cmd/blobstream/orchestrator/config.go b/cmd/blobstream/orchestrator/config.go index eff7cd24..5747b940 100644 --- a/cmd/blobstream/orchestrator/config.go +++ b/cmd/blobstream/orchestrator/config.go @@ -37,6 +37,7 @@ func addOrchestratorFlags(cmd *cobra.Command) *cobra.Command { base.AddP2PNicknameFlag(cmd) base.AddP2PListenAddressFlag(cmd) base.AddBootstrappersFlag(cmd) + base.AddGRPCInsecureFlag(cmd) return cmd } @@ -46,6 +47,7 @@ type StartConfig struct { evmAccAddress string bootstrappers, p2pListenAddr string p2pNickname string + grpcInsecure bool } func parseOrchestratorFlags(cmd *cobra.Command) (StartConfig, error) { @@ -99,6 +101,10 @@ func parseOrchestratorFlags(cmd *cobra.Command) (StartConfig, error) { if err != nil { return StartConfig{}, err } + grpcInsecure, err := cmd.Flags().GetBool(base.FlagGRPCInsecure) + if err != nil { + return StartConfig{}, err + } return StartConfig{ evmAccAddress: evmAccAddr, @@ -111,6 +117,7 @@ func parseOrchestratorFlags(cmd *cobra.Command) (StartConfig, error) { Home: homeDir, EVMPassphrase: passphrase, }, + grpcInsecure: grpcInsecure, }, nil } diff --git a/cmd/blobstream/query/cmd.go b/cmd/blobstream/query/cmd.go index 200954c4..a35d8c58 100644 --- a/cmd/blobstream/query/cmd.go +++ b/cmd/blobstream/query/cmd.go @@ -75,7 +75,7 @@ func Signers() *cobra.Command { }() // create tm querier and app querier - tmQuerier, appQuerier, stops, err := common.NewTmAndAppQuerier(logger, config.coreRPC, config.coreGRPC) + tmQuerier, appQuerier, stops, err := common.NewTmAndAppQuerier(logger, config.coreRPC, config.coreGRPC, config.grpcInsecure) stopFuncs = append(stopFuncs, stops...) if err != nil { return err @@ -358,7 +358,7 @@ func Signature() *cobra.Command { }() // create tm querier and app querier - tmQuerier, appQuerier, stops, err := common.NewTmAndAppQuerier(logger, config.coreRPC, config.coreGRPC) + tmQuerier, appQuerier, stops, err := common.NewTmAndAppQuerier(logger, config.coreRPC, config.coreGRPC, config.grpcInsecure) stopFuncs = append(stopFuncs, stops...) if err != nil { return err diff --git a/cmd/blobstream/query/config.go b/cmd/blobstream/query/config.go index 22e6c050..56a73ed9 100644 --- a/cmd/blobstream/query/config.go +++ b/cmd/blobstream/query/config.go @@ -3,6 +3,8 @@ package query import ( "fmt" + "github.com/celestiaorg/orchestrator-relayer/cmd/blobstream/base" + "github.com/celestiaorg/orchestrator-relayer/cmd/blobstream/relayer" "github.com/spf13/cobra" ) @@ -19,6 +21,7 @@ func addFlags(cmd *cobra.Command) *cobra.Command { cmd.Flags().Uint(relayer.FlagCoreRPCPort, 26657, "Specify the rest rpc address") cmd.Flags().String(FlagP2PNode, "", "P2P target node multiaddress (eg. /ip4/127.0.0.1/tcp/30000/p2p/12D3KooWBSMasWzRSRKXREhediFUwABNZwzJbkZcYz5rYr9Zdmfn)") cmd.Flags().String(FlagOutputFile, "", "Path to an output file path if the results need to be written to a json file. Leaving it as empty will result in printing the result to stdout") + base.AddGRPCInsecureFlag(cmd) return cmd } @@ -27,6 +30,7 @@ type Config struct { coreGRPC, coreRPC string targetNode string outputFile string + grpcInsecure bool } func parseFlags(cmd *cobra.Command) (Config, error) { @@ -54,11 +58,15 @@ func parseFlags(cmd *cobra.Command) (Config, error) { if err != nil { return Config{}, err } - + grpcInsecure, err := cmd.Flags().GetBool(base.FlagGRPCInsecure) + if err != nil { + return Config{}, err + } return Config{ - coreGRPC: fmt.Sprintf("%s:%d", coreGRPCHost, coreGRPCPort), - coreRPC: fmt.Sprintf("tcp://%s:%d", coreRPCHost, coreRPCPort), - targetNode: targetNode, - outputFile: outputFile, + coreGRPC: fmt.Sprintf("%s:%d", coreGRPCHost, coreGRPCPort), + coreRPC: fmt.Sprintf("tcp://%s:%d", coreRPCHost, coreRPCPort), + targetNode: targetNode, + outputFile: outputFile, + grpcInsecure: grpcInsecure, }, nil } diff --git a/cmd/blobstream/relayer/cmd.go b/cmd/blobstream/relayer/cmd.go index ee0278ad..48cfe795 100644 --- a/cmd/blobstream/relayer/cmd.go +++ b/cmd/blobstream/relayer/cmd.go @@ -97,7 +97,7 @@ func Start() *cobra.Command { stopFuncs := make([]func() error, 0) - tmQuerier, appQuerier, stops, err := common.NewTmAndAppQuerier(logger, config.coreRPC, config.coreGRPC) + tmQuerier, appQuerier, stops, err := common.NewTmAndAppQuerier(logger, config.coreRPC, config.coreGRPC, config.grpcInsecure) stopFuncs = append(stopFuncs, stops...) if err != nil { return err diff --git a/cmd/blobstream/relayer/config.go b/cmd/blobstream/relayer/config.go index a957fc91..630a2bd7 100644 --- a/cmd/blobstream/relayer/config.go +++ b/cmd/blobstream/relayer/config.go @@ -46,6 +46,7 @@ func addRelayerStartFlags(cmd *cobra.Command) *cobra.Command { base.AddP2PNicknameFlag(cmd) base.AddP2PListenAddressFlag(cmd) base.AddBootstrappersFlag(cmd) + base.AddGRPCInsecureFlag(cmd) return cmd } @@ -59,6 +60,7 @@ type StartConfig struct { evmGasLimit uint64 bootstrappers, p2pListenAddr string p2pNickname string + grpcInsecure bool } func parseRelayerStartFlags(cmd *cobra.Command) (StartConfig, error) { @@ -135,6 +137,10 @@ func parseRelayerStartFlags(cmd *cobra.Command) (StartConfig, error) { if err != nil { return StartConfig{}, err } + grpcInsecure, err := cmd.Flags().GetBool(base.FlagGRPCInsecure) + if err != nil { + return StartConfig{}, err + } return StartConfig{ evmAccAddress: evmAccAddr, @@ -151,6 +157,7 @@ func parseRelayerStartFlags(cmd *cobra.Command) (StartConfig, error) { Home: homeDir, EVMPassphrase: passphrase, }, + grpcInsecure: grpcInsecure, }, nil } diff --git a/e2e/qgb_network.go b/e2e/qgb_network.go index 73d62173..01be1f53 100644 --- a/e2e/qgb_network.go +++ b/e2e/qgb_network.go @@ -420,7 +420,7 @@ func (network BlobstreamNetwork) WaitForOrchestratorToStart(_ctx context.Context p2pQuerier := p2p.NewQuerier(dht, network.Logger) appQuerier := rpc.NewAppQuerier(network.Logger, network.CelestiaGRPC, network.EncCfg) - err := appQuerier.Start() + err := appQuerier.Start(true) if err != nil { return 0, 0, err } @@ -491,7 +491,7 @@ func (network BlobstreamNetwork) WaitForOrchestratorToStart(_ctx context.Context // Thus, any nonce after the returned valset should be signed by all orchestrators. func (network BlobstreamNetwork) GetValsetContainingVals(_ctx context.Context, number int) (*types.Valset, error) { appQuerier := rpc.NewAppQuerier(network.Logger, network.CelestiaGRPC, network.EncCfg) - err := appQuerier.Start() + err := appQuerier.Start(true) if err != nil { return nil, err } @@ -539,7 +539,7 @@ func (network BlobstreamNetwork) GetValsetConfirm( p2pQuerier := p2p.NewQuerier(dht, network.Logger) // create app querier appQuerier := rpc.NewAppQuerier(network.Logger, network.CelestiaGRPC, network.EncCfg) - err := appQuerier.Start() + err := appQuerier.Start(true) if err != nil { return nil, err } @@ -602,7 +602,7 @@ func (network BlobstreamNetwork) GetDataCommitmentConfirm( // create app querier appQuerier := rpc.NewAppQuerier(network.Logger, network.CelestiaGRPC, network.EncCfg) - err = appQuerier.Start() + err = appQuerier.Start(true) if err != nil { return nil, err } @@ -651,7 +651,7 @@ func (network BlobstreamNetwork) GetDataCommitmentConfirmByHeight( ) (*blobstreamtypes.DataCommitmentConfirm, error) { // create app querier appQuerier := rpc.NewAppQuerier(network.Logger, network.CelestiaGRPC, network.EncCfg) - err := appQuerier.Start() + err := appQuerier.Start(true) if err != nil { return nil, err } @@ -672,7 +672,7 @@ func (network BlobstreamNetwork) GetDataCommitmentConfirmByHeight( func (network BlobstreamNetwork) GetLatestAttestationNonce(_ctx context.Context) (uint64, error) { // create app querier appQuerier := rpc.NewAppQuerier(network.Logger, network.CelestiaGRPC, network.EncCfg) - err := appQuerier.Start() + err := appQuerier.Start(true) if err != nil { return 0, err } @@ -694,7 +694,7 @@ func (network BlobstreamNetwork) WasAttestationSigned( ) (bool, error) { // create app querier appQuerier := rpc.NewAppQuerier(network.Logger, network.CelestiaGRPC, network.EncCfg) - err := appQuerier.Start() + err := appQuerier.Start(true) if err != nil { return false, err } @@ -992,7 +992,7 @@ func (network BlobstreamNetwork) PrintLogs() { func (network BlobstreamNetwork) GetLatestValset(ctx context.Context) (*types.Valset, error) { // create app querier appQuerier := rpc.NewAppQuerier(network.Logger, network.CelestiaGRPC, network.EncCfg) - err := appQuerier.Start() + err := appQuerier.Start(true) if err != nil { return nil, err } diff --git a/e2e/relayer_test.go b/e2e/relayer_test.go index f5101707..24a478d4 100644 --- a/e2e/relayer_test.go +++ b/e2e/relayer_test.go @@ -183,7 +183,7 @@ func TestRelayerWithMultipleValidators(t *testing.T) { // check whether the four validators are up and running appQuerier := rpc.NewAppQuerier(network.Logger, network.CelestiaGRPC, network.EncCfg) HandleNetworkError(t, network, err, false) - err = appQuerier.Start() + err = appQuerier.Start(true) HandleNetworkError(t, network, err, false) defer appQuerier.Stop() //nolint:errcheck @@ -270,7 +270,7 @@ func TestUpdatingTheDataCommitmentWindow(t *testing.T) { // check whether the four validators are up and running appQuerier := rpc.NewAppQuerier(network.Logger, network.CelestiaGRPC, network.EncCfg) HandleNetworkError(t, network, err, false) - err = appQuerier.Start() + err = appQuerier.Start(true) HandleNetworkError(t, network, err, false) defer appQuerier.Stop() //nolint:errcheck diff --git a/e2e/scripts/deploy_blobstream_contract.sh b/e2e/scripts/deploy_blobstream_contract.sh index b6270353..d6696ec6 100644 --- a/e2e/scripts/deploy_blobstream_contract.sh +++ b/e2e/scripts/deploy_blobstream_contract.sh @@ -68,6 +68,7 @@ echo "deploying Blobstream contract..." --evm.account "${EVM_ACCOUNT}" \ --core.grpc.host "${CORE_GRPC_HOST}" \ --core.grpc.port "${CORE_GRPC_PORT}" \ + --grpc.insecure \ --starting-nonce "${STARTING_NONCE}" \ --evm.rpc "${EVM_ENDPOINT}" \ --evm.passphrase=123 > /opt/output diff --git a/e2e/scripts/start_orchestrator_after_validator_created.sh b/e2e/scripts/start_orchestrator_after_validator_created.sh index fbbf199c..3a884b89 100644 --- a/e2e/scripts/start_orchestrator_after_validator_created.sh +++ b/e2e/scripts/start_orchestrator_after_validator_created.sh @@ -53,6 +53,7 @@ then --core.rpc.port="${CORE_RPC_PORT}" \ --core.grpc.host="${CORE_GRPC_HOST}" \ --core.grpc.port="${CORE_GRPC_PORT}" \ + --grpc.insecure \ --p2p.nickname=key \ --p2p.listen-addr="${P2P_LISTEN}" \ --evm.passphrase=123 diff --git a/e2e/scripts/start_relayer.sh b/e2e/scripts/start_relayer.sh index 877946c0..0f756641 100644 --- a/e2e/scripts/start_relayer.sh +++ b/e2e/scripts/start_relayer.sh @@ -59,6 +59,7 @@ sleep 5s --core.rpc.port="${CORE_RPC_PORT}" \ --core.grpc.host="${CORE_GRPC_HOST}" \ --core.grpc.port="${CORE_GRPC_PORT}" \ + --grpc.insecure \ --evm.chain-id="${EVM_CHAIN_ID}" \ --evm.rpc="${EVM_ENDPOINT}" \ --evm.contract-address="${BLOBSTREAM_CONTRACT}" \ diff --git a/orchestrator/orchestrator_test.go b/orchestrator/orchestrator_test.go index 8c150b92..99cafed6 100644 --- a/orchestrator/orchestrator_test.go +++ b/orchestrator/orchestrator_test.go @@ -182,7 +182,7 @@ func (s *OrchestratorTestSuite) TestEnqueuingAttestationNonces() { s.Node.CelestiaNetwork.GRPCAddr, ecfg, ) - require.NoError(s.T(), appQuerier.Start()) + require.NoError(s.T(), appQuerier.Start(true)) defer appQuerier.Stop() //nolint:errcheck latestNonce, err := appQuerier.QueryLatestAttestationNonce(ctx) diff --git a/rpc/app_querier.go b/rpc/app_querier.go index 1a4d873d..c49b3aab 100644 --- a/rpc/app_querier.go +++ b/rpc/app_querier.go @@ -2,8 +2,10 @@ package rpc import ( "context" + "crypto/tls" "google.golang.org/grpc" + "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" "github.com/celestiaorg/orchestrator-relayer/types" @@ -26,9 +28,18 @@ func NewAppQuerier(logger tmlog.Logger, blobStreamRPC string, encCft encoding.Co return &AppQuerier{Logger: logger, blobStreamRPC: blobStreamRPC, EncCfg: encCft} } -func (aq *AppQuerier) Start() error { +func (aq *AppQuerier) Start(grpcInsecure bool) error { // creating a grpc connection to Celestia-app - blobStreamGRPC, err := grpc.Dial(aq.blobStreamRPC, grpc.WithTransportCredentials(insecure.NewCredentials())) + var dialOpts []grpc.DialOption + + if grpcInsecure { + dialOpts = append(dialOpts, grpc.WithTransportCredentials(insecure.NewCredentials())) + } else { + dialOpts = append(dialOpts, grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{ + MinVersion: tls.VersionTLS12, + }))) + } + blobStreamGRPC, err := grpc.Dial(aq.blobStreamRPC, dialOpts...) if err != nil { return err } diff --git a/rpc/app_querier_test.go b/rpc/app_querier_test.go index 0dab597f..5848fa11 100644 --- a/rpc/app_querier_test.go +++ b/rpc/app_querier_test.go @@ -14,7 +14,7 @@ func (s *QuerierTestSuite) TestQueryAttestationByNonce() { s.Network.GRPCAddr, s.EncConf, ) - require.NoError(s.T(), appQuerier.Start()) + require.NoError(s.T(), appQuerier.Start(true)) defer appQuerier.Stop() //nolint:errcheck att, err := appQuerier.QueryAttestationByNonce(context.Background(), 1) @@ -28,7 +28,7 @@ func (s *QuerierTestSuite) TestQueryLatestAttestationNonce() { s.Network.GRPCAddr, s.EncConf, ) - require.NoError(s.T(), appQuerier.Start()) + require.NoError(s.T(), appQuerier.Start(true)) defer appQuerier.Stop() //nolint:errcheck nonce, err := appQuerier.QueryLatestAttestationNonce(context.Background()) @@ -42,7 +42,7 @@ func (s *QuerierTestSuite) TestQueryDataCommitmentByNonce() { s.Network.GRPCAddr, s.EncConf, ) - require.NoError(s.T(), appQuerier.Start()) + require.NoError(s.T(), appQuerier.Start(true)) defer appQuerier.Stop() //nolint:errcheck dc, err := appQuerier.QueryDataCommitmentByNonce(context.Background(), 2) @@ -56,7 +56,7 @@ func (s *QuerierTestSuite) TestQueryDataCommitmentForHeight() { s.Network.GRPCAddr, s.EncConf, ) - require.NoError(s.T(), appQuerier.Start()) + require.NoError(s.T(), appQuerier.Start(true)) defer appQuerier.Stop() //nolint:errcheck dc, err := appQuerier.QueryDataCommitmentForHeight(context.Background(), 10) @@ -70,7 +70,7 @@ func (s *QuerierTestSuite) TestQueryValsetByNonce() { s.Network.GRPCAddr, s.EncConf, ) - require.NoError(s.T(), appQuerier.Start()) + require.NoError(s.T(), appQuerier.Start(true)) defer appQuerier.Stop() //nolint:errcheck vs, err := appQuerier.QueryValsetByNonce(context.Background(), 1) @@ -84,7 +84,7 @@ func (s *QuerierTestSuite) TestQueryLatestValset() { s.Network.GRPCAddr, s.EncConf, ) - require.NoError(s.T(), appQuerier.Start()) + require.NoError(s.T(), appQuerier.Start(true)) defer appQuerier.Stop() //nolint:errcheck vs, err := appQuerier.QueryLatestValset(context.Background()) @@ -98,7 +98,7 @@ func (s *QuerierTestSuite) TestQueryLastValsetBeforeNonce() { s.Network.GRPCAddr, s.EncConf, ) - require.NoError(s.T(), appQuerier.Start()) + require.NoError(s.T(), appQuerier.Start(true)) defer appQuerier.Stop() //nolint:errcheck vs, err := appQuerier.QueryLastValsetBeforeNonce(context.Background(), 2) @@ -112,7 +112,7 @@ func (s *QuerierTestSuite) TestQueryLastUnbondingHeight() { s.Network.GRPCAddr, s.EncConf, ) - require.NoError(s.T(), appQuerier.Start()) + require.NoError(s.T(), appQuerier.Start(true)) defer appQuerier.Stop() //nolint:errcheck unbondingHeight, err := appQuerier.QueryLastUnbondingHeight(context.Background()) @@ -126,7 +126,7 @@ func (s *QuerierTestSuite) TestQueryEarliestAttestationNonce() { s.Network.GRPCAddr, s.EncConf, ) - require.NoError(s.T(), appQuerier.Start()) + require.NoError(s.T(), appQuerier.Start(true)) defer appQuerier.Stop() //nolint:errcheck earliestNonce, err := appQuerier.QueryEarliestAttestationNonce(context.Background()) diff --git a/testing/qgb.go b/testing/qgb.go index 1e175785..28de55a7 100644 --- a/testing/qgb.go +++ b/testing/qgb.go @@ -32,7 +32,7 @@ func NewRelayer( logger := tmlog.NewNopLogger() node.CelestiaNetwork.GRPCClient.Close() appQuerier := rpc.NewAppQuerier(logger, node.CelestiaNetwork.GRPCAddr, encoding.MakeConfig(app.ModuleEncodingRegisters...)) - require.NoError(t, appQuerier.Start()) + require.NoError(t, appQuerier.Start(true)) t.Cleanup(func() { _ = appQuerier.Stop() }) @@ -66,7 +66,7 @@ func NewOrchestrator( ) *orchestrator.Orchestrator { logger := tmlog.NewNopLogger() appQuerier := rpc.NewAppQuerier(logger, node.CelestiaNetwork.GRPCAddr, encoding.MakeConfig(app.ModuleEncodingRegisters...)) - require.NoError(t, appQuerier.Start()) + require.NoError(t, appQuerier.Start(true)) t.Cleanup(func() { _ = appQuerier.Stop() }) From 95df2a02055a17f8a5d8953081e3000f7c5cfb97 Mon Sep 17 00:00:00 2001 From: rachid Date: Fri, 3 Nov 2023 14:54:57 +0100 Subject: [PATCH 2/2] fix: add the insecure flag to e2e orchestrator script --- e2e/scripts/start_orchestrator_after_validator_created.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/e2e/scripts/start_orchestrator_after_validator_created.sh b/e2e/scripts/start_orchestrator_after_validator_created.sh index 3a884b89..86d41f78 100644 --- a/e2e/scripts/start_orchestrator_after_validator_created.sh +++ b/e2e/scripts/start_orchestrator_after_validator_created.sh @@ -67,6 +67,7 @@ else --core.rpc.port="${CORE_RPC_PORT}" \ --core.grpc.host="${CORE_GRPC_HOST}" \ --core.grpc.port="${CORE_GRPC_PORT}" \ + --grpc.insecure \ --p2p.listen-addr="${P2P_LISTEN}" \ --p2p.bootstrappers="${P2P_BOOTSTRAPPERS}" \ --evm.passphrase=123