From ff9aeb53f7e21c3f19565c0fd71ada81eb63ce59 Mon Sep 17 00:00:00 2001 From: ramil Date: Wed, 23 Jun 2021 16:40:57 +0300 Subject: [PATCH 1/2] in PoA networks there is no block and uncle rewards --- statediff/indexer/indexer.go | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/statediff/indexer/indexer.go b/statediff/indexer/indexer.go index 942bf1952..c1d7a7d53 100644 --- a/statediff/indexer/indexer.go +++ b/statediff/indexer/indexer.go @@ -119,7 +119,13 @@ func (sdi *StateDiffIndexer) PushBlock(block *types.Block, receipts types.Receip return nil, fmt.Errorf("expected number of transactions (%d), transaction trie nodes (%d), receipts (%d), and receipt trie nodes (%d)to be equal", len(txNodes), len(txTrieNodes), len(rctNodes), len(rctTrieNodes)) } // Calculate reward - reward := CalcEthBlockReward(block.Header(), block.Uncles(), block.Transactions(), receipts) + var reward *big.Int + // in PoA networks block reward is 0 + if sdi.chainConfig.Clique != nil { + reward = big.NewInt(0) + } else { + reward = CalcEthBlockReward(block.Header(), block.Uncles(), block.Transactions(), receipts) + } t = time.Now() // Begin new db tx for everything tx, err := sdi.dbWriter.db.Beginx() @@ -238,7 +244,13 @@ func (sdi *StateDiffIndexer) processUncles(tx *sqlx.Tx, headerID int64, blockNum if err := shared.PublishIPLD(tx, uncleNode); err != nil { return fmt.Errorf("error publishing uncle IPLD: %v", err) } - uncleReward := CalcUncleMinerReward(blockNumber, uncleNode.Number.Uint64()) + var uncleReward *big.Int + // in PoA networks uncle reward is 0 + if sdi.chainConfig.Clique != nil { + uncleReward = big.NewInt(0) + } else { + uncleReward = CalcUncleMinerReward(blockNumber, uncleNode.Number.Uint64()) + } uncle := models.UncleModel{ CID: uncleNode.Cid().String(), MhKey: shared.MultihashKeyFromCID(uncleNode.Cid()), -- 2.45.2 From 36e0738e7304238ea531a58f0171a4dc6cb90e4f Mon Sep 17 00:00:00 2001 From: ramil Date: Wed, 23 Jun 2021 23:26:32 +0300 Subject: [PATCH 2/2] bump meta version --- params/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/params/version.go b/params/version.go index dd05c4982..db724e9eb 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ const ( VersionMajor = 1 // Major version component of the current release VersionMinor = 10 // Minor version component of the current release VersionPatch = 3 // Patch version component of the current release - VersionMeta = "statediff-0.0.23" // Version metadata to append to the version string + VersionMeta = "statediff-0.0.24" // Version metadata to append to the version string ) // Version holds the textual version string. -- 2.45.2