Merge branch 'master' into spl-memo

coral-xyz · Oct 12, 2023 · 4f6dff3 · 4f6dff3
2 parents 23ddd3d + 6cf2004
commit 4f6dff3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 58 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lang/syn/src/codegen/accounts/constraints.rs b/lang/syn/src/codegen/accounts/constraints.rs
@@ -1118,7 +1118,7 @@ fn generate_get_token_account_space(mint: &Expr) -> proc_macro2::TokenStream {
                 let mint_state = StateWithExtensions::<Mint>::unpack(&mint_data)?;
                 let mint_extensions = mint_state.get_extension_types()?;
                 let required_extensions = ExtensionType::get_required_init_account_extensions(&mint_extensions);
-                ExtensionType::get_account_len::<Account>(&required_extensions)
+                ExtensionType::try_calculate_account_len::<Account>(&required_extensions)?
             } else {
                 ::anchor_spl::token::TokenAccount::LEN
             }

diff --git a/spl/Cargo.toml b/spl/Cargo.toml
@@ -28,7 +28,7 @@ borsh = { version = ">=0.9, <0.11", optional = true }
 mpl-token-metadata = { version = "3.1.0", optional = true }
 serum_dex = { git = "https://github.com/openbook-dex/program/", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true }
 solana-program = ">=1.16, <1.18"
-spl-associated-token-account = { version = "^1.1", features = ["no-entrypoint"], optional = true }
-spl-token = { version = "3.5", features = ["no-entrypoint"], optional = true }
-spl-token-2022 = { version = "0.6", features = ["no-entrypoint"], optional = true }
+spl-associated-token-account = { version = "2.2", features = ["no-entrypoint"], optional = true }
+spl-token = { version = "4", features = ["no-entrypoint"], optional = true }
+spl-token-2022 = { version = "0.9", features = ["no-entrypoint"], optional = true }
 spl-memo = { version = "4.0", features = ["no-entrypoint"], optional = true }