From adca5f7c4d380dbadf280da6fc5fc51b60a332ec Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Thu, 7 Nov 2024 00:07:41 +0400 Subject: [PATCH] move sdk crates to sdk dir (#3498) * move sdk crates to sdk dir * temporarily disable downstream spl jobs --- .github/workflows/downstream-project-spl.yml | 5 ++++- Cargo.toml | 20 +++++++++---------- programs/sbf/Cargo.toml | 2 +- .../define-syscall}/Cargo.toml | 0 .../define-syscall}/src/lib.rs | 0 {frozen-abi => sdk/frozen-abi}/Cargo.toml | 0 .../frozen-abi}/macro/Cargo.toml | 0 .../frozen-abi}/macro/src/lib.rs | 0 .../frozen-abi}/src/abi_digester.rs | 0 .../frozen-abi}/src/abi_example.rs | 0 {frozen-abi => sdk/frozen-abi}/src/hash.rs | 0 {frozen-abi => sdk/frozen-abi}/src/lib.rs | 0 {logger => sdk/logger}/.gitignore | 0 {logger => sdk/logger}/Cargo.toml | 0 {logger => sdk/logger}/src/lib.rs | 0 {short-vec => sdk/short-vec}/Cargo.toml | 0 {short-vec => sdk/short-vec}/src/lib.rs | 0 17 files changed, 15 insertions(+), 12 deletions(-) rename {define-syscall => sdk/define-syscall}/Cargo.toml (100%) rename {define-syscall => sdk/define-syscall}/src/lib.rs (100%) rename {frozen-abi => sdk/frozen-abi}/Cargo.toml (100%) rename {frozen-abi => sdk/frozen-abi}/macro/Cargo.toml (100%) rename {frozen-abi => sdk/frozen-abi}/macro/src/lib.rs (100%) rename {frozen-abi => sdk/frozen-abi}/src/abi_digester.rs (100%) rename {frozen-abi => sdk/frozen-abi}/src/abi_example.rs (100%) rename {frozen-abi => sdk/frozen-abi}/src/hash.rs (100%) rename {frozen-abi => sdk/frozen-abi}/src/lib.rs (100%) rename {logger => sdk/logger}/.gitignore (100%) rename {logger => sdk/logger}/Cargo.toml (100%) rename {logger => sdk/logger}/src/lib.rs (100%) rename {short-vec => sdk/short-vec}/Cargo.toml (100%) rename {short-vec => sdk/short-vec}/src/lib.rs (100%) diff --git a/.github/workflows/downstream-project-spl.yml b/.github/workflows/downstream-project-spl.yml index 83df265a9fce2b..840cd50e856e6d 100644 --- a/.github/workflows/downstream-project-spl.yml +++ b/.github/workflows/downstream-project-spl.yml @@ -37,7 +37,8 @@ env: jobs: check: - if: github.repository == 'anza-xyz/agave' + # if: github.repository == 'anza-xyz/agave' + if: false runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -61,6 +62,7 @@ jobs: cargo check test: + if: false runs-on: ubuntu-latest strategy: matrix: @@ -123,6 +125,7 @@ jobs: done cargo-test-sbf: + if: false runs-on: ubuntu-latest strategy: matrix: diff --git a/Cargo.toml b/Cargo.toml index 4481a65765ce93..992250ce885fb4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,14 +35,11 @@ members = [ "core", "cost-model", "curves/*", - "define-syscall", "dos", "download-utils", "entry", "faucet", "fee", - "frozen-abi", - "frozen-abi/macro", "genesis", "genesis-utils", "geyser-plugin-interface", @@ -57,7 +54,6 @@ members = [ "local-cluster", "log-analyzer", "log-collector", - "logger", "measure", "memory-management", "merkle-root-bench", @@ -112,17 +108,21 @@ members = [ "sdk/commitment-config", "sdk/cpi", "sdk/decode-error", + "sdk/define-syscall", "sdk/derivation-path", "sdk/epoch-rewards", "sdk/epoch-schedule", "sdk/feature-set", "sdk/fee-calculator", "sdk/fee-structure", + "sdk/frozen-abi", + "sdk/frozen-abi/macro", "sdk/gen-headers", "sdk/hash", "sdk/inflation", "sdk/instruction", "sdk/keypair", + "sdk/logger", "sdk/macro", "sdk/msg", "sdk/native-token", @@ -146,6 +146,7 @@ members = [ "sdk/serde-varint", "sdk/serialize-utils", "sdk/sha256-hasher", + "sdk/short-vec", "sdk/signature", "sdk/signer", "sdk/slot-hashes", @@ -155,7 +156,6 @@ members = [ "sdk/time-utils", "sdk/transaction-error", "send-transaction-service", - "short-vec", "stake-accounts", "storage-bigtable", "storage-bigtable/build-proto", @@ -429,7 +429,7 @@ solana-cost-model = { path = "cost-model", version = "=2.2.0" } solana-cpi = { path = "sdk/cpi", version = "=2.2.0" } solana-curve25519 = { path = "curves/curve25519", version = "=2.2.0" } solana-decode-error = { path = "sdk/decode-error", version = "=2.2.0" } -solana-define-syscall = { path = "define-syscall", version = "=2.2.0" } +solana-define-syscall = { path = "sdk/define-syscall", version = "=2.2.0" } solana-derivation-path = { path = "sdk/derivation-path", version = "=2.2.0" } solana-download-utils = { path = "download-utils", version = "=2.2.0" } solana-entry = { path = "entry", version = "=2.2.0" } @@ -441,8 +441,8 @@ solana-feature-set = { path = "sdk/feature-set", version = "=2.2.0" } solana-fee-calculator = { path = "sdk/fee-calculator", version = "=2.2.0" } solana-fee = { path = "fee", version = "=2.2.0" } solana-fee-structure = { path = "sdk/fee-structure", version = "=2.2.0" } -solana-frozen-abi = { path = "frozen-abi", version = "=2.2.0" } -solana-frozen-abi-macro = { path = "frozen-abi/macro", version = "=2.2.0" } +solana-frozen-abi = { path = "sdk/frozen-abi", version = "=2.2.0" } +solana-frozen-abi-macro = { path = "sdk/frozen-abi/macro", version = "=2.2.0" } solana-tps-client = { path = "tps-client", version = "=2.2.0" } solana-genesis = { path = "genesis", version = "=2.2.0" } solana-genesis-utils = { path = "genesis-utils", version = "=2.2.0" } @@ -460,7 +460,7 @@ solana-ledger = { path = "ledger", version = "=2.2.0" } solana-loader-v4-program = { path = "programs/loader-v4", version = "=2.2.0" } solana-local-cluster = { path = "local-cluster", version = "=2.2.0" } solana-log-collector = { path = "log-collector", version = "=2.2.0" } -solana-logger = { path = "logger", version = "=2.2.0" } +solana-logger = { path = "sdk/logger", version = "=2.2.0" } solana-measure = { path = "measure", version = "=2.2.0" } solana-merkle-tree = { path = "merkle-tree", version = "=2.2.0" } solana-metrics = { path = "metrics", version = "=2.2.0" } @@ -516,7 +516,7 @@ solana-sdk = { path = "sdk", version = "=2.2.0" } solana-sdk-macro = { path = "sdk/macro", version = "=2.2.0" } solana-secp256k1-recover = { path = "curves/secp256k1-recover", version = "=2.2.0", default-features = false } solana-send-transaction-service = { path = "send-transaction-service", version = "=2.2.0" } -solana-short-vec = { path = "short-vec", version = "=2.2.0" } +solana-short-vec = { path = "sdk/short-vec", version = "=2.2.0" } solana-stable-layout = { path = "sdk/stable-layout", version = "=2.2.0" } solana-stake-program = { path = "programs/stake", version = "=2.2.0" } solana-storage-bigtable = { path = "storage-bigtable", version = "=2.2.0" } diff --git a/programs/sbf/Cargo.toml b/programs/sbf/Cargo.toml index 0153d9f28eb114..6d33e9518d0924 100644 --- a/programs/sbf/Cargo.toml +++ b/programs/sbf/Cargo.toml @@ -42,7 +42,7 @@ solana-feature-set = { path = "../../sdk/feature-set", version = "=2.2.0" } solana-fee = { path = "../../fee", version = "=2.2.0" } solana-ledger = { path = "../../ledger", version = "=2.2.0" } solana-log-collector = { path = "../../log-collector", version = "=2.2.0" } -solana-logger = { path = "../../logger", version = "=2.2.0" } +solana-logger = { path = "../../sdk/logger", version = "=2.2.0" } solana-measure = { path = "../../measure", version = "=2.2.0" } solana-poseidon = { path = "../../poseidon/", version = "=2.2.0" } solana-program = { path = "../../sdk/program", version = "=2.2.0" } diff --git a/define-syscall/Cargo.toml b/sdk/define-syscall/Cargo.toml similarity index 100% rename from define-syscall/Cargo.toml rename to sdk/define-syscall/Cargo.toml diff --git a/define-syscall/src/lib.rs b/sdk/define-syscall/src/lib.rs similarity index 100% rename from define-syscall/src/lib.rs rename to sdk/define-syscall/src/lib.rs diff --git a/frozen-abi/Cargo.toml b/sdk/frozen-abi/Cargo.toml similarity index 100% rename from frozen-abi/Cargo.toml rename to sdk/frozen-abi/Cargo.toml diff --git a/frozen-abi/macro/Cargo.toml b/sdk/frozen-abi/macro/Cargo.toml similarity index 100% rename from frozen-abi/macro/Cargo.toml rename to sdk/frozen-abi/macro/Cargo.toml diff --git a/frozen-abi/macro/src/lib.rs b/sdk/frozen-abi/macro/src/lib.rs similarity index 100% rename from frozen-abi/macro/src/lib.rs rename to sdk/frozen-abi/macro/src/lib.rs diff --git a/frozen-abi/src/abi_digester.rs b/sdk/frozen-abi/src/abi_digester.rs similarity index 100% rename from frozen-abi/src/abi_digester.rs rename to sdk/frozen-abi/src/abi_digester.rs diff --git a/frozen-abi/src/abi_example.rs b/sdk/frozen-abi/src/abi_example.rs similarity index 100% rename from frozen-abi/src/abi_example.rs rename to sdk/frozen-abi/src/abi_example.rs diff --git a/frozen-abi/src/hash.rs b/sdk/frozen-abi/src/hash.rs similarity index 100% rename from frozen-abi/src/hash.rs rename to sdk/frozen-abi/src/hash.rs diff --git a/frozen-abi/src/lib.rs b/sdk/frozen-abi/src/lib.rs similarity index 100% rename from frozen-abi/src/lib.rs rename to sdk/frozen-abi/src/lib.rs diff --git a/logger/.gitignore b/sdk/logger/.gitignore similarity index 100% rename from logger/.gitignore rename to sdk/logger/.gitignore diff --git a/logger/Cargo.toml b/sdk/logger/Cargo.toml similarity index 100% rename from logger/Cargo.toml rename to sdk/logger/Cargo.toml diff --git a/logger/src/lib.rs b/sdk/logger/src/lib.rs similarity index 100% rename from logger/src/lib.rs rename to sdk/logger/src/lib.rs diff --git a/short-vec/Cargo.toml b/sdk/short-vec/Cargo.toml similarity index 100% rename from short-vec/Cargo.toml rename to sdk/short-vec/Cargo.toml diff --git a/short-vec/src/lib.rs b/sdk/short-vec/src/lib.rs similarity index 100% rename from short-vec/src/lib.rs rename to sdk/short-vec/src/lib.rs