Merge pull request #3725 from filecoin-project/asr/specs-update-0.9.8

Update to specs-actors v0.9.8

CHANGELOG.md

@@ -1,60 +1,5 @@
 # Lotus changelog
 
-# 0.7.0 / 2020-09-10
-
-This consensus-breaking release of Lotus is designed to test a network upgrade on the space race testnet. The changes that break consensus are:
-
-- Upgrading the Drand network used from the test Drand network to the League of Entropy main drand network. This is the same Drand network that will be used in the Filecoin mainnet.
-- Upgrading to specs-actors v0.9.8, which adds a new method to the Multisig actor.
-
-## Changes
-
-#### Core Lotus
-
-- Fix IsAncestorOf (https://github.com/filecoin-project/lotus/pull/3717)
-- Update to specs-actors v0.9.8 (https://github.com/filecoin-project/lotus/pull/3725)
-- Increase chain throughput by 20% (https://github.com/filecoin-project/lotus/pull/3732)
-- Updare to go-libp2p-pubsub `master` (https://github.com/filecoin-project/lotus/pull/3735)
-- Drand upgrade (https://github.com/filecoin-project/lotus/pull/3670)
-- Multisig API additions (https://github.com/filecoin-project/lotus/pull/3590)
-
-#### Storage Miner 
-
-- Increase the number of times precommit2 is attempted before moving back to precommit1 (https://github.com/filecoin-project/lotus/pull/3720)
-
-#### Message pool
-
-- Relax mpool add strictness checks for local pushes (https://github.com/filecoin-project/lotus/pull/3724)
-
-
-#### Maintenance
-
-- Fix devnets (https://github.com/filecoin-project/lotus/pull/3712)
-- Fix(chainwatch): compare prev miner with cur miner (https://github.com/filecoin-project/lotus/pull/3715)
-- CI: fix statediff build; make optional (https://github.com/filecoin-project/lotus/pull/3729)
-- Feat: Chaos abort (https://github.com/filecoin-project/lotus/pull/3733)
-
-## Contributors
-
-The following contributors had commits go into this release.
-We are grateful for every contribution!
-
-| Contributor        | Commits | Lines ±       |
-|--------------------|---------|---------------|
-| arajasek           | 28      | +1144/-239    |
-| Kubuxu             | 19      | +452/-261     |
-| whyrusleeping      | 13      | +456/-87      |
-| vyzo               | 11      | +318/-20      |
-| raulk              | 10      | +1289/-350    |
-| magik6k            | 6       | +188/-55      |
-| dirkmc             | 3       | +31/-8        |
-| alanshaw           | 3       | +176/-37      |
-| Stebalien          | 2       | +9/-12        |
-| lanzafame          | 1       | +1/-1         |
-| frrist             | 1       | +1/-1         |
-| mishmosh           | 1       | +1/-1         |
-| nonsense           | 1       | +1/-0         |
-
 # 0.6.2 / 2020-09-09
 
 This release introduces some critical fixes to message selection and gas estimation logic. It also adds the ability for nodes to mark a certain tipset as checkpointed, as well as various minor improvements and bugfixes.
@@ -93,6 +38,7 @@ This release introduces some critical fixes to message selection and gas estimat
 - Paych: add docs on how to use paych status (https://github.com/filecoin-project/lotus/pull/3690)
 - Initial CODEOWNERS (https://github.com/filecoin-project/lotus/pull/3691)
 
+
 # 0.6.1 / 2020-09-08
 
 This optional release introduces a minor improvement to the sync process, ensuring nodes don't fall behind and then resync.

build/bootstrap/bootstrappers.pi

@@ -1,4 +1,6 @@
-/dns4/bootstrap-0.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWH18xUp3ywhrxdt1NKPKdKJN9PUUoWVvghf7SHig7tabB
-/dns4/bootstrap-1.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWPPYqe8dNkcvqDbdFUZkq6FAgjUYgZ5UCb8JEXVpvYpeW
-/dns4/bootstrap-2.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWANTw75WxNzbM699kNPSjoV7P9T82nX5Mk9cb2Phxx7U1
-/dns4/bootstrap-3.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWBxkzgLoqiXrNaCcHf3NW3LCrQfwp41GVK288cric8MvC
+/dns4/bootstrap-0.testnet.fildev.network/tcp/1347/p2p/12D3KooWJTUBUjtzWJGWU1XSiY21CwmHaCNLNYn2E7jqHEHyZaP7
+/dns4/bootstrap-1.testnet.fildev.network/tcp/1347/p2p/12D3KooW9yeKXha4hdrJKq74zEo99T8DhriQdWNoojWnnQbsgB3v
+/dns4/bootstrap-2.testnet.fildev.network/tcp/1347/p2p/12D3KooWCrx8yVG9U9Kf7w8KLN3Edkj5ZKDhgCaeMqQbcQUoB6CT
+/dns4/bootstrap-4.testnet.fildev.network/tcp/1347/p2p/12D3KooWPkL9LrKRQgHtq7kn9ecNhGU9QaziG8R5tX8v9v7t3h34
+/dns4/bootstrap-3.testnet.fildev.network/tcp/1347/p2p/12D3KooWKYSsbpgZ3HAjax5M1BXCwXLa6gVkUARciz7uN3FNtr7T
+/dns4/bootstrap-5.testnet.fildev.network/tcp/1347/p2p/12D3KooWQYzqnLASJAabyMpPb1GcWZvNSe7JDcRuhdRqonFoiK9W

build/params_testnet.go

@@ -13,28 +13,21 @@ import (
 )
 
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
-	0: DrandMainnet,
+	0:                  DrandIncentinet,
+	UpgradeSmokeHeight: DrandMainnet,
 }
 
-const UpgradeBreezeHeight = -1
+const UpgradeBreezeHeight = 41280
 const BreezeGasTampingDuration = 120
 
-const UpgradeSmokeHeight = -1
+const UpgradeSmokeHeight = 51000
 
 func init() {
-	// Minimum block production power is set to 4 TiB
-	// Rationale is to discourage small-scale miners from trying to take over the network
-	// One needs to invest in ~2.3x the compute to break consensus, making it not worth it
-	//
-	// DOWNSIDE: the fake-seals need to be kept alive/protected, otherwise network will seize
-	//
-	power.ConsensusMinerMinPower = big.NewInt(4 << 40)
+	power.ConsensusMinerMinPower = big.NewInt(10 << 40)
 	miner.SupportedProofTypes = map[abi.RegisteredSealProof]struct{}{
-		abi.RegisteredSealProof_StackedDrg512MiBV1: {},
-		abi.RegisteredSealProof_StackedDrg32GiBV1:  {},
-		abi.RegisteredSealProof_StackedDrg64GiBV1:  {},
+		abi.RegisteredSealProof_StackedDrg32GiBV1: {},
+		abi.RegisteredSealProof_StackedDrg64GiBV1: {},
 	}
-	miner.PreCommitChallengeDelay = abi.ChainEpoch(10)
 }
 
 const BlockDelaySecs = uint64(builtin.EpochDurationSeconds)

build/version.go

@@ -29,7 +29,7 @@ func buildType() string {
 }
 
 // BuildVersion is the local build version, set by build system
-const BuildVersion = "0.7.0"
+const BuildVersion = "0.6.2"
 
 func UserVersion() string {
 	return BuildVersion + buildType() + CurrentCommit

chain/gen/gen.go

@@ -358,7 +358,7 @@ func (cg *ChainGen) nextBlockProof(ctx context.Context, pts *types.TipSet, m add
 		return nil, nil, nil, xerrors.Errorf("failed to cbor marshal address: %w", err)
 	}
 
-	if round > build.UpgradeSmokeHeight {
+	if len(entries) == 0 {
 		buf.Write(pts.MinTicket().VRFProof)
 	}
 

chain/store/basefee.go

@@ -11,20 +11,14 @@ import (
 	"golang.org/x/xerrors"
 )
 
-func ComputeNextBaseFee(baseFee types.BigInt, gasLimitUsed int64, noOfBlocks int, epoch abi.ChainEpoch) types.BigInt {
-	// deta := gasLimitUsed/noOfBlocks - build.BlockGasTarget
-	// change := baseFee * deta / BlockGasTarget
+func computeNextBaseFee(baseFee types.BigInt, gasLimitUsed int64, noOfBlocks int) types.BigInt {
+	// deta := 1/PackingEfficiency * gasLimitUsed/noOfBlocks - build.BlockGasTarget
+	// change := baseFee * deta / BlockGasTarget / BaseFeeMaxChangeDenom
 	// nextBaseFee = baseFee + change
 	// nextBaseFee = max(nextBaseFee, build.MinimumBaseFee)
 
-	var delta int64
-	if epoch > build.UpgradeSmokeHeight {
-		delta = gasLimitUsed / int64(noOfBlocks)
-		delta -= build.BlockGasTarget
-	} else {
-		delta = build.PackingEfficiencyDenom * gasLimitUsed / (int64(noOfBlocks) * build.PackingEfficiencyNum)
-		delta -= build.BlockGasTarget
-	}
+	delta := build.PackingEfficiencyDenom * gasLimitUsed / (int64(noOfBlocks) * build.PackingEfficiencyNum)
+	delta -= build.BlockGasTarget
 
 	// cap change at 12.5% (BaseFeeMaxChangeDenom) by capping delta
 	if delta > build.BlockGasTarget {
@@ -79,5 +73,5 @@ func (cs *ChainStore) ComputeBaseFee(ctx context.Context, ts *types.TipSet) (abi
 	}
 	parentBaseFee := ts.Blocks()[0].ParentBaseFee
 
-	return ComputeNextBaseFee(parentBaseFee, totalLimit, len(ts.Blocks()), ts.Height()), nil
+	return computeNextBaseFee(parentBaseFee, totalLimit, len(ts.Blocks())), nil
 }

chain/store/basefee_test.go

@@ -27,7 +27,7 @@ func TestBaseFee(t *testing.T) {
 	for _, test := range tests {
 		test := test
 		t.Run(fmt.Sprintf("%v", test), func(t *testing.T) {
-			output := ComputeNextBaseFee(types.NewInt(test.basefee), test.limitUsed, test.noOfBlocks, 0)
+			output := computeNextBaseFee(types.NewInt(test.basefee), test.limitUsed, test.noOfBlocks)
 			assert.Equal(t, fmt.Sprintf("%d", test.output), output.String())
 		})
 	}

chain/sync.go

@@ -891,12 +891,10 @@ func (syncer *Syncer) ValidateBlock(ctx context.Context, b *types.FullBlock) (er
 			return xerrors.Errorf("failed to marshal miner address to cbor: %w", err)
 		}
 
-		if h.Height > build.UpgradeSmokeHeight {
-			buf.Write(baseTs.MinTicket().VRFProof)
-		}
-
 		beaconBase := *prevBeacon
-		if len(h.BeaconEntries) != 0 {
+		if len(h.BeaconEntries) == 0 {
+			buf.Write(baseTs.MinTicket().VRFProof)
+		} else {
 			beaconBase = h.BeaconEntries[len(h.BeaconEntries)-1]
 		}
 

cmd/lotus/debug_advance.go

@@ -46,7 +46,6 @@ func init() {
 					return xerrors.Errorf("StateMinerWorker: %w", err)
 				}
 
-				// XXX: This can't be right
 				rand, err := api.ChainGetRandomnessFromTickets(ctx, head.Key(), crypto.DomainSeparationTag_TicketProduction, head.Height(), addr.Bytes())
 				if err != nil {
 					return xerrors.Errorf("failed to get randomness: %w", err)

miner/miner.go

@@ -362,7 +362,7 @@ func (m *Miner) mineOne(ctx context.Context, base *MiningBase) (*types.BlockMsg,
 		rbase = bvals[len(bvals)-1]
 	}
 
-	ticket, err := m.computeTicket(ctx, &rbase, base)
+	ticket, err := m.computeTicket(ctx, &rbase, base, len(bvals) > 0)
 	if err != nil {
 		return nil, xerrors.Errorf("scratching ticket failed: %w", err)
 	}
@@ -432,7 +432,7 @@ func (m *Miner) mineOne(ctx context.Context, base *MiningBase) (*types.BlockMsg,
 	return b, nil
 }
 
-func (m *Miner) computeTicket(ctx context.Context, brand *types.BeaconEntry, base *MiningBase) (*types.Ticket, error) {
+func (m *Miner) computeTicket(ctx context.Context, brand *types.BeaconEntry, base *MiningBase, haveNewEntries bool) (*types.Ticket, error) {
 	mi, err := m.api.StateMinerInfo(ctx, m.address, types.EmptyTSK)
 	if err != nil {
 		return nil, err
@@ -447,12 +447,11 @@ func (m *Miner) computeTicket(ctx context.Context, brand *types.BeaconEntry, bas
 		return nil, xerrors.Errorf("failed to marshal address to cbor: %w", err)
 	}
 
-	round := base.TipSet.Height() + base.NullRounds + 1
-	if round > build.UpgradeSmokeHeight {
+	if !haveNewEntries {
 		buf.Write(base.TipSet.MinTicket().VRFProof)
 	}
 
-	input, err := store.DrawRandomness(brand.Data, crypto.DomainSeparationTag_TicketProduction, round-build.TicketRandomnessLookback, buf.Bytes())
+	input, err := store.DrawRandomness(brand.Data, crypto.DomainSeparationTag_TicketProduction, base.TipSet.Height()+base.NullRounds+1-build.TicketRandomnessLookback, buf.Bytes())
 	if err != nil {
 		return nil, err
 	}

tools/stats/metrics.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"math"
 	"math/big"
 	"strings"
 	"time"
@@ -13,7 +12,6 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/build"
-	"github.com/filecoin-project/lotus/chain/store"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/specs-actors/actors/builtin"
 	"github.com/filecoin-project/specs-actors/actors/builtin/power"
@@ -133,6 +131,12 @@ func RecordTipsetPoints(ctx context.Context, api api.FullNode, pl *PointList, ti
 	p = NewPoint("chain.blocktime", tsTime.Unix())
 	pl.AddPoint(p)
 
+	baseFeeBig := tipset.Blocks()[0].ParentBaseFee.Copy()
+	baseFeeRat := new(big.Rat).SetFrac(baseFeeBig.Int, new(big.Int).SetUint64(build.FilecoinPrecision))
+	baseFeeFloat, _ := baseFeeRat.Float64()
+	p = NewPoint("chain.basefee", baseFeeFloat)
+	pl.AddPoint(p)
+
 	totalGasLimit := int64(0)
 	totalUniqGasLimit := int64(0)
 	seen := make(map[cid.Cid]struct{})
@@ -174,30 +178,6 @@ func RecordTipsetPoints(ctx context.Context, api api.FullNode, pl *PointList, ti
 	p = NewPoint("chain.gas_limit_uniq_total", totalUniqGasLimit)
 	pl.AddPoint(p)
 
-	{
-		baseFeeIn := tipset.Blocks()[0].ParentBaseFee
-		newBaseFee := store.ComputeNextBaseFee(baseFeeIn, totalUniqGasLimit, len(tipset.Blocks()), tipset.Height())
-
-		baseFeeRat := new(big.Rat).SetFrac(newBaseFee.Int, new(big.Int).SetUint64(build.FilecoinPrecision))
-		baseFeeFloat, _ := baseFeeRat.Float64()
-		p = NewPoint("chain.basefee", baseFeeFloat)
-		pl.AddPoint(p)
-
-		baseFeeChange := new(big.Rat).SetFrac(newBaseFee.Int, baseFeeIn.Int)
-		baseFeeChangeF, _ := baseFeeChange.Float64()
-		p = NewPoint("chain.basefee_change_log", math.Log(baseFeeChangeF)/math.Log(1.125))
-		pl.AddPoint(p)
-	}
-	{
-		blks := len(cids)
-		p = NewPoint("chain.gas_fill_ratio", float64(totalGasLimit)/float64(blks*build.BlockGasTarget))
-		pl.AddPoint(p)
-		p = NewPoint("chain.gas_capacity_ratio", float64(totalUniqGasLimit)/float64(blks*build.BlockGasTarget))
-		pl.AddPoint(p)
-		p = NewPoint("chain.gas_waste_ratio", float64(totalGasLimit-totalUniqGasLimit)/float64(blks*build.BlockGasTarget))
-		pl.AddPoint(p)
-	}
-
 	return nil
 }