Fixed UTXO indexer and organized index by address and block height

Bugfix: Make indexer reorg look exactly like SetCurrentHeader
dominant-strategies · Oct 25, 2024 · e0216d9 · e0216d9
1 parent f9a2078
commit e0216d9
Show file tree

Hide file tree

Showing 20 changed files with 715 additions and 1,399 deletions.
diff --git a/common/proto_common.pb.go b/common/proto_common.pb.go
diff --git a/consensus/blake3pow/consensus.go b/consensus/blake3pow/consensus.go
@@ -638,7 +638,7 @@ func (blake3pow *Blake3pow) Finalize(chain consensus.ChainHeaderReader, batch et
 				continue
 			}
 		}
-		addressOutpointMap := make(map[string]map[string]*types.OutpointAndDenomination)
+		addressOutpointMap := make(map[[20]byte][]*types.OutpointAndDenomination)
 		core.AddGenesisUtxos(chain.Database(), &utxosCreate, nodeLocation, addressOutpointMap, blake3pow.logger)
 		if chain.Config().IndexAddressUtxos {
 			chain.WriteAddressOutpoints(addressOutpointMap)

diff --git a/consensus/consensus.go b/consensus/consensus.go
@@ -105,7 +105,7 @@ type ChainHeaderReader interface {
 	UpdateEtxEligibleSlices(header *types.WorkObject, location common.Location) common.Hash
 
 	// WriteAddressOutpoints writes the address outpoints to the database
-	WriteAddressOutpoints(outpointsMap map[string]map[string]*types.OutpointAndDenomination) error
+	WriteAddressOutpoints(outpointsMap map[[20]byte][]*types.OutpointAndDenomination) error
 
 	// WorkShareDistance calculates the geodesic distance between the
 	// workshare and the workobject in which that workshare is included.

diff --git a/consensus/progpow/consensus.go b/consensus/progpow/consensus.go
@@ -696,7 +696,7 @@ func (progpow *Progpow) Finalize(chain consensus.ChainHeaderReader, batch ethdb.
 				continue
 			}
 		}
-		addressOutpointMap := make(map[string]map[string]*types.OutpointAndDenomination)
+		addressOutpointMap := make(map[[20]byte][]*types.OutpointAndDenomination)
 		core.AddGenesisUtxos(chain.Database(), &utxosCreate, nodeLocation, addressOutpointMap, progpow.logger)
 		if chain.Config().IndexAddressUtxos {
 			chain.WriteAddressOutpoints(addressOutpointMap)