Make Postgres behave the same as badger for immature block rewards

lib/block_view.go

@@ -485,7 +485,10 @@ func NewUtxoView(
  // not concern itself with the header chain (see comment on GetBestHash for more
  // info on that).
  if view.Postgres != nil {
- view.TipHash = view.Postgres.GetChain(MAIN_CHAIN).TipHash
+ pgChain := view.Postgres.GetChain(MAIN_CHAIN)
+ if pgChain != nil {
+ view.TipHash = view.Postgres.GetChain(MAIN_CHAIN).TipHash
+ }
  } else {
  view.TipHash = DbGetBestHash(view.Handle, view.Snapshot, ChainTypeDeSoBlock /* don't get the header chain */)
  }
@@ -3889,10 +3892,17 @@ func (bav *UtxoView) GetSpendableDeSoBalanceNanosForPublicKey(pkBytes []byte,
  immatureBlockRewards := uint64(0)
 
  if bav.Postgres != nil {
+ // Note: badger is only getting the block reward for the previous block, so we make postgres
+ // do the same thing. This is not ideal, but it is the simplest way to get the same behavior
+ // and we will address the issue soon.
  // Filter out immature block rewards in postgres. UtxoType needs to be set correctly when importing blocks
  var startHeight uint32
- if tipHeight > numImmatureBlocks {
- startHeight = tipHeight - numImmatureBlocks
+ if tipHeight > 0 {
+ startHeight = tipHeight - 1
+ }
+ // This is a special case to support tests where the number of immature blocks is 0.
+ if numImmatureBlocks == 0 {
+ startHeight = tipHeight
  }
  outputs := bav.Postgres.GetBlockRewardsForPublicKey(NewPublicKey(pkBytes), startHeight, tipHeight)
 

lib/block_view_association_test.go

@@ -47,6 +47,11 @@ func _testAssociations(t *testing.T, flushToDB bool) {
 
  // Initialize test chain and miner.
  chain, params, db := NewLowDifficultyBlockchain(t)
+ defer func() {
+ if chain.postgres != nil {
+ require.NoError(t, ResetPostgres(chain.postgres))
+ }
+ }()
  mempool, miner := NewTestMiner(t, chain, params, true)
  params.ForkHeights.AssociationsAndAccessGroupsBlockHeight = uint32(0)
  GlobalDeSoParams.EncoderMigrationHeights = GetEncoderMigrationHeights(&params.ForkHeights)
@@ -2204,6 +2209,11 @@ func _testAssociationsWithDerivedKey(t *testing.T) {
 
  // Initialize test chain and miner.
  chain, params, db := NewLowDifficultyBlockchain(t)
+ defer func() {
+ if chain.postgres != nil {
+ require.NoError(t, ResetPostgres(chain.postgres))
+ }
+ }()
  mempool, miner := NewTestMiner(t, chain, params, true)
 
  // Initialize fork heights.

lib/block_view_dao_coin_limit_order_test.go

@@ -617,6 +617,11 @@ func TestDAOCoinLimitOrder(t *testing.T) {
  // Initialize test chain and miner.
  require := require.New(t)
  chain, params, db := NewLowDifficultyBlockchain(t)
+ defer func() {
+ if chain.postgres != nil {
+ require.NoError(ResetPostgres(chain.postgres))
+ }
+ }()
  mempool, miner := NewTestMiner(t, chain, params, true)
 
  params.ForkHeights.DAOCoinBlockHeight = uint32(0)

lib/block_view_post_test.go

@@ -2108,6 +2108,11 @@ func TestDeSoDiamondErrorCases(t *testing.T) {
 func TestFreezingPosts(t *testing.T) {
  // Initialize blockchain.
  chain, params, db := NewLowDifficultyBlockchain(t)
+ defer func() {
+ if chain.postgres != nil {
+ require.NoError(t, ResetPostgres(chain.postgres))
+ }
+ }()
  params.ForkHeights.AssociationsAndAccessGroupsBlockHeight = 1
  params.EncoderMigrationHeights = GetEncoderMigrationHeights(&params.ForkHeights)
  params.EncoderMigrationHeightsList = GetEncoderMigrationHeightsList(&params.ForkHeights)

lib/postgres.go

@@ -3284,7 +3284,7 @@ func (postgres *Postgres) GetBlockRewardsForPublicKey(publicKey *PublicKey, star
  Where("pg_transaction_output.public_key = ?", publicKey).
  Where("pgt.Type = ?", TxnTypeBlockReward).
  Where("pg_transaction_output.height > ?", startHeight).
- Where("pg_transaction_output.height < ?", endHeight).Select()
+ Where("pg_transaction_output.height <= ?", endHeight).Select()
  if err != nil {
  return nil
  }

lib/postgres_test.go

@@ -103,3 +103,14 @@ func StopTestEmbeddedPostgresDB(epg *embeddedpostgres.EmbeddedPostgres) error {
  }
  return nil
 }
+
+func ResetPostgres(postgres *Postgres) error {
+ migrate.LoadMigrations()
+ if err := migrations.Run(postgres.db, "migrate", []string{"", "rollback"}); err != nil {
+ return errors.Wrapf(err, "StopTestEmbeddedPostgresDB: Problem running rollback")
+ }
+ if err := migrations.Run(postgres.db, "migrate", []string{"", "migrate"}); err != nil {
+ return errors.Wrapf(err, "StopTestEmbeddedPostgresDB: Problem running migrations")
+ }
+ return nil
+}