fix: implement import genesis for akash stores

Signed-off-by: Artur Troian <[email protected]>

go.mod

@@ -1,9 +1,11 @@
 module github.com/akash-network/node
 
-go 1.21
+go 1.22.0
+
+toolchain go1.23.6
 
 require (
-	github.com/akash-network/akash-api v0.0.67
+	github.com/akash-network/akash-api v0.0.73
 	github.com/blang/semver/v4 v4.0.0
 	github.com/boz/go-lifecycle v0.1.1
 	github.com/cosmos/cosmos-sdk v0.45.16
@@ -119,11 +121,12 @@ require (
 	github.com/fatih/color v1.14.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/getsentry/sentry-go v0.17.0 // indirect
 	github.com/go-kit/kit v0.12.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-logfmt/logfmt v0.5.1 // indirect
-	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gogo/gateway v1.1.0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
@@ -170,7 +173,7 @@ require (
 	github.com/prometheus/procfs v0.10.1 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
-	github.com/rogpeppe/go-internal v1.10.0 // indirect
+	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/rs/cors v1.8.2 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
@@ -184,29 +187,30 @@ require (
 	github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
 	github.com/tendermint/go-amino v0.16.0 // indirect
 	github.com/tidwall/btree v1.5.0 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
 	github.com/zondax/hid v0.9.1 // indirect
 	github.com/zondax/ledger-go v0.14.1 // indirect
 	go.etcd.io/bbolt v1.3.6 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
-	golang.org/x/crypto v0.22.0 // indirect
+	golang.org/x/crypto v0.24.0 // indirect
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
-	golang.org/x/net v0.24.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
-	golang.org/x/term v0.19.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/term v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	k8s.io/api v0.26.1 // indirect
-	k8s.io/apimachinery v0.26.1 // indirect
-	k8s.io/klog/v2 v2.80.1 // indirect
-	k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
+	k8s.io/api v0.31.5 // indirect
+	k8s.io/apimachinery v0.31.5 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
 	nhooyr.io/websocket v1.8.6 // indirect
-	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )

x/audit/genesis.go

@@ -2,9 +2,11 @@ package audit
 
 import (
 	"encoding/json"
+	"sort"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	abci "github.com/tendermint/tendermint/abci/types"
 
 	"github.com/akash-network/node/x/audit/keeper"
@@ -14,17 +16,76 @@ import (
 
 // ValidateGenesis does validation check of the Genesis and returns error incase of failure
 func ValidateGenesis(data *types.GenesisState) error {
+	for _, record := range data.Attributes {
+		if _, err := sdk.AccAddressFromBech32(record.Owner); err != nil {
+			return sdkerrors.ErrInvalidAddress.Wrap("audited attributes: invalid owner address")
+		}
+
+		if _, err := sdk.AccAddressFromBech32(record.Auditor); err != nil {
+			return sdkerrors.ErrInvalidAddress.Wrap("audited attributes: invalid auditor address")
+		}
+
+		if err := record.Attributes.Validate(); err != nil {
+			return sdkerrors.Wrap(err, "audited attributes: invalid attributes")
+		}
+	}
+
 	return nil
 }
 
 // InitGenesis initiate genesis state and return updated validator details
-func InitGenesis(ctx sdk.Context, keeper keeper.Keeper, data *types.GenesisState) []abci.ValidatorUpdate {
+func InitGenesis(ctx sdk.Context, kpr keeper.Keeper, data *types.GenesisState) []abci.ValidatorUpdate {
+	store := ctx.KVStore(kpr.StoreKey())
+	cdc := kpr.Codec()
+
+	for _, record := range data.Attributes {
+		owner, err := sdk.AccAddressFromBech32(record.Owner)
+		if err != nil {
+			panic(sdkerrors.ErrInvalidAddress.Wrap("audited attributes: invalid owner address").Error())
+		}
+
+		auditor, err := sdk.AccAddressFromBech32(record.Auditor)
+		if err != nil {
+			panic(sdkerrors.ErrInvalidAddress.Wrap("audited attributes: invalid auditor address"))
+		}
+
+		key := keeper.ProviderKey(types.ProviderID{
+			Owner:   owner,
+			Auditor: auditor,
+		})
+
+		prov := types.Provider{
+			Owner:      record.Owner,
+			Auditor:    record.Auditor,
+			Attributes: record.Attributes,
+		}
+
+		sort.SliceStable(prov.Attributes, func(i, j int) bool {
+			return prov.Attributes[i].Key < prov.Attributes[j].Key
+		})
+
+		store.Set(key, cdc.MustMarshal(&prov))
+	}
+
 	return []abci.ValidatorUpdate{}
 }
 
 // ExportGenesis returns genesis state as raw bytes for the provider module
 func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
-	return &types.GenesisState{}
+	var records []types.AuditedAttributes
+
+	k.WithProviders(ctx, func(provider types.Provider) bool {
+		records = append(records, types.AuditedAttributes{
+			Owner:      provider.Owner,
+			Auditor:    provider.Auditor,
+			Attributes: provider.Attributes.Dup(),
+		})
+		return false
+	})
+
+	return &types.GenesisState{
+		Attributes: records,
+	}
 }
 
 // DefaultGenesisState returns default genesis state as raw bytes for the provider

x/audit/keeper/keeper.go

@@ -48,7 +48,7 @@ func (k Keeper) StoreKey() sdk.StoreKey {
 func (k Keeper) GetProviderByAuditor(ctx sdk.Context, id types.ProviderID) (types.Provider, bool) {
 	store := ctx.KVStore(k.skey)
 
-	buf := store.Get(providerKey(id))
+	buf := store.Get(ProviderKey(id))
 	if buf == nil {
 		return types.Provider{}, false
 	}
@@ -65,7 +65,7 @@ func (k Keeper) GetProviderAttributes(ctx sdk.Context, id sdk.Address) (types.Pr
 
 	var attr types.Providers
 
-	iter := sdk.KVStorePrefixIterator(store, providerPrefix(id))
+	iter := sdk.KVStorePrefixIterator(store, ProviderPrefix(id))
 	defer func() {
 		_ = iter.Close()
 	}()
@@ -88,7 +88,7 @@ func (k Keeper) GetProviderAttributes(ctx sdk.Context, id sdk.Address) (types.Pr
 // if key exists, existing values for matching pairs will be replaced
 func (k Keeper) CreateOrUpdateProviderAttributes(ctx sdk.Context, id types.ProviderID, attr akashtypes.Attributes) error {
 	store := ctx.KVStore(k.skey)
-	key := providerKey(id)
+	key := ProviderKey(id)
 
 	prov := types.Provider{
 		Owner:      id.Owner.String(),
@@ -138,7 +138,7 @@ func (k Keeper) CreateOrUpdateProviderAttributes(ctx sdk.Context, id types.Provi
 
 func (k Keeper) DeleteProviderAttributes(ctx sdk.Context, id types.ProviderID, keys []string) error {
 	store := ctx.KVStore(k.skey)
-	key := providerKey(id)
+	key := ProviderKey(id)
 
 	buf := store.Get(key)
 	if buf == nil {
@@ -220,10 +220,10 @@ func (k Keeper) WithProviders(ctx sdk.Context, fn func(types.Provider) bool) {
 	}
 }
 
-// WithProviders iterates all signed provider's attributes
+// WithProvider iterates all signed provider's attributes
 func (k Keeper) WithProvider(ctx sdk.Context, id sdk.Address, fn func(types.Provider) bool) {
 	store := ctx.KVStore(k.skey)
-	iter := sdk.KVStorePrefixIterator(store, providerPrefix(id))
+	iter := sdk.KVStorePrefixIterator(store, ProviderPrefix(id))
 	defer func() {
 		_ = iter.Close()
 	}()

x/audit/keeper/key.go

@@ -10,7 +10,7 @@ import (
 	types "github.com/akash-network/akash-api/go/node/audit/v1beta3"
 )
 
-func providerKey(id types.ProviderID) []byte {
+func ProviderKey(id types.ProviderID) []byte {
 	buf := bytes.NewBuffer(types.PrefixProviderID())
 	if _, err := buf.Write(address.MustLengthPrefix(id.Owner.Bytes())); err != nil {
 		panic(err)
@@ -23,7 +23,7 @@ func providerKey(id types.ProviderID) []byte {
 	return buf.Bytes()
 }
 
-func providerPrefix(id sdk.Address) []byte {
+func ProviderPrefix(id sdk.Address) []byte {
 	buf := bytes.NewBuffer(types.PrefixProviderID())
 	if _, err := buf.Write(address.MustLengthPrefix(id.Bytes())); err != nil {
 		panic(err)

x/cert/genesis.go

@@ -1,7 +1,9 @@
 package cert
 
 import (
+	"crypto/x509"
 	"encoding/json"
+	"encoding/pem"
 	"fmt"
 
 	"github.com/cosmos/cosmos-sdk/codec"
@@ -20,29 +22,73 @@ func ValidateGenesis(data *types.GenesisState) error {
 			return err
 		}
 	}
+
 	return nil
 }
 
 // InitGenesis initiate genesis state and return updated validator details
-func InitGenesis(ctx sdk.Context, keeper keeper.Keeper, data *types.GenesisState) []abci.ValidatorUpdate {
+func InitGenesis(ctx sdk.Context, kpr keeper.Keeper, data *types.GenesisState) []abci.ValidatorUpdate {
+	store := ctx.KVStore(kpr.StoreKey())
+	cdc := kpr.Codec()
+
 	for _, record := range data.Certificates {
 		owner, err := sdk.AccAddressFromBech32(record.Owner)
 		if err != nil {
 			panic(fmt.Sprintf("error init certificate from genesis: %s", err))
 		}
 
-		err = keeper.CreateCertificate(ctx, owner, record.Certificate.Cert, record.Certificate.Pubkey)
+		cert, err := types.ParseAndValidateCertificate(owner, record.Certificate.Cert, record.Certificate.Pubkey)
 		if err != nil {
-			panic(fmt.Sprintf("error init certificate from genesis: %s", err))
+			ctx.Logger().Error("error parsing genesis cert", "error", err.Error())
+			continue
+			// panic(err.Error())
+		}
+
+		key := keeper.CertificateKey(types.CertID{
+			Owner:  owner,
+			Serial: *cert.SerialNumber,
+		})
+
+		if store.Has(key) {
+			panic(types.ErrCertificateExists.Error())
 		}
+
+		store.Set(key, cdc.MustMarshal(&record.Certificate))
 	}
 
 	return []abci.ValidatorUpdate{}
 }
 
 // ExportGenesis returns genesis state as raw bytes for the provider module
 func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
-	return &types.GenesisState{}
+	var res types.GenesisCertificates
+
+	k.WithCertificates(ctx, func(id types.CertID, certificate types.CertificateResponse) bool {
+		block, rest := pem.Decode(certificate.Certificate.Cert)
+		if len(rest) > 0 {
+			panic("unable to decode certificate")
+		}
+
+		cert, err := x509.ParseCertificate(block.Bytes)
+		if err != nil {
+			panic(err.Error())
+		}
+
+		if cert.SerialNumber.String() != id.Serial.String() {
+			panic("certificate id does not match")
+		}
+
+		res = append(res, types.GenesisCertificate{
+			Owner:       id.Owner.String(),
+			Certificate: certificate.Certificate,
+		})
+
+		return false
+	})
+
+	return &types.GenesisState{
+		Certificates: res,
+	}
 }
 
 // DefaultGenesisState returns default genesis state as raw bytes for the provider

x/cert/keeper/grpc_query.go

@@ -64,10 +64,10 @@ func (q querier) Certificates(c context.Context, req *types.QueryCertificatesReq
 				certificates = append(certificates, item)
 			}
 		} else {
-			ownerStore := prefix.NewStore(store, certificatePrefix(owner))
+			ownerStore := prefix.NewStore(store, CertificatePrefix(owner))
 			pageRes, err = sdkquery.FilteredPaginate(ownerStore, req.Pagination, func(key []byte, value []byte, accumulate bool) (bool, error) {
 				// prefixed store returns key without prefix
-				key = append(certificatePrefix(owner), key...)
+				key = append(CertificatePrefix(owner), key...)
 				item, err := q.unmarshalIterator(key, value)
 				if err != nil {
 					return true, err