Problem: memiavl is not integrated with state machine

app/app.go

@@ -125,6 +125,7 @@ import (
 
 	// this line is used by starport scaffolding # stargate/app/moduleImport
 
+	"github.com/crypto-org-chain/cronos/store/rootmulti"
 	"github.com/crypto-org-chain/cronos/v2/x/cronos"
 	cronosclient "github.com/crypto-org-chain/cronos/v2/x/cronos/client"
 	cronoskeeper "github.com/crypto-org-chain/cronos/v2/x/cronos/keeper"
@@ -150,7 +151,7 @@ const (
 	// NOTE: In the SDK, the default value is 255.
 	AddrLen = 20
 
-	FileStreamerDirectory = "file_streamer"
+	FlagMemIAVL = "memiavl"
 )
 
 // this line is used by starport scaffolding # stargate/wasm/app/enabledProposals
@@ -344,6 +345,11 @@ func New(
 	interfaceRegistry := encodingConfig.InterfaceRegistry
 
 	bApp := baseapp.NewBaseApp(Name, logger, db, encodingConfig.TxConfig.TxDecoder(), baseAppOptions...)
+
+	if cast.ToBool(appOpts.Get(FlagMemIAVL)) {
+		bApp.SetCMS(rootmulti.NewStore(filepath.Join(homePath, "data", "memiavl.db"), logger))
+	}
+
 	bApp.SetCommitMultiStoreTracer(traceStore)
 	bApp.SetVersion(version.Version)
 	bApp.SetInterfaceRegistry(interfaceRegistry)

default.nix

@@ -34,6 +34,7 @@ buildGoApplication rec {
     "!/client/"
     "!/versiondb/"
     "!/memiavl/"
+    "!/store/"
     "!go.mod"
     "!go.sum"
     "!gomod2nix.toml"

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/cosmos/cosmos-sdk v0.46.11
 	github.com/cosmos/gogoproto v1.4.7
 	github.com/cosmos/ibc-go/v5 v5.2.0
+	github.com/crypto-org-chain/cronos/store v0.0.0
 	github.com/crypto-org-chain/cronos/versiondb v0.0.0
 	github.com/ethereum/go-ethereum v1.10.26
 	github.com/evmos/ethermint v0.6.1-0.20221101220534-a8ea4eceb6d9
@@ -224,8 +225,9 @@ replace (
 	github.com/cometbft/cometbft-db => github.com/crypto-org-chain/cometbft-db v0.0.0-20230412133340-ac70df4b45f6
 	// Ref: https://forum.cosmos.network/t/ibc-security-advisory-dragonberry/7702
 	github.com/confio/ics23/go => github.com/confio/ics23/go v0.9.0
-	github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.46.11
+	github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.46.12-0.20230403092311-152465bd0ca7
 	github.com/crypto-org-chain/cronos/memiavl => ./memiavl
+	github.com/crypto-org-chain/cronos/store => ./store
 	github.com/crypto-org-chain/cronos/versiondb => ./versiondb
 	github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethereum v1.10.19-deepcopy-jumptable
 	github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.20.8-cronos.0.20230315032257-cb741e1d8196

go.sum

@@ -409,8 +409,8 @@ github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk=
 github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis=
 github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0=
 github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE=
-github.com/cosmos/cosmos-sdk v0.46.11 h1:csMJQHtcb/EIu2EJmeg/2NaGkGw3ZScFwa4CRpCCw18=
-github.com/cosmos/cosmos-sdk v0.46.11/go.mod h1:bG4AkW9bqc8ycrryyKGQEl3YV9BY2wr6HggGq8kvcgM=
+github.com/cosmos/cosmos-sdk v0.46.12-0.20230403092311-152465bd0ca7 h1:NhJVy00Q2PDTjxufX7f8Byy/qkS2Kl9YezOYosdXMhI=
+github.com/cosmos/cosmos-sdk v0.46.12-0.20230403092311-152465bd0ca7/go.mod h1:bG4AkW9bqc8ycrryyKGQEl3YV9BY2wr6HggGq8kvcgM=
 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
 github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
 github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=

gomod2nix.toml

@@ -137,8 +137,8 @@ schema = 3
     version = "v1.0.0-beta.1"
     hash = "sha256-oATkuj+fM5eBn+ywO+w/tL0AFSIEkx0J3Yz+VhVe0QA="
   [mod."github.com/cosmos/cosmos-sdk"]
-    version = "v0.46.11"
-    hash = "sha256-RpjzVDZw5n0y4kobBCy2d1oPmDCgL5k47UaZMI67sqU="
+    version = "v0.46.12-0.20230403092311-152465bd0ca7"
+    hash = "sha256-pxjj8RzbtYoJ3mRqSze33piQBZHVCB4Qk0iOgqtbdHw="
     replaced = "github.com/cosmos/cosmos-sdk"
   [mod."github.com/cosmos/go-bip39"]
     version = "v1.0.0"

integration_tests/configs/default.jsonnet

@@ -35,6 +35,7 @@
       staked: '1000000000000000000stake',
       mnemonic: '${VALIDATOR1_MNEMONIC}',
       'app-config': {
+        memiavl: true,
         store: {
           streamers: ['file', 'versiondb'],
         },

memiavl/db.go

@@ -102,18 +102,16 @@ func Load(dir string, opts Options) (*DB, error) {
 // SetInitialVersion wraps `MultiTree.SetInitialVersion`.
 // it do an immediate snapshot rewrite, because we can't use wal log to record this change,
 // because we need it to convert versions to wal index in the first place.
-func (db *DB) SetInitialVersion(initialVersion int64) {
+func (db *DB) SetInitialVersion(initialVersion int64) error {
 	if err := db.MultiTree.SetInitialVersion(initialVersion); err != nil {
-		panic(err)
+		return err
 	}
 
-	if err := db.RewriteSnapshot(); err != nil {
-		panic(err)
+	if err := initEmptyDB(db.dir, db.initialVersion); err != nil {
+		return err
 	}
 
-	if err := db.Reload(); err != nil {
-		panic(err)
-	}
+	return db.Reload()
 }
 
 // ApplyUpgrades wraps MultiTree.ApplyUpgrades, it also append the upgrades in a temporary field,
@@ -234,8 +232,8 @@ func (db *DB) RewriteSnapshot() error {
 	if err := db.WriteSnapshot(snapshotDir); err != nil {
 		return err
 	}
-	tmpLink := filepath.Join(db.dir, "current-tmp")
-	if err := os.Symlink(snapshotDir, tmpLink); err != nil {
+	tmpLink := currentTmpPath(db.dir)
+	if err := os.Symlink(filepath.Base(snapshotDir), tmpLink); err != nil {
 		return err
 	}
 	// assuming file renaming operation is atomic
@@ -256,7 +254,11 @@ func (db *DB) reloadMultiTree(mtree *MultiTree) error {
 	}
 
 	db.MultiTree = *mtree
-	db.pendingUpgrades = nil
+
+	if len(db.pendingUpgrades) > 0 {
+		db.MultiTree.ApplyUpgrades(db.pendingUpgrades)
+	}
+
 	return nil
 }
 
@@ -316,6 +318,10 @@ func currentPath(root string) string {
 	return filepath.Join(root, "current")
 }
 
+func currentTmpPath(root string) string {
+	return filepath.Join(root, "current-tmp")
+}
+
 func walPath(root string) string {
 	return filepath.Join(root, "wal")
 }
@@ -335,5 +341,9 @@ func initEmptyDB(dir string, initialVersion uint32) error {
 	if err := tmp.WriteSnapshot(snapshotDir); err != nil {
 		return err
 	}
-	return os.Symlink(snapshotDir, currentPath(dir))
+	tmpPath := currentTmpPath(dir)
+	if err := os.Symlink(filepath.Base(snapshotDir), tmpPath); err != nil {
+		return err
+	}
+	return os.Rename(tmpPath, currentPath(dir))
 }

memiavl/multitree.go

@@ -20,7 +20,7 @@ import (
 
 const MetadataFileName = "__metadata"
 
-type namedTree struct {
+type NamedTree struct {
 	tree *Tree
 	name string
 }
@@ -45,7 +45,7 @@ type MultiTree struct {
 	// it always corresponds to the wal entry with index 1.
 	initialVersion uint32
 
-	trees          []namedTree
+	trees          []NamedTree
 	treesByName    map[string]int // reversed index of the trees
 	lastCommitInfo storetypes.CommitInfo
 }
@@ -96,11 +96,11 @@ func LoadMultiTree(dir string) (*MultiTree, error) {
 
 	sort.Strings(treeNames)
 
-	trees := make([]namedTree, len(treeNames))
+	trees := make([]NamedTree, len(treeNames))
 	treesByName := make(map[string]int, len(trees))
 	for i, name := range treeNames {
 		tree := treeMap[name]
-		trees[i] = namedTree{tree: tree, name: name}
+		trees[i] = NamedTree{tree: tree, name: name}
 		treesByName[name] = i
 	}
 
@@ -114,6 +114,14 @@ func LoadMultiTree(dir string) (*MultiTree, error) {
 	return mtree, nil
 }
 
+func (t *MultiTree) Trees() []NamedTree {
+	return t.trees
+}
+
+func (t *MultiTree) TreeByName(name string) *Tree {
+	return t.trees[t.treesByName[name]].tree
+}
+
 func (t *MultiTree) SetInitialVersion(initialVersion int64) error {
 	if initialVersion >= math.MaxUint32 {
 		return fmt.Errorf("version overflows uint32: %d", initialVersion)
@@ -142,11 +150,11 @@ func (t *MultiTree) setInitialVersion(initialVersion int64) {
 
 // Copy returns a snapshot of the tree which won't be corrupted by further modifications on the main tree.
 func (t *MultiTree) Copy() *MultiTree {
-	trees := make([]namedTree, len(t.trees))
+	trees := make([]NamedTree, len(t.trees))
 	treesByName := make(map[string]int, len(t.trees))
 	for i, entry := range t.trees {
 		tree := entry.tree.Copy()
-		trees[i] = namedTree{tree: tree, name: entry.name}
+		trees[i] = NamedTree{tree: tree, name: entry.name}
 		treesByName[entry.name] = i
 	}
 
@@ -164,6 +172,10 @@ func (t *MultiTree) Version() int64 {
 	return t.lastCommitInfo.Version
 }
 
+func (t *MultiTree) LastCommitInfo() *storetypes.CommitInfo {
+	return &t.lastCommitInfo
+}
+
 // ApplyUpgrades store name upgrades
 func (t *MultiTree) ApplyUpgrades(upgrades []*TreeNameUpgrade) error {
 	if len(upgrades) == 0 {
@@ -175,7 +187,7 @@ func (t *MultiTree) ApplyUpgrades(upgrades []*TreeNameUpgrade) error {
 	for _, upgrade := range upgrades {
 		switch {
 		case upgrade.Delete:
-			i := slices.IndexFunc(t.trees, func(entry namedTree) bool {
+			i := slices.IndexFunc(t.trees, func(entry NamedTree) bool {
 				return entry.name == upgrade.Name
 			})
 			if i < 0 {
@@ -186,7 +198,7 @@ func (t *MultiTree) ApplyUpgrades(upgrades []*TreeNameUpgrade) error {
 			t.trees = t.trees[:len(t.trees)-1]
 		case upgrade.RenameFrom != "":
 			// rename tree
-			i := slices.IndexFunc(t.trees, func(entry namedTree) bool {
+			i := slices.IndexFunc(t.trees, func(entry NamedTree) bool {
 				return entry.name == upgrade.RenameFrom
 			})
 			if i < 0 {
@@ -196,7 +208,7 @@ func (t *MultiTree) ApplyUpgrades(upgrades []*TreeNameUpgrade) error {
 		default:
 			// add tree
 			tree := NewWithInitialVersion(uint32(nextVersion(t.Version(), t.initialVersion)))
-			t.trees = append(t.trees, namedTree{tree: tree, name: upgrade.Name})
+			t.trees = append(t.trees, NamedTree{tree: tree, name: upgrade.Name})
 		}
 	}
 

memiavl/tree.go

@@ -134,6 +134,13 @@ func (t *Tree) Get(key []byte) []byte {
 	return t.root.Get(key)
 }
 
+func (t *Tree) Has(key []byte) bool {
+	if t.Get(key) == nil {
+		return false
+	}
+	return true
+}
+
 func (t *Tree) Iterator(start, end []byte, ascending bool) dbm.Iterator {
 	return NewIterator(start, end, ascending, t.root)
 }

store/go.mod

@@ -0,0 +1,84 @@
+module github.com/crypto-org-chain/cronos/store
+
+go 1.20
+
+require (
+	github.com/cosmos/cosmos-sdk v0.46.11
+	github.com/cosmos/iavl v0.19.6-0.20230410112350-e1e212a3a3aa
+	github.com/crypto-org-chain/cronos/memiavl v0.0.1
+	github.com/gogo/protobuf v1.3.2
+	github.com/pkg/errors v0.9.1
+	github.com/tendermint/tendermint v0.34.27
+	github.com/tendermint/tm-db v0.6.7
+)
+
+require (
+	cosmossdk.io/errors v1.0.0-beta.7 // indirect
+	github.com/VictoriaMetrics/metrics v1.23.1 // indirect
+	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
+	github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b // indirect
+	github.com/cespare/xxhash v1.1.0 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/confio/ics23/go v0.9.0 // indirect
+	github.com/cosmos/gogoproto v1.4.7 // indirect
+	github.com/cosmos/gorocksdb v1.2.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
+	github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
+	github.com/dgraph-io/ristretto v0.1.0 // indirect
+	github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
+	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/go-kit/log v0.2.1 // indirect
+	github.com/go-logfmt/logfmt v0.5.1 // indirect
+	github.com/go-stack/stack v1.8.1 // indirect
+	github.com/golang/glog v1.0.0 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/btree v1.1.2 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/jmhodges/levigo v1.0.0 // indirect
+	github.com/klauspost/compress v1.15.11 // indirect
+	github.com/ledgerwatch/erigon-lib v0.0.0-20230210071639-db0e7ed11263 // indirect
+	github.com/ledgerwatch/log/v3 v3.7.0 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/sasha-s/go-deadlock v0.3.1 // indirect
+	github.com/spaolacci/murmur3 v1.1.0 // indirect
+	github.com/stretchr/testify v1.8.1 // indirect
+	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
+	github.com/tendermint/go-amino v0.16.0 // indirect
+	github.com/tidwall/btree v1.5.0 // indirect
+	github.com/tidwall/gjson v1.10.2 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.0 // indirect
+	github.com/tidwall/tinylru v1.1.0 // indirect
+	github.com/tidwall/wal v1.1.7 // indirect
+	github.com/torquem-ch/mdbx-go v0.27.5 // indirect
+	github.com/valyala/fastrand v1.1.0 // indirect
+	github.com/valyala/histogram v1.2.0 // indirect
+	go.etcd.io/bbolt v1.3.6 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
+	golang.org/x/crypto v0.6.0 // indirect
+	golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
+	golang.org/x/net v0.8.0 // indirect
+	golang.org/x/sync v0.1.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/text v0.8.0 // indirect
+	google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 // indirect
+	google.golang.org/grpc v1.53.0 // indirect
+	google.golang.org/protobuf v1.29.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
+)
+
+replace (
+	github.com/crypto-org-chain/cronos/memiavl => ../memiavl
+	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
+	// use cometbft
+	github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.27
+)