From fde874c91d1a182d097d10449e18851cebcd8253 Mon Sep 17 00:00:00 2001 From: yihau Date: Mon, 2 Jan 2023 15:12:33 +0800 Subject: [PATCH 1/6] frozen-abi/macro --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index 049a7a5373fbdd..ac117d8ce938ee 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,6 +24,7 @@ members = [ "entry", "faucet", "frozen-abi", + "frozen-abi/macro", "genesis", "genesis-utils", "geyser-plugin-interface", From ee2fd1d151d55dc0c579b57ae71e7f43ad59eda8 Mon Sep 17 00:00:00 2001 From: yihau Date: Mon, 2 Jan 2023 15:12:43 +0800 Subject: [PATCH 2/6] program-runtime --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index ac117d8ce938ee..84ca3cf37a164e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,6 +49,7 @@ members = [ "poh", "poh-bench", "program-test", + "program-runtime", "programs/address-lookup-table", "programs/address-lookup-table-tests", "programs/bpf-loader-tests", From 78ee76835176c294a9fa4e4fae1650537a928a3e Mon Sep 17 00:00:00 2001 From: yihau Date: Mon, 2 Jan 2023 15:13:16 +0800 Subject: [PATCH 3/6] sdk/macro --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index 84ca3cf37a164e..a5be4b3e8004de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -79,6 +79,7 @@ members = [ "sdk/cargo-test-bpf", "sdk/cargo-test-sbf", "sdk/gen-headers", + "sdk/macro", "send-transaction-service", "stake-accounts", "storage-bigtable", From 75cd70b12516d09025005f0102a6d96b0ffc85b9 Mon Sep 17 00:00:00 2001 From: yihau Date: Mon, 2 Jan 2023 15:13:31 +0800 Subject: [PATCH 4/6] sdk/program --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index a5be4b3e8004de..db011c20bcd3a5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -80,6 +80,7 @@ members = [ "sdk/cargo-test-sbf", "sdk/gen-headers", "sdk/macro", + "sdk/program", "send-transaction-service", "stake-accounts", "storage-bigtable", From 1c20c9dc95550c3a4a707d1b8c3b8ae50ca006f4 Mon Sep 17 00:00:00 2001 From: yihau Date: Mon, 2 Jan 2023 15:13:40 +0800 Subject: [PATCH 5/6] storage-bigtable/build-proto --- Cargo.lock | 8 ++++++++ Cargo.toml | 1 + storage-bigtable/build-proto/Cargo.toml | 2 -- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 554b41fa135f9f..7299b5db56f7b6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3667,6 +3667,14 @@ dependencies = [ "prost 0.11.0", ] +[[package]] +name = "proto" +version = "1.15.0" +dependencies = [ + "protobuf-src", + "tonic-build 0.8.0", +] + [[package]] name = "protobuf-src" version = "1.0.5+3.19.3" diff --git a/Cargo.toml b/Cargo.toml index db011c20bcd3a5..6e15128b68da45 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -84,6 +84,7 @@ members = [ "send-transaction-service", "stake-accounts", "storage-bigtable", + "storage-bigtable/build-proto", "storage-proto", "streamer", "sys-tuner", diff --git a/storage-bigtable/build-proto/Cargo.toml b/storage-bigtable/build-proto/Cargo.toml index 06f4bd25ebb654..69fa9788654b81 100644 --- a/storage-bigtable/build-proto/Cargo.toml +++ b/storage-bigtable/build-proto/Cargo.toml @@ -9,8 +9,6 @@ publish = false repository = "https://github.com/solana-labs/solana" version = "1.15.0" -[workspace] - [dependencies] tonic-build = "0.8.0" From a8f995e468445636ebeb66d7c76a8ca4a38489fc Mon Sep 17 00:00:00 2001 From: yihau Date: Mon, 2 Jan 2023 15:39:33 +0800 Subject: [PATCH 6/6] fix sorting --- Cargo.toml | 2 +- program-runtime/Cargo.toml | 2 +- sdk/macro/Cargo.toml | 2 +- sdk/program/Cargo.toml | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6e15128b68da45..d65082e335278b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,8 +48,8 @@ members = [ "perf", "poh", "poh-bench", - "program-test", "program-runtime", + "program-test", "programs/address-lookup-table", "programs/address-lookup-table-tests", "programs/bpf-loader-tests", diff --git a/program-runtime/Cargo.toml b/program-runtime/Cargo.toml index 2a3c830bdb9f0e..90428132b30ce3 100644 --- a/program-runtime/Cargo.toml +++ b/program-runtime/Cargo.toml @@ -26,8 +26,8 @@ solana-frozen-abi = { path = "../frozen-abi", version = "=1.15.0" } solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.15.0" } solana-measure = { path = "../measure", version = "=1.15.0" } solana-metrics = { path = "../metrics", version = "=1.15.0" } -solana_rbpf = "=0.2.38" solana-sdk = { path = "../sdk", version = "=1.15.0" } +solana_rbpf = "=0.2.38" thiserror = "1.0" [dev-dependencies] diff --git a/sdk/macro/Cargo.toml b/sdk/macro/Cargo.toml index df3499f634937e..8c30e08aee92d1 100644 --- a/sdk/macro/Cargo.toml +++ b/sdk/macro/Cargo.toml @@ -16,8 +16,8 @@ proc-macro = true bs58 = "0.4.0" proc-macro2 = "1.0.19" quote = "1.0" -syn = { version = "1.0", features = ["full", "extra-traits"] } rustversion = "1.0.7" +syn = { version = "1.0", features = ["full", "extra-traits"] } [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml index 77cb33341a28e5..180521c6d99fe9 100644 --- a/sdk/program/Cargo.toml +++ b/sdk/program/Cargo.toml @@ -16,8 +16,8 @@ blake3 = { version = "1.3.1", features = ["digest", "traits-preview"] } borsh = "0.9.1" borsh-derive = "0.9.1" bs58 = "0.4.0" -bytemuck = { version = "1.8.0", features = ["derive"] } bv = { version = "0.11.1", features = ["serde"] } +bytemuck = { version = "1.8.0", features = ["derive"] } itertools = "0.10.1" lazy_static = "1.4.0" log = "0.4.17" @@ -37,9 +37,9 @@ solana-sdk-macro = { path = "../macro", version = "=1.15.0" } thiserror = "1.0" [target.'cfg(not(target_os = "solana"))'.dependencies] -ark-bn254="0.3.0" -ark-ec="0.3.0" -ark-ff="0.3.0" +ark-bn254 = "0.3.0" +ark-ec = "0.3.0" +ark-ff = "0.3.0" array-bytes = "=1.4.1" bitflags = "1.3.1" base64 = { version = "0.13", features = ["alloc", "std"] }