gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove frozen ABI modules from solana-sdk

Browse Source
This commit is contained in:
Michael Vines
2020-10-19 21:07:46 -07:00
parent 81d0c8ae7f
commit 6858950f76
38 changed files with 240 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
programs/bpf/Cargo.lock generated
View File

@ -2017,6 +2017,35 @@ dependencies = [
"winapi 0.3.8",
]
[[package]]
name = "solana-frozen-abi"
version = "1.5.0"
dependencies = [
"bs58",
"bv",
"generic-array 0.14.3",
"log",
"memmap",
"rustc_version",
"serde",
"serde_derive",
"sha2",
"solana-frozen-abi-macro",
"solana-logger",
"thiserror",
]
[[package]]
name = "solana-frozen-abi-macro"
version = "1.5.0"
dependencies = [
"lazy_static",
"proc-macro2 1.0.19",
"quote 1.0.6",
"rustc_version",
"syn 1.0.27",
]
[[package]]
name = "solana-logger"
version = "1.5.0"
@ -2088,12 +2117,13 @@ dependencies = [
"serde",
"serde_derive",
"solana-config-program",
"solana-frozen-abi",
"solana-frozen-abi-macro",
"solana-logger",
"solana-measure",
"solana-metrics",
"solana-rayon-threadlimit",
"solana-sdk",
"solana-sdk-macro-frozen-abi",
"solana-secp256k1-program",
"solana-stake-program",
"solana-vote-program",
@ -2139,9 +2169,10 @@ dependencies = [
"sha2",
"sha3",
"solana-crate-features",
"solana-frozen-abi",
"solana-frozen-abi-macro",
"solana-logger",
"solana-sdk-macro",
"solana-sdk-macro-frozen-abi",
"thiserror",
]
@ -2156,17 +2187,6 @@ dependencies = [
"syn 1.0.27",
]
[[package]]
name = "solana-sdk-macro-frozen-abi"
version = "1.5.0"
dependencies = [
"lazy_static",
"proc-macro2 1.0.19",
"quote 1.0.6",
"rustc_version",
"syn 1.0.27",
]
[[package]]
name = "solana-secp256k1-program"
version = "1.5.0"
@ -2192,9 +2212,10 @@ dependencies = [
"serde",
"serde_derive",
"solana-config-program",
"solana-frozen-abi",
"solana-frozen-abi-macro",
"solana-metrics",
"solana-sdk",
"solana-sdk-macro-frozen-abi",
"solana-vote-program",
"thiserror",
]
@ -2210,10 +2231,11 @@ dependencies = [
"rustc_version",
"serde",
"serde_derive",
"solana-frozen-abi",
"solana-frozen-abi-macro",
"solana-logger",
"solana-metrics",
"solana-sdk",
"solana-sdk-macro-frozen-abi",
"thiserror",
]

3
programs/stake/Cargo.toml
View File

@ -15,11 +15,12 @@ num-derive = "0.3"
num-traits = "0.2"
serde = "1.0.112"
serde_derive = "1.0.103"
solana-frozen-abi = { path = "../../frozen-abi", version = "1.5.0" }
solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "1.5.0" }
solana-metrics = { path = "../../metrics", version = "1.5.0" }
solana-sdk = { path = "../../sdk", version = "1.5.0" }
solana-vote-program = { path = "../vote", version = "1.5.0" }
solana-config-program = { path = "../config", version = "1.5.0" }
solana-sdk-macro-frozen-abi = { path = "../../sdk/macro-frozen-abi", version = "1.5.0" }
thiserror = "1.0"
[dev-dependencies]

2
programs/stake/build.rs
View File

@ -1 +1 @@
../../sdk/build.rs
../../frozen-abi/build.rs

2
programs/stake/src/lib.rs
View File

@ -12,4 +12,4 @@ pub fn add_genesis_accounts(genesis_config: &mut GenesisConfig) -> u64 {
}
#[macro_use]
extern crate solana_sdk_macro_frozen_abi;
extern crate solana_frozen_abi_macro;

3
programs/vote/Cargo.toml
View File

@ -15,10 +15,11 @@ num-derive = "0.3"
num-traits = "0.2"
serde = "1.0.112"
serde_derive = "1.0.103"
solana-frozen-abi = { path = "../../frozen-abi", version = "1.5.0" }
solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "1.5.0" }
solana-logger = { path = "../../logger", version = "1.5.0" }
solana-metrics = { path = "../../metrics", version = "1.5.0" }
solana-sdk = { path = "../../sdk", version = "1.5.0" }
solana-sdk-macro-frozen-abi = { path = "../../sdk/macro-frozen-abi", version = "1.5.0" }
thiserror = "1.0"
[build-dependencies]

2
programs/vote/build.rs
View File

@ -1 +1 @@
../../sdk/build.rs
../../frozen-abi/build.rs

2
programs/vote/src/lib.rs
View File

@ -9,6 +9,6 @@ pub mod vote_transaction;
extern crate solana_metrics;
#[macro_use]
extern crate solana_sdk_macro_frozen_abi;
extern crate solana_frozen_abi_macro;
solana_sdk::declare_id!("Vote111111111111111111111111111111111111111");