feat: implementing pip-15

cmd/cmd.go

@@ -293,7 +293,7 @@ func CreateNode(numValidators int, chain genesis.ChainType, workingDir string,
 		if err := genDoc.SaveToFile(genPath); err != nil {
 			return nil, nil, err
 		}
-		conf := config.DefaultConfigTestnet()
+		conf := config.DefaultConfigTestnet(genDoc.Params())
 		if err := conf.Save(confPath); err != nil {
 			return nil, nil, err
 		}
@@ -304,7 +304,7 @@ func CreateNode(numValidators int, chain genesis.ChainType, workingDir string,
 			return nil, nil, err
 		}
 
-		conf := config.DefaultConfigLocalnet()
+		conf := config.DefaultConfigLocalnet(genDoc.Params())
 		if err := conf.Save(confPath); err != nil {
 			return nil, nil, err
 		}
@@ -338,7 +338,7 @@ func StartNode(workingDir string, passwordFetcher func(*wallet.Wallet) (string,
 	}
 
 	confPath := PactusConfigPath(workingDir)
-	conf, err := tryLoadConfig(gen.ChainType(), confPath)
+	conf, err := tryLoadConfig(gen, confPath)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -461,15 +461,15 @@ func makeLocalGenesis(w wallet.Wallet) *genesis.Genesis {
 	return gen
 }
 
-func tryLoadConfig(chainType genesis.ChainType, confPath string) (*config.Config, error) {
+func tryLoadConfig(genDoc *genesis.Genesis, confPath string) (*config.Config, error) {
 	var defConf *config.Config
-	switch chainType {
+	switch genDoc.ChainType() {
 	case genesis.Mainnet:
 		panic("not yet implemented!")
 	case genesis.Testnet:
-		defConf = config.DefaultConfigTestnet()
+		defConf = config.DefaultConfigTestnet(genDoc.Params())
 	case genesis.Localnet:
-		defConf = config.DefaultConfigLocalnet()
+		defConf = config.DefaultConfigLocalnet(genDoc.Params())
 	}
 
 	conf, err := config.LoadFromFile(confPath, true, defConf)
@@ -496,7 +496,7 @@ func tryLoadConfig(chainType genesis.ChainType, confPath string) (*config.Config
 			}
 			PrintSuccessMsgf("Config updated.")
 		} else {
-			switch chainType {
+			switch genDoc.ChainType() {
 			case genesis.Mainnet:
 				err = config.SaveMainnetConfig(confPath)
 				if err != nil {

config/config.go

@@ -11,6 +11,7 @@ import (
 	"github.com/pactus-project/pactus/store"
 	"github.com/pactus-project/pactus/sync"
 	"github.com/pactus-project/pactus/txpool"
+	"github.com/pactus-project/pactus/types/param"
 	"github.com/pactus-project/pactus/util"
 	"github.com/pactus-project/pactus/util/errors"
 	"github.com/pactus-project/pactus/util/logger"
@@ -77,14 +78,21 @@ func defaultConfig() *Config {
 	return conf
 }
 
-func DefaultConfigMainnet() *Config {
+func DefaultConfigMainnet(genParams *param.Params) *Config {
 	conf := defaultConfig()
 	// TO BE DEFINED
+
+	// Store private configs
+	conf.Store.TxCacheSize = genParams.TransactionToLiveInterval
+	conf.Store.SortitionCacheSize = genParams.SortitionInterval
+	conf.Store.AccountCacheSize = 1024
+	conf.Store.PublicKeyCacheSize = 1024
+
 	return conf
 }
 
 //nolint:lll // long multi-address
-func DefaultConfigTestnet() *Config {
+func DefaultConfigTestnet(genParams *param.Params) *Config {
 	conf := defaultConfig()
 	conf.Network.ListenAddrStrings = []string{
 		"/ip4/0.0.0.0/tcp/21777", "/ip4/0.0.0.0/udp/21777/quic-v1",
@@ -121,10 +129,16 @@ func DefaultConfigTestnet() *Config {
 	conf.Nanomsg.Enable = false
 	conf.Nanomsg.Listen = "tcp://127.0.0.1:40799"
 
+	// Store private configs
+	conf.Store.TxCacheSize = genParams.TransactionToLiveInterval
+	conf.Store.SortitionCacheSize = genParams.SortitionInterval
+	conf.Store.AccountCacheSize = 1024
+	conf.Store.PublicKeyCacheSize = 1024
+
 	return conf
 }
 
-func DefaultConfigLocalnet() *Config {
+func DefaultConfigLocalnet(genParams *param.Params) *Config {
 	conf := defaultConfig()
 	conf.Network.ListenAddrStrings = []string{}
 	conf.Network.EnableRelay = false
@@ -143,6 +157,12 @@ func DefaultConfigLocalnet() *Config {
 	conf.Nanomsg.Enable = true
 	conf.Nanomsg.Listen = "tcp://127.0.0.1:0"
 
+	// Store private configs
+	conf.Store.TxCacheSize = genParams.TransactionToLiveInterval
+	conf.Store.SortitionCacheSize = genParams.SortitionInterval
+	conf.Store.AccountCacheSize = 1024
+	conf.Store.PublicKeyCacheSize = 1024
+
 	return conf
 }
 

config/config_test.go

@@ -4,6 +4,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/pactus-project/pactus/types/param"
 	"github.com/pactus-project/pactus/util"
 	"github.com/pactus-project/pactus/util/testsuite"
 	"github.com/stretchr/testify/assert"
@@ -13,40 +14,67 @@ func TestSaveMainnetConfig(t *testing.T) {
 	path := util.TempFilePath()
 	assert.NoError(t, SaveMainnetConfig(path))
 
-	defConf := DefaultConfigMainnet()
+	defConf := DefaultConfigMainnet(param.DefaultParams())
 	conf, err := LoadFromFile(path, true, defConf)
 	assert.NoError(t, err)
 
 	assert.NoError(t, conf.BasicCheck())
+	assert.Equal(t, conf.Store.TxCacheSize, param.DefaultParams().TransactionToLiveInterval)
+	assert.Equal(t, conf.Store.SortitionCacheSize, param.DefaultParams().SortitionInterval)
+	assert.Equal(t, conf.Store.AccountCacheSize, 1024)
+	assert.Equal(t, conf.Store.PublicKeyCacheSize, 1024)
 }
 
 func TestSaveConfig(t *testing.T) {
 	path := util.TempFilePath()
 	conf := defaultConfig()
 	assert.NoError(t, conf.Save(path))
 
-	defConf := DefaultConfigTestnet()
+	defConf := DefaultConfigTestnet(param.DefaultParams())
 	conf, err := LoadFromFile(path, true, defConf)
 	assert.NoError(t, err)
 
 	assert.NoError(t, conf.BasicCheck())
 	assert.Equal(t, conf.Network.NetworkName, "pactus-testnet-v2")
 	assert.Equal(t, conf.Network.DefaultPort, 21777)
+	assert.Equal(t, conf.Store.TxCacheSize, param.DefaultParams().TransactionToLiveInterval)
+	assert.Equal(t, conf.Store.SortitionCacheSize, param.DefaultParams().SortitionInterval)
+	assert.Equal(t, conf.Store.AccountCacheSize, 1024)
+	assert.Equal(t, conf.Store.PublicKeyCacheSize, 1024)
 }
 
 func TestLocalnetConfig(t *testing.T) {
-	conf := DefaultConfigLocalnet()
+	conf := DefaultConfigLocalnet(param.DefaultParams())
 
 	assert.NoError(t, conf.BasicCheck())
 	assert.Empty(t, conf.Network.ListenAddrStrings)
 	assert.Empty(t, conf.Network.RelayAddrStrings)
 	assert.Equal(t, conf.Network.NetworkName, "pactus-localnet")
 	assert.Equal(t, conf.Network.DefaultPort, 21666)
+	assert.Equal(t, conf.Store.TxCacheSize, param.DefaultParams().TransactionToLiveInterval)
+	assert.Equal(t, conf.Store.SortitionCacheSize, param.DefaultParams().SortitionInterval)
+	assert.Equal(t, conf.Store.AccountCacheSize, 1024)
+	assert.Equal(t, conf.Store.PublicKeyCacheSize, 1024)
+}
+
+func TestTestnetConfig(t *testing.T) {
+	conf := DefaultConfigTestnet(param.DefaultParams())
+
+	assert.NoError(t, conf.BasicCheck())
+	assert.NotEmpty(t, conf.Network.ListenAddrStrings)
+	assert.NotEmpty(t, conf.Network.DefaultRelayAddrStrings)
+	assert.Empty(t, conf.Network.RelayAddrStrings)
+	assert.Equal(t, conf.Network.NetworkName, "pactus-testnet-v2")
+	assert.Equal(t, conf.Network.DefaultPort, 21777)
+	assert.Equal(t, conf.Store.TxCacheSize, param.DefaultParams().TransactionToLiveInterval)
+	assert.Equal(t, conf.Store.SortitionCacheSize, param.DefaultParams().SortitionInterval)
+	assert.Equal(t, conf.Store.AccountCacheSize, 1024)
+	assert.Equal(t, conf.Store.PublicKeyCacheSize, 1024)
 }
 
 func TestLoadFromFile(t *testing.T) {
 	path := util.TempFilePath()
-	defConf := DefaultConfigTestnet()
+	defConf := DefaultConfigTestnet(param.DefaultParams())
 
 	_, err := LoadFromFile(path, true, defConf)
 	assert.Error(t, err, "not exists")
@@ -58,6 +86,10 @@ func TestLoadFromFile(t *testing.T) {
 	conf, err := LoadFromFile(path, false, defConf)
 	assert.NoError(t, err)
 	assert.Equal(t, conf, defConf)
+	assert.Equal(t, conf.Store.TxCacheSize, param.DefaultParams().TransactionToLiveInterval)
+	assert.Equal(t, conf.Store.SortitionCacheSize, param.DefaultParams().SortitionInterval)
+	assert.Equal(t, conf.Store.AccountCacheSize, 1024)
+	assert.Equal(t, conf.Store.PublicKeyCacheSize, 1024)
 }
 
 func TestExampleConfig(t *testing.T) {
@@ -73,7 +105,7 @@ func TestExampleConfig(t *testing.T) {
 		}
 	}
 
-	defaultConf := DefaultConfigMainnet()
+	defaultConf := DefaultConfigMainnet(param.DefaultParams())
 	defaultToml := string(defaultConf.toTOML())
 
 	exampleToml = strings.ReplaceAll(exampleToml, "##", "")
@@ -82,6 +114,10 @@ func TestExampleConfig(t *testing.T) {
 	defaultToml = strings.ReplaceAll(defaultToml, "\n\n", "\n")
 
 	assert.Equal(t, defaultToml, exampleToml)
+	assert.Equal(t, defaultConf.Store.TxCacheSize, param.DefaultParams().TransactionToLiveInterval)
+	assert.Equal(t, defaultConf.Store.SortitionCacheSize, param.DefaultParams().SortitionInterval)
+	assert.Equal(t, defaultConf.Store.AccountCacheSize, 1024)
+	assert.Equal(t, defaultConf.Store.PublicKeyCacheSize, 1024)
 }
 
 func TestNodeConfigBasicCheck(t *testing.T) {

go.mod

@@ -4,6 +4,7 @@ go 1.21
 
 require (
 	github.com/fxamacker/cbor/v2 v2.5.0
+	github.com/gofrs/flock v0.8.1
 	github.com/google/uuid v1.4.0
 	github.com/gorilla/handlers v1.5.1
 	github.com/gorilla/mux v1.8.0
@@ -53,7 +54,6 @@ require (
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
-	github.com/gofrs/flock v0.8.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect

node/node.go

@@ -155,6 +155,7 @@ func (n *Node) Stop() {
 }
 
 // these methods are using by GUI.
+
 func (n *Node) ConsManager() consensus.ManagerReader {
 	return n.consMgr
 }

node/node_test.go

@@ -30,7 +30,7 @@ func TestRunningNode(t *testing.T) {
 	gen := genesis.MakeGenesis(util.Now(),
 		map[crypto.Address]*account.Account{crypto.TreasuryAddress: acc},
 		[]*validator.Validator{val}, param.DefaultParams())
-	conf := config.DefaultConfigMainnet()
+	conf := config.DefaultConfigMainnet(param.DefaultParams())
 	conf.GRPC.Enable = false
 	conf.HTTP.Enable = false
 	conf.Store.Path = util.TempDirPath()

sandbox/sandbox.go

@@ -277,18 +277,14 @@ func (sb *sandbox) PowerDelta() int64 {
 
 // VerifyProof verifies proof of a sortition transaction.
 func (sb *sandbox) VerifyProof(blockHeight uint32, proof sortition.Proof, val *validator.Validator) bool {
-	committedBlock, err := sb.store.Block(blockHeight)
-	if err != nil {
-		return false
-	}
-	// TODO: improvement:
-	// We can get the sortition seed without parsing the block
-	blk, err := committedBlock.ToBlock()
-	if err != nil {
+	sb.lk.RLock()
+	defer sb.lk.RUnlock()
+
+	seed := sb.store.SortitionSeed(blockHeight)
+	if seed == nil {
 		return false
 	}
-	seed := blk.Header().SortitionSeed()
-	return sortition.VerifyProof(seed, proof, val.PublicKey(), sb.totalPower, val.Power())
+	return sortition.VerifyProof(*seed, proof, val.PublicKey(), sb.totalPower, val.Power())
 }
 
 func (sb *sandbox) CommitTransaction(trx *tx.Tx) {