Merge branch 'main' into unregister-meter

das/daser_test.go

@@ -164,6 +164,9 @@ func TestDASer_stopsAfter_BEFP(t *testing.T) {
 	getter := func(ctx context.Context, height uint64) (*header.ExtendedHeader, error) {
 		return mockGet.GetByHeight(ctx, height)
 	}
+	headGetter := func(ctx context.Context) (*header.ExtendedHeader, error) {
+		return mockGet.Head(ctx)
+	}
 	unmarshaler := fraud.MultiUnmarshaler[*header.ExtendedHeader]{
 		Unmarshalers: map[fraud.ProofType]func([]byte) (fraud.Proof[*header.ExtendedHeader], error){
 			byzantine.BadEncoding: func(data []byte) (fraud.Proof[*header.ExtendedHeader], error) {
@@ -176,6 +179,7 @@ func TestDASer_stopsAfter_BEFP(t *testing.T) {
 	fserv := fraudserv.NewProofService[*header.ExtendedHeader](ps,
 		net.Hosts()[0],
 		getter,
+		headGetter,
 		unmarshaler,
 		ds,
 		false,

go.mod

@@ -8,9 +8,9 @@ require (
 	github.com/BurntSushi/toml v1.3.2
 	github.com/alecthomas/jsonschema v0.0.0-20220216202328-9eeeec9d044b
 	github.com/benbjohnson/clock v1.3.5
-	github.com/celestiaorg/celestia-app v1.7.0
-	github.com/celestiaorg/go-fraud v0.2.0
-	github.com/celestiaorg/go-header v0.6.0
+	github.com/celestiaorg/celestia-app v1.8.0-rc0
+	github.com/celestiaorg/go-fraud v0.2.1
+	github.com/celestiaorg/go-header v0.6.1
 	github.com/celestiaorg/go-libp2p-messenger v0.2.0
 	github.com/celestiaorg/nmt v0.20.0
 	github.com/celestiaorg/rsmt2d v0.11.0

go.sum

@@ -358,18 +358,18 @@ github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7
 github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
 github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34=
 github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
-github.com/celestiaorg/celestia-app v1.7.0 h1:pFIgQzeMD036ulJ2ShUR/3bDGG6kwNAWaLEE0MXHmgg=
-github.com/celestiaorg/celestia-app v1.7.0/go.mod h1:z2H47Gs9gYd3GdQ22d5sbcL8/aBMRcVDtUWT64goMaY=
+github.com/celestiaorg/celestia-app v1.8.0-rc0 h1:rjEwN0Im1+2QChr8uPfbdomhGL3lEmGlt0cPUodc5JU=
+github.com/celestiaorg/celestia-app v1.8.0-rc0/go.mod h1:z2H47Gs9gYd3GdQ22d5sbcL8/aBMRcVDtUWT64goMaY=
 github.com/celestiaorg/celestia-core v1.35.0-tm-v0.34.29 h1:sXERzNXgyHyqTKNQx4S29C/NMDzgav62DaQDNF49HUQ=
 github.com/celestiaorg/celestia-core v1.35.0-tm-v0.34.29/go.mod h1:weZR4wYx1Vcw3g1Jc5G8VipG4M+KUDSqeIzyyWszmsQ=
 github.com/celestiaorg/cosmos-sdk v1.20.1-sdk-v0.46.16 h1:9U9UthIJSOyVjabD5PkD6aczvqlWOyAFTOXw0duPT5k=
 github.com/celestiaorg/cosmos-sdk v1.20.1-sdk-v0.46.16/go.mod h1:Tvsc3YnqvflXTYC8xIy/Q07Es95xZ1pZC/imoKogtbg=
 github.com/celestiaorg/dagstore v0.0.0-20230824094345-537c012aa403 h1:Lj73O3S+KJx5/hgZ+IeOLEIoLsAveJN/7/ZtQQtPSVw=
 github.com/celestiaorg/dagstore v0.0.0-20230824094345-537c012aa403/go.mod h1:cCGM1UoMvyTk8k62mkc+ReVu8iHBCtSBAAL4wYU7KEI=
-github.com/celestiaorg/go-fraud v0.2.0 h1:aaq2JiW0gTnhEdac3l51UCqSyJ4+VjFGTTpN83V4q7I=
-github.com/celestiaorg/go-fraud v0.2.0/go.mod h1:lNY1i4K6kUeeE60Z2VK8WXd+qXb8KRzfBhvwPkK6aUc=
-github.com/celestiaorg/go-header v0.6.0 h1:Wf2qFHpsvM7PsWJmOYU98+IuErrbWdNS8fte438PIEE=
-github.com/celestiaorg/go-header v0.6.0/go.mod h1:PAEtQmVDqw0nhvkVgfhq2JB7oLnv3GqephFUOeaJqIs=
+github.com/celestiaorg/go-fraud v0.2.1 h1:oYhxI0gM/EpGRgbVQdRI/LSlqyT65g/WhQGSVGfx09w=
+github.com/celestiaorg/go-fraud v0.2.1/go.mod h1:lNY1i4K6kUeeE60Z2VK8WXd+qXb8KRzfBhvwPkK6aUc=
+github.com/celestiaorg/go-header v0.6.1 h1:bbmfNTpL9BA7dZU4/pdzH4DlOnxHTd9F5LLVK5hgSrs=
+github.com/celestiaorg/go-header v0.6.1/go.mod h1:PAEtQmVDqw0nhvkVgfhq2JB7oLnv3GqephFUOeaJqIs=
 github.com/celestiaorg/go-libp2p-messenger v0.2.0 h1:/0MuPDcFamQMbw9xTZ73yImqgTO3jHV7wKHvWD/Irao=
 github.com/celestiaorg/go-libp2p-messenger v0.2.0/go.mod h1:s9PIhMi7ApOauIsfBcQwbr7m+HBzmVfDIS+QLdgzDSo=
 github.com/celestiaorg/merkletree v0.0.0-20210714075610-a84dc3ddbbe4 h1:CJdIpo8n5MFP2MwK0gSRcOVlDlFdQJO1p+FqdxYzmvc=

nodebuilder/fraud/constructors.go

@@ -1,6 +1,8 @@
 package fraud
 
 import (
+	"context"
+
 	"github.com/ipfs/go-datastore"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	"github.com/libp2p/go-libp2p/core/host"
@@ -9,6 +11,7 @@ import (
 	"github.com/celestiaorg/go-fraud"
 	"github.com/celestiaorg/go-fraud/fraudserv"
 	libhead "github.com/celestiaorg/go-header"
+	"github.com/celestiaorg/go-header/sync"
 
 	"github.com/celestiaorg/celestia-node/header"
 	"github.com/celestiaorg/celestia-node/nodebuilder/p2p"
@@ -22,13 +25,18 @@ func newFraudServiceWithSync(
 	lc fx.Lifecycle,
 	sub *pubsub.PubSub,
 	host host.Host,
+	sync *sync.Syncer[*header.ExtendedHeader],
 	hstore libhead.Store[*header.ExtendedHeader],
 	registry fraud.ProofUnmarshaler[*header.ExtendedHeader],
 	ds datastore.Batching,
 	network p2p.Network,
 ) (Module, fraud.Service[*header.ExtendedHeader], error) {
 	syncerEnabled := true
-	pservice := fraudserv.NewProofService(sub, host, hstore.GetByHeight, registry, ds, syncerEnabled, network.String())
+	headGetter := func(ctx context.Context) (*header.ExtendedHeader, error) {
+		return sync.Head(ctx)
+	}
+	pservice := fraudserv.NewProofService(sub, host, hstore.GetByHeight,
+		headGetter, registry, ds, syncerEnabled, network.String())
 	lc.Append(fx.Hook{
 		OnStart: pservice.Start,
 		OnStop:  pservice.Stop,
@@ -42,13 +50,18 @@ func newFraudServiceWithoutSync(
 	lc fx.Lifecycle,
 	sub *pubsub.PubSub,
 	host host.Host,
+	sync *sync.Syncer[*header.ExtendedHeader],
 	hstore libhead.Store[*header.ExtendedHeader],
 	registry fraud.ProofUnmarshaler[*header.ExtendedHeader],
 	ds datastore.Batching,
 	network p2p.Network,
 ) (Module, fraud.Service[*header.ExtendedHeader], error) {
 	syncerEnabled := false
-	pservice := fraudserv.NewProofService(sub, host, hstore.GetByHeight, registry, ds, syncerEnabled, network.String())
+	headGetter := func(ctx context.Context) (*header.ExtendedHeader, error) {
+		return sync.Head(ctx)
+	}
+	pservice := fraudserv.NewProofService(sub, host, hstore.GetByHeight,
+		headGetter, registry, ds, syncerEnabled, network.String())
 	lc.Append(fx.Hook{
 		OnStart: pservice.Start,
 		OnStop:  pservice.Stop,

nodebuilder/header/constructors.go

@@ -69,26 +69,32 @@ func newP2PExchange[H libhead.Header[H]](
 // newSyncer constructs new Syncer for headers.
 func newSyncer[H libhead.Header[H]](
 	ex libhead.Exchange[H],
-	fservice libfraud.Service[H],
 	store libhead.Store[H],
 	sub libhead.Subscriber[H],
 	cfg Config,
-) (*sync.Syncer[H], *modfraud.ServiceBreaker[*sync.Syncer[H], H], error) {
+) (*sync.Syncer[H], error) {
 	opts := []sync.Option{sync.WithParams(cfg.Syncer), sync.WithBlockTime(modp2p.BlockTime)}
 	if MetricsEnabled {
 		opts = append(opts, sync.WithMetrics())
 	}
 
 	syncer, err := sync.NewSyncer[H](ex, store, sub, opts...)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 
-	return syncer, &modfraud.ServiceBreaker[*sync.Syncer[H], H]{
+	return syncer, nil
+}
+
+func newFraudedSyncer[H libhead.Header[H]](
+	fservice libfraud.Service[H],
+	syncer *sync.Syncer[H],
+) *modfraud.ServiceBreaker[*sync.Syncer[H], H] {
+	return &modfraud.ServiceBreaker[*sync.Syncer[H], H]{
 		Service:   syncer,
 		FraudType: byzantine.BadEncoding,
 		FraudServ: fservice,
-	}, nil
+	}
 }
 
 // newInitStore constructs an initialized store

nodebuilder/header/module.go

@@ -34,8 +34,9 @@ func ConstructModule[H libhead.Header[H]](tp node.Type, cfg *Config) fx.Option {
 		fx.Provide(func(subscriber *p2p.Subscriber[H]) libhead.Subscriber[H] {
 			return subscriber
 		}),
+		fx.Provide(newSyncer[H]),
 		fx.Provide(fx.Annotate(
-			newSyncer[H],
+			newFraudedSyncer[H],
 			fx.OnStart(func(
 				ctx context.Context,
 				breaker *modfraud.ServiceBreaker[*sync.Syncer[H], H],

nodebuilder/header/service.go

@@ -9,6 +9,7 @@ import (
 	"github.com/celestiaorg/go-header/sync"
 
 	"github.com/celestiaorg/celestia-node/header"
+	modfraud "github.com/celestiaorg/celestia-node/nodebuilder/fraud"
 )
 
 // Service represents the header Service that can be started / stopped on a node.
@@ -33,14 +34,15 @@ type syncer interface {
 
 // newHeaderService creates a new instance of header Service.
 func newHeaderService(
-	syncer *sync.Syncer[*header.ExtendedHeader],
+	// getting Syncer wrapped in ServiceBreaker so we ensure service breaker is constructed
+	syncer *modfraud.ServiceBreaker[*sync.Syncer[*header.ExtendedHeader], *header.ExtendedHeader],
 	sub libhead.Subscriber[*header.ExtendedHeader],
 	p2pServer *p2p.ExchangeServer[*header.ExtendedHeader],
 	ex libhead.Exchange[*header.ExtendedHeader],
 	store libhead.Store[*header.ExtendedHeader],
 ) Module {
 	return &Service{
-		syncer:    syncer,
+		syncer:    syncer.Service,
 		sub:       sub,
 		p2pServer: p2pServer,
 		ex:        ex,

nodebuilder/module.go

@@ -28,14 +28,11 @@ func ConstructModule(tp node.Type, network p2p.Network, cfg *Config, store Store
 	if err != nil {
 		return fx.Error(err)
 	}
-	signer, err := state.KeyringSigner(cfg.State, ks, network)
-	if err != nil {
-		return fx.Error(err)
-	}
 
 	baseComponents := fx.Options(
 		fx.Supply(tp),
 		fx.Supply(network),
+		fx.Supply(ks),
 		fx.Provide(p2p.BootstrappersFor),
 		fx.Provide(func(lc fx.Lifecycle) context.Context {
 			return fxutil.WithLifecycle(context.Background(), lc)
@@ -45,7 +42,6 @@ func ConstructModule(tp node.Type, network p2p.Network, cfg *Config, store Store
 		fx.Provide(store.Datastore),
 		fx.Provide(store.Keystore),
 		fx.Supply(node.StorePath(store.Path())),
-		fx.Supply(signer),
 		// modules provided by the node
 		p2p.ConstructModule(tp, &cfg.P2P),
 		state.ConstructModule(tp, &cfg.State, &cfg.Core),

nodebuilder/state/core.go

@@ -1,7 +1,8 @@
 package state
 
 import (
-	apptypes "github.com/celestiaorg/celestia-app/x/blob/types"
+	"github.com/cosmos/cosmos-sdk/crypto/keyring"
+
 	libfraud "github.com/celestiaorg/go-fraud"
 	"github.com/celestiaorg/go-header/sync"
 
@@ -16,16 +17,25 @@ import (
 // a celestia-core connection.
 func coreAccessor(
 	corecfg core.Config,
-	signer *apptypes.KeyringSigner,
+	keyring keyring.Keyring,
+	keyname AccountName,
 	sync *sync.Syncer[*header.ExtendedHeader],
 	fraudServ libfraud.Service[*header.ExtendedHeader],
 	opts []state.Option,
-) (*state.CoreAccessor, Module, *modfraud.ServiceBreaker[*state.CoreAccessor, *header.ExtendedHeader]) {
-	ca := state.NewCoreAccessor(signer, sync, corecfg.IP, corecfg.RPCPort, corecfg.GRPCPort, opts...)
+) (
+	*state.CoreAccessor,
+	Module,
+	*modfraud.ServiceBreaker[*state.CoreAccessor, *header.ExtendedHeader],
+	error,
+) {
+	ca, err := state.NewCoreAccessor(keyring, string(keyname), sync, corecfg.IP, corecfg.RPCPort, corecfg.GRPCPort,
+		opts...)
+
 	sBreaker := &modfraud.ServiceBreaker[*state.CoreAccessor, *header.ExtendedHeader]{
 		Service:   ca,
 		FraudType: byzantine.BadEncoding,
 		FraudServ: fraudServ,
 	}
-	return ca, ca, sBreaker
+
+	return ca, ca, sBreaker, err
 }

nodebuilder/state/keyring.go

@@ -3,42 +3,36 @@ package state
 import (
 	kr "github.com/cosmos/cosmos-sdk/crypto/keyring"
 
-	apptypes "github.com/celestiaorg/celestia-app/x/blob/types"
-
 	"github.com/celestiaorg/celestia-node/libs/keystore"
-	"github.com/celestiaorg/celestia-node/nodebuilder/p2p"
 )
 
 const DefaultAccountName = "my_celes_key"
 
-// KeyringSigner constructs a new keyring signer.
-// NOTE: we construct keyring signer before constructing node for easier UX
+type AccountName string
+
+// Keyring constructs a new keyring.
+// NOTE: we construct keyring before constructing node for easier UX
 // as having keyring-backend set to `file` prompts user for password.
-func KeyringSigner(cfg Config, ks keystore.Keystore, net p2p.Network) (*apptypes.KeyringSigner, error) {
+func Keyring(cfg Config, ks keystore.Keystore) (kr.Keyring, AccountName, error) {
 	ring := ks.Keyring()
 	var info *kr.Record
 	// if custom keyringAccName provided, find key for that name
 	if cfg.KeyringAccName != "" {
 		keyInfo, err := ring.Key(cfg.KeyringAccName)
 		if err != nil {
 			log.Errorw("failed to find key by given name", "keyring.accname", cfg.KeyringAccName)
-			return nil, err
+			return nil, "", err
 		}
 		info = keyInfo
 	} else {
 		// use default key
 		keyInfo, err := ring.Key(DefaultAccountName)
 		if err != nil {
 			log.Errorw("could not access key in keyring", "name", DefaultAccountName)
-			return nil, err
+			return nil, "", err
 		}
 		info = keyInfo
 	}
-	// construct signer using the default key found / generated above
-	signer := apptypes.NewKeyringSigner(ring, info.Name, string(net))
-	signerInfo := signer.GetSignerInfo()
-	log.Infow("constructed keyring signer", "backend", cfg.KeyringBackend, "path", ks.Path(),
-		"key name", signerInfo.Name, "chain-id", string(net))
 
-	return signer, nil
+	return ring, AccountName(info.Name), nil
 }

nodebuilder/state/module.go

@@ -3,11 +3,13 @@ package state
 import (
 	"context"
 
+	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	logging "github.com/ipfs/go-log/v2"
 	"go.uber.org/fx"
 
 	"github.com/celestiaorg/celestia-node/header"
 	"github.com/celestiaorg/celestia-node/libs/fxutil"
+	"github.com/celestiaorg/celestia-node/libs/keystore"
 	"github.com/celestiaorg/celestia-node/nodebuilder/core"
 	modfraud "github.com/celestiaorg/celestia-node/nodebuilder/fraud"
 	"github.com/celestiaorg/celestia-node/nodebuilder/node"
@@ -29,6 +31,9 @@ func ConstructModule(tp node.Type, cfg *Config, coreCfg *core.Config) fx.Option
 		fx.Supply(*cfg),
 		fx.Error(cfgErr),
 		fx.Supply(opts),
+		fx.Provide(func(ks keystore.Keystore) (keyring.Keyring, AccountName, error) {
+			return Keyring(*cfg, ks)
+		}),
 		fxutil.ProvideIf(coreCfg.IsEndpointConfigured(), fx.Annotate(
 			coreAccessor,
 			fx.OnStart(func(ctx context.Context,

nodebuilder/state/opts.go

@@ -1,13 +1,19 @@
 package state
 
 import (
+	kr "github.com/cosmos/cosmos-sdk/crypto/keyring"
 	"go.uber.org/fx"
 
-	"github.com/celestiaorg/celestia-app/x/blob/types"
+	"github.com/celestiaorg/celestia-node/libs/fxutil"
 )
 
-// WithKeyringSigner overrides the default keyring signer constructed
+// WithKeyring overrides the default keyring constructed
 // by the node.
-func WithKeyringSigner(signer *types.KeyringSigner) fx.Option {
-	return fx.Replace(signer)
+func WithKeyring(keyring kr.Keyring) fx.Option {
+	return fxutil.ReplaceAs(keyring, new(kr.Keyring))
+}
+
+// WithKeyName configures the signer to use the given key.
+func WithKeyName(name AccountName) fx.Option {
+	return fx.Replace(name)
 }

nodebuilder/testing.go

@@ -8,7 +8,6 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/fx"
 
-	apptypes "github.com/celestiaorg/celestia-app/x/blob/types"
 	libhead "github.com/celestiaorg/go-header"
 
 	"github.com/celestiaorg/celestia-node/core"
@@ -17,9 +16,10 @@ import (
 	"github.com/celestiaorg/celestia-node/libs/fxutil"
 	"github.com/celestiaorg/celestia-node/nodebuilder/node"
 	"github.com/celestiaorg/celestia-node/nodebuilder/p2p"
-	"github.com/celestiaorg/celestia-node/nodebuilder/state"
 )
 
+const TestKeyringName = "test_celes"
+
 // MockStore provides mock in memory Store for testing purposes.
 func MockStore(t *testing.T, cfg *Config) Store {
 	t.Helper()
@@ -48,10 +48,13 @@ func TestNodeWithConfig(t *testing.T, tp node.Type, cfg *Config, opts ...fx.Opti
 	store := MockStore(t, cfg)
 	ks, err := store.Keystore()
 	require.NoError(t, err)
+	kr := ks.Keyring()
+	// create a key in the keystore to be used by the core accessor
+	_, _, err = kr.NewMnemonic(TestKeyringName, keyring.English, "", "", hd.Secp256k1)
+	require.NoError(t, err)
+	cfg.State.KeyringAccName = TestKeyringName
 
 	opts = append(opts,
-		// avoid writing keyring on disk
-		state.WithKeyringSigner(TestKeyringSigner(t, ks.Keyring())),
 		// temp dir for the eds store FIXME: Should be in mem
 		fx.Replace(node.StorePath(t.TempDir())),
 		// avoid requesting trustedPeer during initialization
@@ -71,11 +74,3 @@ func TestNodeWithConfig(t *testing.T, tp node.Type, cfg *Config, opts ...fx.Opti
 	require.NoError(t, err)
 	return nd
 }
-
-func TestKeyringSigner(t *testing.T, ring keyring.Keyring) *apptypes.KeyringSigner {
-	signer := apptypes.NewKeyringSigner(ring, "", string(p2p.Private))
-	_, _, err := signer.NewMnemonic("my_celes_key", keyring.English, "",
-		"", hd.Secp256k1)
-	require.NoError(t, err)
-	return signer
-}