From c0eb275b5d287e46e94080a6655938789f9d169d Mon Sep 17 00:00:00 2001 From: Giannis Chatziveroglou Date: Wed, 9 Nov 2022 16:39:05 -0500 Subject: [PATCH] bump version --- Cargo.lock | 192 +----------------- package.json | 2 +- programs/cardinal-creator-standard/Cargo.toml | 4 +- .../instructions/token/initialize_account.rs | 10 +- .../src/instructions/token/initialize_mint.rs | 10 +- 5 files changed, 12 insertions(+), 206 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9af62618..ac1ee6a1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,42 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "aead" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" -dependencies = [ - "generic-array", -] - -[[package]] -name = "aes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" -dependencies = [ - "cfg-if", - "cipher 0.3.0", - "cpufeatures", - "opaque-debug", -] - -[[package]] -name = "aes-gcm-siv" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589c637f0e68c877bbd59a4599bbe849cac8e5f3e4b5a3ebae8f528cd218dcdc" -dependencies = [ - "aead", - "aes", - "cipher 0.3.0", - "ctr", - "polyval", - "subtle", - "zeroize", -] - [[package]] name = "ahash" version = "0.7.6" @@ -275,7 +239,7 @@ checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" [[package]] name = "cardinal-creator-standard" -version = "1.0.5" +version = "1.0.6" dependencies = [ "anyhow", "arrayref", @@ -317,25 +281,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", -] - -[[package]] -name = "cipher" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" -dependencies = [ - "crypto-common", - "inout", -] - [[package]] name = "console_error_panic_hook" version = "0.1.7" @@ -440,15 +385,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ctr" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" -dependencies = [ - "cipher 0.3.0", -] - [[package]] name = "curve25519-dalek" version = "3.2.1" @@ -671,15 +607,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - [[package]] name = "itertools" version = "0.10.5" @@ -822,18 +749,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "merlin" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" -dependencies = [ - "byteorder", - "keccak", - "rand_core 0.6.4", - "zeroize", -] - [[package]] name = "mio" version = "0.8.5" @@ -1004,18 +919,6 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" -[[package]] -name = "polyval" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - [[package]] name = "ppv-lite86" version = "0.2.17" @@ -1281,18 +1184,6 @@ dependencies = [ "digest 0.10.5", ] -[[package]] -name = "sha3" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "keccak", - "opaque-debug", -] - [[package]] name = "sha3" version = "0.10.6" @@ -1508,7 +1399,7 @@ dependencies = [ "serde_derive", "serde_json", "sha2 0.10.6", - "sha3 0.10.6", + "sha3", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-sdk-macro", @@ -1558,7 +1449,7 @@ dependencies = [ "serde_derive", "serde_json", "sha2 0.10.6", - "sha3 0.10.6", + "sha3", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-logger", @@ -1582,60 +1473,15 @@ dependencies = [ "syn", ] -[[package]] -name = "solana-zk-token-sdk" -version = "1.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d4f9818b158e7a49266b83e0c06e551ba429d2395a55de5803eb6e2daa1260c" -dependencies = [ - "aes-gcm-siv", - "arrayref", - "base64 0.13.1", - "bincode", - "bytemuck", - "byteorder", - "cipher 0.4.3", - "curve25519-dalek", - "getrandom 0.1.16", - "itertools", - "lazy_static", - "merlin", - "num-derive", - "num-traits", - "rand", - "serde", - "serde_json", - "sha3 0.9.1", - "solana-program", - "solana-sdk", - "subtle", - "thiserror", - "zeroize", -] - [[package]] name = "spl-associated-token-account" -version = "1.1.1" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16a33ecc83137583902c3e13c02f34151c8b2f2b74120f9c2b3ff841953e083d" +checksum = "2b013067447a1396303ddfc294f36e3d260a32f8a16c501c295bcdc7de39b490" dependencies = [ - "assert_matches", "borsh", - "num-derive", - "num-traits", "solana-program", "spl-token", - "spl-token-2022", - "thiserror", -] - -[[package]] -name = "spl-memo" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325" -dependencies = [ - "solana-program", ] [[package]] @@ -1653,24 +1499,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "spl-token-2022" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c0ebca4740cc4c892aa31e07d0b4dc1a24cac4748376d4b34f8eb0fee9ff46" -dependencies = [ - "arrayref", - "bytemuck", - "num-derive", - "num-traits", - "num_enum", - "solana-program", - "solana-zk-token-sdk", - "spl-memo", - "spl-token", - "thiserror", -] - [[package]] name = "subtle" version = "2.4.1" @@ -1830,16 +1658,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" -[[package]] -name = "universal-hash" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" -dependencies = [ - "generic-array", - "subtle", -] - [[package]] name = "uriparse" version = "0.6.4" diff --git a/package.json b/package.json index 7793aabb..deb92342 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cardinal-creator-standard", - "version": "1.0.5", + "version": "1.0.6", "description": "SDK for cardinal-creator-standard", "main": "index.ts", "license": "MIT", diff --git a/programs/cardinal-creator-standard/Cargo.toml b/programs/cardinal-creator-standard/Cargo.toml index 330d25dc..1fb82be4 100644 --- a/programs/cardinal-creator-standard/Cargo.toml +++ b/programs/cardinal-creator-standard/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cardinal-creator-standard" -version = "1.0.5" +version = "1.0.6" description = "The Cardinal Creator Standard" edition = "2021" homepage = "https://cardinal.so" @@ -23,7 +23,7 @@ default = [] solana-program = "1.10.29" shank = "^0.0.5" spl-token = { version = "3.3.0", features = ["no-entrypoint"] } -spl-associated-token-account = { version = "1.1.1", features = [ "no-entrypoint"] } +spl-associated-token-account = { version = "=1.0.5", features = [ "no-entrypoint"] } mpl-token-metadata = { version = "1.3.3", features = [ "no-entrypoint" ] } thiserror = "^1.0.24" borsh = "0.9.3" diff --git a/programs/cardinal-creator-standard/src/instructions/token/initialize_account.rs b/programs/cardinal-creator-standard/src/instructions/token/initialize_account.rs index 6c660165..1d090c8b 100644 --- a/programs/cardinal-creator-standard/src/instructions/token/initialize_account.rs +++ b/programs/cardinal-creator-standard/src/instructions/token/initialize_account.rs @@ -8,7 +8,7 @@ use solana_program::program::invoke_signed; use solana_program::program_error::ProgramError; use solana_program::system_program; use solana_program::sysvar; -use spl_associated_token_account::instruction::create_associated_token_account; +use spl_associated_token_account::create_associated_token_account; pub struct InitializeAccountCtx<'a, 'info> { pub mint: &'a AccountInfo<'info>, @@ -72,19 +72,13 @@ impl<'a, 'info> InitializeAccountCtx<'a, 'info> { pub fn handler(ctx: InitializeAccountCtx) -> ProgramResult { invoke_signed( - &create_associated_token_account( - ctx.payer.key, - ctx.token_account.key, - ctx.mint.key, - ctx.token_program.key, - ), + &create_associated_token_account(ctx.payer.key, ctx.token_account.key, ctx.mint.key), &[ ctx.payer.clone(), ctx.token_account.clone(), ctx.owner.clone(), ctx.mint.clone(), ctx.system_program.clone(), - ctx.token_program.clone(), ctx.rent.clone(), ], &[], diff --git a/programs/cardinal-creator-standard/src/instructions/token/initialize_mint.rs b/programs/cardinal-creator-standard/src/instructions/token/initialize_mint.rs index f0973847..f040ab93 100644 --- a/programs/cardinal-creator-standard/src/instructions/token/initialize_mint.rs +++ b/programs/cardinal-creator-standard/src/instructions/token/initialize_mint.rs @@ -24,8 +24,8 @@ use solana_program::system_instruction::create_account; use solana_program::system_program; use solana_program::sysvar; use solana_program::sysvar::Sysvar; +use spl_associated_token_account::create_associated_token_account; use spl_associated_token_account::get_associated_token_address; -use spl_associated_token_account::instruction::create_associated_token_account; use std::str::FromStr; pub struct InitializeMintCtx<'a, 'info> { @@ -189,19 +189,13 @@ pub fn handler(ctx: InitializeMintCtx) -> ProgramResult { } if ctx.target_token_account.data_is_empty() { invoke_signed( - &create_associated_token_account( - ctx.payer.key, - ctx.target.key, - ctx.mint.key, - ctx.token_program.key, - ), + &create_associated_token_account(ctx.payer.key, ctx.target.key, ctx.mint.key), &[ ctx.payer.clone(), ctx.target_token_account.clone(), ctx.target.clone(), ctx.mint.clone(), ctx.system_program.clone(), - ctx.token_program.clone(), ctx.rent.clone(), ], &[],