diff --git a/memo/Cargo.lock b/memo/Cargo.lock index e18bdd9f86568a..6d59814062f6dc 100644 --- a/memo/Cargo.lock +++ b/memo/Cargo.lock @@ -180,6 +180,37 @@ dependencies = [ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rustversion" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "serde" version = "1.0.112" @@ -219,7 +250,7 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.2.10" +version = "1.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -232,22 +263,25 @@ dependencies = [ "num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "pbkdf2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rustversion 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", "serde_bytes 0.11.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk-macro 1.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk-macro 1.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-sdk-macro" -version = "1.2.10" +version = "1.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bs58 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "rustversion 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "syn 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -255,7 +289,7 @@ dependencies = [ name = "spl-memo" version = "1.0.2" dependencies = [ - "solana-sdk 1.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk 1.2.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -327,12 +361,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum pbkdf2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9" "checksum proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" "checksum quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" +"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +"checksum rustversion 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b9bdc5e856e51e685846fb6c13a1f5e5432946c2c90501bdc76a1319f19e29da" +"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" "checksum serde 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)" = "736aac72d1eafe8e5962d1d1c3d99b0df526015ba40915cb3c49d042e92ec243" "checksum serde_bytes 0.11.5 (registry+https://github.com/rust-lang/crates.io-index)" = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9" "checksum serde_derive 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)" = "bf0343ce212ac0d3d6afd9391ac8e9c9efe06b533c8d33f660f6390cc4093f57" "checksum sha2 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" -"checksum solana-sdk 1.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "3869d4a4784d10fc0db91fc666a7ccb916fd47e74636e37c328df5a3b7f8157f" -"checksum solana-sdk-macro 1.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d3fba494b48ee7d1b1c9cfd2df292d9dad69ccfd1f2b107eb030e29601cc4103" +"checksum solana-sdk 1.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "d6a3809bf6d1d39368fa7a539ea43d5db4dff319b267b8f9e22a00d89a7a977a" +"checksum solana-sdk-macro 1.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "81ce1a528901871a60147fd1747fb875638fd02af7dc8c7b233b353a65d9bc48" "checksum subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" "checksum syn 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)" = "b5304cfdf27365b7585c25d4af91b35016ed21ef88f17ced89c7093b43dba8b6" "checksum thiserror 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)" = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" diff --git a/memo/Cargo.toml b/memo/Cargo.toml index d5cd69b0af08e9..004dae08351ad4 100644 --- a/memo/Cargo.toml +++ b/memo/Cargo.toml @@ -10,8 +10,12 @@ repository = "https://github.com/solana-labs/solana-program-library" license = "Apache-2.0" edition = "2018" +[features] +program = [] +default = ["program"] + [dependencies] -solana-sdk = { version = "=1.2.10", default-features = false, features=["program"] } +solana-sdk = { version = "=1.2.12", default-features = false, features=["program"] } [lib] name = "spl_memo" diff --git a/token-swap/Cargo.lock b/token-swap/Cargo.lock index b0f9169e958f9f..08add02b5d0f15 100644 --- a/token-swap/Cargo.lock +++ b/token-swap/Cargo.lock @@ -396,12 +396,47 @@ dependencies = [ "winapi", ] +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver", +] + +[[package]] +name = "rustversion" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9bdc5e856e51e685846fb6c13a1f5e5432946c2c90501bdc76a1319f19e29da" +dependencies = [ + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.33", +] + [[package]] name = "ryu" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + [[package]] name = "serde" version = "1.0.114" @@ -456,9 +491,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.2.10" +version = "1.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3869d4a4784d10fc0db91fc666a7ccb916fd47e74636e37c328df5a3b7f8157f" +checksum = "d6a3809bf6d1d39368fa7a539ea43d5db4dff319b267b8f9e22a00d89a7a977a" dependencies = [ "bincode", "bs58", @@ -470,6 +505,8 @@ dependencies = [ "num-derive 0.3.0", "num-traits", "pbkdf2", + "rustc_version", + "rustversion", "serde", "serde_bytes", "serde_derive", @@ -480,13 +517,14 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.2.10" +version = "1.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fba494b48ee7d1b1c9cfd2df292d9dad69ccfd1f2b107eb030e29601cc4103" +checksum = "81ce1a528901871a60147fd1747fb875638fd02af7dc8c7b233b353a65d9bc48" dependencies = [ "bs58", "proc-macro2 1.0.18", "quote 1.0.7", + "rustversion", "syn 1.0.33", ] diff --git a/token-swap/Cargo.toml b/token-swap/Cargo.toml index 5a636608a1d21b..3037a465e815fb 100644 --- a/token-swap/Cargo.toml +++ b/token-swap/Cargo.toml @@ -10,11 +10,15 @@ repository = "https://github.com/solana-labs/solana-program-library" license = "Apache-2.0" edition = "2018" +[features] +program = [] +default = ["program"] + [dependencies] num-derive = "0.2" num-traits = "0.2" remove_dir_all = "=0.5.0" -solana-sdk = { version = "=1.2.10", default-features = false, features=["program"] } +solana-sdk = { version = "=1.2.12", default-features = false, features=["program"] } spl-token = { path = "../token" } thiserror = "1.0" diff --git a/token-swap/js/package.json b/token-swap/js/package.json index 8e10bb20a0c500..553300f26d6fca 100644 --- a/token-swap/js/package.json +++ b/token-swap/js/package.json @@ -6,7 +6,7 @@ "type": "git", "url": "https://github.com/solana-labs/solana-program-library" }, - "testnetDefaultChannel": "v1.2.3", + "testnetDefaultChannel": "v1.2.12", "scripts": { "start": "babel-node cli/main.js", "lint": "npm run pretty && eslint .", diff --git a/token/Cargo.lock b/token/Cargo.lock index e1c093dd60fcd2..d5b4d587faf35a 100644 --- a/token/Cargo.lock +++ b/token/Cargo.lock @@ -396,12 +396,47 @@ dependencies = [ "winapi", ] +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver", +] + +[[package]] +name = "rustversion" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9bdc5e856e51e685846fb6c13a1f5e5432946c2c90501bdc76a1319f19e29da" +dependencies = [ + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", +] + [[package]] name = "ryu" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + [[package]] name = "serde" version = "1.0.112" @@ -456,9 +491,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.2.10" +version = "1.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3869d4a4784d10fc0db91fc666a7ccb916fd47e74636e37c328df5a3b7f8157f" +checksum = "d6a3809bf6d1d39368fa7a539ea43d5db4dff319b267b8f9e22a00d89a7a977a" dependencies = [ "bincode", "bs58", @@ -470,6 +505,8 @@ dependencies = [ "num-derive 0.3.0", "num-traits", "pbkdf2", + "rustc_version", + "rustversion", "serde", "serde_bytes", "serde_derive", @@ -480,13 +517,14 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.2.10" +version = "1.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fba494b48ee7d1b1c9cfd2df292d9dad69ccfd1f2b107eb030e29601cc4103" +checksum = "81ce1a528901871a60147fd1747fb875638fd02af7dc8c7b233b353a65d9bc48" dependencies = [ "bs58", "proc-macro2 1.0.18", "quote 1.0.7", + "rustversion", "syn 1.0.31", ] diff --git a/token/Cargo.toml b/token/Cargo.toml index 211cfc34ce8827..42794499114cca 100644 --- a/token/Cargo.toml +++ b/token/Cargo.toml @@ -11,11 +11,15 @@ license = "Apache-2.0" edition = "2018" exclude = ["js/**"] +[features] +program = [] +default = ["program"] + [dependencies] num-derive = "0.2" num-traits = "0.2" remove_dir_all = "=0.5.0" -solana-sdk = { version = "=1.2.10", default-features = false, features=["program"] } +solana-sdk = { version = "=1.2.12", default-features = false, features=["program"] } thiserror = "1.0" [dev-dependencies] diff --git a/token/js/package.json b/token/js/package.json index 89e3eec95c054a..faaab2213e2f0f 100644 --- a/token/js/package.json +++ b/token/js/package.json @@ -6,7 +6,7 @@ "type": "git", "url": "https://github.com/solana-labs/solana-program-library" }, - "testnetDefaultChannel": "v1.2.3", + "testnetDefaultChannel": "v1.2.12", "scripts": { "start": "babel-node cli/main.js", "lint": "npm run pretty && eslint .",