Merge pull request #497 from oasisprotocol/andrew7234/bugfix-total-su…

…pply-change bugfix: initialize possibleToken fields
oasisprotocol · Aug 7, 2023 · f3354c0 · f3354c0
2 parents 803ca11 + 137d753
commit f3354c0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/analyzer/runtime/evm/client.go b/analyzer/runtime/evm/client.go
@@ -37,7 +37,7 @@ const NativeRuntimeTokenAddress = "oasis1runt1menat1vet0ken000000000000000000000
 
 type EVMPossibleToken struct {
 	Mutated           bool
-	TotalSupplyChange *big.Int
+	TotalSupplyChange big.Int
 }
 
 type EVMTokenData struct {

diff --git a/analyzer/runtime/extract.go b/analyzer/runtime/extract.go
@@ -751,22 +751,20 @@ func extractEvents(blockData *BlockData, relatedAccountAddresses map[apiTypes.Ad
 					}
 					// TODO: Reckon ownership.
 					if _, ok := blockData.PossibleTokens[eventAddr]; !ok {
-						blockData.PossibleTokens[eventAddr] = &evm.EVMPossibleToken{
-							TotalSupplyChange: &big.Int{},
-						}
+						blockData.PossibleTokens[eventAddr] = &evm.EVMPossibleToken{}
 					}
 					// Mark as mutated if transfer is between zero address
 					// and nonzero address (either direction) and nonzero
 					// amount. These will change the total supply as mint/
 					// burn.
 					if fromZero && !toZero && tokenID.Cmp(&big.Int{}) != 0 {
 						pt := blockData.PossibleTokens[eventAddr]
-						pt.TotalSupplyChange.Add(pt.TotalSupplyChange, big.NewInt(1))
+						pt.TotalSupplyChange.Add(&pt.TotalSupplyChange, big.NewInt(1))
 						pt.Mutated = true
 					}
 					if !fromZero && toZero && tokenID.Cmp(&big.Int{}) != 0 {
 						pt := blockData.PossibleTokens[eventAddr]
-						pt.TotalSupplyChange.Sub(pt.TotalSupplyChange, big.NewInt(1))
+						pt.TotalSupplyChange.Sub(&pt.TotalSupplyChange, big.NewInt(1))
 						pt.Mutated = true
 					}
 					eventData.EvmLogName = evmabi.ERC721.Events["Transfer"].Name

diff --git a/analyzer/runtime/runtime.go b/analyzer/runtime/runtime.go
@@ -286,24 +286,21 @@ func (m *processor) queueDbUpdates(batch *storage.QueryBatch, data *BlockData) {
 
 	// Insert EVM token addresses.
 	for addr, possibleToken := range data.PossibleTokens {
-		totalSupply := "0"
-		if possibleToken.TotalSupplyChange != nil {
-			totalSupply = possibleToken.TotalSupplyChange.String()
-		}
+		totalSupplyChange := possibleToken.TotalSupplyChange.String()
 		if possibleToken.Mutated {
-			batch.Queue(queries.RuntimeEVMTokenAnalysisMutateUpsert, m.runtime, addr, totalSupply, data.Header.Round)
+			batch.Queue(queries.RuntimeEVMTokenAnalysisMutateUpsert, m.runtime, addr, totalSupplyChange, data.Header.Round)
 		} else {
-			batch.Queue(queries.RuntimeEVMTokenAnalysisInsert, m.runtime, addr, totalSupply, data.Header.Round)
+			batch.Queue(queries.RuntimeEVMTokenAnalysisInsert, m.runtime, addr, totalSupplyChange, data.Header.Round)
 		}
 		// Dead reckon total_supply because it's optional for ERC721 contracts.
 		// If the evm_tokens analyzer is able to fetch the total supply from the node,
 		// it will supersede this.
-		if possibleToken.TotalSupplyChange != nil && possibleToken.TotalSupplyChange.Cmp(&big.Int{}) != 0 {
+		if possibleToken.TotalSupplyChange.Cmp(&big.Int{}) != 0 {
 			batch.Queue(
 				queries.RuntimeEVMTokenTotalSupplyChangeUpdate,
 				m.runtime,
 				addr,
-				possibleToken.TotalSupplyChange.String(),
+				totalSupplyChange,
 			)
 		}
 	}