refactor: rebase with type changes

Layr-Labs · Oct 17, 2024 · 0aaa646 · 0aaa646
1 parent b085195
commit 0aaa646
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/core/data.go b/core/data.go
@@ -490,7 +490,7 @@ type PaymentMetadata struct {
 	BinIndex uint32
 	// TODO: we are thinking the contract can use uint128 for cumulative payment,
 	// but the definition on v2 uses uint64. Double check with team.
-	CumulativePayment big.Int
+	CumulativePayment *big.Int
 }
 
 // Hash returns the Keccak256 hash of the PaymentMetadata

diff --git a/core/meterer/meterer.go b/core/meterer/meterer.go
@@ -147,7 +147,6 @@ func (m *Meterer) ValidateBinIndex(header core.PaymentMetadata, reservation *cor
 }
 
 // IncrementBinUsage increments the bin usage atomically and checks for overflow
-// TODO: Bin limit should be direct write to the Store
 func (m *Meterer) IncrementBinUsage(ctx context.Context, header core.PaymentMetadata, reservation *core.ActiveReservation, blobLength uint) error {
 	numSymbols := m.SymbolsCharged(blobLength)
 	newUsage, err := m.OffchainStore.UpdateReservationBin(ctx, header.AccountID, uint64(header.BinIndex), uint64(numSymbols))

diff --git a/core/meterer/meterer_test.go b/core/meterer/meterer_test.go
@@ -477,7 +477,7 @@ func createMetererInput(binIndex uint32, cumulativePayment uint64, dataLength ui
 	header = &core.PaymentMetadata{
 		AccountID:         accountID,
 		BinIndex:          binIndex,
-		CumulativePayment: *big.NewInt(int64(cumulativePayment)),
+		CumulativePayment: big.NewInt(int64(cumulativePayment)),
 	}
 	return blob, header
 }
diff --git a/core/meterer/offchain_store.go b/core/meterer/offchain_store.go
@@ -165,7 +165,7 @@ func (s *OffchainStore) AddOnDemandPayment(ctx context.Context, paymentMetadata
 }
 
 // RemoveOnDemandPayment removes a specific payment from the list for a specific account
-func (s *OffchainStore) RemoveOnDemandPayment(ctx context.Context, accountID string, payment big.Int) error {
+func (s *OffchainStore) RemoveOnDemandPayment(ctx context.Context, accountID string, payment *big.Int) error {
 	err := s.dynamoClient.DeleteItem(ctx, s.onDemandTableName,
 		commondynamodb.Key{
 			"AccountID":          &types.AttributeValueMemberS{Value: accountID},
@@ -182,7 +182,7 @@ func (s *OffchainStore) RemoveOnDemandPayment(ctx context.Context, accountID str
 
 // GetRelevantOnDemandRecords gets previous cumulative payment, next cumulative payment, blob size of next payment
 // The queries are done sequentially instead of one-go for efficient querying and would not cause race condition errors for honest requests
-func (s *OffchainStore) GetRelevantOnDemandRecords(ctx context.Context, accountID string, cumulativePayment big.Int) (uint64, uint64, uint32, error) {
+func (s *OffchainStore) GetRelevantOnDemandRecords(ctx context.Context, accountID string, cumulativePayment *big.Int) (uint64, uint64, uint32, error) {
 	// Fetch the largest entry smaller than the given cumulativePayment
 	queryInput := &dynamodb.QueryInput{
 		TableName:              aws.String(s.onDemandTableName),