classic mantlemint update to 2.2.1

Dockerfile

@@ -1,5 +1,7 @@
-ARG GO_VERSION="1.20"
-ARG ALPINE_VERSION="3.16"
+
+# docker build . -t cosmwasm/wasmd:latest
+# docker run --rm -it cosmwasm/wasmd:latest /bin/sh
+FROM golang:1.20-alpine3.17 AS go-builder
 ARG BUILDPLATFORM=linux/amd64
 ARG BASE_IMAGE="golang:${GO_VERSION}-alpine${ALPINE_VERSION}"
 FROM --platform=${BUILDPLATFORM} ${BASE_IMAGE} as base

db/heleveldb/leveldb_batch.go

@@ -3,7 +3,7 @@ package heleveldb
 import (
 	"fmt"
 
-	tmdb "github.com/tendermint/tm-db"
+	dbm "github.com/tendermint/tm-db"
 	"github.com/terra-money/mantlemint/db/hld"
 	"github.com/terra-money/mantlemint/db/rollbackable"
 )
@@ -74,7 +74,7 @@ func (b *LevelBatch) Close() error {
 	return b.batch.Close()
 }
 
-func (b *LevelBatch) RollbackBatch() tmdb.Batch {
+func (b *LevelBatch) RollbackBatch() dbm.Batch {
 	b.Metric()
 	return b.batch.RollbackBatch
 }

db/heleveldb/leveldb_driver.go

@@ -4,18 +4,18 @@ import (
 	"fmt"
 	"math"
 
-	tmdb "github.com/tendermint/tm-db"
+	dbm "github.com/tendermint/tm-db"
 	"github.com/terra-money/mantlemint/db/hld"
 	"github.com/terra-money/mantlemint/lib"
 )
 
 type Driver struct {
-	session *tmdb.GoLevelDB
+	session *dbm.GoLevelDB
 	mode    int
 }
 
 func NewLevelDBDriver(config *DriverConfig) (*Driver, error) {
-	ldb, err := tmdb.NewGoLevelDB(config.Name, config.Dir)
+	ldb, err := dbm.NewGoLevelDB(config.Name, config.Dir)
 	if err != nil {
 		return nil, err
 	}
@@ -26,7 +26,7 @@ func NewLevelDBDriver(config *DriverConfig) (*Driver, error) {
 	}, nil
 }
 
-func (d *Driver) newInnerIterator(requestHeight int64, pdb *tmdb.PrefixDB) (tmdb.Iterator, error) {
+func (d *Driver) newInnerIterator(requestHeight int64, pdb *dbm.PrefixDB) (dbm.Iterator, error) {
 	if d.mode == DriverModeKeySuffixAsc {
 		heightEnd := lib.UintToBigEndian(uint64(requestHeight + 1))
 		return pdb.ReverseIterator(nil, heightEnd)
@@ -48,7 +48,7 @@ func (d *Driver) Get(maxHeight int64, key []byte) ([]byte, error) {
 		return nil, fmt.Errorf("invalid height")
 	}
 
-	pdb := tmdb.NewPrefixDB(d.session, prefixDataWithHeightKey(key))
+	pdb := dbm.NewPrefixDB(d.session, prefixDataWithHeightKey(key))
 
 	iter, _ := d.newInnerIterator(requestHeight, pdb)
 	defer iter.Close()
@@ -82,7 +82,7 @@ func (d *Driver) Has(maxHeight int64, key []byte) (bool, error) {
 		return false, fmt.Errorf("invalid height")
 	}
 
-	pdb := tmdb.NewPrefixDB(d.session, prefixDataWithHeightKey(key))
+	pdb := dbm.NewPrefixDB(d.session, prefixDataWithHeightKey(key))
 
 	iter, _ := d.newInnerIterator(requestHeight, pdb)
 	defer iter.Close()
@@ -122,15 +122,15 @@ func (d *Driver) DeleteSync(atHeight int64, key []byte) error {
 
 func (d *Driver) Iterator(maxHeight int64, start, end []byte) (hld.HeightLimitEnabledIterator, error) {
 	if maxHeight == 0 {
-		pdb := tmdb.NewPrefixDB(d.session, cCurrentDataPrefix)
+		pdb := dbm.NewPrefixDB(d.session, cCurrentDataPrefix)
 		return pdb.Iterator(start, end)
 	}
 	return NewLevelDBIterator(d, maxHeight, start, end)
 }
 
 func (d *Driver) ReverseIterator(maxHeight int64, start, end []byte) (hld.HeightLimitEnabledIterator, error) {
 	if maxHeight == 0 {
-		pdb := tmdb.NewPrefixDB(d.session, cCurrentDataPrefix)
+		pdb := dbm.NewPrefixDB(d.session, cCurrentDataPrefix)
 		return pdb.ReverseIterator(start, end)
 	}
 	return NewLevelDBReverseIterator(d, maxHeight, start, end)

db/heleveldb/leveldb_iterator.go

@@ -3,15 +3,15 @@ package heleveldb
 import (
 	"bytes"
 
-	tmdb "github.com/tendermint/tm-db"
+	dbm "github.com/tendermint/tm-db"
 	"github.com/terra-money/mantlemint/db/hld"
 )
 
 var _ hld.HeightLimitEnabledIterator = (*Iterator)(nil)
 
 type Iterator struct {
 	driver *Driver
-	tmdb.Iterator
+	dbm.Iterator
 
 	maxHeight int64
 	start     []byte
@@ -24,7 +24,7 @@ type Iterator struct {
 }
 
 func NewLevelDBIterator(d *Driver, maxHeight int64, start, end []byte) (*Iterator, error) {
-	pdb := tmdb.NewPrefixDB(d.session, cKeysForIteratorPrefix)
+	pdb := dbm.NewPrefixDB(d.session, cKeysForIteratorPrefix)
 	iter, err := pdb.Iterator(start, end)
 	if err != nil {
 		return nil, err
@@ -41,7 +41,7 @@ func NewLevelDBIterator(d *Driver, maxHeight int64, start, end []byte) (*Iterato
 }
 
 func NewLevelDBReverseIterator(d *Driver, maxHeight int64, start, end []byte) (*Iterator, error) {
-	pdb := tmdb.NewPrefixDB(d.session, cKeysForIteratorPrefix)
+	pdb := dbm.NewPrefixDB(d.session, cKeysForIteratorPrefix)
 	iter, err := pdb.ReverseIterator(start, end)
 	if err != nil {
 		return nil, err

db/hld/height_limited_db.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/terra-money/mantlemint/lib"
 
-	tmdb "github.com/tendermint/tm-db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 const (
@@ -149,7 +149,7 @@ func (hld *HeightLimitedDB) DeleteSync(key []byte) error {
 // from the first key, and a nil end iterates to the last key (inclusive).
 // CONTRACT: No writes may happen within a domain while an iterator exists over it.
 // CONTRACT: start, end readonly []byte
-func (hld *HeightLimitedDB) Iterator(start, end []byte) (tmdb.Iterator, error) {
+func (hld *HeightLimitedDB) Iterator(start, end []byte) (dbm.Iterator, error) {
 	return hld.odb.Iterator(hld.GetCurrentReadHeight(), start, end)
 }
 
@@ -158,7 +158,7 @@ func (hld *HeightLimitedDB) Iterator(start, end []byte) (tmdb.Iterator, error) {
 // iterates from the last key (inclusive), and a nil start iterates to the first key (inclusive).
 // CONTRACT: No writes may happen within a domain while an iterator exists over it.
 // CONTRACT: start, end readonly []byte
-func (hld *HeightLimitedDB) ReverseIterator(start, end []byte) (tmdb.Iterator, error) {
+func (hld *HeightLimitedDB) ReverseIterator(start, end []byte) (dbm.Iterator, error) {
 	return hld.odb.ReverseIterator(hld.GetCurrentReadHeight(), start, end)
 }
 
@@ -168,7 +168,7 @@ func (hld *HeightLimitedDB) Close() error {
 }
 
 // NewBatch creates a batch for atomic updates. The caller must call Batch.Close.
-func (hld *HeightLimitedDB) NewBatch() tmdb.Batch {
+func (hld *HeightLimitedDB) NewBatch() dbm.Batch {
 	// if hld.writeBatch != nil {
 	// 	// TODO: fix me
 	// 	return hld.writeBatch

db/hld/height_limited_iterator.go

@@ -1,15 +1,15 @@
 package hld
 
-import tmdb "github.com/tendermint/tm-db"
+import dbm "github.com/tendermint/tm-db"
 
-var _ tmdb.Iterator = (*HeightLimitedDBIterator)(nil)
+var _ dbm.Iterator = (*HeightLimitedDBIterator)(nil)
 
 type HeightLimitedDBIterator struct {
-	oit      tmdb.Iterator
+	oit      dbm.Iterator
 	atHeight int64
 }
 
-func NewHeightLimitedIterator(atHeight int64, oit tmdb.Iterator) tmdb.Iterator {
+func NewHeightLimitedIterator(atHeight int64, oit dbm.Iterator) dbm.Iterator {
 	return &HeightLimitedDBIterator{
 		oit:      oit,
 		atHeight: atHeight,

db/hld/types.go

@@ -1,11 +1,11 @@
 package hld
 
 import (
-	tmdb "github.com/tendermint/tm-db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 type HLD interface {
-	tmdb.DB
+	dbm.DB
 	SetReadHeight(int64)
 	ClearReadHeight() int64
 	SetWriteHeight(int64)
@@ -63,9 +63,9 @@ type HeightLimitEnabledDB interface {
 }
 
 type HeightLimitEnabledIterator interface {
-	tmdb.Iterator
+	dbm.Iterator
 }
 
 type HeightLimitEnabledBatch interface {
-	tmdb.Batch
+	dbm.Batch
 }

db/rollbackable/rollbackable_batch.go

@@ -1,24 +1,24 @@
 package rollbackable
 
 import (
-	tmdb "github.com/tendermint/tm-db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 type HasRollbackBatch interface {
-	RollbackBatch() tmdb.Batch
+	RollbackBatch() dbm.Batch
 }
 
-var _ tmdb.Batch = (*RollbackableBatch)(nil)
+var _ dbm.Batch = (*RollbackableBatch)(nil)
 
 type RollbackableBatch struct {
-	tmdb.Batch
+	dbm.Batch
 
-	db            tmdb.DB
-	RollbackBatch tmdb.Batch
+	db            dbm.DB
+	RollbackBatch dbm.Batch
 	RecordCount   int
 }
 
-func NewRollbackableBatch(db tmdb.DB) *RollbackableBatch {
+func NewRollbackableBatch(db dbm.DB) *RollbackableBatch {
 	return &RollbackableBatch{
 		db:            db,
 		Batch:         db.NewBatch(),

db/safe_batch/safe_batch.go

@@ -3,24 +3,24 @@ package safe_batch
 import (
 	"fmt"
 
-	tmdb "github.com/tendermint/tm-db"
+	dbm "github.com/tendermint/tm-db"
 	"github.com/terra-money/mantlemint/db/rollbackable"
 )
 
 var (
-	_ tmdb.DB           = (*SafeBatchDB)(nil)
+	_ dbm.DB            = (*SafeBatchDB)(nil)
 	_ SafeBatchDBCloser = (*SafeBatchDB)(nil)
 )
 
 type SafeBatchDBCloser interface {
-	tmdb.DB
+	dbm.DB
 	Open()
-	Flush() (tmdb.Batch, error)
+	Flush() (dbm.Batch, error)
 }
 
 type SafeBatchDB struct {
-	db    tmdb.DB
-	batch tmdb.Batch
+	db    dbm.DB
+	batch dbm.Batch
 }
 
 // open batch
@@ -29,7 +29,7 @@ func (s *SafeBatchDB) Open() {
 }
 
 // flush batch and return rollback batch if rollbackable
-func (s *SafeBatchDB) Flush() (tmdb.Batch, error) {
+func (s *SafeBatchDB) Flush() (dbm.Batch, error) {
 	defer func() {
 		if s.batch != nil {
 			s.batch.Close()
@@ -44,7 +44,7 @@ func (s *SafeBatchDB) Flush() (tmdb.Batch, error) {
 	}
 }
 
-func NewSafeBatchDB(db tmdb.DB) tmdb.DB {
+func NewSafeBatchDB(db dbm.DB) dbm.DB {
 	return &SafeBatchDB{
 		db:    db,
 		batch: nil,
@@ -83,19 +83,19 @@ func (s *SafeBatchDB) DeleteSync(key []byte) error {
 	return s.Delete(key)
 }
 
-func (s *SafeBatchDB) Iterator(start, end []byte) (tmdb.Iterator, error) {
+func (s *SafeBatchDB) Iterator(start, end []byte) (dbm.Iterator, error) {
 	return s.db.Iterator(start, end)
 }
 
-func (s *SafeBatchDB) ReverseIterator(start, end []byte) (tmdb.Iterator, error) {
+func (s *SafeBatchDB) ReverseIterator(start, end []byte) (dbm.Iterator, error) {
 	return s.db.ReverseIterator(start, end)
 }
 
 func (s *SafeBatchDB) Close() error {
 	return s.db.Close()
 }
 
-func (s *SafeBatchDB) NewBatch() tmdb.Batch {
+func (s *SafeBatchDB) NewBatch() dbm.Batch {
 	if s.batch != nil {
 		return NewSafeBatchNullify(s.batch)
 	} else {

db/safe_batch/safe_batch_nullify.go

@@ -1,14 +1,14 @@
 package safe_batch
 
-import tmdb "github.com/tendermint/tm-db"
+import dbm "github.com/tendermint/tm-db"
 
-var _ tmdb.Batch = (*SafeBatchNullified)(nil)
+var _ dbm.Batch = (*SafeBatchNullified)(nil)
 
 type SafeBatchNullified struct {
-	batch tmdb.Batch
+	batch dbm.Batch
 }
 
-func NewSafeBatchNullify(batch tmdb.Batch) tmdb.Batch {
+func NewSafeBatchNullify(batch dbm.Batch) dbm.Batch {
 	return &SafeBatchNullified{
 		batch: batch,
 	}

db/snappy/snappy_batch.go

@@ -2,16 +2,16 @@ package snappy
 
 import (
 	"github.com/golang/snappy"
-	tmdb "github.com/tendermint/tm-db"
+	dbm "github.com/tendermint/tm-db"
 )
 
-var _ tmdb.Batch = (*SnappyBatch)(nil)
+var _ dbm.Batch = (*SnappyBatch)(nil)
 
 type SnappyBatch struct {
-	batch tmdb.Batch
+	batch dbm.Batch
 }
 
-func NewSnappyBatch(batch tmdb.Batch) *SnappyBatch {
+func NewSnappyBatch(batch dbm.Batch) *SnappyBatch {
 	return &SnappyBatch{
 		batch: batch,
 	}