From 41b747d729748aa712e963dcd5546f106d320fd8 Mon Sep 17 00:00:00 2001 From: Joe Caulfield Date: Wed, 23 Oct 2024 17:09:23 +0400 Subject: [PATCH 1/3] update linting configurations --- program/Cargo.toml | 8 ++++++++ program/tests/create_lookup_table_ix.rs | 2 +- program/tests/deactivate_lookup_table_ix.rs | 2 +- program/tests/extend_lookup_table_ix.rs | 2 +- program/tests/freeze_lookup_table_ix.rs | 2 +- scripts/client/lint-rust.mjs | 1 + scripts/program/lint.mjs | 4 ++-- 7 files changed, 15 insertions(+), 6 deletions(-) diff --git a/program/Cargo.toml b/program/Cargo.toml index 2bc6cf7..b7cf89f 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -35,3 +35,11 @@ crate-type = ["cdylib", "lib"] [build-dependencies] rustc_version = "0.4" + +[lints.rust.unexpected_cfgs] +level = "warn" +check-cfg = [ + 'cfg(target_os, values("solana"))', + 'cfg(feature, values("min_specialization"))', + 'cfg(RUSTC_WITH_SPECIALIZATION)', +] diff --git a/program/tests/create_lookup_table_ix.rs b/program/tests/create_lookup_table_ix.rs index 048d4d8..06ded3a 100644 --- a/program/tests/create_lookup_table_ix.rs +++ b/program/tests/create_lookup_table_ix.rs @@ -64,7 +64,7 @@ fn test_create_lookup_table_idempotent() { lookup_table_account.lamports(), Rent::default().minimum_balance(LOOKUP_TABLE_META_SIZE) ); - let lookup_table = AddressLookupTable::deserialize(&lookup_table_account.data()).unwrap(); + let lookup_table = AddressLookupTable::deserialize(lookup_table_account.data()).unwrap(); assert_eq!(lookup_table.meta.deactivation_slot, Slot::MAX); assert_eq!(lookup_table.meta.authority, Some(authority)); assert_eq!(lookup_table.meta.last_extended_slot, 0); diff --git a/program/tests/deactivate_lookup_table_ix.rs b/program/tests/deactivate_lookup_table_ix.rs index c025ece..c1b43b9 100644 --- a/program/tests/deactivate_lookup_table_ix.rs +++ b/program/tests/deactivate_lookup_table_ix.rs @@ -36,7 +36,7 @@ fn test_deactivate_lookup_table() { let lookup_table_account = result.get_account(&lookup_table_address).unwrap(); - let lookup_table = AddressLookupTable::deserialize(&lookup_table_account.data()).unwrap(); + let lookup_table = AddressLookupTable::deserialize(lookup_table_account.data()).unwrap(); assert_eq!(lookup_table.meta.deactivation_slot, 0); // Check that only the deactivation slot changed diff --git a/program/tests/extend_lookup_table_ix.rs b/program/tests/extend_lookup_table_ix.rs index bd9345a..9cf642c 100644 --- a/program/tests/extend_lookup_table_ix.rs +++ b/program/tests/extend_lookup_table_ix.rs @@ -44,7 +44,7 @@ fn run_test_case(mollusk: &Mollusk, test_case: TestCase) { assert!(matches!(result.program_result, ProgramResult::Success)); let table_account = result.get_account(&test_case.lookup_table_address).unwrap(); - let lookup_table = AddressLookupTable::deserialize(&table_account.data()).unwrap(); + let lookup_table = AddressLookupTable::deserialize(table_account.data()).unwrap(); assert_eq!(lookup_table, expected_account.state); assert_eq!(table_account.lamports(), expected_account.lamports); assert_eq!(table_account.data().len(), expected_account.data_len); diff --git a/program/tests/freeze_lookup_table_ix.rs b/program/tests/freeze_lookup_table_ix.rs index 21336ee..fb1e5bb 100644 --- a/program/tests/freeze_lookup_table_ix.rs +++ b/program/tests/freeze_lookup_table_ix.rs @@ -35,7 +35,7 @@ fn test_freeze_lookup_table() { ); let lookup_table_account = result.get_account(&lookup_table_address).unwrap(); - let lookup_table = AddressLookupTable::deserialize(&lookup_table_account.data()).unwrap(); + let lookup_table = AddressLookupTable::deserialize(lookup_table_account.data()).unwrap(); assert_eq!(lookup_table.meta.authority, None); diff --git a/scripts/client/lint-rust.mjs b/scripts/client/lint-rust.mjs index d21a84a..0e2091d 100644 --- a/scripts/client/lint-rust.mjs +++ b/scripts/client/lint-rust.mjs @@ -10,6 +10,7 @@ import { // Configure arguments here. const lintArgs = [ '-Zunstable-options', + '--all-targets', '--', '--deny=warnings', ...cliArguments(), diff --git a/scripts/program/lint.mjs b/scripts/program/lint.mjs index 39cf804..e431431 100644 --- a/scripts/program/lint.mjs +++ b/scripts/program/lint.mjs @@ -11,8 +11,8 @@ import { // Configure arguments here. const lintArgs = [ '-Zunstable-options', - '--features', - 'bpf-entrypoint,test-sbf', + '--all-targets', + '--all-features', '--', '--deny=warnings', '--deny=clippy::arithmetic_side_effects', From 6a18868062f805725743af4b39e5278b0499be6a Mon Sep 17 00:00:00 2001 From: Joe Caulfield Date: Wed, 23 Oct 2024 17:17:18 +0400 Subject: [PATCH 2/3] add kaigan serde dep --- Cargo.lock | 1 + clients/rust/Cargo.toml | 2 +- scripts/client/lint-rust.mjs | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 634aa40..660a3d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1595,6 +1595,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6dd100976df9dd59d0c3fecf6f9ad3f161a087374d1b2a77ebb4ad8920f11bb" dependencies = [ "borsh 0.10.3", + "serde", ] [[package]] diff --git a/clients/rust/Cargo.toml b/clients/rust/Cargo.toml index 91be97f..2cf647a 100644 --- a/clients/rust/Cargo.toml +++ b/clients/rust/Cargo.toml @@ -10,7 +10,7 @@ license-file = "../../LICENSE" [features] anchor = ["dep:anchor-lang"] test-sbf = [] -serde = ["dep:serde", "dep:serde_with"] +serde = ["dep:serde", "dep:serde_with", "kaigan/serde"] [dependencies] anchor-lang = { version = "0.30.0", optional = true } diff --git a/scripts/client/lint-rust.mjs b/scripts/client/lint-rust.mjs index 0e2091d..fd5a231 100644 --- a/scripts/client/lint-rust.mjs +++ b/scripts/client/lint-rust.mjs @@ -11,6 +11,7 @@ import { const lintArgs = [ '-Zunstable-options', '--all-targets', + '--all-features', '--', '--deny=warnings', ...cliArguments(), From 83a96375017383bc37bf060b3dbd9feb268b717e Mon Sep 17 00:00:00 2001 From: Joe Caulfield Date: Thu, 24 Oct 2024 14:08:26 +0400 Subject: [PATCH 3/3] drop anchor --- .../accounts/address_lookup_table.rs | 25 ------------------- .../instructions/close_lookup_table.rs | 2 +- .../instructions/create_lookup_table.rs | 2 +- .../instructions/deactivate_lookup_table.rs | 2 +- .../instructions/extend_lookup_table.rs | 2 +- .../instructions/freeze_lookup_table.rs | 2 +- package.json | 2 +- pnpm-lock.yaml | 10 ++++---- scripts/generate-clients.mjs | 1 + 9 files changed, 12 insertions(+), 36 deletions(-) diff --git a/clients/rust/src/generated/accounts/address_lookup_table.rs b/clients/rust/src/generated/accounts/address_lookup_table.rs index 2c356fc..9f2eab2 100644 --- a/clients/rust/src/generated/accounts/address_lookup_table.rs +++ b/clients/rust/src/generated/accounts/address_lookup_table.rs @@ -62,28 +62,3 @@ impl<'a> TryFrom<&solana_program::account_info::AccountInfo<'a>> for AddressLook Self::deserialize(&mut data) } } - -#[cfg(feature = "anchor")] -impl anchor_lang::AccountDeserialize for AddressLookupTable { - fn try_deserialize_unchecked(buf: &mut &[u8]) -> anchor_lang::Result { - Ok(Self::deserialize(buf)?) - } -} - -#[cfg(feature = "anchor")] -impl anchor_lang::AccountSerialize for AddressLookupTable {} - -#[cfg(feature = "anchor")] -impl anchor_lang::Owner for AddressLookupTable { - fn owner() -> Pubkey { - crate::ADDRESS_LOOKUP_TABLE_ID - } -} - -#[cfg(feature = "anchor-idl-build")] -impl anchor_lang::IdlBuild for AddressLookupTable {} - -#[cfg(feature = "anchor-idl-build")] -impl anchor_lang::Discriminator for AddressLookupTable { - const DISCRIMINATOR: [u8; 8] = [0; 8]; -} diff --git a/clients/rust/src/generated/instructions/close_lookup_table.rs b/clients/rust/src/generated/instructions/close_lookup_table.rs index a0ee4d8..86f6edc 100644 --- a/clients/rust/src/generated/instructions/close_lookup_table.rs +++ b/clients/rust/src/generated/instructions/close_lookup_table.rs @@ -222,7 +222,7 @@ impl<'a, 'b> CloseLookupTableCpi<'a, 'b> { accounts, data, }; - let mut account_infos = Vec::with_capacity(3 + 1 + remaining_accounts.len()); + let mut account_infos = Vec::with_capacity(4 + remaining_accounts.len()); account_infos.push(self.__program.clone()); account_infos.push(self.address.clone()); account_infos.push(self.authority.clone()); diff --git a/clients/rust/src/generated/instructions/create_lookup_table.rs b/clients/rust/src/generated/instructions/create_lookup_table.rs index 65349f6..08a41f6 100644 --- a/clients/rust/src/generated/instructions/create_lookup_table.rs +++ b/clients/rust/src/generated/instructions/create_lookup_table.rs @@ -287,7 +287,7 @@ impl<'a, 'b> CreateLookupTableCpi<'a, 'b> { accounts, data, }; - let mut account_infos = Vec::with_capacity(4 + 1 + remaining_accounts.len()); + let mut account_infos = Vec::with_capacity(5 + remaining_accounts.len()); account_infos.push(self.__program.clone()); account_infos.push(self.address.clone()); account_infos.push(self.authority.clone()); diff --git a/clients/rust/src/generated/instructions/deactivate_lookup_table.rs b/clients/rust/src/generated/instructions/deactivate_lookup_table.rs index 98a4071..77d1a38 100644 --- a/clients/rust/src/generated/instructions/deactivate_lookup_table.rs +++ b/clients/rust/src/generated/instructions/deactivate_lookup_table.rs @@ -203,7 +203,7 @@ impl<'a, 'b> DeactivateLookupTableCpi<'a, 'b> { accounts, data, }; - let mut account_infos = Vec::with_capacity(2 + 1 + remaining_accounts.len()); + let mut account_infos = Vec::with_capacity(3 + remaining_accounts.len()); account_infos.push(self.__program.clone()); account_infos.push(self.address.clone()); account_infos.push(self.authority.clone()); diff --git a/clients/rust/src/generated/instructions/extend_lookup_table.rs b/clients/rust/src/generated/instructions/extend_lookup_table.rs index 44eafa8..0caef8c 100644 --- a/clients/rust/src/generated/instructions/extend_lookup_table.rs +++ b/clients/rust/src/generated/instructions/extend_lookup_table.rs @@ -283,7 +283,7 @@ impl<'a, 'b> ExtendLookupTableCpi<'a, 'b> { accounts, data, }; - let mut account_infos = Vec::with_capacity(4 + 1 + remaining_accounts.len()); + let mut account_infos = Vec::with_capacity(5 + remaining_accounts.len()); account_infos.push(self.__program.clone()); account_infos.push(self.address.clone()); account_infos.push(self.authority.clone()); diff --git a/clients/rust/src/generated/instructions/freeze_lookup_table.rs b/clients/rust/src/generated/instructions/freeze_lookup_table.rs index e606764..94e074f 100644 --- a/clients/rust/src/generated/instructions/freeze_lookup_table.rs +++ b/clients/rust/src/generated/instructions/freeze_lookup_table.rs @@ -203,7 +203,7 @@ impl<'a, 'b> FreezeLookupTableCpi<'a, 'b> { accounts, data, }; - let mut account_infos = Vec::with_capacity(2 + 1 + remaining_accounts.len()); + let mut account_infos = Vec::with_capacity(3 + remaining_accounts.len()); account_infos.push(self.__program.clone()); account_infos.push(self.address.clone()); account_infos.push(self.authority.clone()); diff --git a/package.json b/package.json index 7ea548e..92c7cfb 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ }, "devDependencies": { "@codama/renderers-js": "^1.0.0", - "@codama/renderers-rust": "^1.0.0", + "@codama/renderers-rust": "^1.0.3", "@iarna/toml": "^2.2.5", "codama": "^1.0.0", "typescript": "^5.5.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4e6134d..7c7e669 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ importers: specifier: ^1.0.0 version: 1.0.0(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.3) '@codama/renderers-rust': - specifier: ^1.0.0 - version: 1.0.0(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.3) + specifier: ^1.0.3 + version: 1.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.3) '@iarna/toml': specifier: ^2.2.5 version: 2.2.5 @@ -48,8 +48,8 @@ packages: '@codama/renderers-js@1.0.0': resolution: {integrity: sha512-wi9eqrtLbTM49ELqKqxIgbTaf7xKMWT+HIqj6GN373G0OJnSKwUJPIXAGLO+RCls5DGjDuOE5svuThU0zBkfzA==} - '@codama/renderers-rust@1.0.0': - resolution: {integrity: sha512-2z+XN6KCTQFDfE30OQcRo2LW4+9dnYlqs8rSUhKO2YsRiCnOoMu/zrNSqLtjL84T2PAwReRq+vBifcE0zaOuRw==} + '@codama/renderers-rust@1.0.3': + resolution: {integrity: sha512-S2n+bq92q5YZ01Z+8klNNbvgVErKsJzUYWN0Y0rPymx2vwkHfTkeQHEOuckb/kzHJm9QGXrzkDtSDBy5EDS1Wg==} '@codama/validators@1.0.0': resolution: {integrity: sha512-jSfU5IrcGTvcqsJSBSzD3Ochig+hKKg2NKsT/vUfQ4jAw2cQrVUP5f4dMXyX779JYfHLHCwZnBYvgEdgi9gBZQ==} @@ -441,7 +441,7 @@ snapshots: - fastestsmallesttextencoderdecoder - typescript - '@codama/renderers-rust@1.0.0(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.3)': + '@codama/renderers-rust@1.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.3)': dependencies: '@codama/errors': 1.0.0 '@codama/nodes': 1.0.0 diff --git a/scripts/generate-clients.mjs b/scripts/generate-clients.mjs index d83d59f..5a397a8 100755 --- a/scripts/generate-clients.mjs +++ b/scripts/generate-clients.mjs @@ -22,6 +22,7 @@ codama.accept( const rustClient = path.join(__dirname, '..', 'clients', 'rust'); codama.accept( renderRustVisitor(path.join(rustClient, 'src', 'generated'), { + anchorTraits: false, formatCode: true, crateFolder: rustClient, toolchain: getToolchainArgument('format'),