pm: refresh ticket params before expiry from sender side

livepeer · May 19, 2021 · 2cc84ee · 2cc84ee
1 parent 41ebbc6
commit 2cc84ee
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
@@ -8,6 +8,8 @@
 
 #### Broadcaster
 
+- \#1877 Refresh TicketParams for the active session before expiry (@kyriediculous)
+
 #### Orchestrator
 
 #### Transcoder

diff --git a/pm/recipient.go b/pm/recipient.go
@@ -22,6 +22,7 @@ var errInsufficientSenderReserve = errors.New("insufficient sender reserve")
 var maxWinProb = new(big.Int).Sub(new(big.Int).Lsh(big.NewInt(1), 256), big.NewInt(1))
 
 var paramsExpirationBlock = big.NewInt(10)
+var paramsExpiryBuffer = int64(1)
 
 // Recipient is an interface which describes an object capable
 // of receiving tickets

diff --git a/pm/sender.go b/pm/sender.go
@@ -155,7 +155,9 @@ func (s *sender) validateTicketParams(ticketParams *TicketParams, numTickets int
 	}
 
 	latestBlock := s.timeManager.LastSeenBlock()
-	if ticketParams.ExpirationBlock.Cmp(latestBlock) <= 0 {
+
+	currentBuffer := new(big.Int).Sub(ticketParams.ExpirationBlock, latestBlock).Int64()
+	if currentBuffer <= paramsExpiryBuffer {
 		return ErrTicketParamsExpired
 	}
 

diff --git a/pm/sender_test.go b/pm/sender_test.go
@@ -266,7 +266,7 @@ func TestCreateTicketBatch_UsesSessionParamsInBatch(t *testing.T) {
 		WinProb:           big.NewInt(2222),
 		Seed:              big.NewInt(3333),
 		RecipientRandHash: recipientRandHash,
-		ExpirationBlock:   big.NewInt(1),
+		ExpirationBlock:   big.NewInt(2),
 		PricePerPixel:     big.NewRat(1, 1),
 		ExpirationParams:  expectedExpParams,
 	}
@@ -295,7 +295,7 @@ func TestCreateTicketBatch_UsesSessionParamsInBatch(t *testing.T) {
 		WinProb:           big.NewInt(2222),
 		Seed:              big.NewInt(3333),
 		RecipientRandHash: recipientRandHash,
-		ExpirationBlock:   big.NewInt(1),
+		ExpirationBlock:   big.NewInt(2),
 		PricePerPixel:     big.NewRat(1, 1),
 		ExpirationParams:  &TicketExpirationParams{},
 	}
@@ -316,7 +316,7 @@ func TestCreateTicketBatch_UsesSessionParamsInBatch(t *testing.T) {
 		WinProb:           big.NewInt(2222),
 		Seed:              big.NewInt(3333),
 		RecipientRandHash: recipientRandHash,
-		ExpirationBlock:   big.NewInt(1),
+		ExpirationBlock:   big.NewInt(2),
 		PricePerPixel:     big.NewRat(1, 1),
 		ExpirationParams:  nil,
 	}
@@ -498,13 +498,24 @@ func TestValidateTicketParams_ExpiredParams_ReturnsError(t *testing.T) {
 	sender.maxEV = big.NewRat(100, 1)
 	sender.depositMultiplier = 2
 
+	sender.timeManager.(*stubTimeManager).lastSeenBlock = big.NewInt(100)
+
 	// test expired
 	ticketParams := defaultTicketParams(t, RandAddress())
-	ticketParams.ExpirationBlock = big.NewInt(int64(-1))
+	ticketParams.ExpirationBlock = big.NewInt(int64(1))
 	err := sender.ValidateTicketParams(&ticketParams)
 	assert.EqualError(t, err, ErrTicketParamsExpired.Error())
 
+	// test within expiry buffer
+	ticketParams.ExpirationBlock = big.NewInt(99)
+	err = sender.ValidateTicketParams(&ticketParams)
+	assert.EqualError(t, err, ErrTicketParamsExpired.Error())
+
 	// test nil
+	ticketParams.ExpirationBlock = big.NewInt(105)
+	err = sender.ValidateTicketParams(&ticketParams)
+	assert.Nil(t, err)
+
 	ticketParams.ExpirationBlock = big.NewInt(0)
 	err = sender.ValidateTicketParams(&ticketParams)
 	assert.Nil(t, err)