feat: upgrade to v1.20.0-rc2

proto-build/src/main.rs

@@ -19,7 +19,7 @@ use walkdir::WalkDir;
 static QUIET: AtomicBool = AtomicBool::new(false);
 
 /// The Provenance SDK commit or tag to be cloned and used to build the proto files
-const PROVENANCE_SDK_REV: &str = "v1.19.1";
+const PROVENANCE_SDK_REV: &str = "v1.20.0-rc2";
 
 // All paths must end with a / and either be absolute or include a ./ to reference the current
 // working directory.
@@ -199,7 +199,7 @@ fn compile_sdk_protos_and_services(out_dir: &Path) {
         .build_server(true)
         .out_dir(out_dir)
         .extern_path(".tendermint", "::tendermint_proto")
-        .compile(&protos, &includes)
+        .compile_protos(&protos, &includes)
         .unwrap();
 
     info!("=> Done!");
@@ -262,7 +262,7 @@ fn copy_and_patch(src: impl AsRef<Path>, dest: impl AsRef<Path>) -> io::Result<(
     const REPLACEMENTS: &[(&str, &str)] = &[
         // Use `tendermint-proto` proto definitions
         ("(super::)+cosmos", "cosmos_sdk_proto::cosmos"),
-        ("(super::)+ibc", "cosmos_sdk_proto::ibc"),
+        ("(super::)+ibc", "ibc_proto::ibc"),
         // Feature-gate gRPC client modules
         (
             "/// Generated client implementations.",

provenance-sdk-proto/Cargo.toml

@@ -11,7 +11,8 @@ keywords = ["blockchain", "cosmos", "proto", "provenance", "tendermint"]
 edition = "2021"
 
 [dependencies]
-cosmos-sdk-proto = { version = "0.24", default-features = false }
+cosmos-sdk-proto = { version = "0.25", default-features = false }
+ibc-proto = { version = "0.49", default-features = false }
 prost = "0.13"
 prost-types = "0.13"
 # TODO this only needs to be included if grpc or grpc-transport are included

provenance-sdk-proto/src/prost/provenance-sdk/PROVENANCE_SDK_COMMIT

@@ -1 +1 @@
-v1.19.1
+v1.20.0-rc2

provenance-sdk-proto/src/prost/provenance-sdk/provenance.metadata.v1.p8e.rs

@@ -1,6 +1,5 @@
 // This file is @generated by prost-build.
 /// Deprecated: Do not use.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Contract {
     #[prost(message, optional, tag = "1")]
@@ -26,7 +25,6 @@ pub struct Contract {
     pub context: ::prost::alloc::vec::Vec<u8>,
 }
 /// Deprecated: Do not use.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DefinitionSpec {
     #[prost(string, tag = "1")]
@@ -39,7 +37,6 @@ pub struct DefinitionSpec {
     pub r#type: i32,
 }
 /// Deprecated: Do not use.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Fact {
     #[prost(string, tag = "1")]
@@ -48,7 +45,6 @@ pub struct Fact {
     pub data_location: ::core::option::Option<Location>,
 }
 /// Deprecated: Do not use.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Condition {
     #[prost(string, tag = "1")]
@@ -57,7 +53,6 @@ pub struct Condition {
     pub result: ::core::option::Option<ExecutionResult>,
 }
 /// Deprecated: Do not use.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Consideration {
     #[prost(string, tag = "1")]
@@ -68,7 +63,6 @@ pub struct Consideration {
     pub result: ::core::option::Option<ExecutionResult>,
 }
 /// Deprecated: Do not use.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ProposedFact {
     #[prost(string, tag = "1")]
@@ -81,7 +75,6 @@ pub struct ProposedFact {
     pub ancestor: ::core::option::Option<ProvenanceReference>,
 }
 /// Deprecated: Do not use.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ExecutionResult {
     #[prost(message, optional, tag = "1")]
@@ -94,14 +87,12 @@ pub struct ExecutionResult {
     pub error_message: ::prost::alloc::string::String,
 }
 /// Deprecated: Do not use.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Recitals {
     #[prost(message, repeated, tag = "1")]
     pub parties: ::prost::alloc::vec::Vec<Recital>,
 }
 /// Deprecated: Do not use.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Recital {
     #[prost(enumeration = "PartyType", tag = "1")]
@@ -112,7 +103,6 @@ pub struct Recital {
     pub address: ::prost::alloc::vec::Vec<u8>,
 }
 /// Deprecated: Do not use.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Location {
     #[prost(message, optional, tag = "1")]
@@ -121,7 +111,6 @@ pub struct Location {
     pub classname: ::prost::alloc::string::String,
 }
 /// Deprecated: Do not use.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ProvenanceReference {
     #[prost(message, optional, tag = "1")]
@@ -134,14 +123,12 @@ pub struct ProvenanceReference {
     pub name: ::prost::alloc::string::String,
 }
 /// Deprecated: Do not use.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SignatureSet {
     #[prost(message, repeated, tag = "1")]
     pub signatures: ::prost::alloc::vec::Vec<Signature>,
 }
 /// Deprecated: Do not use.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Signature {
     #[prost(string, tag = "1")]
@@ -154,7 +141,6 @@ pub struct Signature {
     pub signer: ::core::option::Option<SigningAndEncryptionPublicKeys>,
 }
 /// Deprecated: Do not use.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SigningAndEncryptionPublicKeys {
     #[prost(message, optional, tag = "1")]
@@ -163,7 +149,6 @@ pub struct SigningAndEncryptionPublicKeys {
     pub encryption_public_key: ::core::option::Option<PublicKey>,
 }
 /// Deprecated: Do not use.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct PublicKey {
     #[prost(bytes = "vec", tag = "1")]
@@ -174,14 +159,12 @@ pub struct PublicKey {
     pub curve: i32,
 }
 /// Deprecated: Do not use.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Uuid {
     #[prost(string, tag = "1")]
     pub value: ::prost::alloc::string::String,
 }
 /// Deprecated: Do not use.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct Timestamp {
     #[prost(int64, tag = "1")]
@@ -190,7 +173,6 @@ pub struct Timestamp {
     pub nanos: i32,
 }
 /// Deprecated: Do not use.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ContractSpec {
     #[prost(message, optional, tag = "1")]
@@ -205,7 +187,6 @@ pub struct ContractSpec {
     pub consideration_specs: ::prost::alloc::vec::Vec<ConsiderationSpec>,
 }
 /// Deprecated: Do not use.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ConditionSpec {
     #[prost(string, tag = "1")]
@@ -216,7 +197,6 @@ pub struct ConditionSpec {
     pub output_spec: ::core::option::Option<OutputSpec>,
 }
 /// Deprecated: Do not use.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ConsiderationSpec {
     #[prost(string, tag = "1")]
@@ -229,7 +209,6 @@ pub struct ConsiderationSpec {
     pub output_spec: ::core::option::Option<OutputSpec>,
 }
 /// Deprecated: Do not use.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct OutputSpec {
     #[prost(message, optional, tag = "1")]
@@ -255,10 +234,10 @@ impl DefinitionSpecType {
     /// (if the ProtoBuf definition does not change) and safe for programmatic use.
     pub fn as_str_name(&self) -> &'static str {
         match self {
-            DefinitionSpecType::Unknown => "DEFINITION_SPEC_TYPE_UNKNOWN",
-            DefinitionSpecType::Proposed => "DEFINITION_SPEC_TYPE_PROPOSED",
-            DefinitionSpecType::Fact => "DEFINITION_SPEC_TYPE_FACT",
-            DefinitionSpecType::FactList => "DEFINITION_SPEC_TYPE_FACT_LIST",
+            Self::Unknown => "DEFINITION_SPEC_TYPE_UNKNOWN",
+            Self::Proposed => "DEFINITION_SPEC_TYPE_PROPOSED",
+            Self::Fact => "DEFINITION_SPEC_TYPE_FACT",
+            Self::FactList => "DEFINITION_SPEC_TYPE_FACT_LIST",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -288,8 +267,8 @@ impl PublicKeyCurve {
     /// (if the ProtoBuf definition does not change) and safe for programmatic use.
     pub fn as_str_name(&self) -> &'static str {
         match self {
-            PublicKeyCurve::Secp256k1 => "SECP256K1",
-            PublicKeyCurve::P256 => "P256",
+            Self::Secp256k1 => "SECP256K1",
+            Self::P256 => "P256",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -315,7 +294,7 @@ impl PublicKeyType {
     /// (if the ProtoBuf definition does not change) and safe for programmatic use.
     pub fn as_str_name(&self) -> &'static str {
         match self {
-            PublicKeyType::Elliptic => "ELLIPTIC",
+            Self::Elliptic => "ELLIPTIC",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -346,10 +325,10 @@ impl ExecutionResultType {
     /// (if the ProtoBuf definition does not change) and safe for programmatic use.
     pub fn as_str_name(&self) -> &'static str {
         match self {
-            ExecutionResultType::ResultTypeUnknown => "RESULT_TYPE_UNKNOWN",
-            ExecutionResultType::ResultTypePass => "RESULT_TYPE_PASS",
-            ExecutionResultType::ResultTypeSkip => "RESULT_TYPE_SKIP",
-            ExecutionResultType::ResultTypeFail => "RESULT_TYPE_FAIL",
+            Self::ResultTypeUnknown => "RESULT_TYPE_UNKNOWN",
+            Self::ResultTypePass => "RESULT_TYPE_PASS",
+            Self::ResultTypeSkip => "RESULT_TYPE_SKIP",
+            Self::ResultTypeFail => "RESULT_TYPE_FAIL",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -399,18 +378,18 @@ impl PartyType {
     /// (if the ProtoBuf definition does not change) and safe for programmatic use.
     pub fn as_str_name(&self) -> &'static str {
         match self {
-            PartyType::Unknown => "PARTY_TYPE_UNKNOWN",
-            PartyType::Originator => "PARTY_TYPE_ORIGINATOR",
-            PartyType::Servicer => "PARTY_TYPE_SERVICER",
-            PartyType::Investor => "PARTY_TYPE_INVESTOR",
-            PartyType::Custodian => "PARTY_TYPE_CUSTODIAN",
-            PartyType::Owner => "PARTY_TYPE_OWNER",
-            PartyType::Affiliate => "PARTY_TYPE_AFFILIATE",
-            PartyType::Omnibus => "PARTY_TYPE_OMNIBUS",
-            PartyType::Provenance => "PARTY_TYPE_PROVENANCE",
-            PartyType::Marker => "PARTY_TYPE_MARKER",
-            PartyType::Controller => "PARTY_TYPE_CONTROLLER",
-            PartyType::Validator => "PARTY_TYPE_VALIDATOR",
+            Self::Unknown => "PARTY_TYPE_UNKNOWN",
+            Self::Originator => "PARTY_TYPE_ORIGINATOR",
+            Self::Servicer => "PARTY_TYPE_SERVICER",
+            Self::Investor => "PARTY_TYPE_INVESTOR",
+            Self::Custodian => "PARTY_TYPE_CUSTODIAN",
+            Self::Owner => "PARTY_TYPE_OWNER",
+            Self::Affiliate => "PARTY_TYPE_AFFILIATE",
+            Self::Omnibus => "PARTY_TYPE_OMNIBUS",
+            Self::Provenance => "PARTY_TYPE_PROVENANCE",
+            Self::Marker => "PARTY_TYPE_MARKER",
+            Self::Controller => "PARTY_TYPE_CONTROLLER",
+            Self::Validator => "PARTY_TYPE_VALIDATOR",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.