From b914e95f346de9b60b1f2deb71347f46d0d22508 Mon Sep 17 00:00:00 2001
From: ZenGround0 <ZenGround0@users.noreply.github.com>
Date: Tue, 10 Aug 2021 15:50:37 -0400
Subject: [PATCH] revert pricelist by version to pricelist by epoch

---
 api/version.go                              |   4 +--
 build/openrpc/worker.json.gz                | Bin 2711 -> 2711 bytes
 build/params_2k.go                          |   1 -
 build/params_butterfly.go                   |   1 -
 build/params_calibnet.go                    |   2 --
 build/params_interop.go                     |   1 -
 build/params_mainnet.go                     |   1 -
 build/params_nerpanet.go                    |   1 -
 build/params_testground.go                  |  31 ++++++++++----------
 chain/actors/version.go                     |   2 +-
 chain/messagepool/check.go                  |   2 +-
 chain/messagepool/messagepool.go            |   3 +-
 chain/messagepool/selection.go              |   2 +-
 chain/stmgr/upgrades.go                     |   4 ---
 chain/sync.go                               |   2 +-
 chain/vm/gas.go                             |  28 ++++++++++--------
 chain/vm/mkactor.go                         |   2 +-
 chain/vm/vm.go                              |   4 +--
 documentation/en/api-v0-methods-miner.md    |   2 +-
 documentation/en/api-v0-methods-worker.md   |   2 +-
 documentation/en/api-v0-methods.md          |   2 +-
 documentation/en/api-v1-unstable-methods.md |   2 +-
 22 files changed, 45 insertions(+), 54 deletions(-)

diff --git a/api/version.go b/api/version.go
index ef59dd104..687f5135a 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, 1)
-	FullAPIVersion1 = newVer(2, 1, 1)
+	FullAPIVersion0 = newVer(1, 3, 0)
+	FullAPIVersion1 = newVer(2, 1, 0)
 
 	MinerAPIVersion0  = newVer(1, 2, 0)
 	WorkerAPIVersion0 = newVer(1, 1, 0)
diff --git a/build/openrpc/worker.json.gz b/build/openrpc/worker.json.gz
index 5c6e4a866be993d0dfe3a93e1fe3a320dfabeec9..46ed1f5b266010aaadb7d84332548e4f0029ce16 100644
GIT binary patch
delta 2502
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
Q00030|M}e-$60y+0Jlx#=Kufz

delta 2502
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
Q00030|JgX%cUgJ>0IQnrasU7T

diff --git a/build/params_2k.go b/build/params_2k.go
index a1ccb0ce3..efa38dc0c 100644
--- a/build/params_2k.go
+++ b/build/params_2k.go
@@ -28,7 +28,6 @@ var UpgradeAssemblyHeight = abi.ChainEpoch(-5)
 var UpgradeLiftoffHeight = abi.ChainEpoch(-6)
 
 var UpgradeKumquatHeight = abi.ChainEpoch(-7)
-var UpgradePricelistOopsHeight = abi.ChainEpoch(-8)
 var UpgradeCalicoHeight = abi.ChainEpoch(-9)
 var UpgradePersianHeight = abi.ChainEpoch(-10)
 var UpgradeOrangeHeight = abi.ChainEpoch(-11)
diff --git a/build/params_butterfly.go b/build/params_butterfly.go
index 14b885e5f..4f4cc756d 100644
--- a/build/params_butterfly.go
+++ b/build/params_butterfly.go
@@ -28,7 +28,6 @@ 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 fe871bcca..df334a516 100644
--- a/build/params_calibnet.go
+++ b/build/params_calibnet.go
@@ -33,8 +33,6 @@ 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 b5e49577d..921dd0981 100644
--- a/build/params_interop.go
+++ b/build/params_interop.go
@@ -31,7 +31,6 @@ var UpgradeAssemblyHeight = abi.ChainEpoch(-5)
 var UpgradeLiftoffHeight = abi.ChainEpoch(-6)
 
 var UpgradeKumquatHeight = abi.ChainEpoch(-7)
