Add TipSetToken to SavePaymentVoucher (#165)

filecoin-project · Mar 18, 2020 · 6403a5b · 6403a5b
1 parent 9176aec
commit 6403a5b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/retrievalmarket/impl/providerstates/provider_states.go b/retrievalmarket/impl/providerstates/provider_states.go
@@ -103,10 +103,15 @@ func ProcessPayment(ctx fsm.Context, environment ProviderDealEnvironment, deal r
 		return ctx.Trigger(rm.ProviderEventReadPaymentFailed, xerrors.Errorf("reading payment: %w", err))
 	}
 
+	tok, _, err := environment.Node().GetChainHead(ctx.Context())
+	if err != nil {
+		return ctx.Trigger(rm.ProviderEventSaveVoucherFailed, err)
+	}
+
 	// attempt to redeem voucher
 	// (totalSent * pricePerbyte) - fundsReceived
 	paymentOwed := big.Sub(big.Mul(abi.NewTokenAmount(int64(deal.TotalSent)), deal.PricePerByte), deal.FundsReceived)
-	received, err := environment.Node().SavePaymentVoucher(ctx.Context(), payment.PaymentChannel, payment.PaymentVoucher, nil, paymentOwed)
+	received, err := environment.Node().SavePaymentVoucher(ctx.Context(), payment.PaymentChannel, payment.PaymentVoucher, nil, paymentOwed, tok)
 	if err != nil {
 		return ctx.Trigger(rm.ProviderEventSaveVoucherFailed, err)
 	}

diff --git a/retrievalmarket/impl/testnodes/test_retrieval_provider_node.go b/retrievalmarket/impl/testnodes/test_retrieval_provider_node.go
@@ -101,7 +101,8 @@ func (trpn *TestRetrievalProviderNode) SavePaymentVoucher(
 	paymentChannel address.Address,
 	voucher *paych.SignedVoucher,
 	proof []byte,
-	expectedAmount abi.TokenAmount) (abi.TokenAmount, error) {
+	expectedAmount abi.TokenAmount,
+	tok shared.TipSetToken) (abi.TokenAmount, error) {
 	key, err := trpn.toExpectedVoucherKey(paymentChannel, voucher, proof, expectedAmount)
 	if err != nil {
 		return abi.TokenAmount{}, err

diff --git a/retrievalmarket/types.go b/retrievalmarket/types.go
@@ -319,7 +319,7 @@ type RetrievalProviderNode interface {
 	// returns the worker address associated with a miner
 	GetMinerWorkerAddress(ctx context.Context, miner address.Address, tok shared.TipSetToken) (address.Address, error)
 	UnsealSector(ctx context.Context, sectorID uint64, offset uint64, length uint64) (io.ReadCloser, error)
-	SavePaymentVoucher(ctx context.Context, paymentChannel address.Address, voucher *paych.SignedVoucher, proof []byte, expectedAmount abi.TokenAmount) (abi.TokenAmount, error)
+	SavePaymentVoucher(ctx context.Context, paymentChannel address.Address, voucher *paych.SignedVoucher, proof []byte, expectedAmount abi.TokenAmount, tok shared.TipSetToken) (abi.TokenAmount, error)
 }
 
 // PeerResolver is an interface for looking up providers that may have a piece