Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

Commit 3f3c66e

Browse files
committed
Merge branch 'master' into confidential_mint_burn_ext_program
2 parents 5256e9d + 21f0430 commit 3f3c66e

File tree

20 files changed

+322
-283
lines changed

20 files changed

+322
-283
lines changed

.github/workflows/publish-rust.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
run: ./ci/install-build-deps.sh
8585

8686
- name: Run clippy
87-
run: ./cargo-nightly clippy -Zunstable-options --workspace --all-targets --features test-sbf -- --deny=warnings --deny=clippy::arithmetic_side_effects
87+
run: ./cargo-nightly clippy -Zunstable-options --workspace --all-targets --all-features -- --deny=warnings --deny=clippy::arithmetic_side_effects
8888

8989
cargo-build-test:
9090
runs-on: ubuntu-latest
@@ -167,7 +167,7 @@ jobs:
167167
cargo-publish-
168168
169169
- name: Install Cargo Release
170-
run: which cargo-release || cargo install cargo-release
170+
run: which cargo-release || cargo install cargo-release --version 0.25.11
171171

172172
- name: Ensure CARGO_REGISTRY_TOKEN variable is set
173173
env:

.github/workflows/pull-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
run: ./ci/install-build-deps.sh
7272

7373
- name: Run clippy
74-
run: ./cargo-nightly clippy -Zunstable-options --workspace --all-targets --features test-sbf -- --deny=warnings --deny=clippy::arithmetic_side_effects
74+
run: ./cargo-nightly clippy -Zunstable-options --workspace --all-targets --all-features -- --deny=warnings --deny=clippy::arithmetic_side_effects
7575

7676
audit:
7777
runs-on: ubuntu-latest

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

account-compression/sdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"@solana/eslint-config-solana": "^3.0.3",
6868
"@types/bn.js": "^5.1.6",
6969
"@types/jest": "^29.5.14",
70-
"@types/node": "^22.7.9",
70+
"@types/node": "^22.8.1",
7171
"@types/node-fetch": "^2.6.11",
7272
"@typescript-eslint/eslint-plugin": "^8.4.0",
7373
"@typescript-eslint/parser": "^8.4.0",

libraries/discriminator/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,15 +130,15 @@ mod tests {
130130

131131
#[cfg(all(test, feature = "borsh"))]
132132
mod borsh_test {
133-
use super::*;
133+
use {super::*, borsh::BorshDeserialize};
134134

135135
#[test]
136136
fn borsh_test() {
137137
let my_discrim = ArrayDiscriminator::new_with_hash_input("my_discrim");
138138
let mut buffer = [0u8; 8];
139-
my_discrim.serialize(&mut buffer[..]).unwrap();
139+
borsh::to_writer(&mut buffer[..], &my_discrim).unwrap();
140140
let my_discrim_again = ArrayDiscriminator::try_from_slice(&buffer).unwrap();
141141
assert_eq!(my_discrim, my_discrim_again);
142-
assert_eq!(buf, my_discrim.into());
142+
assert_eq!(buffer, <[u8; 8]>::from(my_discrim));
143143
}
144144
}

libraries/math/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ uint = "0.10"
2323
proptest = "1.5.0"
2424
solana-program-test = "2.0.3"
2525
solana-sdk = "2.0.3"
26-
libm = "0.2.8"
26+
libm = "0.2.10"
2727

2828
[lib]
2929
crate-type = ["cdylib", "lib"]

libraries/type-length-value/js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"devDependencies": {
5050
"@types/chai": "^5.0.0",
5151
"@types/mocha": "^10.0.9",
52-
"@types/node": "^22.7.9",
52+
"@types/node": "^22.8.1",
5353
"@typescript-eslint/eslint-plugin": "^8.4.0",
5454
"@typescript-eslint/parser": "^8.4.0",
5555
"chai": "^5.1.2",

memo/js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"@solana/web3.js": "^1.95.4",
5555
"@types/chai": "^5.0.0",
5656
"@types/jest": "^29.5.14",
57-
"@types/node": "^22.7.9",
57+
"@types/node": "^22.8.1",
5858
"@types/node-fetch": "^2.6.11",
5959
"@typescript-eslint/eslint-plugin": "^8.4.0",
6060
"@typescript-eslint/parser": "^8.4.0",

name-service/js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"@jest/globals": "^29.7.0",
4646
"@types/bn.js": "^5.1.6",
4747
"@types/jest": "^29.5.14",
48-
"@types/node": "^22.7.9",
48+
"@types/node": "^22.8.1",
4949
"@typescript-eslint/eslint-plugin": "^8.4.0",
5050
"@typescript-eslint/parser": "^8.4.0",
5151
"eslint": "^8.57.0",

0 commit comments

Comments
 (0)