chore(deps): update go-state-types, adapt to QAP API changes

filecoin-project · Sep 11, 2024 · 7abca40 · 7abca40
1 parent 6f0cd11
commit 7abca40
Show file tree

Hide file tree

Showing 26 changed files with 70 additions and 77 deletions.
diff --git a/chain/actors/builtin/builtin.go b/chain/actors/builtin/builtin.go
@@ -8,8 +8,8 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/builtin"
+	minertypes "github.com/filecoin-project/go-state-types/builtin/v15/miner"
 	smoothingtypes "github.com/filecoin-project/go-state-types/builtin/v8/util/smoothing"
-	minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner"
 	"github.com/filecoin-project/go-state-types/manifest"
 	"github.com/filecoin-project/go-state-types/proof"
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
@@ -55,8 +55,8 @@ type ExtendedSectorInfo = proof.ExtendedSectorInfo
 type PoStProof = proof.PoStProof
 type FilterEstimate = smoothingtypes.FilterEstimate
 
-func QAPowerForWeight(size abi.SectorSize, duration abi.ChainEpoch, dealWeight, verifiedWeight abi.DealWeight) abi.StoragePower {
-	return minertypes.QAPowerForWeight(size, duration, dealWeight, verifiedWeight)
+func QAPowerForWeight(size abi.SectorSize, duration abi.ChainEpoch, verifiedWeight abi.DealWeight) abi.StoragePower {
+	return minertypes.QAPowerForWeight(size, duration, verifiedWeight)
 }
 
 func ActorNameByCode(c cid.Cid) string {

diff --git a/chain/actors/builtin/builtin.go.template b/chain/actors/builtin/builtin.go.template
@@ -19,7 +19,7 @@ import (
 
 	"github.com/filecoin-project/lotus/chain/actors"
 
-	minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner"
+	minertypes "github.com/filecoin-project/go-state-types/builtin/v15/miner"
 	smoothingtypes "github.com/filecoin-project/go-state-types/builtin/v8/util/smoothing"
 )
 
@@ -55,8 +55,8 @@ type ExtendedSectorInfo = proof.ExtendedSectorInfo
 type PoStProof = proof.PoStProof
 type FilterEstimate = smoothingtypes.FilterEstimate
 
-func QAPowerForWeight(size abi.SectorSize, duration abi.ChainEpoch, dealWeight, verifiedWeight abi.DealWeight) abi.StoragePower {
-	return minertypes.QAPowerForWeight(size, duration, dealWeight, verifiedWeight)
+func QAPowerForWeight(size abi.SectorSize, duration abi.ChainEpoch, verifiedWeight abi.DealWeight) abi.StoragePower {
+	return minertypes.QAPowerForWeight(size, duration, verifiedWeight)
 }
 
 func ActorNameByCode(c cid.Cid) string {

diff --git a/chain/actors/builtin/market/actor.go.template b/chain/actors/builtin/market/actor.go.template
@@ -90,7 +90,7 @@ type State interface {
 	Proposals() (DealProposals, error)
 	VerifyDealsForActivation(
 		minerAddr address.Address, deals []abi.DealID, currEpoch, sectorExpiry abi.ChainEpoch,
-	) (weight, verifiedWeight abi.DealWeight, err error)
+	) (verifiedWeight abi.DealWeight, err error)
 	NextID() (abi.DealID, error)
 	GetState() interface{}
 	GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes.AllocationId, error)

diff --git a/chain/actors/builtin/market/market.go b/chain/actors/builtin/market/market.go
@@ -161,7 +161,7 @@ type State interface {
 	Proposals() (DealProposals, error)
 	VerifyDealsForActivation(
 		minerAddr address.Address, deals []abi.DealID, currEpoch, sectorExpiry abi.ChainEpoch,
-	) (weight, verifiedWeight abi.DealWeight, err error)
+	) (verifiedWeight abi.DealWeight, err error)
 	NextID() (abi.DealID, error)
 	GetState() interface{}
 	GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes.AllocationId, error)

diff --git a/chain/actors/builtin/market/state.go.template b/chain/actors/builtin/market/state.go.template
@@ -146,9 +146,9 @@ func (s *state{{.v}}) LockedTable() (BalanceTable, error) {
 
 func (s *state{{.v}}) VerifyDealsForActivation(
 	minerAddr address.Address, deals []abi.DealID, currEpoch, sectorExpiry abi.ChainEpoch,
-) (weight, verifiedWeight abi.DealWeight, err error) {
-	w, vw{{if (ge .v 2)}}, _{{end}}, err := market{{.v}}.ValidateDealsForActivation(&s.State, s.store, deals, minerAddr, sectorExpiry, currEpoch)
-	return w, vw, err
+) (verifiedWeight abi.DealWeight, err error) {
+	_, vw{{if (ge .v 2)}}, _{{end}}, err := market{{.v}}.ValidateDealsForActivation(&s.State, s.store, deals, minerAddr, sectorExpiry, currEpoch)
+	return vw, err
 }
 
 func (s *state{{.v}}) NextID() (abi.DealID, error) {

diff --git a/chain/actors/builtin/market/v0.go b/chain/actors/builtin/market/v0.go
diff --git a/chain/actors/builtin/market/v10.go b/chain/actors/builtin/market/v10.go
diff --git a/chain/actors/builtin/market/v11.go b/chain/actors/builtin/market/v11.go
diff --git a/chain/actors/builtin/market/v12.go b/chain/actors/builtin/market/v12.go
diff --git a/chain/actors/builtin/market/v13.go b/chain/actors/builtin/market/v13.go
diff --git a/chain/actors/builtin/market/v14.go b/chain/actors/builtin/market/v14.go
diff --git a/chain/actors/builtin/market/v2.go b/chain/actors/builtin/market/v2.go
diff --git a/chain/actors/builtin/market/v3.go b/chain/actors/builtin/market/v3.go
diff --git a/chain/actors/builtin/market/v4.go b/chain/actors/builtin/market/v4.go
diff --git a/chain/actors/builtin/market/v5.go b/chain/actors/builtin/market/v5.go
diff --git a/chain/actors/builtin/market/v6.go b/chain/actors/builtin/market/v6.go
diff --git a/chain/actors/builtin/market/v7.go b/chain/actors/builtin/market/v7.go
diff --git a/chain/actors/builtin/market/v8.go b/chain/actors/builtin/market/v8.go
diff --git a/chain/actors/builtin/market/v9.go b/chain/actors/builtin/market/v9.go
diff --git a/chain/actors/builtin/verifreg/actor.go.template b/chain/actors/builtin/verifreg/actor.go.template
@@ -48,7 +48,6 @@ type (
 	RemoveDataCapReturn            = verifregtypes.RemoveDataCapReturn
 	RemoveExpiredAllocationsParams = verifregtypes.RemoveExpiredAllocationsParams
 	RemoveExpiredAllocationsReturn = verifregtypes.RemoveExpiredAllocationsReturn
-	BatchReturn                    = verifregtypes.BatchReturn
 	AllocationId                   = verifregtypes.AllocationId
 	ClaimId                        = verifregtypes.ClaimId
 	ClaimAllocationsParams         = verifregtypes.ClaimAllocationsParams

diff --git a/chain/actors/builtin/verifreg/verifreg.go b/chain/actors/builtin/verifreg/verifreg.go
diff --git a/chain/gen/genesis/miners.go b/chain/gen/genesis/miners.go
@@ -292,7 +292,7 @@ func SetupStorageMiners(ctx context.Context, cs *store.ChainStore, sys vm.Syscal
 				}
 
 				rawPow = big.Add(rawPow, big.NewInt(int64(m.SectorSize)))
-				sectorWeight := builtin.QAPowerForWeight(m.SectorSize, minerInfos[i].presealExp, big.Zero(), markettypes.DealWeight(&preseal.Deal))
+				sectorWeight := builtin.QAPowerForWeight(m.SectorSize, minerInfos[i].presealExp, markettypes.DealWeight(&preseal.Deal))
 				minerInfos[i].sectorWeight = append(minerInfos[i].sectorWeight, sectorWeight)
 				qaPow = big.Add(qaPow, sectorWeight)
 			}

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/filecoin-project/lotus
 
-go 1.21
+go 1.22
 
 retract v1.14.0 // Accidentally force-pushed tag, use v1.14.1+ instead.
 
@@ -36,8 +36,8 @@ require (
 	github.com/etclabscore/go-openrpc-reflect v0.0.36
 	github.com/fatih/color v1.15.0
 	github.com/filecoin-project/filecoin-ffi v1.28.0-rc2
-	github.com/filecoin-project/go-address v1.1.0
-	github.com/filecoin-project/go-amt-ipld/v4 v4.3.0
+	github.com/filecoin-project/go-address v1.2.0
+	github.com/filecoin-project/go-amt-ipld/v4 v4.4.0
 	github.com/filecoin-project/go-bitfield v0.2.4
 	github.com/filecoin-project/go-cbor-util v0.0.1
 	github.com/filecoin-project/go-commp-utils/v2 v2.1.0
@@ -48,7 +48,7 @@ require (
 	github.com/filecoin-project/go-jsonrpc v0.6.0
 	github.com/filecoin-project/go-padreader v0.0.1
 	github.com/filecoin-project/go-paramfetch v0.0.4
-	github.com/filecoin-project/go-state-types v0.14.0
+	github.com/filecoin-project/go-state-types v0.15.0-dev.0.20240911011318-dbe511aed411
 	github.com/filecoin-project/go-statemachine v1.0.3
 	github.com/filecoin-project/go-statestore v0.2.0
 	github.com/filecoin-project/go-storedcounter v0.1.0
@@ -195,8 +195,6 @@ require (
 	github.com/filecoin-project/go-amt-ipld/v2 v2.1.0 // indirect
 	github.com/filecoin-project/go-amt-ipld/v3 v3.1.0 // indirect
 	github.com/filecoin-project/go-clock v0.1.0 // indirect
-	github.com/filecoin-project/go-commp-utils v0.1.4 // indirect
-	github.com/filecoin-project/go-commp-utils/nonffi v0.0.0-20240802040721-2a04ffc8ffe8 // indirect
 	github.com/filecoin-project/go-fil-commp-hashhash v0.2.0 // indirect
 	github.com/filecoin-project/go-hamt-ipld v0.1.5 // indirect
 	github.com/filecoin-project/go-hamt-ipld/v2 v2.0.0 // indirect
@@ -220,7 +218,6 @@ require (
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/gopacket v1.1.19 // indirect
 	github.com/google/pprof v0.0.0-20240509144519-723abb6459b7 // indirect
-	github.com/gopherjs/gopherjs v1.17.2 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
 	github.com/huin/goupnp v1.3.0 // indirect