Skip to content

cre-6391: refactor of ShardID into DonID as being the same #458

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

Merged
mchain0 merged 1 commit into from
Sep 4, 2026
Merged

cre-6391: refactor of ShardID into DonID as being the same #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ring/go/arbiter.pb.go
View file
Open in desktop

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

14 changes: 7 additions & 7 deletions ring/go/consensus.pb.go
View file
Open in desktop

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

36 changes: 18 additions & 18 deletions ring/go/shard_orchestrator.pb.go
View file
Open in desktop

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

24 changes: 12 additions & 12 deletions ring/go/sharding.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 ring/pb/arbiter.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import "shared.proto";
option go_package = "github.com/smartcontractkit/chainlink-protos/ring/go;ring";

message ShardStatusRequest {
map<uint32, ShardStatus> status = 1; // shard_id -> status
map<uint32, ShardStatus> status = 1; // don_id -> status
}

message ArbiterResponse {
Expand Down
4 changes: 2 additions & 2 deletions ring/pb/consensus.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
option go_package = "github.com/smartcontractkit/chainlink-protos/ring/go;ring";

message Observation {
map<uint32, ShardStatus> shard_status = 1; // shard_id -> status
map<uint32, ShardStatus> shard_status = 1; // don_id -> status
repeated string workflow_ids = 2;
google.protobuf.Timestamp now = 3;
uint32 want_shards = 4; // from ArbiterScaler.Status()
}

message WorkflowRoute {
uint32 shard = 1;
uint32 don_id = 1;

Check failure on line 18 in ring/pb/consensus.proto

View workflow job for this annotation

GitHub Actions / buf 

Field "1" on message "WorkflowRoute" changed name from "shard" to "don_id".

Check failure on line 18 in ring/pb/consensus.proto

View workflow job for this annotation

GitHub Actions / buf 

Field "1" with name "don_id" on message "WorkflowRoute" changed option "json_name" from "shard" to "donId".
}

message Transition {
Expand Down
6 changes: 3 additions & 3 deletions ring/pb/shard_orchestrator.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
}

message WorkflowMappingState {
uint32 old_shard_id = 1;
uint32 new_shard_id = 2;
uint32 old_don_id = 1;

Check failure on line 12 in ring/pb/shard_orchestrator.proto

View workflow job for this annotation

GitHub Actions / buf 

Field "1" on message "WorkflowMappingState" changed name from "old_shard_id" to "old_don_id".

Check failure on line 12 in ring/pb/shard_orchestrator.proto

View workflow job for this annotation

GitHub Actions / buf 

Field "1" with name "old_don_id" on message "WorkflowMappingState" changed option "json_name" from "oldShardId" to "oldDonId".
uint32 new_don_id = 2;

Check failure on line 13 in ring/pb/shard_orchestrator.proto

View workflow job for this annotation

GitHub Actions / buf 

Field "2" on message "WorkflowMappingState" changed name from "new_shard_id" to "new_don_id".

Check failure on line 13 in ring/pb/shard_orchestrator.proto

View workflow job for this annotation

GitHub Actions / buf 

Field "2" with name "new_don_id" on message "WorkflowMappingState" changed option "json_name" from "newShardId" to "newDonId".
bool in_transition = 3;
}

Expand All @@ -23,7 +23,7 @@
}

message ReportWorkflowTriggerRegistrationRequest {
uint32 source_shard_id = 1;
uint32 source_don_id = 1;

Check failure on line 26 in ring/pb/shard_orchestrator.proto

View workflow job for this annotation

GitHub Actions / buf 

Field "1" on message "ReportWorkflowTriggerRegistrationRequest" changed name from "source_shard_id" to "source_don_id".

Check failure on line 26 in ring/pb/shard_orchestrator.proto

View workflow job for this annotation

GitHub Actions / buf 

Field "1" with name "source_don_id" on message "ReportWorkflowTriggerRegistrationRequest" changed option "json_name" from "sourceShardId" to "sourceDonId".
map<string, uint32> registered_workflows = 2;
uint32 total_active_workflows = 3;
}
Expand Down
4 changes: 2 additions & 2 deletions ring/pb/sharding.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
string trigger_event_id = 2;
uint32 trigger_index = 3;
ExecutionStatus status = 4;
uint32 primary_shard_id = 5;
uint32 primary_don_id = 5;

Check failure on line 12 in ring/pb/sharding.proto

View workflow job for this annotation

GitHub Actions / buf 

Field "5" on message "ExecutionStatusUpdate" changed name from "primary_shard_id" to "primary_don_id".

Check failure on line 12 in ring/pb/sharding.proto

View workflow job for this annotation

GitHub Actions / buf 

Field "5" with name "primary_don_id" on message "ExecutionStatusUpdate" changed option "json_name" from "primaryShardId" to "primaryDonId".
string execution_id = 6;
}

Expand All @@ -21,7 +21,7 @@
}

message ShardHeartbeat {
uint32 primary_shard_id = 1;
uint32 primary_don_id = 1;
int64 timestamp = 2;
uint32 active_execution_count = 3;
}
Loading