Skip to content

Commit c1d26d8

Browse files
committed
release 2.0.0-alpha.11
1 parent a0afbfa commit c1d26d8

File tree

9 files changed

+95
-66
lines changed

9 files changed

+95
-66
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

side-proto/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "side-proto"
3-
version = "2.0.0-alpha.10"
3+
version = "2.0.0-alpha.11"
44
edition = "2021"
55
description = "Rust Client for Side Chain"
66
readme = "README.md"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dkg-test
1+
release/v2.0.x

side-proto/src/prost/side/side.btcbridge.rs

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,44 +9,41 @@ pub struct Params {
99
/// The minimum number of confirmations required for the withdrawal transactions
1010
#[prost(int32, tag = "2")]
1111
pub withdraw_confirmation_depth: i32,
12-
/// The allowed maximum depth for bitcoin block reorganization
13-
#[prost(int32, tag = "3")]
14-
pub max_reorg_depth: i32,
1512
/// Indicates the maximum depth or distance from the latest block up to which transactions are considered for acceptance.
16-
#[prost(uint64, tag = "4")]
13+
#[prost(uint64, tag = "3")]
1714
pub max_acceptable_block_depth: u64,
1815
/// The denomination of the voucher
19-
#[prost(string, tag = "5")]
16+
#[prost(string, tag = "4")]
2017
pub btc_voucher_denom: ::prost::alloc::string::String,
2118
/// Indicates if deposit is enabled
22-
#[prost(bool, tag = "6")]
19+
#[prost(bool, tag = "5")]
2320
pub deposit_enabled: bool,
2421
/// Indicates if withdrawal is enabled
25-
#[prost(bool, tag = "7")]
22+
#[prost(bool, tag = "6")]
2623
pub withdraw_enabled: bool,
2724
/// Trusted relayers for non-btc asset deposit
28-
#[prost(string, repeated, tag = "8")]
25+
#[prost(string, repeated, tag = "7")]
2926
pub trusted_non_btc_relayers: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
3027
/// Trusted fee providers to submit bitcoin fee rate
31-
#[prost(string, repeated, tag = "9")]
28+
#[prost(string, repeated, tag = "8")]
3229
pub trusted_fee_providers: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
3330
/// Period of validity for the fee rate
34-
#[prost(int64, tag = "10")]
31+
#[prost(int64, tag = "9")]
3532
pub fee_rate_validity_period: i64,
3633
/// Asset vaults
37-
#[prost(message, repeated, tag = "11")]
34+
#[prost(message, repeated, tag = "10")]
3835
pub vaults: ::prost::alloc::vec::Vec<Vault>,
3936
/// Withdrawal params
40-
#[prost(message, optional, tag = "12")]
37+
#[prost(message, optional, tag = "11")]
4138
pub withdraw_params: ::core::option::Option<WithdrawParams>,
4239
/// Protocol limitations
43-
#[prost(message, optional, tag = "13")]
40+
#[prost(message, optional, tag = "12")]
4441
pub protocol_limits: ::core::option::Option<ProtocolLimits>,
4542
/// Protocol fees
46-
#[prost(message, optional, tag = "14")]
43+
#[prost(message, optional, tag = "13")]
4744
pub protocol_fees: ::core::option::Option<ProtocolFees>,
4845
/// TSS params
49-
#[prost(message, optional, tag = "15")]
46+
#[prost(message, optional, tag = "14")]
5047
pub tss_params: ::core::option::Option<TssParams>,
5148
}
5249
impl ::prost::Name for Params {
@@ -416,13 +413,13 @@ impl ::prost::Name for RunesConsolidation {
416413
#[allow(clippy::derive_partial_eq_without_eq)]
417414
#[derive(Clone, PartialEq, ::prost::Message)]
418415
pub struct DkgParticipant {
419-
/// the moniker of the corresponding validator
416+
/// the optional moniker
420417
#[prost(string, tag = "1")]
421418
pub moniker: ::prost::alloc::string::String,
422-
/// the operator address of the corresponding validator
419+
/// the optional operator address
423420
#[prost(string, tag = "2")]
424421
pub operator_address: ::prost::alloc::string::String,
425-
/// the consensus public key of the corresponding validator
422+
/// participant consensus pub key
426423
#[prost(string, tag = "3")]
427424
pub consensus_pubkey: ::prost::alloc::string::String,
428425
}

side-proto/src/prost/side/side.btcbridge.serde.rs

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4283,9 +4283,6 @@ impl serde::Serialize for Params {
42834283
if self.withdraw_confirmation_depth != 0 {
42844284
len += 1;
42854285
}
4286-
if self.max_reorg_depth != 0 {
4287-
len += 1;
4288-
}
42894286
if self.max_acceptable_block_depth != 0 {
42904287
len += 1;
42914288
}
@@ -4333,9 +4330,6 @@ impl serde::Serialize for Params {
43334330
&self.withdraw_confirmation_depth,
43344331
)?;
43354332
}
4336-
if self.max_reorg_depth != 0 {
4337-
struct_ser.serialize_field("maxReorgDepth", &self.max_reorg_depth)?;
4338-
}
43394333
if self.max_acceptable_block_depth != 0 {
43404334
#[allow(clippy::needless_borrow)]
43414335
struct_ser.serialize_field(
@@ -4395,8 +4389,6 @@ impl<'de> serde::Deserialize<'de> for Params {
43954389
"depositConfirmationDepth",
43964390
"withdraw_confirmation_depth",
43974391
"withdrawConfirmationDepth",
4398-
"max_reorg_depth",
4399-
"maxReorgDepth",
44004392
"max_acceptable_block_depth",
44014393
"maxAcceptableBlockDepth",
44024394
"btc_voucher_denom",
@@ -4426,7 +4418,6 @@ impl<'de> serde::Deserialize<'de> for Params {
44264418
enum GeneratedField {
44274419
DepositConfirmationDepth,
44284420
WithdrawConfirmationDepth,
4429-
MaxReorgDepth,
44304421
MaxAcceptableBlockDepth,
44314422
BtcVoucherDenom,
44324423
DepositEnabled,
@@ -4470,9 +4461,6 @@ impl<'de> serde::Deserialize<'de> for Params {
44704461
"withdrawConfirmationDepth" | "withdraw_confirmation_depth" => {
44714462
Ok(GeneratedField::WithdrawConfirmationDepth)
44724463
}
4473-
"maxReorgDepth" | "max_reorg_depth" => {
4474-
Ok(GeneratedField::MaxReorgDepth)
4475-
}
44764464
"maxAcceptableBlockDepth" | "max_acceptable_block_depth" => {
44774465
Ok(GeneratedField::MaxAcceptableBlockDepth)
44784466
}
@@ -4524,7 +4512,6 @@ impl<'de> serde::Deserialize<'de> for Params {
45244512
{
45254513
let mut deposit_confirmation_depth__ = None;
45264514
let mut withdraw_confirmation_depth__ = None;
4527-
let mut max_reorg_depth__ = None;
45284515
let mut max_acceptable_block_depth__ = None;
45294516
let mut btc_voucher_denom__ = None;
45304517
let mut deposit_enabled__ = None;
@@ -4561,15 +4548,6 @@ impl<'de> serde::Deserialize<'de> for Params {
45614548
.0,
45624549
);
45634550
}
4564-
GeneratedField::MaxReorgDepth => {
4565-
if max_reorg_depth__.is_some() {
4566-
return Err(serde::de::Error::duplicate_field("maxReorgDepth"));
4567-
}
4568-
max_reorg_depth__ = Some(
4569-
map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?
4570-
.0,
4571-
);
4572-
}
45734551
GeneratedField::MaxAcceptableBlockDepth => {
45744552
if max_acceptable_block_depth__.is_some() {
45754553
return Err(serde::de::Error::duplicate_field(
@@ -4661,7 +4639,6 @@ impl<'de> serde::Deserialize<'de> for Params {
46614639
Ok(Params {
46624640
deposit_confirmation_depth: deposit_confirmation_depth__.unwrap_or_default(),
46634641
withdraw_confirmation_depth: withdraw_confirmation_depth__.unwrap_or_default(),
4664-
max_reorg_depth: max_reorg_depth__.unwrap_or_default(),
46654642
max_acceptable_block_depth: max_acceptable_block_depth__.unwrap_or_default(),
46664643
btc_voucher_denom: btc_voucher_denom__.unwrap_or_default(),
46674644
deposit_enabled: deposit_enabled__.unwrap_or_default(),

side-proto/src/prost/side/side.dlc.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,11 +286,13 @@ pub struct Params {
286286
pub date_interval: ::core::option::Option<::tendermint_proto::google::protobuf::Duration>,
287287
#[prost(uint32, tag = "5")]
288288
pub lending_event_nonce_queue_size: u32,
289-
#[prost(uint32, tag = "6")]
290-
pub oracle_participant_base_num: u32,
289+
#[prost(string, repeated, tag = "6")]
290+
pub allowed_oracle_participants: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
291291
#[prost(uint32, tag = "7")]
292292
pub oracle_participant_num: u32,
293293
#[prost(uint32, tag = "8")]
294+
pub oracle_participant_threshold: u32,
295+
#[prost(uint32, tag = "9")]
294296
pub nonce_generation_batch_size: u32,
295297
}
296298
impl ::prost::Name for Params {

side-proto/src/prost/side/side.dlc.serde.rs

Lines changed: 44 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1817,12 +1817,15 @@ impl serde::Serialize for Params {
18171817
if self.lending_event_nonce_queue_size != 0 {
18181818
len += 1;
18191819
}
1820-
if self.oracle_participant_base_num != 0 {
1820+
if !self.allowed_oracle_participants.is_empty() {
18211821
len += 1;
18221822
}
18231823
if self.oracle_participant_num != 0 {
18241824
len += 1;
18251825
}
1826+
if self.oracle_participant_threshold != 0 {
1827+
len += 1;
1828+
}
18261829
if self.nonce_generation_batch_size != 0 {
18271830
len += 1;
18281831
}
@@ -1849,15 +1852,21 @@ impl serde::Serialize for Params {
18491852
&self.lending_event_nonce_queue_size,
18501853
)?;
18511854
}
1852-
if self.oracle_participant_base_num != 0 {
1855+
if !self.allowed_oracle_participants.is_empty() {
18531856
struct_ser.serialize_field(
1854-
"oracleParticipantBaseNum",
1855-
&self.oracle_participant_base_num,
1857+
"allowedOracleParticipants",
1858+
&self.allowed_oracle_participants,
18561859
)?;
18571860
}
18581861
if self.oracle_participant_num != 0 {
18591862
struct_ser.serialize_field("oracleParticipantNum", &self.oracle_participant_num)?;
18601863
}
1864+
if self.oracle_participant_threshold != 0 {
1865+
struct_ser.serialize_field(
1866+
"oracleParticipantThreshold",
1867+
&self.oracle_participant_threshold,
1868+
)?;
1869+
}
18611870
if self.nonce_generation_batch_size != 0 {
18621871
struct_ser.serialize_field(
18631872
"nonceGenerationBatchSize",
@@ -1885,10 +1894,12 @@ impl<'de> serde::Deserialize<'de> for Params {
18851894
"dateInterval",
18861895
"lending_event_nonce_queue_size",
18871896
"lendingEventNonceQueueSize",
1888-
"oracle_participant_base_num",
1889-
"oracleParticipantBaseNum",
1897+
"allowed_oracle_participants",
1898+
"allowedOracleParticipants",
18901899
"oracle_participant_num",
18911900
"oracleParticipantNum",
1901+
"oracle_participant_threshold",
1902+
"oracleParticipantThreshold",
18921903
"nonce_generation_batch_size",
18931904
"nonceGenerationBatchSize",
18941905
];
@@ -1900,8 +1911,9 @@ impl<'de> serde::Deserialize<'de> for Params {
19001911
DateEventNonceQueueSize,
19011912
DateInterval,
19021913
LendingEventNonceQueueSize,
1903-
OracleParticipantBaseNum,
1914+
AllowedOracleParticipants,
19041915
OracleParticipantNum,
1916+
OracleParticipantThreshold,
19051917
NonceGenerationBatchSize,
19061918
}
19071919
#[cfg(feature = "serde")]
@@ -1941,12 +1953,15 @@ impl<'de> serde::Deserialize<'de> for Params {
19411953
"lendingEventNonceQueueSize" | "lending_event_nonce_queue_size" => {
19421954
Ok(GeneratedField::LendingEventNonceQueueSize)
19431955
}
1944-
"oracleParticipantBaseNum" | "oracle_participant_base_num" => {
1945-
Ok(GeneratedField::OracleParticipantBaseNum)
1956+
"allowedOracleParticipants" | "allowed_oracle_participants" => {
1957+
Ok(GeneratedField::AllowedOracleParticipants)
19461958
}
19471959
"oracleParticipantNum" | "oracle_participant_num" => {
19481960
Ok(GeneratedField::OracleParticipantNum)
19491961
}
1962+
"oracleParticipantThreshold" | "oracle_participant_threshold" => {
1963+
Ok(GeneratedField::OracleParticipantThreshold)
1964+
}
19501965
"nonceGenerationBatchSize" | "nonce_generation_batch_size" => {
19511966
Ok(GeneratedField::NonceGenerationBatchSize)
19521967
}
@@ -1974,8 +1989,9 @@ impl<'de> serde::Deserialize<'de> for Params {
19741989
let mut date_event_nonce_queue_size__ = None;
19751990
let mut date_interval__ = None;
19761991
let mut lending_event_nonce_queue_size__ = None;
1977-
let mut oracle_participant_base_num__ = None;
1992+
let mut allowed_oracle_participants__ = None;
19781993
let mut oracle_participant_num__ = None;
1994+
let mut oracle_participant_threshold__ = None;
19791995
let mut nonce_generation_batch_size__ = None;
19801996
while let Some(k) = map_.next_key()? {
19811997
match k {
@@ -2024,16 +2040,13 @@ impl<'de> serde::Deserialize<'de> for Params {
20242040
.0,
20252041
);
20262042
}
2027-
GeneratedField::OracleParticipantBaseNum => {
2028-
if oracle_participant_base_num__.is_some() {
2043+
GeneratedField::AllowedOracleParticipants => {
2044+
if allowed_oracle_participants__.is_some() {
20292045
return Err(serde::de::Error::duplicate_field(
2030-
"oracleParticipantBaseNum",
2046+
"allowedOracleParticipants",
20312047
));
20322048
}
2033-
oracle_participant_base_num__ = Some(
2034-
map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?
2035-
.0,
2036-
);
2049+
allowed_oracle_participants__ = Some(map_.next_value()?);
20372050
}
20382051
GeneratedField::OracleParticipantNum => {
20392052
if oracle_participant_num__.is_some() {
@@ -2046,6 +2059,17 @@ impl<'de> serde::Deserialize<'de> for Params {
20462059
.0,
20472060
);
20482061
}
2062+
GeneratedField::OracleParticipantThreshold => {
2063+
if oracle_participant_threshold__.is_some() {
2064+
return Err(serde::de::Error::duplicate_field(
2065+
"oracleParticipantThreshold",
2066+
));
2067+
}
2068+
oracle_participant_threshold__ = Some(
2069+
map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?
2070+
.0,
2071+
);
2072+
}
20492073
GeneratedField::NonceGenerationBatchSize => {
20502074
if nonce_generation_batch_size__.is_some() {
20512075
return Err(serde::de::Error::duplicate_field(
@@ -2067,8 +2091,10 @@ impl<'de> serde::Deserialize<'de> for Params {
20672091
date_interval: date_interval__,
20682092
lending_event_nonce_queue_size: lending_event_nonce_queue_size__
20692093
.unwrap_or_default(),
2070-
oracle_participant_base_num: oracle_participant_base_num__.unwrap_or_default(),
2094+
allowed_oracle_participants: allowed_oracle_participants__.unwrap_or_default(),
20712095
oracle_participant_num: oracle_participant_num__.unwrap_or_default(),
2096+
oracle_participant_threshold: oracle_participant_threshold__
2097+
.unwrap_or_default(),
20722098
nonce_generation_batch_size: nonce_generation_batch_size__.unwrap_or_default(),
20732099
})
20742100
}

side-proto/src/prost/side/side.tss.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
#[allow(clippy::derive_partial_eq_without_eq)]
44
#[derive(Clone, PartialEq, ::prost::Message)]
55
pub struct Params {
6-
#[prost(message, optional, tag = "1")]
6+
#[prost(string, repeated, tag = "1")]
7+
pub allowed_dkg_participants: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
8+
#[prost(message, optional, tag = "2")]
79
pub dkg_timeout_period: ::core::option::Option<::tendermint_proto::google::protobuf::Duration>,
810
}
911
impl ::prost::Name for Params {

0 commit comments

Comments
 (0)