cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

storageminer: Fix PaymentVerify interface

Browse Source
This commit is contained in:
Łukasz Magiera 2019-08-15 16:07:45 +02:00
parent 1579137236
commit fc69556817
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
chain/actors/actor_miner.go
View File

@ -6,12 +6,11 @@ import (
"github.com/filecoin-project/go-lotus/chain/address" "github.com/filecoin-project/go-lotus/chain/address"
"github.com/filecoin-project/go-lotus/chain/types" "github.com/filecoin-project/go-lotus/chain/types"
"github.com/filecoin-project/go-lotus/lib/sectorbuilder" "github.com/filecoin-project/go-lotus/lib/sectorbuilder"
"golang.org/x/xerrors"
"github.com/ipfs/go-cid" "github.com/ipfs/go-cid"
"github.com/ipfs/go-hamt-ipld" "github.com/ipfs/go-hamt-ipld"
cbor "github.com/ipfs/go-ipld-cbor" cbor "github.com/ipfs/go-ipld-cbor"
"github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/peer"
"golang.org/x/xerrors"
) )
func init() { func init() {
@ -533,14 +532,17 @@ func (sma StorageMinerActor) GetSectorSize(act *types.Actor, vmctx types.VMConte
type StorageVoucherData struct { // TODO: Update spec at https://github.com/filecoin-project/specs/blob/master/actors.md#paymentverify type StorageVoucherData struct { // TODO: Update spec at https://github.com/filecoin-project/specs/blob/master/actors.md#paymentverify
CommP []byte CommP []byte
PieceSize []byte PieceSize types.BigInt
}
type StoragePaymentVerifyProof struct {
Sector types.BigInt
Proof []byte
} }
type PaymentVerifyParams struct { type PaymentVerifyParams struct {
Extra StorageVoucherData Extra []byte // StorageVoucherData
Proof []byte // StoragePaymentVerifyProof
Sector []byte
Proof []byte
} }
func (sma StorageMinerActor) PaymentVerify(act *types.Actor, vmctx types.VMContext, params *PaymentVerifyParams) ([]byte, ActorError) { func (sma StorageMinerActor) PaymentVerify(act *types.Actor, vmctx types.VMContext, params *PaymentVerifyParams) ([]byte, ActorError) {
@ -554,9 +556,17 @@ func (sma StorageMinerActor) PaymentVerify(act *types.Actor, vmctx types.VMConte
return nil, err return nil, err
} }
sectorID := types.BigFromBytes(params.Sector) var voucherData StorageVoucherData
if err := cbor.DecodeInto(params.Extra, &voucherData); err != nil {
return nil, aerrors.Escalate(err, "failed to decode storage voucher data for verification")
}
ok, _, commD, aerr := GetFromSectorSet(context.TODO(), vmctx.Ipld(), self.Sectors, sectorID) var proof StoragePaymentVerifyProof
if err := cbor.DecodeInto(params.Proof, &proof); err != nil {
return nil, aerrors.Escalate(err, "failed to decode storage payment proof")
}
ok, _, commD, aerr := GetFromSectorSet(context.TODO(), vmctx.Ipld(), self.Sectors, proof.Sector)
if aerr != nil { if aerr != nil {
return nil, aerr return nil, aerr
} }
@ -564,10 +574,8 @@ func (sma StorageMinerActor) PaymentVerify(act *types.Actor, vmctx types.VMConte
return nil, aerrors.New(1, "miner does not have required sector") return nil, aerrors.New(1, "miner does not have required sector")
} }
if params.Extra.CommP != nil { if voucherData.CommP != nil {
pieceSize := types.BigFromBytes(params.Extra.PieceSize) ok, err := sectorbuilder.VerifyPieceInclusionProof(mi.SectorSize.Uint64(), voucherData.PieceSize.Uint64(), voucherData.CommP, commD, params.Proof)
ok, err := sectorbuilder.VerifyPieceInclusionProof(mi.SectorSize.Uint64(), pieceSize.Uint64(), params.Extra.CommP, commD, params.Proof)
if err != nil { if err != nil {
return nil, aerrors.Escalate(err, "verify piece inclusion proof failed") return nil, aerrors.Escalate(err, "verify piece inclusion proof failed")
} }