chore: release 0.1.25 (#70)

* chore: bump versions * chore: add patch to curve25519 only to znap-cli * chore: shit gets ignored anyway * chore: struggling with curve25519-dalek * chore: bump again to see if it works * chore: disable reqwest https features * chore: downgrade solana temporarily * chore: yet another bump * chore: downgrade solana in the examples too * chore: well, yeah, another bump
heavy-duty · Jul 7, 2024 · 044dd2c · 044dd2c
1 parent 5913eb4
commit 044dd2c
Show file tree

Hide file tree

Showing 13 changed files with 447 additions and 414 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.1.21"
+version = "0.1.25"
 
 [workspace.dependencies]
 # znap specific
@@ -17,7 +17,7 @@ serde = { version = "1.0.203", features = ["derive"] }
 tower-http = { version = "0.5.2", features = ["cors", "fs"] }
 
 # solana
-solana-sdk = "2.0.1"
+solana-sdk = "1.18.17"
 
 # macros
 proc-macro2 = "1.0"
@@ -28,6 +28,3 @@ syn = "2.0"
 heck = "0.5.0"
 colored = "2.1.0"
 console = "0.15.8"
-
-[patch.crates-io]
-curve25519-dalek = { git = "https://github.com/dalek-cryptography/curve25519-dalek", rev = "8274d5cbb6fc3f38cdc742b4798173895cd2a290" }
diff --git a/examples/send-donation/collections/my-actions/Cargo.toml b/examples/send-donation/collections/my-actions/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2021"
 [dependencies]
 axum = "0.7.5"
 serde = "1.0.203"
-solana-sdk = "2.0.1"
+solana-sdk = "1.18.17"
 znap = { path = "../../../../znap" }
diff --git a/examples/standalone-shuttle/Cargo.toml b/examples/standalone-shuttle/Cargo.toml
@@ -9,7 +9,7 @@ shuttle-axum = "0.46.0"
 shuttle-runtime = "0.46.0"
 solana-sdk = "1.18.17"
 tokio = "1.28.2"
-znap = "0.1.21"
+znap = "0.1.25"
 serde = { version = "1.0.203", features = ["derive"] }
 tower-http = { version = "0.5.2", features = ["cors"] }
 

diff --git a/examples/standalone-tokio/Cargo.toml b/examples/standalone-tokio/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 axum = "0.7.5"
 serde = "1.0.203"
-solana-sdk = "2.0.1"
+solana-sdk = "1.18.17"
 spl-associated-token-account = "3.0.2"
 spl-token = "4.0.1"
 tokio = { version = "1", features = ["full"] }

diff --git a/examples/znap-hats/collections/my-actions/Cargo.toml b/examples/znap-hats/collections/my-actions/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 axum = "0.7.4"
-solana-sdk = "2.0.1"
+solana-sdk = "1.18.17"
 serde = "1.0.203"
 znap = { path = "../../../../znap" }
 spl-associated-token-account = "4.0.0"

diff --git a/znap-cli/Cargo.toml b/znap-cli/Cargo.toml
@@ -23,7 +23,7 @@ anyhow = "1.0.86"
 clap = { version = "4.5.7", features = ["derive"] }
 toml = "0.8.14"
 shellexpand = "3.1.0"
-reqwest = { version = "0.12.5", features = ["blocking", "json"] }
+reqwest = { version = "0.12.5", default_features = false, features = ["blocking", "json"] }
 
 # local
-znap = { path = "../znap", version = "0.1.21" }
+znap = { path = "../znap", version = "0.1.25" }
diff --git a/znap-cli/src/template/collection_toml.rs b/znap-cli/src/template/collection_toml.rs
@@ -8,8 +8,8 @@ pub fn template(name: &String) -> String {
         \n[dependencies]\n\
         axum = \"0.7.5\"\n\
         serde = \"1.0.203\"\n\
-        solana-sdk = \"2.0.1\"\n\
-        znap = \"0.1.21\"\n\
+        solana-sdk = \"1.18.17\"\n\
+        znap = \"0.1.25\"\n\
     ", name.to_kebab_case())
 }
 
diff --git a/znap-cli/src/template/deploy_toml.rs b/znap-cli/src/template/deploy_toml.rs
@@ -3,7 +3,7 @@ use crate::utils::Collection;
 pub fn template(collections: &Vec<Collection>) -> String {
     let cargo_content_without_collections = format!("[package]\n\
         name = \"znap-deploy\"\n\
-        version = \"0.1.21\"\n\
+        version = \"0.1.25\"\n\
         edition = \"2021\"\n\
         \n[dependencies]\n\
         tokio = {{ version = \"1\", features = [\"full\"] }}\n\

diff --git a/znap-cli/src/template/server_toml.rs b/znap-cli/src/template/server_toml.rs
@@ -3,7 +3,7 @@ use crate::utils::Collection;
 pub fn template(collections: &Vec<Collection>) -> String {
     let cargo_content_without_collections = format!("[package]\n\
         name = \"znap-server\"\n\
-        version = \"0.1.21\"\n\
+        version = \"0.1.25\"\n\
         edition = \"2021\"\n\
         \n[dependencies]\n\
         tokio = {{ version = \"1\", features = [\"full\"] }}\n\

diff --git a/znap-macros/Cargo.toml b/znap-macros/Cargo.toml
@@ -14,7 +14,7 @@ syn = { workspace = true }
 quote = { workspace = true }
 
 # local
-znap-syn = { path = "../znap-syn", version = "0.1.21" }
+znap-syn = { path = "../znap-syn", version = "0.1.25" }
 
 [lib]
 proc-macro = true
diff --git a/znap/Cargo.toml b/znap/Cargo.toml
@@ -21,4 +21,4 @@ bincode = "1.3.3"
 handlebars = "5.1.2"
 
 # local
-znap-macros = { path = "../znap-macros", version = "0.1.21" }
+znap-macros = { path = "../znap-macros", version = "0.1.25" }
diff --git a/znap/src/lib.rs b/znap/src/lib.rs
@@ -236,7 +236,7 @@ pub fn add_action_identity_proof(transaction: Transaction) -> Transaction {
 
                     match transaction
                         .message
-                        .is_maybe_writable(*account_index as usize, None)
+                        .is_writable(*account_index as usize)
                     {
                         true => AccountMeta::new(
                             pubkey,