From 753e8ff7f57ae6a342032d90c8d6369a7920a47c Mon Sep 17 00:00:00 2001 From: Aayush Rajasekaran Date: Tue, 24 Mar 2020 02:50:20 -0400 Subject: [PATCH] Award gas fees to miners correctly --- chain/stmgr/stmgr.go | 3 ++- chain/vm/validation_test.go | 4 +--- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/chain/stmgr/stmgr.go b/chain/stmgr/stmgr.go index 6894b8fd3..b65de7e1d 100644 --- a/chain/stmgr/stmgr.go +++ b/chain/stmgr/stmgr.go @@ -174,7 +174,7 @@ func (sm *StateManager) ApplyBlocks(ctx context.Context, pstate cid.Cid, bms []B vmi.SetBlockMiner(b.Miner) penalty := types.NewInt(0) - gasReward := types.NewInt(0) + gasReward := big.Zero() for _, cm := range append(b.BlsMessages, b.SecpkMessages...) { m := cm.VMMessage() @@ -198,6 +198,7 @@ func (sm *StateManager) ApplyBlocks(ctx context.Context, pstate cid.Cid, bms []B } receipts = append(receipts, &r.MessageReceipt) + gasReward = big.Add(gasReward, big.NewInt(r.GasUsed)) if cb != nil { if err := cb(cm.Cid(), m, r); err != nil { diff --git a/chain/vm/validation_test.go b/chain/vm/validation_test.go index c15b15a74..feb06810a 100644 --- a/chain/vm/validation_test.go +++ b/chain/vm/validation_test.go @@ -8,7 +8,6 @@ import ( "testing" suites "github.com/filecoin-project/chain-validation/suites" - "github.com/filecoin-project/chain-validation/suites/message" "github.com/filecoin-project/chain-validation/suites/tipset" factory "github.com/filecoin-project/lotus/chain/validation" @@ -37,11 +36,10 @@ func init() { // initialize the test skipper with tests being skipped TestSuiteSkipper = TestSkipper{testSkips: []suites.TestCase{ /* tests to skip go here */ - tipset.TestInvalidSenderAddress, tipset.TestBlockMessageDeduplication, tipset.TestMinerSubmitFallbackPoSt, tipset.TestMinerMissPoStChallengeWindow, - message.TestNestedSends, + tipset.TestMinerRewardsAndPenalties, }} } diff --git a/go.mod b/go.mod index e376866f5..f6b62393d 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/coreos/go-systemd/v22 v22.0.0 github.com/davidlazar/go-crypto v0.0.0-20190912175916-7055855a373f // indirect github.com/docker/go-units v0.4.0 - github.com/filecoin-project/chain-validation v0.0.6-0.20200322224124-43046d8bc33f + github.com/filecoin-project/chain-validation v0.0.6-0.20200324001434-7c1ecd76e3eb github.com/filecoin-project/filecoin-ffi v0.0.0-20200304181354-4446ff8a1bb9 github.com/filecoin-project/go-address v0.0.2-0.20200218010043-eb9bb40ed5be github.com/filecoin-project/go-amt-ipld/v2 v2.0.1-0.20200131012142-05d80eeccc5e diff --git a/go.sum b/go.sum index 730bb41df..06866109a 100644 --- a/go.sum +++ b/go.sum @@ -97,8 +97,8 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/fatih/color v1.8.0 h1:5bzFgL+oy7JITMTxUPJ00n7VxmYd/PdMp5mHFX40/RY= github.com/fatih/color v1.8.0/go.mod h1:3l45GVGkyrnYNl9HoIjnp2NnNWvh6hLAqD8yTfGjnw8= -github.com/filecoin-project/chain-validation v0.0.6-0.20200322224124-43046d8bc33f h1:+Hx42GMXOSd2masNH5MLnmd+I8mmHAqPOUErqV8UtC0= -github.com/filecoin-project/chain-validation v0.0.6-0.20200322224124-43046d8bc33f/go.mod h1:YTLxUr6gOZpkUaXzLe7OZ4s1dpfJGp2FY/J2/K5DJqc= +github.com/filecoin-project/chain-validation v0.0.6-0.20200324001434-7c1ecd76e3eb h1:tynvU1AYRXYAzRrMX6VZGYgUg3+/lweulbAyeZqET/I= +github.com/filecoin-project/chain-validation v0.0.6-0.20200324001434-7c1ecd76e3eb/go.mod h1:YTLxUr6gOZpkUaXzLe7OZ4s1dpfJGp2FY/J2/K5DJqc= github.com/filecoin-project/go-address v0.0.0-20200107215422-da8eea2842b5/go.mod h1:SAOwJoakQ8EPjwNIsiakIQKsoKdkcbx8U3IapgCg9R0= github.com/filecoin-project/go-address v0.0.2-0.20200218010043-eb9bb40ed5be h1:TooKBwR/g8jG0hZ3lqe9S5sy2vTUcLOZLlz3M5wGn2E= github.com/filecoin-project/go-address v0.0.2-0.20200218010043-eb9bb40ed5be/go.mod h1:SAOwJoakQ8EPjwNIsiakIQKsoKdkcbx8U3IapgCg9R0=