Merge branch 'master' into confidential_mint_burn_ext_program

solana-labs · Oct 28, 2024 · 3f3c66e · 3f3c66e
2 parents 5256e9d + 21f0430
commit 3f3c66e
Show file tree

Hide file tree

Showing 20 changed files with 322 additions and 283 deletions.
diff --git a/.github/workflows/publish-rust.yml b/.github/workflows/publish-rust.yml
@@ -84,7 +84,7 @@ jobs:
         run: ./ci/install-build-deps.sh
 
       - name: Run clippy
-        run: ./cargo-nightly clippy -Zunstable-options --workspace --all-targets --features test-sbf -- --deny=warnings --deny=clippy::arithmetic_side_effects
+        run: ./cargo-nightly clippy -Zunstable-options --workspace --all-targets --all-features -- --deny=warnings --deny=clippy::arithmetic_side_effects
 
   cargo-build-test:
     runs-on: ubuntu-latest
@@ -167,7 +167,7 @@ jobs:
             cargo-publish-
 
       - name: Install Cargo Release
-        run: which cargo-release || cargo install cargo-release
+        run: which cargo-release || cargo install cargo-release --version 0.25.11
 
       - name: Ensure CARGO_REGISTRY_TOKEN variable is set
         env:

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -71,7 +71,7 @@ jobs:
         run: ./ci/install-build-deps.sh
 
       - name: Run clippy
-        run: ./cargo-nightly clippy -Zunstable-options --workspace --all-targets --features test-sbf -- --deny=warnings --deny=clippy::arithmetic_side_effects
+        run: ./cargo-nightly clippy -Zunstable-options --workspace --all-targets --all-features -- --deny=warnings --deny=clippy::arithmetic_side_effects
 
   audit:
     runs-on: ubuntu-latest

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/account-compression/sdk/package.json b/account-compression/sdk/package.json
@@ -67,7 +67,7 @@
     "@solana/eslint-config-solana": "^3.0.3",
     "@types/bn.js": "^5.1.6",
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.7.9",
+    "@types/node": "^22.8.1",
     "@types/node-fetch": "^2.6.11",
     "@typescript-eslint/eslint-plugin": "^8.4.0",
     "@typescript-eslint/parser": "^8.4.0",

diff --git a/libraries/discriminator/src/lib.rs b/libraries/discriminator/src/lib.rs
@@ -130,15 +130,15 @@ mod tests {
 
 #[cfg(all(test, feature = "borsh"))]
 mod borsh_test {
-    use super::*;
+    use {super::*, borsh::BorshDeserialize};
 
     #[test]
     fn borsh_test() {
         let my_discrim = ArrayDiscriminator::new_with_hash_input("my_discrim");
         let mut buffer = [0u8; 8];
-        my_discrim.serialize(&mut buffer[..]).unwrap();
+        borsh::to_writer(&mut buffer[..], &my_discrim).unwrap();
         let my_discrim_again = ArrayDiscriminator::try_from_slice(&buffer).unwrap();
         assert_eq!(my_discrim, my_discrim_again);
-        assert_eq!(buf, my_discrim.into());
+        assert_eq!(buffer, <[u8; 8]>::from(my_discrim));
     }
 }
diff --git a/libraries/math/Cargo.toml b/libraries/math/Cargo.toml
@@ -23,7 +23,7 @@ uint = "0.10"
 proptest = "1.5.0"
 solana-program-test = "2.0.3"
 solana-sdk = "2.0.3"
-libm = "0.2.8"
+libm = "0.2.10"
 
 [lib]
 crate-type = ["cdylib", "lib"]

diff --git a/libraries/type-length-value/js/package.json b/libraries/type-length-value/js/package.json
@@ -49,7 +49,7 @@
     "devDependencies": {
         "@types/chai": "^5.0.0",
         "@types/mocha": "^10.0.9",
-        "@types/node": "^22.7.9",
+        "@types/node": "^22.8.1",
         "@typescript-eslint/eslint-plugin": "^8.4.0",
         "@typescript-eslint/parser": "^8.4.0",
         "chai": "^5.1.2",

diff --git a/memo/js/package.json b/memo/js/package.json
@@ -54,7 +54,7 @@
         "@solana/web3.js": "^1.95.4",
         "@types/chai": "^5.0.0",
         "@types/jest": "^29.5.14",
-        "@types/node": "^22.7.9",
+        "@types/node": "^22.8.1",
         "@types/node-fetch": "^2.6.11",
         "@typescript-eslint/eslint-plugin": "^8.4.0",
         "@typescript-eslint/parser": "^8.4.0",

diff --git a/name-service/js/package.json b/name-service/js/package.json
@@ -45,7 +45,7 @@
     "@jest/globals": "^29.7.0",
     "@types/bn.js": "^5.1.6",
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.7.9",
+    "@types/node": "^22.8.1",
     "@typescript-eslint/eslint-plugin": "^8.4.0",
     "@typescript-eslint/parser": "^8.4.0",
     "eslint": "^8.57.0",