Ln/replace best chain with block index

cmd/config.go

@@ -94,7 +94,8 @@ type Config struct {
 func GetStringSliceWorkaround(flagName string) []string {
 	value := viper.GetString(flagName)
 	if value == "" || value == " " {
-		return []string{}
+		values := viper.GetStringSlice(flagName)
+		return values
 	}
 	return strings.Split(value, ",")
 }
@@ -147,7 +148,6 @@ func LoadConfig() *Config {
 
 	// Peers
 	config.ConnectIPs = GetStringSliceWorkaround("connect-ips")
-	glog.V(2).Infof("Connect IPs read in: %v", config.ConnectIPs)
 	config.AddIPs = GetStringSliceWorkaround("add-ips")
 	config.AddSeeds = GetStringSliceWorkaround("add-seeds")
 	config.TargetOutboundPeers = viper.GetUint32("target-outbound-peers")
@@ -266,6 +266,7 @@ func (config *Config) Print() {
 		glog.Infof("MaxSyncBlockHeight: %v", config.MaxSyncBlockHeight)
 	}
 
+	glog.Infof("Connect IPs: %s", config.ConnectIPs)
 	if len(config.ConnectIPs) > 0 {
 		glog.Infof("Connect IPs: %s", config.ConnectIPs)
 	}

go.mod

@@ -14,7 +14,6 @@ require (
 	github.com/bxcodec/faker v2.0.1+incompatible
 	github.com/cloudflare/circl v1.5.0
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
-	github.com/decred/dcrd/container/lru v1.0.0
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
 	github.com/deso-protocol/go-deadlock v1.0.1
 	github.com/deso-protocol/go-merkle-tree v1.0.0
@@ -27,6 +26,7 @@ require (
 	github.com/go-pg/pg/v10 v10.13.0
 	github.com/golang/glog v1.2.2
 	github.com/google/uuid v1.6.0
+	github.com/hashicorp/golang-lru/v2 v2.0.3
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/oleiade/lane v1.0.1
 	github.com/onflow/crypto v0.25.2

go.sum

@@ -91,8 +91,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/decred/dcrd/container/lru v1.0.0 h1:7foQymtbu18aQWYiY9RnNIeE+kvpiN+fiBQ3+viyJjI=
-github.com/decred/dcrd/container/lru v1.0.0/go.mod h1:vlPwj0l+IzAHhQSsbgQnJgO5Cte78+yI065V+Mc5PRQ=
 github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
 github.com/decred/dcrd/crypto/blake256 v1.1.0 h1:zPMNGQCm0g4QTY27fOCorQW7EryeQ/U0x++OzVrdms8=
 github.com/decred/dcrd/crypto/blake256 v1.1.0/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo=
@@ -207,6 +205,8 @@ github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4=
 github.com/hashicorp/go-sockaddr v1.0.7 h1:G+pTkSO01HpR5qCxg7lxfsFEZaG+C0VssTy/9dbT+Fw=
 github.com/hashicorp/go-sockaddr v1.0.7/go.mod h1:FZQbEYa1pxkQ7WLpyXJ6cbjpT8q0YgQaK/JakXqGyWw=
+github.com/hashicorp/golang-lru/v2 v2.0.3 h1:kmRrRLlInXvng0SmLxmQpQkpbYAvcXm7NPDrgxJa9mE=
+github.com/hashicorp/golang-lru/v2 v2.0.3/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hashicorp/hcl v1.0.1-vault-5 h1:kI3hhbbyzr4dldA8UdTb7ZlVVlI2DACdCfz31RPDgJM=
 github.com/hashicorp/hcl v1.0.1-vault-5/go.mod h1:XYhtn6ijBSAj6n4YqAaf7RBPS4I06AItNorpy+MoQNM=
 github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u7lxST/RaJw+cv273q79D81Xbog=

lib/block_producer.go

@@ -367,8 +367,8 @@ func (desoBlockProducer *DeSoBlockProducer) _getBlockTemplate(publicKey []byte)
 	blockRet.Header.TransactionMerkleRoot = merkleRoot
 
 	// Compute the next difficulty target given the current tip.
-	diffTarget, err := CalcNextDifficultyTarget(
-		lastNode, CurrentHeaderVersion, desoBlockProducer.params)
+	diffTarget, err := desoBlockProducer.chain.CalcNextDifficultyTarget(
+		lastNode, CurrentHeaderVersion)
 	if err != nil {
 		return nil, nil, nil, errors.Wrapf(err, "DeSoBlockProducer._getBlockTemplate: Problem computing next difficulty: ")
 	}

lib/block_view.go

@@ -5114,6 +5114,7 @@ func (bav *UtxoView) GetSpendableDeSoBalanceNanosForPublicKey(pkBytes []byte,
 			// but we do have the header. As a result, this condition always evaluates to false and thus
 			// we only process the block reward for the previous block instead of all immature block rewards
 			// as defined by the params.
+			// NOTE: we are not using .GetParent here as it changes the meaning of this code.
 			if blockNode.Parent != nil {
 				nextBlockHash = blockNode.Parent.Hash
 			} else {

lib/block_view_lockups_test.go

@@ -2462,7 +2462,7 @@ func TestLockupBlockConnectsAndDisconnects(t *testing.T) {
 	require.NoError(t, utxoView.FlushToDb(blk2.Header.Height))
 
 	// Update the tip
-	testMeta.chain.bestChain = testMeta.chain.bestChain[:len(testMeta.chain.bestChain)-1]
+	testMeta.chain.blockIndex.tip = testMeta.chain.blockIndex.tip.Parent
 
 	// Validate the state update
 	utxoView = NewUtxoView(
@@ -2517,7 +2517,7 @@ func TestLockupBlockConnectsAndDisconnects(t *testing.T) {
 	require.NoError(t, utxoView.FlushToDb(blk1.Header.Height))
 
 	// Update the tip
-	testMeta.chain.bestChain = testMeta.chain.bestChain[:len(testMeta.chain.bestChain)-1]
+	testMeta.chain.blockIndex.setTip(testMeta.chain.blockIndex.tip.Parent)
 
 	// Verify we return back to the initial state
 	utxoView = NewUtxoView(

lib/block_view_test.go

@@ -13,10 +13,10 @@ import (
 	"github.com/deso-protocol/core/bls"
 
 	"github.com/btcsuite/btcd/btcec/v2"
-	"github.com/decred/dcrd/container/lru"
 	"github.com/dgraph-io/badger/v4"
 	embeddedpostgres "github.com/fergusstrange/embedded-postgres"
 	"github.com/golang/glog"
+	"github.com/hashicorp/golang-lru/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -702,8 +702,8 @@ func (tes *transactionTestSuite) testDisconnectBlock(tm *transactionTestMeta, te
 	require.NoError(err)
 	// sanity-check that the last block hash is the same as the last header hash.
 	require.Equal(true, bytes.Equal(
-		tm.chain.bestChain[len(tm.chain.bestChain)-1].Hash.ToBytes(),
-		tm.chain.bestHeaderChain[len(tm.chain.bestHeaderChain)-1].Hash.ToBytes()))
+		tm.chain.blockIndex.GetTip().Hash.ToBytes(),
+		tm.chain.blockIndex.GetHeaderTip().Hash.ToBytes()))
 	// Last block shouldn't be nil, and the number of expectedTxns should be the same as in the testVectorBlock + 1,
 	// because of the additional block reward.
 	require.NotNil(lastBlock)
@@ -791,15 +791,14 @@ func (tes *transactionTestSuite) testDisconnectBlock(tm *transactionTestMeta, te
 	// TODO: if ever needed we can call tm.chain.eventManager.blockDisconnected() here.
 
 	// Update the block and header metadata chains.
-	tm.chain.bestChain = tm.chain.bestChain[:len(tm.chain.bestChain)-1]
-	tm.chain.bestHeaderChain = tm.chain.bestHeaderChain[:len(tm.chain.bestHeaderChain)-1]
-	delete(tm.chain.bestChainMap, *lastBlockHash)
-	delete(tm.chain.bestHeaderChainMap, *lastBlockHash)
+	tm.chain.blockIndex.setTip(tm.chain.BlockTip().GetParent(tm.chain.blockIndex))
+	tm.chain.blockIndex.setHeaderTip(tm.chain.HeaderTip().GetParent(tm.chain.blockIndex))
 
 	// We don't pass the chain's snapshot above to prevent certain concurrency issues. As a
 	// result, we need to reset the snapshot's db cache to get rid of stale data.
 	if tm.chain.snapshot != nil {
-		tm.chain.snapshot.DatabaseCache = *lru.NewMap[string, []byte](DatabaseCacheSize)
+		tm.chain.snapshot.DatabaseCache, err = lru.New[string, []byte](int(DatabaseCacheSize))
+		require.NoError(err)
 	}
 
 	// Note that unlike connecting test vectors, when disconnecting, we don't need to verify db entries.