handle versions properly

Author: arlyon

.mise.toml

@@ -40,10 +40,16 @@ run = [
 [tasks.gen-openapi]
 description = "Generate the Rust code for the Privy API"
 depends = ["pull-openapi"]
-run = [
-  "cargo-progenitor progenitor --input openapi.json --name privy-openapi -o crates/privy-openapi --version 0.1.0 --no-rustfmt true --license-name \"MIT OR Apache-2.0\"",
-  "cargo +nightly fmt"
-]
+run = """
+#!/usr/bin/env bash
+
+# get current crate version
+VERSION=$(grep -m 1 "^version" Cargo.toml | cut -d '"' -f 2)
+cargo-progenitor progenitor --input openapi.json --name privy-openapi -o crates/privy-openapi --version $VERSION --no-rustfmt true --license-name "MIT OR Apache-2.0"
+# insert description using sed
+sed -i '2i description="Privy OpenAPI Bindings"' crates/privy-openapi/Cargo.toml
+cargo +nightly fmt
+""""
 
 [tasks.gen-p256-key]
 description = "Generate P-256 key pair for Privy wallet owner"

Cargo.lock

@@ -16,7 +16,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tokio = { version = "1", features = ["full"] }
 uuid = { version = "1.18.1", features = ["serde"] }
-privy-openapi = { path = "crates/privy-openapi", version = "0" }
+privy-openapi = { path = "crates/privy-openapi", version = "0.1.0-alpha.0" }
 
 # crypto
 p256 = { version = "0.13.2", features = ["pem", "ecdsa", "pkcs8"] }

Cargo.toml

@@ -1,6 +1,7 @@
 [package]
+description="Privy OpenAPI Bindings"
 name = "privy-openapi"
-version = "0.1.0"
+version = "0.1.0-alpha.0"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 

crates/privy-openapi/Cargo.toml

@@ -34280,7 +34280,6 @@ pub mod types {
     #[doc = "    \"id\","]
     #[doc = "    \"imported\","]
     #[doc = "    \"latest_verified_at\","]
-    #[doc = "    \"public_key\","]
     #[doc = "    \"recovery_method\","]
     #[doc = "    \"type\","]
     #[doc = "    \"verified_at\","]
@@ -34386,7 +34385,8 @@ pub mod types {
         pub id: ::std::option::Option<::std::string::String>,
         pub imported: bool,
         pub latest_verified_at: ::std::option::Option<f64>,
-        pub public_key: ::std::string::String,
+        #[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
+        pub public_key: ::std::option::Option<::std::string::String>,
         pub recovery_method: LinkedAccountSolanaEmbeddedWalletRecoveryMethod,
         #[serde(rename = "type")]
         pub type_: LinkedAccountSolanaEmbeddedWalletType,

crates/privy-openapi/src/lib.rs

@@ -1,10 +1,9 @@
+use super::ResponseValue;
 use crate::{
     AuthorizationContext, PrivySignedApiError, generate_authorization_signatures,
     subclients::KeyQuorumsClient,
 };
 
-use super::ResponseValue;
-
 impl KeyQuorumsClient {
     /// Update a key quorum
     ///

src/subclients/key_quorums.rs

@@ -1,11 +1,10 @@
+use super::ResponseValue;
 use crate::{
     AuthorizationContext, PrivySignedApiError, generate_authorization_signatures,
     generated::types::{Policy, UpdatePolicyBody, UpdatePolicyPolicyId},
     subclients::PoliciesClient,
 };
 
-use super::ResponseValue;
-
 impl PoliciesClient {
     /// Update a policy
     ///

src/subclients/policies.rs

@@ -1,3 +1,4 @@
+use super::{Error, ResponseValue, types};
 use crate::{
     AuthorizationContext, PrivyApiError, PrivyExportError, PrivyHpke, PrivySignedApiError,
     ethereum::EthereumService,
@@ -12,8 +13,6 @@ use crate::{
     subclients::WalletsClient,
 };
 
-use super::{Error, ResponseValue, types};
-
 impl WalletsClient {
     /// Make a wallet rpc call
     ///
@@ -139,8 +138,6 @@ impl WalletsClient {
     /// Import a wallet into the Privy app
     ///
     /// # Errors
-    ///
-    ///
     pub async fn import(
         &self,
         address: String,