add explicit hex message

LayerTwo-Labs · Nov 4, 2024 · e56d062 · e56d062
1 parent a5ddfc0
commit e56d062
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/proto/cusf/common/v1/common.proto b/proto/cusf/common/v1/common.proto
@@ -5,12 +5,19 @@ package cusf.common.v1;
 
 import "google/protobuf/wrappers.proto";
 
-/// Consensus-encoded hex
+/// Consensus-encoded hex.
+/// Variable length data uses a length prefix.
 message ConsensusHex {
   google.protobuf.StringValue hex = 1;
 }
 
-/// Reverse-encoded hex
+/// Hex encoding of byte arrays/vectors.
+/// Length prefixes are not used.
+message Hex {
+  google.protobuf.StringValue hex = 1;
+}
+
+/// Reverse consensus-encoded hex
 message ReverseHex {
   google.protobuf.StringValue hex = 1;
 }

diff --git a/proto/cusf/mainchain/v1/common.proto b/proto/cusf/mainchain/v1/common.proto
@@ -17,7 +17,7 @@ message SidechainDeclaration {
     google.protobuf.StringValue title = 1;
     google.protobuf.StringValue description = 2;
     cusf.common.v1.ConsensusHex hash_id_1 = 3;
-    cusf.common.v1.ConsensusHex hash_id_2 = 4;
+    cusf.common.v1.Hex hash_id_2 = 4;
   }
   oneof sidechain_declaration {
     V0 v0 = 1;

diff --git a/proto/cusf/mainchain/v1/validator.proto b/proto/cusf/mainchain/v1/validator.proto
@@ -25,13 +25,13 @@ enum Network {
   NETWORK_TESTNET = 5;
 }
 
-message Output {
-  cusf.common.v1.ConsensusHex address = 2;
-  uint64 value_sats = 3;
-}
-
 message Deposit {
-  uint64 sequence_number = 1;
+  message Output {
+    cusf.common.v1.Hex address = 2;
+    google.protobuf.UInt64Value value_sats = 3;
+  }
+
+  google.protobuf.UInt64Value sequence_number = 1;
   OutPoint outpoint = 2;
   Output output = 3;
 }

diff --git a/proto/cusf/mainchain/v1/wallet.proto b/proto/cusf/mainchain/v1/wallet.proto
@@ -50,7 +50,7 @@ message CreateBmmCriticalDataTransactionResponse {
 
 message CreateDepositTransactionRequest {
   google.protobuf.UInt32Value sidechain_id = 1;
-  cusf.common.v1.ConsensusHex address = 2;
+  cusf.common.v1.Hex address = 2;
   google.protobuf.UInt64Value value_sats = 3;
   google.protobuf.UInt64Value fee_sats = 4;
 }