From e95d3922159c63ab5a63c9de9c7c8be9dd503302 Mon Sep 17 00:00:00 2001
From: Yihau Chen <a122092487@gmail.com>
Date: Wed, 4 Jan 2023 13:22:00 +0800
Subject: [PATCH] chore: add missing members back to workspace.members (#29450)

* frozen-abi/macro

* program-runtime

* sdk/macro

* sdk/program

* storage-bigtable/build-proto

* fix sorting
---
 Cargo.lock                              | 8 ++++++++
 Cargo.toml                              | 5 +++++
 program-runtime/Cargo.toml              | 2 +-
 sdk/macro/Cargo.toml                    | 2 +-
 sdk/program/Cargo.toml                  | 8 ++++----
 storage-bigtable/build-proto/Cargo.toml | 2 --
 6 files changed, 19 insertions(+), 8 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 049a7a5373fbdd..d65082e335278b 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",
@@ -47,6 +48,7 @@ members = [
     "perf",
     "poh",
     "poh-bench",
+    "program-runtime",
     "program-test",
     "programs/address-lookup-table",
     "programs/address-lookup-table-tests",
@@ -77,9 +79,12 @@ members = [
     "sdk/cargo-test-bpf",
     "sdk/cargo-test-sbf",
     "sdk/gen-headers",
+    "sdk/macro",
+    "sdk/program",
     "send-transaction-service",
     "stake-accounts",
     "storage-bigtable",
+    "storage-bigtable/build-proto",
     "storage-proto",
     "streamer",
     "sys-tuner",
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"] }
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"