removed computor index from qchain; added transfer txs filtering by s…

…tart and end tick
qubic · Mar 12, 2024 · d8858e4 · d8858e4
1 parent bcd2172
commit d8858e4
Show file tree

Hide file tree

Showing 14 changed files with 413 additions and 746 deletions.
diff --git a/protobuff/archive.pb.go b/protobuff/archive.pb.go
diff --git a/protobuff/archive.pb.gw.go b/protobuff/archive.pb.gw.go
diff --git a/protobuff/archive.proto b/protobuff/archive.proto
@@ -66,7 +66,6 @@ message QuorumDiff {
 }
 
 message QuorumTickStructure {
-  uint32 computor_index = 1;
   uint32 epoch = 2;
   uint32 tick_number = 3;
   uint64 timestamp = 4;
@@ -128,11 +127,8 @@ message IdentityInfo {
 
 message TransferTransactionsPerTick {
   uint32 tick_number = 1;
-  Transactions transactions = 2;
-}
-
-message TransferTransactions {
-  repeated TransferTransactionsPerTick transfer_transactions_per_tick = 1;
+  string identity = 2;
+  Transactions transactions = 3;
 }
 
 message GetIdentityInfoRequest {
@@ -163,21 +159,14 @@ message GetSkippedTicksResponse {
   repeated SkippedTicksInterval skipped_ticks = 1;
 }
 
-message GetTransferTransactionsRequest {
-  string identity = 1;
-}
-
-message GetTransferTransactionsResponse {
-  TransferTransactions transfer_transactions = 1;
-}
-
 message GetTransferTransactionsPerTickRequest {
   string identity = 1;
-  uint32 tick_number = 2;
+  uint32 start_tick = 2;
+  uint32 end_tick = 3;
 }
 
 message GetTransferTransactionsPerTickResponse {
-  TransferTransactionsPerTick transfer_transactions_per_tick = 1;
+  repeated TransferTransactionsPerTick transfer_transactions_per_tick = 1;
 }
 
 message GetQChainHashRequest {
@@ -198,7 +187,6 @@ service ArchiveService {
   rpc GetLastProcessedTick(GetLastProcessedTickRequest) returns (GetLastProcessedTickResponse);
   rpc SendRawTransaction(SendRawTransactionRequest) returns (SendRawTransactionResponse);
   rpc GetSkippedTicks(GetSkippedTicksRequest) returns (GetSkippedTicksResponse);
-  rpc GetTransferTransactions(GetTransferTransactionsRequest) returns (GetTransferTransactionsResponse);
   rpc GetTransferTransactionsPerTick(GetTransferTransactionsPerTickRequest) returns (GetTransferTransactionsPerTickResponse);
   rpc GetQChainHash(GetQChainHashRequest) returns (GetQChainHashResponse);
 }
diff --git a/protobuff/archive_grpc.pb.go b/protobuff/archive_grpc.pb.go
diff --git a/rpc/rpc_server.go b/rpc/rpc_server.go
@@ -187,20 +187,9 @@ func (s *Server) GetSkippedTicks(ctx context.Context, req *protobuff.GetSkippedT
 	return &protobuff.GetSkippedTicksResponse{SkippedTicks: ticks.SkippedTicks}, nil
 }
 
-func (s *Server) GetTransferTransactions(ctx context.Context, req *protobuff.GetTransferTransactionsRequest) (*protobuff.GetTransferTransactionsResponse, error) {
-	txs, err := s.store.GetTransferTransactions(ctx, req.Identity)
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "getting transfer transactions: %v", err)
-	}
-
-	return &protobuff.GetTransferTransactionsResponse{TransferTransactions: txs}, nil
-}
 func (s *Server) GetTransferTransactionsPerTick(ctx context.Context, req *protobuff.GetTransferTransactionsPerTickRequest) (*protobuff.GetTransferTransactionsPerTickResponse, error) {
-	txs, err := s.store.GetTransferTransactionsPerTick(ctx, req.Identity, uint64(req.TickNumber))
+	txs, err := s.store.GetTransferTransactions(ctx, req.Identity, uint64(req.GetStartTick()), uint64(req.GetEndTick()))
 	if err != nil {
-		if errors.Cause(err) == store.ErrNotFound {
-			return nil, status.Errorf(codes.NotFound, "transfer transactions for specified identity, tick pair not found")
-		}
 		return nil, status.Errorf(codes.Internal, "getting transfer transactions: %v", err)
 	}
 

diff --git a/store/store.go b/store/store.go
@@ -347,12 +347,11 @@ func (s *PebbleStore) PutTransferTransactionsPerTick(ctx context.Context, identi
 	return nil
 }
 
-func (s *PebbleStore) GetTransferTransactions(ctx context.Context, identity string) (*protobuff.TransferTransactions, error) {
+func (s *PebbleStore) GetTransferTransactions(ctx context.Context, identity string, startTick, endTick uint64) ([]*protobuff.TransferTransactionsPerTick, error) {
 	partialKey := identityTransferTransactions(identity)
-	upperBound := append(partialKey, []byte(strconv.FormatUint(maxTickNumber, 10))...)
 	iter, err := s.db.NewIter(&pebble.IterOptions{
-		LowerBound: partialKey,
-		UpperBound: upperBound,
+		LowerBound: binary.BigEndian.AppendUint64(partialKey, startTick),
+		UpperBound: binary.BigEndian.AppendUint64(partialKey, endTick+1),
 	})
 	if err != nil {
 		return nil, errors.Wrap(err, "creating iter")
@@ -377,27 +376,7 @@ func (s *PebbleStore) GetTransferTransactions(ctx context.Context, identity stri
 		transferTxs = append(transferTxs, &perTick)
 	}
 
-	return &protobuff.TransferTransactions{TransferTransactionsPerTick: transferTxs}, nil
-}
-
-func (s *PebbleStore) GetTransferTransactionsPerTick(ctx context.Context, identity string, tickNumber uint64) (*protobuff.TransferTransactionsPerTick, error) {
-	key := identityTransferTransactionsPerTickKey(identity, tickNumber)
-	value, closer, err := s.db.Get(key)
-	if err != nil {
-		if errors.Is(err, pebble.ErrNotFound) {
-			return nil, ErrNotFound
-		}
-
-		return nil, errors.Wrap(err, "getting transfer tx per tick")
-	}
-	defer closer.Close()
-
-	var perTick protobuff.TransferTransactionsPerTick
-	if err := protojson.Unmarshal(value, &perTick); err != nil {
-		return nil, errors.Wrap(err, "unmarshalling transfer tx per tick to protobuff type")
-	}
-
-	return &perTick, nil
+	return transferTxs, nil
 }
 
 func (s *PebbleStore) PutQChainDigest(ctx context.Context, tickNumber uint64, digest []byte) error {