-var UpgradePricelistOopsHeight = abi.ChainEpoch(-8)
 var UpgradeCalicoHeight = abi.ChainEpoch(-9)
 var UpgradePersianHeight = abi.ChainEpoch(-10)
 var UpgradeOrangeHeight = abi.ChainEpoch(-11)
diff --git a/build/params_mainnet.go b/build/params_mainnet.go
index c9750b6e6..1c9b69462 100644
--- a/build/params_mainnet.go
+++ b/build/params_mainnet.go
@@ -45,7 +45,6 @@ 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 8e18216db..5eef25cb2 100644
--- a/build/params_nerpanet.go
+++ b/build/params_nerpanet.go
@@ -32,7 +32,6 @@ const UpgradeTapeHeight = 60
 
 const UpgradeKumquatHeight = 90
 
-const UpgradePricelistOopsHeight = 99
 const UpgradeCalicoHeight = 100
 const UpgradePersianHeight = UpgradeCalicoHeight + (builtin2.EpochsInHour * 1)
 
diff --git a/build/params_testground.go b/build/params_testground.go
index b12df11e7..204c74e67 100644
--- a/build/params_testground.go
+++ b/build/params_testground.go
@@ -82,22 +82,21 @@ 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
-	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
+	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 = -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,
diff --git a/chain/actors/version.go b/chain/actors/version.go
index 36e8d17b4..8787089af 100644
--- a/chain/actors/version.go
+++ b/chain/actors/version.go
@@ -25,7 +25,7 @@ func VersionForNetwork(version network.Version) (Version, error) {
 	switch version {
 	case network.Version0, network.Version1, network.Version2, network.Version3:
 		return Version0, nil
-	case network.Version4, network.Version5, network.Version6, network.Version6AndAHalf, network.Version7, network.Version8, network.Version9:
+	case network.Version4, network.Version5, network.Version6, network.Version7, network.Version8, network.Version9:
 		return Version2, nil
 	case network.Version10, network.Version11:
 		return Version3, nil
diff --git a/chain/messagepool/check.go b/chain/messagepool/check.go
index 9a55c283c..283c0d119 100644
--- a/chain/messagepool/check.go
+++ b/chain/messagepool/check.go
@@ -281,7 +281,7 @@ func (mp *MessagePool) checkMessages(ctx context.Context, msgs []*types.Message,
 		// gas checks
 
 		// 4. Min Gas
-		minGas := vm.PricelistByVersion(nv).OnChainMessage(m.ChainLength())
+		minGas := vm.PricelistByEpoch(epoch).OnChainMessage(m.ChainLength())
 
 		check = api.MessageCheckStatus{
 			Cid: m.Cid(),
diff --git a/chain/messagepool/messagepool.go b/chain/messagepool/messagepool.go
index 175cda9ff..ee2518ed9 100644
--- a/chain/messagepool/messagepool.go
+++ b/chain/messagepool/messagepool.go
@@ -616,7 +616,8 @@ 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) {
-	minGas := vm.PricelistByVersion(build.NewestNetworkVersion).OnChainMessage(m.ChainLength())
+	epoch := curTs.Height()
+	minGas := vm.PricelistByEpoch(epoch).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 60d75a841..611ab8e5f 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.PricelistByVersion(build.NewestNetworkVersion).OnChainMessage(m.ChainLength()).Total()
+		minGas := vm.PricelistByEpoch(ts.Height()).OnChainMessage(m.ChainLength()).Total()
 		if m.Message.GasLimit < minGas {
 			break
 		}
diff --git a/chain/stmgr/upgrades.go b/chain/stmgr/upgrades.go
index 968a0e273..d2ccbad39 100644
--- a/chain/stmgr/upgrades.go
+++ b/chain/stmgr/upgrades.go
@@ -72,10 +72,6 @@ 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/sync.go b/chain/sync.go
index 5d3c1d992..7914cc8d5 100644
--- a/chain/sync.go
+++ b/chain/sync.go
@@ -1060,7 +1060,7 @@ func (syncer *Syncer) checkBlockMessages(ctx context.Context, b *types.FullBlock
 	}
 
 	nv := syncer.sm.GetNtwkVersion(ctx, b.Header.Height)
-	pl := vm.PricelistByVersion(nv)
+	pl := vm.PricelistByEpoch(baseTs.Height())
 	var sumGasLimit int64
 	checkMsg := func(msg types.ChainMsg) error {
 		m := msg.VMMessage()
diff --git a/chain/vm/gas.go b/chain/vm/gas.go
index b848550f3..206a55d36 100644
--- a/chain/vm/gas.go
+++ b/chain/vm/gas.go
@@ -7,7 +7,7 @@ import (
 	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"
+	"github.com/filecoin-project/lotus/build"
 	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"
@@ -79,8 +79,8 @@ type Pricelist interface {
 	OnVerifyConsensusFault() GasCharge
 }
 
-var prices = map[network.Version]Pricelist{
-	network.Version0: &pricelistV0{
+var prices = map[abi.ChainEpoch]Pricelist{
+	abi.ChainEpoch(0): &pricelistV0{
 		computeGasMulti: 1,
 		storageGasMulti: 1000,
 
@@ -129,7 +129,7 @@ var prices = map[network.Version]Pricelist{
 		verifyPostDiscount:   true,
 		verifyConsensusFault: 495422,
 	},
-	network.Version6AndAHalf: &pricelistV0{
+	abi.ChainEpoch(build.UpgradeCalicoHeight): &pricelistV0{
 		computeGasMulti: 1,
 		storageGasMulti: 1300,
 
@@ -207,19 +207,21 @@ var prices = map[network.Version]Pricelist{
 	},
 }
 
-// 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
+// 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
 			bestPrice = pl
 		}
 	}
 	if bestPrice == nil {
-		panic(fmt.Sprintf("bad setup: no gas prices available for version %d", version))
+		panic(fmt.Sprintf("bad setup: no gas prices available for epoch %d", epoch))
 	}
 	return bestPrice
 }
diff --git a/chain/vm/mkactor.go b/chain/vm/mkactor.go
index 4beee5ce6..e461a2b4c 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(PricelistByVersion(rt.NetworkVersion()).OnCreateActor()); err != nil {
+	if err := rt.chargeGasSafe(PricelistByEpoch(rt.height).OnCreateActor()); err != nil {
 		return nil, address.Undef, err
 	}
 
diff --git a/chain/vm/vm.go b/chain/vm/vm.go
index 84f57ec9b..199896671 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:        PricelistByVersion(vm.ntwkVersion(ctx, vm.blockHeight)),
+		pricelist:        PricelistByEpoch(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 := PricelistByVersion(vm.ntwkVersion(ctx, vm.blockHeight))
+	pl := PricelistByEpoch(vm.blockHeight)
 
 	msgGas := pl.OnChainMessage(cmsg.ChainLength())
 	msgGasCost := msgGas.Total()
diff --git a/documentation/en/api-v0-methods-miner.md b/documentation/en/api-v0-methods-miner.md
index 3b6d5ac51..86cf62bbc 100644
--- a/documentation/en/api-v0-methods-miner.md
+++ b/documentation/en/api-v0-methods-miner.md
@@ -201,7 +201,7 @@ Response:
 ```json
 {
   "Version": "string value",
-  "APIVersion": 131329,
+  "APIVersion": 131328,
   "BlockDelay": 42
 }
 ```
diff --git a/documentation/en/api-v0-methods-worker.md b/documentation/en/api-v0-methods-worker.md
index 341846759..c620113f4 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: `131329`
+Response: `131328`
 
 ## Add
 
diff --git a/documentation/en/api-v0-methods.md b/documentation/en/api-v0-methods.md
index bc67382d6..6b09ffc2a 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": 131329,
+  "APIVersion": 131328,
   "BlockDelay": 42
 }
 ```
diff --git a/documentation/en/api-v1-unstable-methods.md b/documentation/en/api-v1-unstable-methods.md
index 4ed1509e0..acccf50fb 100644
--- a/documentation/en/api-v1-unstable-methods.md
+++ b/documentation/en/api-v1-unstable-methods.md
@@ -285,7 +285,7 @@ Response:
 ```json
 {
   "Version": "string value",
-  "APIVersion": 131329,
+  "APIVersion": 131328,
   "BlockDelay": 42
 }
 ```