From f49a8248f0482da329059711cf79c22c747395a1 Mon Sep 17 00:00:00 2001 From: ZenGround0 Date: Thu, 15 Jul 2021 10:43:18 -0400 Subject: [PATCH 01/14] PriceListByVersion --- chain/messagepool/check.go | 4 +--- chain/messagepool/messagepool.go | 3 +-- chain/messagepool/selection.go | 2 +- chain/sync.go | 7 ++++--- chain/vm/gas.go | 29 +++++++++++++---------------- chain/vm/mkactor.go | 2 +- chain/vm/vm.go | 4 ++-- go.mod | 4 ++-- go.sum | 4 ++++ 9 files changed, 29 insertions(+), 30 deletions(-) diff --git a/chain/messagepool/check.go b/chain/messagepool/check.go index 11203e7df..c36b7d0a7 100644 --- a/chain/messagepool/check.go +++ b/chain/messagepool/check.go @@ -107,8 +107,6 @@ func (mp *MessagePool) checkMessages(ctx context.Context, msgs []*types.Message, curTs := mp.curTs mp.curTsLk.Unlock() - epoch := curTs.Height() - var baseFee big.Int if len(curTs.Blocks()) > 0 { baseFee = curTs.Blocks()[0].ParentBaseFee @@ -276,7 +274,7 @@ func (mp *MessagePool) checkMessages(ctx context.Context, msgs []*types.Message, // gas checks // 4. Min Gas - minGas := vm.PricelistByEpoch(epoch).OnChainMessage(m.ChainLength()) + minGas := vm.PricelistByVersion(build.NewestNetworkVersion).OnChainMessage(m.ChainLength()) check = api.MessageCheckStatus{ Cid: m.Cid(), diff --git a/chain/messagepool/messagepool.go b/chain/messagepool/messagepool.go index f6c8e3ac9..9e17b2ff2 100644 --- a/chain/messagepool/messagepool.go +++ b/chain/messagepool/messagepool.go @@ -610,8 +610,7 @@ func (mp *MessagePool) addLocal(ctx context.Context, m *types.SignedMessage) err // For non local messages, if the message cannot be included in the next 20 blocks it returns // a (soft) validation error. func (mp *MessagePool) verifyMsgBeforeAdd(m *types.SignedMessage, curTs *types.TipSet, local bool) (bool, error) { - epoch := curTs.Height() - minGas := vm.PricelistByEpoch(epoch).OnChainMessage(m.ChainLength()) + minGas := vm.PricelistByVersion(build.NewestNetworkVersion).OnChainMessage(m.ChainLength()) if err := m.VMMessage().ValidForBlockInclusion(minGas.Total(), build.NewestNetworkVersion); err != nil { return false, xerrors.Errorf("message will not be included in a block: %w", err) diff --git a/chain/messagepool/selection.go b/chain/messagepool/selection.go index 611ab8e5f..60d75a841 100644 --- a/chain/messagepool/selection.go +++ b/chain/messagepool/selection.go @@ -749,7 +749,7 @@ func (mp *MessagePool) createMessageChains(actor address.Address, mset map[uint6 } curNonce++ - minGas := vm.PricelistByEpoch(ts.Height()).OnChainMessage(m.ChainLength()).Total() + minGas := vm.PricelistByVersion(build.NewestNetworkVersion).OnChainMessage(m.ChainLength()).Total() if m.Message.GasLimit < minGas { break } diff --git a/chain/sync.go b/chain/sync.go index 167856927..5a5362ccd 100644 --- a/chain/sync.go +++ b/chain/sync.go @@ -1054,14 +1054,15 @@ func (syncer *Syncer) checkBlockMessages(ctx context.Context, b *types.FullBlock return xerrors.Errorf("failed to load base state tree: %w", err) } - pl := vm.PricelistByEpoch(baseTs.Height()) + nv := syncer.sm.GetNtwkVersion(ctx, b.Header.Height) + pl := vm.PricelistByVersion(nv) var sumGasLimit int64 checkMsg := func(msg types.ChainMsg) error { m := msg.VMMessage() // Phase 1: syntactic validation, as defined in the spec minGas := pl.OnChainMessage(msg.ChainLength()) - if err := m.ValidForBlockInclusion(minGas.Total(), syncer.sm.GetNtwkVersion(ctx, b.Header.Height)); err != nil { + if err := m.ValidForBlockInclusion(minGas.Total(), nv); err != nil { return err } @@ -1075,7 +1076,7 @@ func (syncer *Syncer) checkBlockMessages(ctx context.Context, b *types.FullBlock // Phase 2: (Partial) semantic validation: // the sender exists and is an account actor, and the nonces make sense var sender address.Address - if syncer.sm.GetNtwkVersion(ctx, b.Header.Height) >= network.Version13 { + if nv >= network.Version13 { sender, err = st.LookupID(m.From) if err != nil { return err diff --git a/chain/vm/gas.go b/chain/vm/gas.go index c860ce9a0..4b840cbf0 100644 --- a/chain/vm/gas.go +++ b/chain/vm/gas.go @@ -3,12 +3,11 @@ package vm import ( "fmt" - "github.com/filecoin-project/lotus/build" - "github.com/filecoin-project/go-address" addr "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/crypto" + "github.com/filecoin-project/go-state-types/network" vmr5 "github.com/filecoin-project/specs-actors/v5/actors/runtime" proof5 "github.com/filecoin-project/specs-actors/v5/actors/runtime/proof" "github.com/ipfs/go-cid" @@ -80,8 +79,8 @@ type Pricelist interface { OnVerifyConsensusFault() GasCharge } -var prices = map[abi.ChainEpoch]Pricelist{ - abi.ChainEpoch(0): &pricelistV0{ +var prices = map[network.Version]Pricelist{ + network.Version0: &pricelistV0{ computeGasMulti: 1, storageGasMulti: 1000, @@ -130,7 +129,7 @@ var prices = map[abi.ChainEpoch]Pricelist{ verifyPostDiscount: true, verifyConsensusFault: 495422, }, - abi.ChainEpoch(build.UpgradeCalicoHeight): &pricelistV0{ + network.Version6: &pricelistV0{ computeGasMulti: 1, storageGasMulti: 1300, @@ -208,21 +207,19 @@ var prices = map[abi.ChainEpoch]Pricelist{ }, } -// PricelistByEpoch finds the latest prices for the given epoch -func PricelistByEpoch(epoch abi.ChainEpoch) Pricelist { - // since we are storing the prices as map or epoch to price - // we need to get the price with the highest epoch that is lower or equal to the `epoch` arg - bestEpoch := abi.ChainEpoch(0) - bestPrice := prices[bestEpoch] - for e, pl := range prices { - // if `e` happened after `bestEpoch` and `e` is earlier or equal to the target `epoch` - if e > bestEpoch && e <= epoch { - bestEpoch = e +// PricelistByVersion finds the latest prices for the given network version +func PricelistByVersion(version network.Version) Pricelist { + bestVersion := network.Version0 + bestPrice := prices[bestVersion] + for nv, pl := range prices { + // if `nv > bestVersion` and `nv <= version` + if nv > bestVersion && nv <= version { + bestVersion = nv bestPrice = pl } } if bestPrice == nil { - panic(fmt.Sprintf("bad setup: no gas prices available for epoch %d", epoch)) + panic(fmt.Sprintf("bad setup: no gas prices available for version %d", version)) } return bestPrice } diff --git a/chain/vm/mkactor.go b/chain/vm/mkactor.go index 669c1450f..9f277bf3e 100644 --- a/chain/vm/mkactor.go +++ b/chain/vm/mkactor.go @@ -41,7 +41,7 @@ var EmptyObjectCid cid.Cid // TryCreateAccountActor creates account actors from only BLS/SECP256K1 addresses. func TryCreateAccountActor(rt *Runtime, addr address.Address) (*types.Actor, address.Address, aerrors.ActorError) { - if err := rt.chargeGasSafe(PricelistByEpoch(rt.height).OnCreateActor()); err != nil { + if err := rt.chargeGasSafe(PricelistByVersion(rt.NetworkVersion()).OnCreateActor()); err != nil { return nil, address.Undef, err } diff --git a/chain/vm/vm.go b/chain/vm/vm.go index 5a31187b7..2746d5f17 100644 --- a/chain/vm/vm.go +++ b/chain/vm/vm.go @@ -135,7 +135,7 @@ func (vm *VM) makeRuntime(ctx context.Context, msg *types.Message, parent *Runti gasAvailable: msg.GasLimit, depth: 0, numActorsCreated: 0, - pricelist: PricelistByEpoch(vm.blockHeight), + pricelist: PricelistByVersion(vm.ntwkVersion(ctx, vm.blockHeight)), allowInternal: true, callerValidated: false, executionTrace: types.ExecutionTrace{Msg: msg}, @@ -424,7 +424,7 @@ func (vm *VM) ApplyMessage(ctx context.Context, cmsg types.ChainMsg) (*ApplyRet, return nil, err } - pl := PricelistByEpoch(vm.blockHeight) + pl := PricelistByVersion(vm.ntwkVersion(ctx, vm.blockHeight)) msgGas := pl.OnChainMessage(cmsg.ChainLength()) msgGasCost := msgGas.Total() diff --git a/go.mod b/go.mod index 198b862e6..97fd416d0 100644 --- a/go.mod +++ b/go.mod @@ -40,7 +40,7 @@ require ( github.com/filecoin-project/go-multistore v0.0.3 github.com/filecoin-project/go-padreader v0.0.0-20200903213702-ed5fae088b20 github.com/filecoin-project/go-paramfetch v0.0.2-0.20210614165157-25a6c7769498 - github.com/filecoin-project/go-state-types v0.1.1-0.20210506134452-99b279731c48 + github.com/filecoin-project/go-state-types v0.1.1-0.20210715140315-cb1fb37068fa github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe github.com/filecoin-project/go-statestore v0.1.1 github.com/filecoin-project/go-storedcounter v0.0.0-20200421200003-1c99c62e8a5b @@ -48,7 +48,7 @@ require ( github.com/filecoin-project/specs-actors/v2 v2.3.5 github.com/filecoin-project/specs-actors/v3 v3.1.1 github.com/filecoin-project/specs-actors/v4 v4.0.1 - github.com/filecoin-project/specs-actors/v5 v5.0.1 + github.com/filecoin-project/specs-actors/v5 v5.0.2-0.20210715141705-1c0359c0f993 github.com/filecoin-project/specs-storage v0.1.1-0.20201105051918-5188d9774506 github.com/filecoin-project/test-vectors/schema v0.0.5 github.com/gbrlsnchs/jwt/v3 v3.0.0-beta.1 diff --git a/go.sum b/go.sum index 2624a0d3f..610f6813d 100644 --- a/go.sum +++ b/go.sum @@ -307,6 +307,8 @@ github.com/filecoin-project/go-state-types v0.0.0-20201102161440-c8033295a1fc/go github.com/filecoin-project/go-state-types v0.1.0/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= github.com/filecoin-project/go-state-types v0.1.1-0.20210506134452-99b279731c48 h1:Jc4OprDp3bRDxbsrXNHPwJabZJM3iDy+ri8/1e0ZnX4= github.com/filecoin-project/go-state-types v0.1.1-0.20210506134452-99b279731c48/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= +github.com/filecoin-project/go-state-types v0.1.1-0.20210715140315-cb1fb37068fa h1:m0MPsgTeZfFTZokwocR9WPNHdi7ZIP8pYM4UF6XUu20= +github.com/filecoin-project/go-state-types v0.1.1-0.20210715140315-cb1fb37068fa/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe h1:dF8u+LEWeIcTcfUcCf3WFVlc81Fr2JKg8zPzIbBDKDw= github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe/go.mod h1:FGwQgZAt2Gh5mjlwJUlVB62JeYdo+if0xWxSEfBD9ig= github.com/filecoin-project/go-statestore v0.1.0/go.mod h1:LFc9hD+fRxPqiHiaqUEZOinUJB4WARkRfNl10O7kTnI= @@ -333,6 +335,8 @@ github.com/filecoin-project/specs-actors/v4 v4.0.1/go.mod h1:TkHXf/l7Wyw4ZejyXIP github.com/filecoin-project/specs-actors/v5 v5.0.0-20210512015452-4fe3889fff57/go.mod h1:283yBMMUSDB2abcjP/hhrwTkhb9h3sfM6KGrep/ZlBI= github.com/filecoin-project/specs-actors/v5 v5.0.1 h1:PrYm5AKdMlJ/55eRW5laWcnaX66gyyDYBWvH38kNAMo= github.com/filecoin-project/specs-actors/v5 v5.0.1/go.mod h1:74euMDIXorusOBs/QL/LNkYsXZdDpLJwojWw6T03pdE= +github.com/filecoin-project/specs-actors/v5 v5.0.2-0.20210715141705-1c0359c0f993 h1:Nv+6kuR5S7bZIthv+VpQOKq8Szf9Gze495mjIe43s2k= +github.com/filecoin-project/specs-actors/v5 v5.0.2-0.20210715141705-1c0359c0f993/go.mod h1:9brQ9T9NtldzOSC2e+H7HnkfGU37RDpF0bILE/WOP5I= github.com/filecoin-project/specs-storage v0.1.1-0.20201105051918-5188d9774506 h1:Ur/l2+6qN+lQiqjozWWc5p9UDaAMDZKTlDS98oRnlIw= github.com/filecoin-project/specs-storage v0.1.1-0.20201105051918-5188d9774506/go.mod h1:nJRRM7Aa9XVvygr3W9k6xGF46RWzr2zxF/iGoAIfA/g= github.com/filecoin-project/test-vectors/schema v0.0.5 h1:w3zHQhzM4pYxJDl21avXjOKBLF8egrvwUwjpT8TquDg= From 47b5afa84b3b1758ce3ace296b01ae68ab2e3752 Mon Sep 17 00:00:00 2001 From: ZenGround0 Date: Thu, 15 Jul 2021 11:04:24 -0400 Subject: [PATCH 02/14] Add version six and a half --- build/params_2k.go | 17 +++++++++-------- build/params_butterfly.go | 1 + build/params_calibnet.go | 2 ++ build/params_interop.go | 17 +++++++++-------- build/params_mainnet.go | 1 + build/params_nerpanet.go | 1 + chain/stmgr/forks.go | 4 ++++ chain/vm/gas.go | 2 +- go.sum | 3 --- 9 files changed, 28 insertions(+), 20 deletions(-) diff --git a/build/params_2k.go b/build/params_2k.go index 387d2da0b..a1ccb0ce3 100644 --- a/build/params_2k.go +++ b/build/params_2k.go @@ -28,18 +28,19 @@ var UpgradeAssemblyHeight = abi.ChainEpoch(-5) var UpgradeLiftoffHeight = abi.ChainEpoch(-6) var UpgradeKumquatHeight = abi.ChainEpoch(-7) -var UpgradeCalicoHeight = abi.ChainEpoch(-8) -var UpgradePersianHeight = abi.ChainEpoch(-9) -var UpgradeOrangeHeight = abi.ChainEpoch(-10) -var UpgradeClausHeight = abi.ChainEpoch(-11) +var UpgradePricelistOopsHeight = abi.ChainEpoch(-8) +var UpgradeCalicoHeight = abi.ChainEpoch(-9) +var UpgradePersianHeight = abi.ChainEpoch(-10) +var UpgradeOrangeHeight = abi.ChainEpoch(-11) +var UpgradeClausHeight = abi.ChainEpoch(-12) -var UpgradeTrustHeight = abi.ChainEpoch(-12) +var UpgradeTrustHeight = abi.ChainEpoch(-13) -var UpgradeNorwegianHeight = abi.ChainEpoch(-13) +var UpgradeNorwegianHeight = abi.ChainEpoch(-14) -var UpgradeTurboHeight = abi.ChainEpoch(-14) +var UpgradeTurboHeight = abi.ChainEpoch(-15) -var UpgradeHyperdriveHeight = abi.ChainEpoch(-15) +var UpgradeHyperdriveHeight = abi.ChainEpoch(-16) var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ 0: DrandMainnet, diff --git a/build/params_butterfly.go b/build/params_butterfly.go index 258f6ab0f..835c7dc7a 100644 --- a/build/params_butterfly.go +++ b/build/params_butterfly.go @@ -28,6 +28,7 @@ var UpgradeAssemblyHeight = abi.ChainEpoch(30) const UpgradeTapeHeight = 60 const UpgradeLiftoffHeight = -5 const UpgradeKumquatHeight = 90 +const UpgradePricelistOopsHeight = 119 const UpgradeCalicoHeight = 120 const UpgradePersianHeight = 150 const UpgradeClausHeight = 180 diff --git a/build/params_calibnet.go b/build/params_calibnet.go index df334a516..fe871bcca 100644 --- a/build/params_calibnet.go +++ b/build/params_calibnet.go @@ -33,6 +33,8 @@ const UpgradeLiftoffHeight = -5 const UpgradeKumquatHeight = 90 +const UpgradePricelistOopsHeight = 119 + const UpgradeCalicoHeight = 120 const UpgradePersianHeight = UpgradeCalicoHeight + (builtin2.EpochsInHour * 1) diff --git a/build/params_interop.go b/build/params_interop.go index 73cc1c7d9..b5e49577d 100644 --- a/build/params_interop.go +++ b/build/params_interop.go @@ -31,18 +31,19 @@ var UpgradeAssemblyHeight = abi.ChainEpoch(-5) var UpgradeLiftoffHeight = abi.ChainEpoch(-6) var UpgradeKumquatHeight = abi.ChainEpoch(-7) -var UpgradeCalicoHeight = abi.ChainEpoch(-8) -var UpgradePersianHeight = abi.ChainEpoch(-9) -var UpgradeOrangeHeight = abi.ChainEpoch(-10) -var UpgradeClausHeight = abi.ChainEpoch(-11) +var UpgradePricelistOopsHeight = abi.ChainEpoch(-8) +var UpgradeCalicoHeight = abi.ChainEpoch(-9) +var UpgradePersianHeight = abi.ChainEpoch(-10) +var UpgradeOrangeHeight = abi.ChainEpoch(-11) +var UpgradeClausHeight = abi.ChainEpoch(-12) -var UpgradeTrustHeight = abi.ChainEpoch(-12) +var UpgradeTrustHeight = abi.ChainEpoch(-13) -var UpgradeNorwegianHeight = abi.ChainEpoch(-13) +var UpgradeNorwegianHeight = abi.ChainEpoch(-14) -var UpgradeTurboHeight = abi.ChainEpoch(-14) +var UpgradeTurboHeight = abi.ChainEpoch(-15) -var UpgradeHyperdriveHeight = abi.ChainEpoch(-15) +var UpgradeHyperdriveHeight = abi.ChainEpoch(-16) var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ 0: DrandMainnet, diff --git a/build/params_mainnet.go b/build/params_mainnet.go index 1c9b69462..c9750b6e6 100644 --- a/build/params_mainnet.go +++ b/build/params_mainnet.go @@ -45,6 +45,7 @@ const UpgradeLiftoffHeight = 148888 const UpgradeKumquatHeight = 170000 +const UpgradePricelistOopsHeight = 265199 const UpgradeCalicoHeight = 265200 const UpgradePersianHeight = UpgradeCalicoHeight + (builtin2.EpochsInHour * 60) diff --git a/build/params_nerpanet.go b/build/params_nerpanet.go index 6663a9162..d0d99ece4 100644 --- a/build/params_nerpanet.go +++ b/build/params_nerpanet.go @@ -32,6 +32,7 @@ const UpgradeTapeHeight = 60 const UpgradeKumquatHeight = 90 +const UpgradePricelistOopsHeight = 99 const UpgradeCalicoHeight = 100 const UpgradePersianHeight = UpgradeCalicoHeight + (builtin2.EpochsInHour * 1) diff --git a/chain/stmgr/forks.go b/chain/stmgr/forks.go index bb87da44c..c4fe5108e 100644 --- a/chain/stmgr/forks.go +++ b/chain/stmgr/forks.go @@ -161,6 +161,10 @@ func DefaultUpgradeSchedule() UpgradeSchedule { Height: build.UpgradeKumquatHeight, Network: network.Version6, Migration: nil, + }, { + Height: build.UpgradePricelistOopsHeight, + Network: network.Version6AndAHalf, + Migration: nil, }, { Height: build.UpgradeCalicoHeight, Network: network.Version7, diff --git a/chain/vm/gas.go b/chain/vm/gas.go index 4b840cbf0..b848550f3 100644 --- a/chain/vm/gas.go +++ b/chain/vm/gas.go @@ -129,7 +129,7 @@ var prices = map[network.Version]Pricelist{ verifyPostDiscount: true, verifyConsensusFault: 495422, }, - network.Version6: &pricelistV0{ + network.Version6AndAHalf: &pricelistV0{ computeGasMulti: 1, storageGasMulti: 1300, diff --git a/go.sum b/go.sum index 610f6813d..c610263f9 100644 --- a/go.sum +++ b/go.sum @@ -305,7 +305,6 @@ github.com/filecoin-project/go-state-types v0.0.0-20200904021452-1883f36ca2f4/go github.com/filecoin-project/go-state-types v0.0.0-20200928172055-2df22083d8ab/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= github.com/filecoin-project/go-state-types v0.0.0-20201102161440-c8033295a1fc/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= github.com/filecoin-project/go-state-types v0.1.0/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= -github.com/filecoin-project/go-state-types v0.1.1-0.20210506134452-99b279731c48 h1:Jc4OprDp3bRDxbsrXNHPwJabZJM3iDy+ri8/1e0ZnX4= github.com/filecoin-project/go-state-types v0.1.1-0.20210506134452-99b279731c48/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= github.com/filecoin-project/go-state-types v0.1.1-0.20210715140315-cb1fb37068fa h1:m0MPsgTeZfFTZokwocR9WPNHdi7ZIP8pYM4UF6XUu20= github.com/filecoin-project/go-state-types v0.1.1-0.20210715140315-cb1fb37068fa/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= @@ -333,8 +332,6 @@ github.com/filecoin-project/specs-actors/v4 v4.0.0/go.mod h1:TkHXf/l7Wyw4ZejyXIP github.com/filecoin-project/specs-actors/v4 v4.0.1 h1:AiWrtvJZ63MHGe6rn7tPu4nSUY8bA1KDNszqJaD5+Fg= github.com/filecoin-project/specs-actors/v4 v4.0.1/go.mod h1:TkHXf/l7Wyw4ZejyXIPS2rK8bBO0rdwhTZyQQgaglng= github.com/filecoin-project/specs-actors/v5 v5.0.0-20210512015452-4fe3889fff57/go.mod h1:283yBMMUSDB2abcjP/hhrwTkhb9h3sfM6KGrep/ZlBI= -github.com/filecoin-project/specs-actors/v5 v5.0.1 h1:PrYm5AKdMlJ/55eRW5laWcnaX66gyyDYBWvH38kNAMo= -github.com/filecoin-project/specs-actors/v5 v5.0.1/go.mod h1:74euMDIXorusOBs/QL/LNkYsXZdDpLJwojWw6T03pdE= github.com/filecoin-project/specs-actors/v5 v5.0.2-0.20210715141705-1c0359c0f993 h1:Nv+6kuR5S7bZIthv+VpQOKq8Szf9Gze495mjIe43s2k= github.com/filecoin-project/specs-actors/v5 v5.0.2-0.20210715141705-1c0359c0f993/go.mod h1:9brQ9T9NtldzOSC2e+H7HnkfGU37RDpF0bILE/WOP5I= github.com/filecoin-project/specs-storage v0.1.1-0.20201105051918-5188d9774506 h1:Ur/l2+6qN+lQiqjozWWc5p9UDaAMDZKTlDS98oRnlIw= From aff7200b3e1a233764e4cde7a28b0c7c802e7a4f Mon Sep 17 00:00:00 2001 From: ZenGround0 Date: Thu, 15 Jul 2021 11:11:24 -0400 Subject: [PATCH 03/14] Add missing upgrade height --- build/params_testground.go | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/build/params_testground.go b/build/params_testground.go index 252d23e75..b12df11e7 100644 --- a/build/params_testground.go +++ b/build/params_testground.go @@ -82,21 +82,22 @@ var ( UpgradeBreezeHeight abi.ChainEpoch = -1 BreezeGasTampingDuration abi.ChainEpoch = 0 - UpgradeSmokeHeight abi.ChainEpoch = -1 - UpgradeIgnitionHeight abi.ChainEpoch = -2 - UpgradeRefuelHeight abi.ChainEpoch = -3 - UpgradeTapeHeight abi.ChainEpoch = -4 - UpgradeAssemblyHeight abi.ChainEpoch = 10 - UpgradeLiftoffHeight abi.ChainEpoch = -5 - UpgradeKumquatHeight abi.ChainEpoch = -6 - UpgradeCalicoHeight abi.ChainEpoch = -7 - UpgradePersianHeight abi.ChainEpoch = -8 - UpgradeOrangeHeight abi.ChainEpoch = -9 - UpgradeClausHeight abi.ChainEpoch = -10 - UpgradeTrustHeight abi.ChainEpoch = -11 - UpgradeNorwegianHeight abi.ChainEpoch = -12 - UpgradeTurboHeight abi.ChainEpoch = -13 - UpgradeHyperdriveHeight abi.ChainEpoch = -13 + UpgradeSmokeHeight abi.ChainEpoch = -1 + UpgradeIgnitionHeight abi.ChainEpoch = -2 + UpgradeRefuelHeight abi.ChainEpoch = -3 + UpgradeTapeHeight abi.ChainEpoch = -4 + UpgradeAssemblyHeight abi.ChainEpoch = 10 + UpgradeLiftoffHeight abi.ChainEpoch = -5 + UpgradeKumquatHeight abi.ChainEpoch = -6 + UpgradePricelistOopsHeight abi.ChainEpoch = -7 + UpgradeCalicoHeight abi.ChainEpoch = -8 + UpgradePersianHeight abi.ChainEpoch = -9 + UpgradeOrangeHeight abi.ChainEpoch = -10 + UpgradeClausHeight abi.ChainEpoch = -11 + UpgradeTrustHeight abi.ChainEpoch = -12 + UpgradeNorwegianHeight abi.ChainEpoch = -13 + UpgradeTurboHeight abi.ChainEpoch = -14 + UpgradeHyperdriveHeight abi.ChainEpoch = -15 DrandSchedule = map[abi.ChainEpoch]DrandEnum{ 0: DrandMainnet, From 545cc723e03cf55813c5ee9fdb7d52a523570640 Mon Sep 17 00:00:00 2001 From: ZenGround0 Date: Thu, 15 Jul 2021 12:02:02 -0400 Subject: [PATCH 04/14] Fix test --- chain/messagepool/messagepool_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chain/messagepool/messagepool_test.go b/chain/messagepool/messagepool_test.go index 2ea8fdec0..e57212e7c 100644 --- a/chain/messagepool/messagepool_test.go +++ b/chain/messagepool/messagepool_test.go @@ -287,7 +287,7 @@ func TestCheckMessageBig(t *testing.T) { From: from, Value: types.NewInt(1), Nonce: 0, - GasLimit: 50000000, + GasLimit: 60000000, GasFeeCap: types.NewInt(100), GasPremium: types.NewInt(1), Params: make([]byte, 41<<10), // 41KiB payload From cbc07cb9398d7b8670700950cf449c3ecf87e55a Mon Sep 17 00:00:00 2001 From: ZenGround0 Date: Thu, 15 Jul 2021 14:24:08 -0400 Subject: [PATCH 05/14] Add 6.5 to VersionForNetwork commit updated docs --- chain/actors/version.go | 2 +- documentation/en/api-v0-methods.md | 2 +- documentation/en/api-v1-unstable-methods.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chain/actors/version.go b/chain/actors/version.go index 9710e62fa..778fbda9d 100644 --- a/chain/actors/version.go +++ b/chain/actors/version.go @@ -25,7 +25,7 @@ func VersionForNetwork(version network.Version) Version { switch version { case network.Version0, network.Version1, network.Version2, network.Version3: return Version0 - case network.Version4, network.Version5, network.Version6, network.Version7, network.Version8, network.Version9: + case network.Version4, network.Version5, network.Version6, network.Version6AndAHalf, network.Version7, network.Version8, network.Version9: return Version2 case network.Version10, network.Version11: return Version3 diff --git a/documentation/en/api-v0-methods.md b/documentation/en/api-v0-methods.md index 4466cde8c..f52728d94 100644 --- a/documentation/en/api-v0-methods.md +++ b/documentation/en/api-v0-methods.md @@ -4634,7 +4634,7 @@ Inputs: ] ``` -Response: `13` +Response: `14` ### StateReadState StateReadState returns the indicated actor's state. diff --git a/documentation/en/api-v1-unstable-methods.md b/documentation/en/api-v1-unstable-methods.md index ef151a94d..cc61711b9 100644 --- a/documentation/en/api-v1-unstable-methods.md +++ b/documentation/en/api-v1-unstable-methods.md @@ -4855,7 +4855,7 @@ Inputs: ] ``` -Response: `13` +Response: `14` ### StateReadState StateReadState returns the indicated actor's state. From 56d71a190fae968cc0243bb55e3d00c9623a1bdf Mon Sep 17 00:00:00 2001 From: ZenGround0 Date: Fri, 16 Jul 2021 14:57:51 -0400 Subject: [PATCH 06/14] Update versions to have more digits --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 97fd416d0..a73c0c360 100644 --- a/go.mod +++ b/go.mod @@ -40,7 +40,7 @@ require ( github.com/filecoin-project/go-multistore v0.0.3 github.com/filecoin-project/go-padreader v0.0.0-20200903213702-ed5fae088b20 github.com/filecoin-project/go-paramfetch v0.0.2-0.20210614165157-25a6c7769498 - github.com/filecoin-project/go-state-types v0.1.1-0.20210715140315-cb1fb37068fa + github.com/filecoin-project/go-state-types v0.1.1-0.20210716171938-88aca2297c3a github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe github.com/filecoin-project/go-statestore v0.1.1 github.com/filecoin-project/go-storedcounter v0.0.0-20200421200003-1c99c62e8a5b @@ -48,7 +48,7 @@ require ( github.com/filecoin-project/specs-actors/v2 v2.3.5 github.com/filecoin-project/specs-actors/v3 v3.1.1 github.com/filecoin-project/specs-actors/v4 v4.0.1 - github.com/filecoin-project/specs-actors/v5 v5.0.2-0.20210715141705-1c0359c0f993 + github.com/filecoin-project/specs-actors/v5 v5.0.2-0.20210716184838-35d4a91dd9e5 github.com/filecoin-project/specs-storage v0.1.1-0.20201105051918-5188d9774506 github.com/filecoin-project/test-vectors/schema v0.0.5 github.com/gbrlsnchs/jwt/v3 v3.0.0-beta.1 diff --git a/go.sum b/go.sum index c610263f9..8f0329e9b 100644 --- a/go.sum +++ b/go.sum @@ -306,8 +306,8 @@ github.com/filecoin-project/go-state-types v0.0.0-20200928172055-2df22083d8ab/go github.com/filecoin-project/go-state-types v0.0.0-20201102161440-c8033295a1fc/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= github.com/filecoin-project/go-state-types v0.1.0/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= github.com/filecoin-project/go-state-types v0.1.1-0.20210506134452-99b279731c48/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= -github.com/filecoin-project/go-state-types v0.1.1-0.20210715140315-cb1fb37068fa h1:m0MPsgTeZfFTZokwocR9WPNHdi7ZIP8pYM4UF6XUu20= -github.com/filecoin-project/go-state-types v0.1.1-0.20210715140315-cb1fb37068fa/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= +github.com/filecoin-project/go-state-types v0.1.1-0.20210716171938-88aca2297c3a h1:8oe6tfFHF8kwK8ayeWU3C3zQb65VD1/XGO+gKJcMUrY= +github.com/filecoin-project/go-state-types v0.1.1-0.20210716171938-88aca2297c3a/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe h1:dF8u+LEWeIcTcfUcCf3WFVlc81Fr2JKg8zPzIbBDKDw= github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe/go.mod h1:FGwQgZAt2Gh5mjlwJUlVB62JeYdo+if0xWxSEfBD9ig= github.com/filecoin-project/go-statestore v0.1.0/go.mod h1:LFc9hD+fRxPqiHiaqUEZOinUJB4WARkRfNl10O7kTnI= @@ -332,8 +332,8 @@ github.com/filecoin-project/specs-actors/v4 v4.0.0/go.mod h1:TkHXf/l7Wyw4ZejyXIP github.com/filecoin-project/specs-actors/v4 v4.0.1 h1:AiWrtvJZ63MHGe6rn7tPu4nSUY8bA1KDNszqJaD5+Fg= github.com/filecoin-project/specs-actors/v4 v4.0.1/go.mod h1:TkHXf/l7Wyw4ZejyXIPS2rK8bBO0rdwhTZyQQgaglng= github.com/filecoin-project/specs-actors/v5 v5.0.0-20210512015452-4fe3889fff57/go.mod h1:283yBMMUSDB2abcjP/hhrwTkhb9h3sfM6KGrep/ZlBI= -github.com/filecoin-project/specs-actors/v5 v5.0.2-0.20210715141705-1c0359c0f993 h1:Nv+6kuR5S7bZIthv+VpQOKq8Szf9Gze495mjIe43s2k= -github.com/filecoin-project/specs-actors/v5 v5.0.2-0.20210715141705-1c0359c0f993/go.mod h1:9brQ9T9NtldzOSC2e+H7HnkfGU37RDpF0bILE/WOP5I= +github.com/filecoin-project/specs-actors/v5 v5.0.2-0.20210716184838-35d4a91dd9e5 h1:+LfpxA29WP6l7waIgbtbjTZSV9r2kVQlaRCqQWt/UJA= +github.com/filecoin-project/specs-actors/v5 v5.0.2-0.20210716184838-35d4a91dd9e5/go.mod h1:ULkTjZQEX5fSQFuKc//TcNiXrq+RL7rPTt+ejhYPrcg= github.com/filecoin-project/specs-storage v0.1.1-0.20201105051918-5188d9774506 h1:Ur/l2+6qN+lQiqjozWWc5p9UDaAMDZKTlDS98oRnlIw= github.com/filecoin-project/specs-storage v0.1.1-0.20201105051918-5188d9774506/go.mod h1:nJRRM7Aa9XVvygr3W9k6xGF46RWzr2zxF/iGoAIfA/g= github.com/filecoin-project/test-vectors/schema v0.0.5 h1:w3zHQhzM4pYxJDl21avXjOKBLF8egrvwUwjpT8TquDg= From 9fc4a25bd19bd9c6e746db45f154dad679ebcb60 Mon Sep 17 00:00:00 2001 From: ZenGround0 Date: Fri, 16 Jul 2021 15:17:16 -0400 Subject: [PATCH 07/14] Fix tests with bad network version refs --- chain/stmgr/forks_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/chain/stmgr/forks_test.go b/chain/stmgr/forks_test.go index 6d22a294d..9caeee51f 100644 --- a/chain/stmgr/forks_test.go +++ b/chain/stmgr/forks_test.go @@ -17,6 +17,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/cbor" + "github.com/filecoin-project/go-state-types/network" builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" init2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/init" @@ -121,7 +122,7 @@ func TestForkHeightTriggers(t *testing.T) { sm, err := NewStateManagerWithUpgradeSchedule( cg.ChainStore(), UpgradeSchedule{{ - Network: 1, + Network: network.Version1, Height: testForkHeight, Migration: func(ctx context.Context, sm *StateManager, cache MigrationCache, cb ExecMonitor, root cid.Cid, height abi.ChainEpoch, ts *types.TipSet) (cid.Cid, error) { @@ -250,7 +251,7 @@ func TestForkRefuseCall(t *testing.T) { sm, err := NewStateManagerWithUpgradeSchedule( cg.ChainStore(), UpgradeSchedule{{ - Network: 1, + Network: network.Version1, Expensive: true, Height: testForkHeight, Migration: func(ctx context.Context, sm *StateManager, cache MigrationCache, cb ExecMonitor, @@ -365,7 +366,7 @@ func TestForkPreMigration(t *testing.T) { sm, err := NewStateManagerWithUpgradeSchedule( cg.ChainStore(), UpgradeSchedule{{ - Network: 1, + Network: network.Version1, Height: testForkHeight, Migration: func(ctx context.Context, sm *StateManager, cache MigrationCache, cb ExecMonitor, root cid.Cid, height abi.ChainEpoch, ts *types.TipSet) (cid.Cid, error) { From ed844c5283a86463432852ade65a756a701fba04 Mon Sep 17 00:00:00 2001 From: ZenGround0 Date: Tue, 20 Jul 2021 12:02:52 -0400 Subject: [PATCH 08/14] Use current ntwk version in mpool message check --- chain/messagepool/check.go | 15 ++++++++--- chain/messagepool/messagepool.go | 45 +++++++++++++++++++------------- chain/stmgr/forks.go | 12 +++++++++ 3 files changed, 50 insertions(+), 22 deletions(-) diff --git a/chain/messagepool/check.go b/chain/messagepool/check.go index c36b7d0a7..9a55c283c 100644 --- a/chain/messagepool/check.go +++ b/chain/messagepool/check.go @@ -11,7 +11,6 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/lotus/api" - "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/vm" ) @@ -107,6 +106,8 @@ func (mp *MessagePool) checkMessages(ctx context.Context, msgs []*types.Message, curTs := mp.curTs mp.curTsLk.Unlock() + epoch := curTs.Height() + var baseFee big.Int if len(curTs.Blocks()) > 0 { baseFee = curTs.Blocks()[0].ParentBaseFee @@ -257,8 +258,14 @@ func (mp *MessagePool) checkMessages(ctx context.Context, msgs []*types.Message, Code: api.CheckStatusMessageValidity, }, } - - if err := m.ValidForBlockInclusion(0, build.NewestNetworkVersion); err != nil { + nv, err := mp.getNtwkVersion(epoch) + if err != nil { + check.OK = false + check.Err = fmt.Sprintf("error retrieving network version: %s", err.Error()) + } else { + check.OK = true + } + if err := m.ValidForBlockInclusion(0, nv); err != nil { check.OK = false check.Err = fmt.Sprintf("syntactically invalid message: %s", err.Error()) } else { @@ -274,7 +281,7 @@ func (mp *MessagePool) checkMessages(ctx context.Context, msgs []*types.Message, // gas checks // 4. Min Gas - minGas := vm.PricelistByVersion(build.NewestNetworkVersion).OnChainMessage(m.ChainLength()) + minGas := vm.PricelistByVersion(nv).OnChainMessage(m.ChainLength()) check = api.MessageCheckStatus{ Cid: m.Cid(), diff --git a/chain/messagepool/messagepool.go b/chain/messagepool/messagepool.go index 9e17b2ff2..2307a4f39 100644 --- a/chain/messagepool/messagepool.go +++ b/chain/messagepool/messagepool.go @@ -14,6 +14,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/crypto" + "github.com/filecoin-project/go-state-types/network" "github.com/hashicorp/go-multierror" lru "github.com/hashicorp/golang-lru" "github.com/ipfs/go-cid" @@ -29,6 +30,7 @@ import ( "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build" + "github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/vm" @@ -147,6 +149,8 @@ type MessagePool struct { minGasPrice types.BigInt + getNtwkVersion func(abi.ChainEpoch) (network.Version, error) + currentSize int // pruneTrigger is a channel used to trigger a mempool pruning @@ -362,26 +366,31 @@ func New(api Provider, ds dtypes.MetadataDS, netName dtypes.NetworkName, j journ if j == nil { j = journal.NilJournal() } + us := stmgr.DefaultUpgradeSchedule() + if err := us.Validate(); err != nil { + return nil, err + } mp := &MessagePool{ - ds: ds, - addSema: make(chan struct{}, 1), - closer: make(chan struct{}), - repubTk: build.Clock.Ticker(RepublishInterval), - repubTrigger: make(chan struct{}, 1), - localAddrs: make(map[address.Address]struct{}), - pending: make(map[address.Address]*msgSet), - keyCache: make(map[address.Address]address.Address), - minGasPrice: types.NewInt(0), - pruneTrigger: make(chan struct{}, 1), - pruneCooldown: make(chan struct{}, 1), - blsSigCache: cache, - sigValCache: verifcache, - changes: lps.New(50), - localMsgs: namespace.Wrap(ds, datastore.NewKey(localMsgsDs)), - api: api, - netName: netName, - cfg: cfg, + ds: ds, + addSema: make(chan struct{}, 1), + closer: make(chan struct{}), + repubTk: build.Clock.Ticker(RepublishInterval), + repubTrigger: make(chan struct{}, 1), + localAddrs: make(map[address.Address]struct{}), + pending: make(map[address.Address]*msgSet), + keyCache: make(map[address.Address]address.Address), + minGasPrice: types.NewInt(0), + getNtwkVersion: us.GetNtwkVersion, + pruneTrigger: make(chan struct{}, 1), + pruneCooldown: make(chan struct{}, 1), + blsSigCache: cache, + sigValCache: verifcache, + changes: lps.New(50), + localMsgs: namespace.Wrap(ds, datastore.NewKey(localMsgsDs)), + api: api, + netName: netName, + cfg: cfg, evtTypes: [...]journal.EventType{ evtTypeMpoolAdd: j.RegisterEventType("mpool", "add"), evtTypeMpoolRemove: j.RegisterEventType("mpool", "remove"), diff --git a/chain/stmgr/forks.go b/chain/stmgr/forks.go index c4fe5108e..56618172c 100644 --- a/chain/stmgr/forks.go +++ b/chain/stmgr/forks.go @@ -296,6 +296,18 @@ func (us UpgradeSchedule) Validate() error { return nil } +func (us UpgradeSchedule) GetNtwkVersion(e abi.ChainEpoch) (network.Version, error) { + // Traverse from newest to oldest returning upgrade active during epoch e + for i := len(us) - 1; i >= 0; i-- { + u := us[i] + // u.Height is the last epoch before u.Network becomes the active version + if u.Height < e { + return u.Network, nil + } + } + return network.Version0, xerrors.Errorf("Epoch %d has no defined network version") +} + func (sm *StateManager) handleStateForks(ctx context.Context, root cid.Cid, height abi.ChainEpoch, cb ExecMonitor, ts *types.TipSet) (cid.Cid, error) { retCid := root var err error From 4cd05fa39cd7b1ba5e74a7001724482a89ac5a78 Mon Sep 17 00:00:00 2001 From: ZenGround0 Date: Tue, 20 Jul 2021 12:09:00 -0400 Subject: [PATCH 09/14] Lint --- chain/stmgr/forks.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chain/stmgr/forks.go b/chain/stmgr/forks.go index 56618172c..fb8e407ed 100644 --- a/chain/stmgr/forks.go +++ b/chain/stmgr/forks.go @@ -305,7 +305,7 @@ func (us UpgradeSchedule) GetNtwkVersion(e abi.ChainEpoch) (network.Version, err return u.Network, nil } } - return network.Version0, xerrors.Errorf("Epoch %d has no defined network version") + return network.Version0, xerrors.Errorf("Epoch %d has no defined network version", e) } func (sm *StateManager) handleStateForks(ctx context.Context, root cid.Cid, height abi.ChainEpoch, cb ExecMonitor, ts *types.TipSet) (cid.Cid, error) { From d6a8a7aeb82c36935047cc625c1e772c448ab995 Mon Sep 17 00:00:00 2001 From: ZenGround0 Date: Tue, 20 Jul 2021 12:48:37 -0400 Subject: [PATCH 10/14] Remove validation because of sync TestDrandNull test --- chain/messagepool/messagepool.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/chain/messagepool/messagepool.go b/chain/messagepool/messagepool.go index 2307a4f39..175cda9ff 100644 --- a/chain/messagepool/messagepool.go +++ b/chain/messagepool/messagepool.go @@ -367,9 +367,6 @@ func New(api Provider, ds dtypes.MetadataDS, netName dtypes.NetworkName, j journ j = journal.NilJournal() } us := stmgr.DefaultUpgradeSchedule() - if err := us.Validate(); err != nil { - return nil, err - } mp := &MessagePool{ ds: ds, From fe5e1b23d52f4679145101f250c43c47970a42d1 Mon Sep 17 00:00:00 2001 From: ZenGround0 Date: Wed, 21 Jul 2021 15:30:30 -0400 Subject: [PATCH 11/14] Update api version to account for new network version 6.5 + new underlying repr --- api/version.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/version.go b/api/version.go index 687f5135a..ef59dd104 100644 --- a/api/version.go +++ b/api/version.go @@ -54,8 +54,8 @@ func VersionForType(nodeType NodeType) (Version, error) { // semver versions of the rpc api exposed var ( - FullAPIVersion0 = newVer(1, 3, 0) - FullAPIVersion1 = newVer(2, 1, 0) + FullAPIVersion0 = newVer(1, 3, 1) + FullAPIVersion1 = newVer(2, 1, 1) MinerAPIVersion0 = newVer(1, 2, 0) WorkerAPIVersion0 = newVer(1, 1, 0) From 09adc4d5e2d30f85141a5cb5950bbcf2b3714e7b Mon Sep 17 00:00:00 2001 From: ZenGround0 Date: Wed, 21 Jul 2021 15:49:09 -0400 Subject: [PATCH 12/14] make docsgen changes --- documentation/en/api-v0-methods-miner.md | 2 +- documentation/en/api-v0-methods-worker.md | 2 +- documentation/en/api-v0-methods.md | 4 ++-- documentation/en/api-v1-unstable-methods.md | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/documentation/en/api-v0-methods-miner.md b/documentation/en/api-v0-methods-miner.md index b488e8996..e8598ff0c 100644 --- a/documentation/en/api-v0-methods-miner.md +++ b/documentation/en/api-v0-methods-miner.md @@ -199,7 +199,7 @@ Response: ```json { "Version": "string value", - "APIVersion": 131328, + "APIVersion": 131329, "BlockDelay": 42 } ``` diff --git a/documentation/en/api-v0-methods-worker.md b/documentation/en/api-v0-methods-worker.md index c620113f4..341846759 100644 --- a/documentation/en/api-v0-methods-worker.md +++ b/documentation/en/api-v0-methods-worker.md @@ -144,7 +144,7 @@ Perms: admin Inputs: `null` -Response: `131328` +Response: `131329` ## Add diff --git a/documentation/en/api-v0-methods.md b/documentation/en/api-v0-methods.md index f52728d94..bc67382d6 100644 --- a/documentation/en/api-v0-methods.md +++ b/documentation/en/api-v0-methods.md @@ -280,7 +280,7 @@ Response: ```json { "Version": "string value", - "APIVersion": 131328, + "APIVersion": 131329, "BlockDelay": 42 } ``` @@ -4634,7 +4634,7 @@ Inputs: ] ``` -Response: `14` +Response: `1300` ### StateReadState StateReadState returns the indicated actor's state. diff --git a/documentation/en/api-v1-unstable-methods.md b/documentation/en/api-v1-unstable-methods.md index cc61711b9..37389d0a6 100644 --- a/documentation/en/api-v1-unstable-methods.md +++ b/documentation/en/api-v1-unstable-methods.md @@ -282,7 +282,7 @@ Response: ```json { "Version": "string value", - "APIVersion": 131328, + "APIVersion": 131329, "BlockDelay": 42 } ``` @@ -4855,7 +4855,7 @@ Inputs: ] ``` -Response: `14` +Response: `1300` ### StateReadState StateReadState returns the indicated actor's state. From 31556093045fca21749a92b259484b303eec66c1 Mon Sep 17 00:00:00 2001 From: ZenGround0 Date: Thu, 22 Jul 2021 09:42:23 -0400 Subject: [PATCH 13/14] Finalize deps + fix after rebase --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index a73c0c360..9520c8d98 100644 --- a/go.mod +++ b/go.mod @@ -40,7 +40,7 @@ require ( github.com/filecoin-project/go-multistore v0.0.3 github.com/filecoin-project/go-padreader v0.0.0-20200903213702-ed5fae088b20 github.com/filecoin-project/go-paramfetch v0.0.2-0.20210614165157-25a6c7769498 - github.com/filecoin-project/go-state-types v0.1.1-0.20210716171938-88aca2297c3a + github.com/filecoin-project/go-state-types v0.1.1-0.20210722133031-ad9bfe54c124 github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe github.com/filecoin-project/go-statestore v0.1.1 github.com/filecoin-project/go-storedcounter v0.0.0-20200421200003-1c99c62e8a5b @@ -48,7 +48,7 @@ require ( github.com/filecoin-project/specs-actors/v2 v2.3.5 github.com/filecoin-project/specs-actors/v3 v3.1.1 github.com/filecoin-project/specs-actors/v4 v4.0.1 - github.com/filecoin-project/specs-actors/v5 v5.0.2-0.20210716184838-35d4a91dd9e5 + github.com/filecoin-project/specs-actors/v5 v5.0.2 github.com/filecoin-project/specs-storage v0.1.1-0.20201105051918-5188d9774506 github.com/filecoin-project/test-vectors/schema v0.0.5 github.com/gbrlsnchs/jwt/v3 v3.0.0-beta.1 diff --git a/go.sum b/go.sum index 8f0329e9b..86ac15b2c 100644 --- a/go.sum +++ b/go.sum @@ -306,8 +306,8 @@ github.com/filecoin-project/go-state-types v0.0.0-20200928172055-2df22083d8ab/go github.com/filecoin-project/go-state-types v0.0.0-20201102161440-c8033295a1fc/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= github.com/filecoin-project/go-state-types v0.1.0/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= github.com/filecoin-project/go-state-types v0.1.1-0.20210506134452-99b279731c48/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= -github.com/filecoin-project/go-state-types v0.1.1-0.20210716171938-88aca2297c3a h1:8oe6tfFHF8kwK8ayeWU3C3zQb65VD1/XGO+gKJcMUrY= -github.com/filecoin-project/go-state-types v0.1.1-0.20210716171938-88aca2297c3a/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= +github.com/filecoin-project/go-state-types v0.1.1-0.20210722133031-ad9bfe54c124 h1:veGrNABg/9I7prngrowkhwbvW5d5JN55MNKmbsr5FqA= +github.com/filecoin-project/go-state-types v0.1.1-0.20210722133031-ad9bfe54c124/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe h1:dF8u+LEWeIcTcfUcCf3WFVlc81Fr2JKg8zPzIbBDKDw= github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe/go.mod h1:FGwQgZAt2Gh5mjlwJUlVB62JeYdo+if0xWxSEfBD9ig= github.com/filecoin-project/go-statestore v0.1.0/go.mod h1:LFc9hD+fRxPqiHiaqUEZOinUJB4WARkRfNl10O7kTnI= @@ -332,8 +332,8 @@ github.com/filecoin-project/specs-actors/v4 v4.0.0/go.mod h1:TkHXf/l7Wyw4ZejyXIP github.com/filecoin-project/specs-actors/v4 v4.0.1 h1:AiWrtvJZ63MHGe6rn7tPu4nSUY8bA1KDNszqJaD5+Fg= github.com/filecoin-project/specs-actors/v4 v4.0.1/go.mod h1:TkHXf/l7Wyw4ZejyXIPS2rK8bBO0rdwhTZyQQgaglng= github.com/filecoin-project/specs-actors/v5 v5.0.0-20210512015452-4fe3889fff57/go.mod h1:283yBMMUSDB2abcjP/hhrwTkhb9h3sfM6KGrep/ZlBI= -github.com/filecoin-project/specs-actors/v5 v5.0.2-0.20210716184838-35d4a91dd9e5 h1:+LfpxA29WP6l7waIgbtbjTZSV9r2kVQlaRCqQWt/UJA= -github.com/filecoin-project/specs-actors/v5 v5.0.2-0.20210716184838-35d4a91dd9e5/go.mod h1:ULkTjZQEX5fSQFuKc//TcNiXrq+RL7rPTt+ejhYPrcg= +github.com/filecoin-project/specs-actors/v5 v5.0.2 h1:pLNFUt9xtFuhrgZZ0tPnzGchAVu4koyCRIopzkx/OP0= +github.com/filecoin-project/specs-actors/v5 v5.0.2/go.mod h1:E0yeEl6Scl6eWeeWmxwQsAufvOAC72H6ELyh2Y62H90= github.com/filecoin-project/specs-storage v0.1.1-0.20201105051918-5188d9774506 h1:Ur/l2+6qN+lQiqjozWWc5p9UDaAMDZKTlDS98oRnlIw= github.com/filecoin-project/specs-storage v0.1.1-0.20201105051918-5188d9774506/go.mod h1:nJRRM7Aa9XVvygr3W9k6xGF46RWzr2zxF/iGoAIfA/g= github.com/filecoin-project/test-vectors/schema v0.0.5 h1:w3zHQhzM4pYxJDl21avXjOKBLF8egrvwUwjpT8TquDg= From c130d2cb87149d6d71d15277d3f0a9ff4a2eebac Mon Sep 17 00:00:00 2001 From: ZenGround0 Date: Thu, 22 Jul 2021 09:50:43 -0400 Subject: [PATCH 14/14] Rebase fix --- build/openrpc/full.json.gz | Bin 23505 -> 23507 bytes build/openrpc/worker.json.gz | Bin 2513 -> 2513 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/build/openrpc/full.json.gz b/build/openrpc/full.json.gz index 56feb6ee5e4799f8c4a9e2047ecb7bb5dd4305a2..92465d5a78c607f3e5dc38fc1b857960bf5935c9 100644 GIT binary patch delta 1383 zcmV-t1(^ELw*k|)0kG3Ze{61c)>5x1jd;^!KRO5O>r6(S$U|CvK@Yrrli^6%v9x@* z7P`!|_)PGemKuAi8m`uma?{a z_R=x6&X{M0-%?;{PNt^UX3cM!y=k&UsY?>mu0&eawZv|ULVLvDlTb+-H3~7{9FL%n zFz4}v&=Dd6-C~|9Bek_@5HRn$91ujKx{WJ(MNftZo8RafrjqT4I!B@3SC*5XNgxec z8p2f12;z9E{ih7Rlgvp+1nk1W_>&h(B}Ju17YqUAabz;cz#aBPFg0EM9RpXl;d37X zci_bWd_C<`^x^l5OYOO#Tc{Wp;RybYaUeTOvp>jva!CA*EBcv;vDS){fl68hhQGsH zr<34HEgXgQuP9|IfxbpLeFVbWc$`GS)vOD_TLlUYk3NHDo$%*Pu= zxokPh-&Oll2?29-sEh%NFRel|C{ngO;P-)#WMhfItc>25EFVbvIAW7Rv}vXQpDg%? z$}Fw%=sV0$$%F`X_mja(F#$c3^Giqp#gjZtC4Z5hd!g@&0maINAbWI4lF2`ZVN8>j zRs0D36*~6DTg9FTqn8oZK;CT$`z`TS;<|FG^`khk7rop}|I-_2jH6K&jr}4XNEl>( zw`{QOmGiib5z7puB6N3o$NYpry0E>1WoH#$f} z?c_meyc_psP?^MB79=Gf<57|P!gnAlZ*I5X7p95(W)^M3L(C4Y6{|4S3YT6|r(hK=VqOA`4Rmhm(l`hZ zp_!j>536mzI%yY)o&;tl-Ag|9MZ#*!8DR493Y52DRUiZPVkUTldR7sNqVRkszC>@c*Ckq%3*b@P zgbU!Y+5tQsGH~2!y7xSrZD;}Lm^O0X;PI4sZS@TKv9*&>Pzga|kzdnX+}dbWM30X; z?V1B&j}wF?$FdoL&ty8M&jP#z&P zp>%W+hhZ>Ha9}rx+t8qW2+2|tR*<#1>p77m8!Bh1lORzR0rHbKQIrAQlgv>W0j87Y pQCw z%(VDS=$zy#9+tgJ5m}abta7d+UM+m&vi(}t7Zl#v=qHn$6ei~$^I?hiDol>DwpsSl zF}2Q@XNKQWTxm|Frq^c8@0q=6vO}pW64S0kTGq8hZi+&C#NRk1lT=9#;1na`Vc#|1QB}FAh7YqUAab)txz#aBPFg0EM9RpW);d37X zci_bWd_C<`^x^l5OYOIzTc{Wp;RybYaUeTOb3e#^a!CA*EBcv;vDS%`gGyQjgulaF zCzIkzEgXdPuP9|IeZEFHeFVbWc$`C^kROD_TKlUqw5NFcdm%*Pu= zscbpR-&OZh2?29-sEh%NFRcPIC{ngO;P-)#WMhfAtW4gQEFVVtIAW7RtZAkIpDg%? z$}6q$=sV0$$%F`X^OM6%F#$W1^-D+rMUy^EB^{8Td!cWN0maIJAbWI4lF2`ZVN8>j zRrCn`6*}^hfJ_uHuidPB+4RC)wDOV8=Ss{)It*N_X6g19j=t~Du;Ua2V_Gz zk*Z(}eH8AZ0b_v*Qp-oDj9tf}mANH9lDzA1?&Zk2Wxf@D`Mex>Fi3uRkP_hT_AfEVbpV(zeq}GRXpvzQs{6 z?Z%W%RjYr9m!{K47an43yXk_PUcz@ED(`K#;1{Ne`(_qxgG0;?t`(~=)e4thQm0@Q zD`H;yj16>d>e4s}5TTi$a1uRDHbe4W&RVUPx)I9)8#$&m!BgczJOG3}FOIMP*{+In zEgR>36mzI%vD)D~9x`y; zX}b43n`@InP#Qs6kzdnH+}dbWM30X;>6!y!j}wF?$FdoLF8SI zaBG!)ZS6Ql(+%wEY>M5vM!unY;2f1Hlblckg0h}+PheE`W)6IPJ5x$8M`BpWJciPNYK(sO67RV5zWURD!vRaL%8Cb}x_ zlQ~h80ojwzQ5gXylju=i0oId8QX&D$vuaWe0RsNulX+8w0W7orQ_TkmRaLH@B&q}e DA}gen diff --git a/build/openrpc/worker.json.gz b/build/openrpc/worker.json.gz index 593a45b6acdba0c89eb6bd7b1c9e587b1c22a6bc..9c570804e10ca7129c67aa8c5acb92ec7570ec6d 100644 GIT binary patch delta 2485 zcmV;m2}<_S6VVfp8Wgnkx1Mv`Gth@G*eT~ zOb^f|*Laaz$=@VrjaKGJZwG8~(bH@7DyOn`Qg7e8A3m0(z?dsOR z#Ik(0h&>YA1)-=OXF_ZV26kgj(a0qTLMAqX$O1+Ttb7Kd->VIayZf%zEqwd~Oofw+ zDlx$KXn%y;m4OBP=}`d|?knMeJ`7iYNtAB!7q>Dtr`1WFR*u9LIy2_k_N{@bf>0<@ zD@e{2>=mLC5wx|)?-9+dKHI2`2tgL*SJ_R?Tyl+7))Cv6cB|97%~)B{r-1knxofTl?`@s>-G(-KI4qa9o$%%-HD}+OG(kR`Sl7tm+tc=QIAvVG6-e$0Gs=z{IM%Sl zpTHT-7LuC8#{FK$&<)oQ#9jZm0tw0}sqq_zmyy7Sn17YQ z^SV!zqFHUNpv24p_eHe!L)dd|mw!@>ZrhQ>Mi!YOv9|>Yf|IFDN%x}F$u=dQ_&r<) zIHIIQiBaw+?NtFMCwZtr@=o=OdttsViPHqwGH zi#teLt941_+0u%o>|4>Mq4zZ>QT^C78-Q00oxvh;4f&eR^puN1h) zQpoWgr08k4D?1Hc=;S2ruYbS>BH=5OK+4x(Y*GK!Y5Vl_bx3kl0P7e+k~(i+$31o2 zbJB57Hz#j@1%B~HS)Znf@?04i)6nh@FV6z^l<%Fwfiz*ZLkdF?)I?v@Oart%d8jy- z1$8w?L(3`MVdb}^v}Rel&z_ww$_yK0IjJ>JwC!iE8oiu6w2n##+<$SXN=whv`Vpfn zhxY=ZB=(gbnlO-Z{e+IMGsIN%9#TDe;qyKI69mD{GWYe?6a#9>3ivU(lwgqOe~FvgV3NtAGyX|TAl(OP%`O&Q(!EgQuAGD8{@{;)y5532 z?vJrEfyJcTo6xSexbQsab?$os#NOw4B~9gK@^a@H--a@j`$R!?yjRD2&l%Ld&biOE z!EV zsGeZi5bq_&vK8)BbWsVW;@OhgQyqnN9fPMj`7BADIjDVn?c-mNkH5&NoJn}ZD)Huq zxLU}$amUr8&IAv2;CWPvbPVo1Q`VlJN3Z=-?Uzo?FTKerdZ|{{yq|jJU4_ga=^VBy zs0}ps6k1m}vwyIrCRVnrCDx+Se_2;uvix#Nmfz-zImG>*KKNVdQ!iJ$!nFA4*}@t1K<77JtJMV*JXrk8;nxnv zQ@gagf02|-B&r#)hnRbO8d zeM{h<3k5@F!Q+lEd}Q7Xe~nCPH3rnGkTFlLp?`i}piZ3^dKFGeZV&hkj9#nzb|0U? zIN7gxoLGTExvx*=&)____=;!k7)wrM|*&+E3kop+VJ-m!{LPB!ryq3S;#1yxdj)^wR7^kilxPMR$_>mF!qb8{|{ z#}u`Znt=dB1RxgNYmrEJjQMwHeo@$7To$UNcY#-{+tvRA00960QeuI~igEw|A4%!k delta 2485 zcmV;m2}<_S6VVfp8Wc43x1Mv`Gth@G*+!G)H_HXD&HAb%E^yTF8N;y!LSI*l`I zV9F*O_ZL`EWdrWxPh5EtU5*Cm!)S;N`~X5y&U}h?yU{+i-~lfU?0}kaOXB|Z0yE-h z(%-2KCa0|N!LmjaOuz=VK$?QODj4GK?rzF&*u-NddLz+q-?_L4aixT3suL8Ey>VN} zrJsjFpvKMlV;jw4o@b zRr#8t87Rcjt?nc}Tj{Yw-Zo8CCZ`)6ir9d_W`8_u2edNd*1O=(X~tjCA6&^wgu=Wi zB)VIzgF~K%!GP^E13Q$(eubR_8DAQ)wI80Ps%(1FZCX8}H2CF1i2&pol!U=ja=G@-q!Pf(1JM0pkIZInL3#lcA zjoYl zVthIL0V*?9!?+s89UF{0Kg;prlo6Z$gzzj%y7L5a+5At`eo5H0l6T&mJ#y2vdp-yi zIt2H;A!XHaH6^z8>trH9728`su~KnkDrSCa&sKZ3WAkk9d)c0C$R@m`Khq@Hseg&h z`vAJx@WCUwki3{AK)s$ z5hX23jB+<=uL?Lh$wLj256T-K0!V&2IjkDL*7)_n!gZgxNq=mg_pGbm zflgUJXCnsrt34b;a3E!9mQoaUbgZi&d+oz|mLz066Scedj)Oq_l?y2LR zqmFyJIeGg_@QXLf`ZP_H=gP>KhIW5=aT2(veD4$vqzSVfQW%P$Ci<#o8ldgSL&do) zsH-^|T2ATqE59YBHOta{@$7U_X4n|ZNv(jQZNG5U=;h?0byPawj(j~Hb+ zycY;1u`m75gn^W+Cv<$BA*P}akm}J3pYQRXAP8=jxomqLY?fx~d1@Sa z5Dx1QaAaD1kMMDwTt$4*YfaaKZkUw42L=92gD|BRZi;U)nL&?02 z{unzGm`}RB3GI6GGtYxw=b;xs>|Ksm(p0V|FL$2tZ74&zOB7Vcdv(0`l0og;ocmmB zJePLgML}(+d~tIs%L@lJ9q8{tkx7nNWto-L_8)j??2A$Y2z&yv)cgWAW}KK>Q?__LhKnS@8I5^t`F ztA(6vcU(Q{Oz=<#o(H8!hv3dLW$op8^x7}ge(Bi!(z~3Zmuh9ryQyd1R>=H`-or)( zwSmT-LaPdA7Jt^%#LAYn#9CDPFYBsHmS0cF@_BCQimLX;xHVxO;2LvoZ>j1^4Dw86 z*Qy(Gh`5(X%^;FzA`t}Fnvq;L&=;Sa2 z(`}NU8Y^G?cNQ%8$&6y}4~xHCV3+UfdVQjplhyu%$oq@HV3icZ7-g;q0i(-nu;;*%9KD3&qA3ilZwP^l=XufOZBxCfM1pc;yWCnyg70lI;wOqam zxoqbIV}H?^lzsYoMVB3rImEqAAN;NKsTa#_VOo6jY~hT0pwk<#)#?HY9xVRl@M{a> zsa@LMzeq|Zl65UPk+}C4e#M_ll-`t4A|uiGZEFhSxRVR-IytddP`y~?(;hL(s;{q! zz9sO_xq>0H;AzVjJ~D5HzeOgs8Ut!o$e1VBP=7x!P^Zody$UBKw|o2sMz7U9-^FJz zj`nLFM^>PaF3=Cn+xC;mtRhH`HJ}y}dU^>=>7_`pC#ON5v5vOQa13Hu0;B{B(bZ@T zG*o&6CR{jRq469M^xxoHQU)Suz%4M*o5vY7XNWS3>Luzq9M4wN)K^bkV%~$bnnn5G zn}0A15%gL2nh`l`Bn4+T4+GTi`>t;^)i;^~EZEJ-OoqB#5(kD<*>TOvJUoxX)?@7D zby9f?Tet7Y=XKlN&Ut08cc|i%lTG|isQQmbL6sDs6