Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[payment] transactor ping payment vault contract #827

Merged
merged 18 commits into from
Dec 10, 2024
Merged

[payment] transactor ping payment vault contract #827

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
afd077e
feat: fill in transactor payment contract call
hopeyen Nov 22, 2024
a1f9d6a
fix: use on-chain field names
hopeyen Nov 22, 2024
75320b1
fix: fill in global param contract calls
hopeyen Nov 22, 2024
eee8f4e
feat: global bin interval calls
hopeyen Nov 25, 2024
56c85e1
refactor: ptrs, addrs, zero-value mapping check
hopeyen Dec 4, 2024
7fd1c61
fix: atomic and map pointers
hopeyen Dec 5, 2024
28bed77
fix: lint
hopeyen Dec 5, 2024
572ef67
fix: tests
hopeyen Dec 5, 2024
b0d8d51
refactor: atomicPointer type
hopeyen Dec 6, 2024
49b6559
fix: temporary nil checks for paymentVault contract
hopeyen Dec 6, 2024
9b68330
fix: onchain state type
hopeyen Dec 6, 2024
573c031
refactor: adding locks and moving checks
hopeyen Dec 6, 2024
34ffa52
fix: QuorumSplits typo
hopeyen Dec 6, 2024
7e9d37e
fix: proto gen
hopeyen Dec 6, 2024
2c2f893
refactor: define and check ActiveReservation against onchain struct
hopeyen Dec 10, 2024
91856ce
fix: properly check zero valued reservation
hopeyen Dec 10, 2024
b585fca
fix: adding on-chain payments to cached maps
hopeyen Dec 10, 2024
971edc2
fix: logs
hopeyen Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions api/clients/accountant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func (a *Accountant) BlobPaymentInfo(ctx context.Context, numSymbols uint64, quo
relativeBinRecord.Usage += numSymbols

// first attempt to use the active reservation
binLimit := a.reservation.SymbolsPerSec * uint64(a.reservationWindow)
binLimit := a.reservation.SymbolsPerSecond * uint64(a.reservationWindow)
if relativeBinRecord.Usage <= binLimit {
if err := QuorumCheck(quorumNumbers, a.reservation.QuorumNumbers); err != nil {
return 0, big.NewInt(0), err
Expand Down Expand Up @@ -166,7 +166,7 @@ func (a *Accountant) SetPaymentState(paymentState *disperser_rpc.GetPaymentState
return fmt.Errorf("reservation cannot be nil")
} else if paymentState.GetReservation().GetQuorumNumbers() == nil {
return fmt.Errorf("reservation quorum numbers cannot be nil")
} else if paymentState.GetReservation().GetQuorumSplit() == nil {
} else if paymentState.GetReservation().GetQuorumSplits() == nil {
return fmt.Errorf("reservation quorum split cannot be nil")
} else if paymentState.GetBinRecords() == nil {
return fmt.Errorf("bin records cannot be nil")
Expand All @@ -177,7 +177,7 @@ func (a *Accountant) SetPaymentState(paymentState *disperser_rpc.GetPaymentState
a.cumulativePayment = new(big.Int).SetBytes(paymentState.CumulativePayment)
a.pricePerSymbol = uint32(paymentState.PaymentGlobalParams.PricePerSymbol)

a.reservation.SymbolsPerSec = uint64(paymentState.PaymentGlobalParams.GlobalSymbolsPerSecond)
a.reservation.SymbolsPerSecond = uint64(paymentState.PaymentGlobalParams.GlobalSymbolsPerSecond)
a.reservation.StartTimestamp = uint64(paymentState.Reservation.StartTimestamp)
a.reservation.EndTimestamp = uint64(paymentState.Reservation.EndTimestamp)
a.reservationWindow = uint32(paymentState.PaymentGlobalParams.ReservationWindow)
Expand All @@ -188,11 +188,11 @@ func (a *Accountant) SetPaymentState(paymentState *disperser_rpc.GetPaymentState
}
a.reservation.QuorumNumbers = quorumNumbers

quorumSplit := make([]uint8, len(paymentState.Reservation.QuorumSplit))
for i, quorum := range paymentState.Reservation.QuorumSplit {
quorumSplit[i] = uint8(quorum)
quorumSplits := make([]uint8, len(paymentState.Reservation.QuorumSplits))
for i, quorum := range paymentState.Reservation.QuorumSplits {
quorumSplits[i] = uint8(quorum)
}
a.reservation.QuorumSplit = quorumSplit
a.reservation.QuorumSplits = quorumSplits

binRecords := make([]BinRecord, len(paymentState.BinRecords))
for i, record := range paymentState.BinRecords {
Expand Down
80 changes: 40 additions & 40 deletions api/clients/accountant_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ const numBins = uint32(3)

func TestNewAccountant(t *testing.T) {
reservation := &core.ActiveReservation{
SymbolsPerSec: 100,
StartTimestamp: 100,
EndTimestamp: 200,
QuorumSplit: []byte{50, 50},
QuorumNumbers: []uint8{0, 1},
SymbolsPerSecond: 100,
StartTimestamp: 100,
EndTimestamp: 200,
QuorumSplits: []byte{50, 50},
QuorumNumbers: []uint8{0, 1},
}
onDemand := &core.OnDemandPayment{
CumulativePayment: big.NewInt(500),
Expand All @@ -48,11 +48,11 @@ func TestNewAccountant(t *testing.T) {

func TestAccountBlob_Reservation(t *testing.T) {
reservation := &core.ActiveReservation{
SymbolsPerSec: 200,
StartTimestamp: 100,
EndTimestamp: 200,
QuorumSplit: []byte{50, 50},
QuorumNumbers: []uint8{0, 1},
SymbolsPerSecond: 200,
StartTimestamp: 100,
EndTimestamp: 200,
QuorumSplits: []byte{50, 50},
QuorumNumbers: []uint8{0, 1},
}
onDemand := &core.OnDemandPayment{
CumulativePayment: big.NewInt(500),
Expand Down Expand Up @@ -96,11 +96,11 @@ func TestAccountBlob_Reservation(t *testing.T) {

func TestAccountBlob_OnDemand(t *testing.T) {
reservation := &core.ActiveReservation{
SymbolsPerSec: 200,
StartTimestamp: 100,
EndTimestamp: 200,
QuorumSplit: []byte{50, 50},
QuorumNumbers: []uint8{0, 1},
SymbolsPerSecond: 200,
StartTimestamp: 100,
EndTimestamp: 200,
QuorumSplits: []byte{50, 50},
QuorumNumbers: []uint8{0, 1},
}
onDemand := &core.OnDemandPayment{
CumulativePayment: big.NewInt(1500),
Expand Down Expand Up @@ -152,11 +152,11 @@ func TestAccountBlob_InsufficientOnDemand(t *testing.T) {

func TestAccountBlobCallSeries(t *testing.T) {
reservation := &core.ActiveReservation{
SymbolsPerSec: 200,
StartTimestamp: 100,
EndTimestamp: 200,
QuorumSplit: []byte{50, 50},
QuorumNumbers: []uint8{0, 1},
SymbolsPerSecond: 200,
StartTimestamp: 100,
EndTimestamp: 200,
QuorumSplits: []byte{50, 50},
QuorumNumbers: []uint8{0, 1},
}
onDemand := &core.OnDemandPayment{
CumulativePayment: big.NewInt(1000),
Expand Down Expand Up @@ -200,11 +200,11 @@ func TestAccountBlobCallSeries(t *testing.T) {

func TestAccountBlob_BinRotation(t *testing.T) {
reservation := &core.ActiveReservation{
SymbolsPerSec: 1000,
StartTimestamp: 100,
EndTimestamp: 200,
QuorumSplit: []byte{50, 50},
QuorumNumbers: []uint8{0, 1},
SymbolsPerSecond: 1000,
StartTimestamp: 100,
EndTimestamp: 200,
QuorumSplits: []byte{50, 50},
QuorumNumbers: []uint8{0, 1},
}
onDemand := &core.OnDemandPayment{
CumulativePayment: big.NewInt(1000),
Expand Down Expand Up @@ -242,11 +242,11 @@ func TestAccountBlob_BinRotation(t *testing.T) {

func TestConcurrentBinRotationAndAccountBlob(t *testing.T) {
reservation := &core.ActiveReservation{
SymbolsPerSec: 1000,
StartTimestamp: 100,
EndTimestamp: 200,
QuorumSplit: []byte{50, 50},
QuorumNumbers: []uint8{0, 1},
SymbolsPerSecond: 1000,
StartTimestamp: 100,
EndTimestamp: 200,
QuorumSplits: []byte{50, 50},
QuorumNumbers: []uint8{0, 1},
}
onDemand := &core.OnDemandPayment{
CumulativePayment: big.NewInt(1000),
Expand Down Expand Up @@ -288,11 +288,11 @@ func TestConcurrentBinRotationAndAccountBlob(t *testing.T) {

func TestAccountBlob_ReservationWithOneOverflow(t *testing.T) {
reservation := &core.ActiveReservation{
SymbolsPerSec: 200,
StartTimestamp: 100,
EndTimestamp: 200,
QuorumSplit: []byte{50, 50},
QuorumNumbers: []uint8{0, 1},
SymbolsPerSecond: 200,
StartTimestamp: 100,
EndTimestamp: 200,
QuorumSplits: []byte{50, 50},
QuorumNumbers: []uint8{0, 1},
}
onDemand := &core.OnDemandPayment{
CumulativePayment: big.NewInt(1000),
Expand Down Expand Up @@ -333,11 +333,11 @@ func TestAccountBlob_ReservationWithOneOverflow(t *testing.T) {

func TestAccountBlob_ReservationOverflowReset(t *testing.T) {
reservation := &core.ActiveReservation{
SymbolsPerSec: 1000,
StartTimestamp: 100,
EndTimestamp: 200,
QuorumSplit: []byte{50, 50},
QuorumNumbers: []uint8{0, 1},
SymbolsPerSecond: 1000,
StartTimestamp: 100,
EndTimestamp: 200,
QuorumSplits: []byte{50, 50},
QuorumNumbers: []uint8{0, 1},
}
onDemand := &core.OnDemandPayment{
CumulativePayment: big.NewInt(1000),
Expand Down
2 changes: 1 addition & 1 deletion api/docs/disperser_v2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ <h3 id="disperser.v2.Reservation">Reservation</h3>
</tr>

<tr>
<td>quorum_split</td>
<td>quorum_splits</td>
<td><a href="#uint32">uint32</a></td>
<td>repeated</td>
<td><p> </p></td>
Expand Down
2 changes: 1 addition & 1 deletion api/docs/disperser_v2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ GetPaymentStateRequest contains parameters to query the payment state of an acco
| start_timestamp | [uint32](#uint32) | | |
| end_timestamp | [uint32](#uint32) | | |
| quorum_numbers | [uint32](#uint32) | repeated | |
| quorum_split | [uint32](#uint32) | repeated | |
| quorum_splits | [uint32](#uint32) | repeated | |



Expand Down
2 changes: 1 addition & 1 deletion api/docs/eigenda-protos.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2396,7 +2396,7 @@ <h3 id="disperser.v2.Reservation">Reservation</h3>
</tr>

<tr>
<td>quorum_split</td>
<td>quorum_splits</td>
<td><a href="#uint32">uint32</a></td>
<td>repeated</td>
<td><p> </p></td>
Expand Down
2 changes: 1 addition & 1 deletion api/docs/eigenda-protos.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,7 @@ GetPaymentStateRequest contains parameters to query the payment state of an acco
| start_timestamp | [uint32](#uint32) | | |
| end_timestamp | [uint32](#uint32) | | |
| quorum_numbers | [uint32](#uint32) | repeated | |
| quorum_split | [uint32](#uint32) | repeated | |
| quorum_splits | [uint32](#uint32) | repeated | |



Expand Down
90 changes: 45 additions & 45 deletions api/grpc/disperser/v2/disperser_v2.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/proto/disperser/v2/disperser_v2.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ message Reservation {
uint32 start_timestamp = 2;
uint32 end_timestamp = 3;
repeated uint32 quorum_numbers = 4;
repeated uint32 quorum_split = 5;
repeated uint32 quorum_splits = 5;
}

// BinRecord is the usage record of an account in a bin. The API should return the active bin
Expand Down
8 changes: 4 additions & 4 deletions core/chainio.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,16 +110,16 @@ type Reader interface {
GetAllVersionedBlobParams(ctx context.Context) (map[uint8]*BlobVersionParameters, error)

// GetActiveReservations returns active reservations (end timestamp > current timestamp)
GetActiveReservations(ctx context.Context, blockNumber uint32, accountIDs []string) (map[string]ActiveReservation, error)
GetActiveReservations(ctx context.Context, accountIDs []gethcommon.Address) (map[gethcommon.Address]*ActiveReservation, error)

// GetActiveReservationByAccount returns active reservation by account ID
GetActiveReservationByAccount(ctx context.Context, blockNumber uint32, accountID string) (ActiveReservation, error)
GetActiveReservationByAccount(ctx context.Context, accountID gethcommon.Address) (*ActiveReservation, error)

// GetOnDemandPayments returns all on-demand payments
GetOnDemandPayments(ctx context.Context, blockNumber uint32, accountIDs []string) (map[string]OnDemandPayment, error)
GetOnDemandPayments(ctx context.Context, accountIDs []gethcommon.Address) (map[gethcommon.Address]*OnDemandPayment, error)

// GetOnDemandPaymentByAccount returns on-demand payment of an account
GetOnDemandPaymentByAccount(ctx context.Context, blockNumber uint32, accountID string) (OnDemandPayment, error)
GetOnDemandPaymentByAccount(ctx context.Context, accountID gethcommon.Address) (*OnDemandPayment, error)

// GetRelayURL returns the relay URL address for the given key.
GetRelayURL(ctx context.Context, key uint32) (string, error)
Expand Down
Loading
Loading