integrate progenitor fork

Author: arlyon

.github/workflows/ci.yml

@@ -14,33 +14,34 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-    
-    - name: Install Rust
-      uses: dtolnay/rust-toolchain@1.87
-      with:
-        components: clippy
-    
-    - name: Cache cargo registry
-      uses: actions/cache@v3
-      with:
-        path: ~/.cargo/registry
-        key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
-    
-    - name: Cache cargo index
-      uses: actions/cache@v3
-      with:
-        path: ~/.cargo/git
-        key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
-    
-    - name: Cache cargo build
-      uses: actions/cache@v3
-      with:
-        path: target
-        key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
-
-    - name: Run tests
-      run: cargo test --verbose
-
-    - name: Run clippy
-      run: cargo clippy --all-targets --all-features -- -D warnings
+      - uses: actions/checkout@v4
+
+      - name: Install toolchains
+        uses: jdx/mise-action@v2
+
+      - name: Cache cargo registry
+        uses: actions/cache@v3
+        with:
+          path: ~/.cargo/registry
+          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Cache cargo index
+        uses: actions/cache@v3
+        with:
+          path: ~/.cargo/git
+          key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Cache cargo build
+        uses: actions/cache@v3
+        with:
+          path: target
+          key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Fetch openapi
+        run: mise pull-openapi
+
+      - name: Run tests
+        run: cargo test --verbose
+
+      - name: Run clippy
+        run: cargo clippy --all-targets --all-features -- -D warnings

.mise.toml

@@ -6,7 +6,6 @@ jq = "latest"
 rust = "{{ exec(command='yq .toolchain.channel rust-toolchain.toml') }}"
 cargo-binstall = "latest"
 "cargo:bacon" = "latest"
-"cargo:cargo-progenitor" = "latest"
 
 [env]
 _.file = ['.env', '.env.local']
@@ -38,12 +37,6 @@ run = [
   "curl https://api.privy.io/v1/openapi.json | jq -s -f 'scripts/openapi.jq' openapi.overlay.json - | sed \"s/anyOf/oneOf/g\" > openapi.json",
 ]
 
