Skip to content

Commit

Permalink
cleanup unnecesary changes
Browse files Browse the repository at this point in the history
  • Loading branch information
janezpodhostnik committed Aug 21, 2024
1 parent 9fca1cc commit 49e4f71
Show file tree
Hide file tree
Showing 13 changed files with 601 additions and 675 deletions.
210 changes: 88 additions & 122 deletions protobuf/flow/access/access.proto

Large diffs are not rendered by default.

53 changes: 21 additions & 32 deletions protobuf/flow/entities/block_execution_data.proto
Original file line number Diff line number Diff line change
Expand Up @@ -8,51 +8,44 @@ option java_package = "org.onflow.protobuf.entities";
import "flow/entities/event.proto";
import "flow/entities/transaction.proto";

// BlockExecutionData represents the collection of data produced while execiting
// the block.
// BlockExecutionData represents the collection of data produced while execiting the block.
message BlockExecutionData {
// Block ID of the block that was executed.
bytes block_id = 1;

// Ordered list of ChunkExecutionData produced while executing the block.
//
// Note: there will be one ChunkExecutionData per collection in the block,
// plus one for the service chunk. The service chunk is executed last and is
// always the last chunk in the list.
// Note: there will be one ChunkExecutionData per collection in the block, plus one for the
// service chunk. The service chunk is executed last and is always the last chunk in the list.
repeated ChunkExecutionData chunk_execution_data = 2;
}

// ChunkExecutionData represents the collection of data produced while executing
// a chunk.
// ChunkExecutionData represents the collection of data produced while executing a chunk.
message ChunkExecutionData {
// Ordered list of transactions included in the collection that was executed
// in the chunk.
// Ordered list of transactions included in the collection that was executed in the chunk.
ExecutionDataCollection collection = 1;

// Events emitted by transactions in the collection.
//
// Note: events listed in the last ChunkExecutionData in the
// BlockExecutionData were emitted by the service transaction. Some, but not
// all, of these events are service events.
// Note: events listed in the last ChunkExecutionData in the BlockExecutionData were emitted by
// the service transaction. Some, but not all, of these events are service events.
repeated Event events = 2;

// TrieUpdate produced by executing the collection.
//
// TrieUpdates contain a list of registers that were modified during chunk
// execution. The value included is the new value of the register.
// TrieUpdates contain a list of registers that were modified during chunk execution. The value
// included is the new value of the register.
TrieUpdate trieUpdate = 3;

// Transaction results produced by executing the collection.
//
// Note: these are not the same type of results returned by other RPCs. These
// results are sepcific to execution data. The most notable difference is they
// only include a boolean value to indicate whether or not an error was
// encountered during execution, not the error itself.
// Note: these are not the same type of results returned by other RPCs. These results are sepcific
// to execution data. The most notable difference is they only include a boolean value to indicate
// whether or not an error was encountered during execution, not the error itself.
repeated ExecutionDataTransactionResult transaction_results = 4;
}

// ExecutionDataCollection represents the collection of transactions that were
// executed within a chunk.
// ExecutionDataCollection represents the collection of transactions that were executed within a chunk.
//
// Note: this is not the same type as the entities.Collection.
message ExecutionDataCollection {
Expand All @@ -62,24 +55,22 @@ message ExecutionDataCollection {

// TrieUpdate produced by executing the collection.
//
// TrieUpdates contain a list of registers that were modified during chunk
// execution. The value included is the new value of the register.
// TrieUpdates contain a list of registers that were modified during chunk execution. The value
// included is the new value of the register.
message TrieUpdate {
// RootHash is the root hash of the trie before the update is applied.
bytes root_hash = 1;

// List of register paths updated.
//
// Note: paths and payloads map 1:1 with eachother. i.e. for each element in
// path, the value in payloads at the same index is the value of the register
// at that path.
// Note: paths and payloads map 1:1 with eachother. i.e. for each element in path, the value in
// payloads at the same index is the value of the register at that path.
repeated bytes paths = 2;

// List of register values updated.
//
// Note: paths and payloads map 1:1 with eachother. i.e. for each element in
// path, the value in payloads at the same index is the value of the register
// at that path.
// Note: paths and payloads map 1:1 with eachother. i.e. for each element in path, the value in
// payloads at the same index is the value of the register at that path.
repeated Payload payloads = 3;
}

Expand All @@ -102,14 +93,12 @@ message KeyPart {
bytes value = 2;
}

// ExecutionDataTransactionResult represents the result of executing a
// transaction.
// ExecutionDataTransactionResult represents the result of executing a transaction.
message ExecutionDataTransactionResult {
// Transaction ID of the transaction that was executed.
bytes transaction_id = 1;

// Boolean indicating whether or not the transaction's execution failed with
// an error.
// Boolean indicating whether or not the transaction's execution failed with an error.
bool failed = 2;

// Amount of computation used during execution.
Expand Down
3 changes: 1 addition & 2 deletions protobuf/flow/entities/block_header.proto
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ message BlockHeader {
google.protobuf.Timestamp timestamp = 4;
bytes payload_hash = 5;
uint64 view = 6;
repeated bytes parent_voter_ids =
7; // deprecated!! value will be empty. replaced by parent_vote_indices
repeated bytes parent_voter_ids = 7; // deprecated!! value will be empty. replaced by parent_vote_indices
bytes parent_voter_sig_data = 8;
bytes proposer_id = 9;
bytes proposer_sig_data = 10;
Expand Down
3 changes: 1 addition & 2 deletions protobuf/flow/entities/collection.proto
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ message CollectionGuarantee {
repeated bytes signatures = 2;
bytes reference_block_id = 3;
bytes signature = 4;
repeated bytes signer_ids =
5; // deprecated!! value will be empty. replaced by signer_indices
repeated bytes signer_ids = 5; // deprecated!! value will be empty. replaced by signer_indices
bytes signer_indices = 6;
}
4 changes: 2 additions & 2 deletions protobuf/flow/entities/event.proto
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ option go_package = "github.com/onflow/flow/protobuf/go/flow/entities";
option java_package = "org.onflow.protobuf.entities";

enum EventEncodingVersion {
JSON_CDC_V0 = 0;
CCF_V0 = 1;
JSON_CDC_V0 = 0;
CCF_V0 = 1;
}

message Event {
Expand Down
3 changes: 1 addition & 2 deletions protobuf/flow/entities/execution_result.proto
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ message Chunk {
uint64 index = 7; // chunk index inside the ER (starts from zero)
bytes end_state = 8; // EndState inferred from next chunk or from the ER
bytes execution_data_id = 9;
bytes state_delta_commitment =
10; // a commitment over sorted list of register changes
bytes state_delta_commitment = 10; // a commitment over sorted list of register changes
}

message ServiceEvent {
Expand Down
Loading

0 comments on commit 49e4f71

Please sign in to comment.