-[tasks.generate-openapi]
-description = "Generate the Rust code from the OpenAPI spec"
-run = [
-  "cargo progenitor --input openapi.json --output crates/privy-api --name privy-api --version 0.0.1 --interface builder --include-client=false"
-]
-
 [tasks.gen-p256-key]
 description = "Generate P-256 key pair for Privy wallet owner"
 run = [

Cargo.lock

@@ -52,7 +52,10 @@ path = "examples/get_wallets.rs"
 
 [build-dependencies]
 prettyplease = "0.2.37"
-progenitor = {path = "../progenitor/progenitor"}
+# the privy branch includes these PRs:
+# https://github.com/oxidecomputer/progenitor/pull/1194
+# https://github.com/oxidecomputer/typify/pull/894
+progenitor = { git = "https://github.com/arlyon/progenitor", branch = "privy" }
 quote = "1.0.40"
 serde_json = "1.0"
 syn = { version = "2.0.106", features = ["full", "extra-traits"] }

Cargo.toml

@@ -33,7 +33,7 @@
 use std::{collections::HashMap, fs};
 
 use heck::{ToPascalCase, ToSnakeCase};
-use progenitor::GenerationSettings;
+use progenitor::{GenerationSettings, OperationIdStrategy};
 use quote::quote;
 use serde_yaml::Value;
 use syn::{File, Item, ItemImpl, Signature};
@@ -70,7 +70,9 @@ fn main() {
 
     // Step 1: Generate the base progenitor code
     let openapi_spec = load_openapi_spec();
-    let mut generator = progenitor::Generator::new(&GenerationSettings::default());
+    let mut generator = progenitor::Generator::new(
+        &GenerationSettings::default().with_operation_id_strategy(OperationIdStrategy::OmitMissing),
+    );
     let tokens = generator.generate_tokens(&openapi_spec).unwrap();
     let ast = syn::parse2(tokens).unwrap();
     let content = prettyplease::unparse(&ast);

build.rs

@@ -66,7 +66,7 @@ async fn main() -> Result<()> {
             &wallet_id,
             &ctx,
             &UpdateWalletBody {
-                owner: Some(OwnerInput::Variant0 {
+                owner: Some(OwnerInput::PublicKeyOwner {
                     public_key: public_key.to_string(),
                 }),
                 ..Default::default()

examples/update_wallet.rs

@@ -20,7 +20,8 @@ use anyhow::Result;
 use privy_rust::{
     PrivyClient,
     generated::types::{
-        GetWalletBalanceAsset, GetWalletBalanceChain, GetWalletBalanceIncludeCurrency,
+        GetWalletBalanceAsset, GetWalletBalanceAssetString, GetWalletBalanceChain,
+        GetWalletBalanceChainString, GetWalletBalanceIncludeCurrency,
     },
 };
 use tracing_subscriber::EnvFilter;
@@ -55,12 +56,8 @@ async fn main() -> Result<()> {
         .balance()
         .get(
             &wallet_id,
-            &GetWalletBalanceAsset::Variant0(
-                privy_rust::generated::types::GetWalletBalanceAssetVariant0::Sol,
-            ),
-            &GetWalletBalanceChain::Variant0(
-                privy_rust::generated::types::GetWalletBalanceChainVariant0::Solana,
-            ),
+            &GetWalletBalanceAsset::String(GetWalletBalanceAssetString::Sol),
+            &GetWalletBalanceChain::String(GetWalletBalanceChainString::Solana),
             Some(GetWalletBalanceIncludeCurrency::Usd),
         )
         .await?;

examples/wallet_balance.rs

@@ -23,7 +23,7 @@ use anyhow::Result;
 use hex::ToHex;
 use privy_rust::{
     AuthorizationContext, JwtUser, PrivateKeyFromFile, PrivyClient,
-    generated::types::{HpkeEncryption, WalletExportRequest},
+    generated::types::{HpkeEncryption, WalletExportRequestBody},
 };
 use tracing_subscriber::EnvFilter;
 
@@ -67,7 +67,7 @@ async fn main() -> Result<()> {
         .export(
             &wallet_id,
             &ctx,
-            &WalletExportRequest {
+            &WalletExportRequestBody {
                 encryption_type: HpkeEncryption::Hpke,
                 recipient_public_key,
             },

examples/wallet_export.rs

@@ -19,7 +19,9 @@
 use anyhow::Result;
 use privy_rust::{
     PrivyClient,
-    generated::types::{WalletTransactionsAsset, WalletTransactionsChain},
+    generated::types::{
+        WalletTransactionsAsset, WalletTransactionsAssetString, WalletTransactionsChain,
+    },
 };
 use tracing_subscriber::EnvFilter;
 
@@ -53,9 +55,7 @@ async fn main() -> Result<()> {
         .transactions()
         .get(
             &wallet_id,
-            &WalletTransactionsAsset::Variant0(
-                privy_rust::generated::types::WalletTransactionsAssetVariant0::Sol,
-            ),
+            &WalletTransactionsAsset::String(WalletTransactionsAssetString::Sol),
             WalletTransactionsChain::Base,
             None,       // No cursor for first page
             Some(10.0), // Limit to 10 transactions

examples/wallet_transactions.rs

@@ -56,7 +56,7 @@ impl PoliciesClient {
         policy_id: &'a crate::generated::types::CreatePolicyRulePolicyId,
         ctx: &'a AuthorizationContext,
         body: &'a crate::generated::types::PolicyRule,
-    ) -> Result<ResponseValue<crate::generated::types::RuleResponse>, Error<()>> {
+    ) -> Result<ResponseValue<crate::generated::types::PolicyRuleResponse>, Error<()>> {
         let sig = generate_authorization_signatures(
             ctx,
             &self.app_id,
@@ -234,8 +234,8 @@ impl WalletsClient {
         &'a self,
         wallet_id: &'a str,
         ctx: &'a AuthorizationContext,
-        body: &'a crate::generated::types::WalletExportRequest,
-    ) -> Result<ResponseValue<crate::generated::types::WalletExportResponse>, Error<()>> {
+        body: &'a crate::generated::types::WalletExportRequestBody,
+    ) -> Result<ResponseValue<crate::generated::types::WalletExportResponseBody>, Error<()>> {
         let sig = generate_authorization_signatures(
             ctx,
             &self.app_id,