Browse Source

move sdk crates to sdk dir (#3498)

* move sdk crates to sdk dir

* temporarily disable downstream spl jobs
Kevin Heavey 1 year ago
parent
commit
adca5f7c4d

+ 4 - 1
.github/workflows/downstream-project-spl.yml

@@ -37,7 +37,8 @@ env:
 
 
 jobs:
 jobs:
   check:
   check:
-    if: github.repository == 'anza-xyz/agave'
+    # if: github.repository == 'anza-xyz/agave'
+    if: false
     runs-on: ubuntu-latest
     runs-on: ubuntu-latest
     steps:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/checkout@v4
@@ -61,6 +62,7 @@ jobs:
           cargo check
           cargo check
 
 
   test:
   test:
+    if: false
     runs-on: ubuntu-latest
     runs-on: ubuntu-latest
     strategy:
     strategy:
       matrix:
       matrix:
@@ -123,6 +125,7 @@ jobs:
           done
           done
 
 
   cargo-test-sbf:
   cargo-test-sbf:
+    if: false
     runs-on: ubuntu-latest
     runs-on: ubuntu-latest
     strategy:
     strategy:
       matrix:
       matrix:

+ 10 - 10
Cargo.toml

@@ -35,14 +35,11 @@ members = [
     "core",
     "core",
     "cost-model",
     "cost-model",
     "curves/*",
     "curves/*",
-    "define-syscall",
     "dos",
     "dos",
     "download-utils",
     "download-utils",
     "entry",
     "entry",
     "faucet",
     "faucet",
     "fee",
     "fee",
-    "frozen-abi",
-    "frozen-abi/macro",
     "genesis",
     "genesis",
     "genesis-utils",
     "genesis-utils",
     "geyser-plugin-interface",
     "geyser-plugin-interface",
@@ -57,7 +54,6 @@ members = [
     "local-cluster",
     "local-cluster",
     "log-analyzer",
     "log-analyzer",
     "log-collector",
     "log-collector",
-    "logger",
     "measure",
     "measure",
     "memory-management",
     "memory-management",
     "merkle-root-bench",
     "merkle-root-bench",
@@ -112,17 +108,21 @@ members = [
     "sdk/commitment-config",
     "sdk/commitment-config",
     "sdk/cpi",
     "sdk/cpi",
     "sdk/decode-error",
     "sdk/decode-error",
+    "sdk/define-syscall",
     "sdk/derivation-path",
     "sdk/derivation-path",
     "sdk/epoch-rewards",
     "sdk/epoch-rewards",
     "sdk/epoch-schedule",
     "sdk/epoch-schedule",
     "sdk/feature-set",
     "sdk/feature-set",
     "sdk/fee-calculator",
     "sdk/fee-calculator",
     "sdk/fee-structure",
     "sdk/fee-structure",
+    "sdk/frozen-abi",
+    "sdk/frozen-abi/macro",
     "sdk/gen-headers",
     "sdk/gen-headers",
     "sdk/hash",
     "sdk/hash",
     "sdk/inflation",
     "sdk/inflation",
     "sdk/instruction",
     "sdk/instruction",
     "sdk/keypair",
     "sdk/keypair",
+    "sdk/logger",
     "sdk/macro",
     "sdk/macro",
     "sdk/msg",
     "sdk/msg",
     "sdk/native-token",
     "sdk/native-token",
@@ -146,6 +146,7 @@ members = [
     "sdk/serde-varint",
     "sdk/serde-varint",
     "sdk/serialize-utils",
     "sdk/serialize-utils",
     "sdk/sha256-hasher",
     "sdk/sha256-hasher",
+    "sdk/short-vec",
     "sdk/signature",
     "sdk/signature",
     "sdk/signer",
     "sdk/signer",
     "sdk/slot-hashes",
     "sdk/slot-hashes",
@@ -155,7 +156,6 @@ members = [
     "sdk/time-utils",
     "sdk/time-utils",
     "sdk/transaction-error",
     "sdk/transaction-error",
     "send-transaction-service",
     "send-transaction-service",
-    "short-vec",
     "stake-accounts",
     "stake-accounts",
     "storage-bigtable",
     "storage-bigtable",
     "storage-bigtable/build-proto",
     "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-cpi = { path = "sdk/cpi", version = "=2.2.0" }
 solana-curve25519 = { path = "curves/curve25519", 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-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-derivation-path = { path = "sdk/derivation-path", version = "=2.2.0" }
 solana-download-utils = { path = "download-utils", version = "=2.2.0" }
 solana-download-utils = { path = "download-utils", version = "=2.2.0" }
 solana-entry = { path = "entry", 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-calculator = { path = "sdk/fee-calculator", version = "=2.2.0" }
 solana-fee = { path = "fee", version = "=2.2.0" }
 solana-fee = { path = "fee", version = "=2.2.0" }
 solana-fee-structure = { path = "sdk/fee-structure", 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-tps-client = { path = "tps-client", version = "=2.2.0" }
 solana-genesis = { path = "genesis", version = "=2.2.0" }
 solana-genesis = { path = "genesis", version = "=2.2.0" }
 solana-genesis-utils = { path = "genesis-utils", 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-loader-v4-program = { path = "programs/loader-v4", version = "=2.2.0" }
 solana-local-cluster = { path = "local-cluster", 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-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-measure = { path = "measure", version = "=2.2.0" }
 solana-merkle-tree = { path = "merkle-tree", version = "=2.2.0" }
 solana-merkle-tree = { path = "merkle-tree", version = "=2.2.0" }
 solana-metrics = { path = "metrics", 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-sdk-macro = { path = "sdk/macro", version = "=2.2.0" }
 solana-secp256k1-recover = { path = "curves/secp256k1-recover", version = "=2.2.0", default-features = false }
 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-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-stable-layout = { path = "sdk/stable-layout", version = "=2.2.0" }
 solana-stake-program = { path = "programs/stake", version = "=2.2.0" }
 solana-stake-program = { path = "programs/stake", version = "=2.2.0" }
 solana-storage-bigtable = { path = "storage-bigtable", version = "=2.2.0" }
 solana-storage-bigtable = { path = "storage-bigtable", version = "=2.2.0" }

+ 1 - 1
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-fee = { path = "../../fee", version = "=2.2.0" }
 solana-ledger = { path = "../../ledger", version = "=2.2.0" }
 solana-ledger = { path = "../../ledger", version = "=2.2.0" }
 solana-log-collector = { path = "../../log-collector", 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-measure = { path = "../../measure", version = "=2.2.0" }
 solana-poseidon = { path = "../../poseidon/", version = "=2.2.0" }
 solana-poseidon = { path = "../../poseidon/", version = "=2.2.0" }
 solana-program = { path = "../../sdk/program", version = "=2.2.0" }
 solana-program = { path = "../../sdk/program", version = "=2.2.0" }

+ 0 - 0
define-syscall/Cargo.toml → sdk/define-syscall/Cargo.toml


+ 0 - 0
define-syscall/src/lib.rs → sdk/define-syscall/src/lib.rs


+ 0 - 0
frozen-abi/Cargo.toml → sdk/frozen-abi/Cargo.toml


+ 0 - 0
frozen-abi/macro/Cargo.toml → sdk/frozen-abi/macro/Cargo.toml


+ 0 - 0
frozen-abi/macro/src/lib.rs → sdk/frozen-abi/macro/src/lib.rs


+ 0 - 0
frozen-abi/src/abi_digester.rs → sdk/frozen-abi/src/abi_digester.rs


+ 0 - 0
frozen-abi/src/abi_example.rs → sdk/frozen-abi/src/abi_example.rs


+ 0 - 0
frozen-abi/src/hash.rs → sdk/frozen-abi/src/hash.rs


+ 0 - 0
frozen-abi/src/lib.rs → sdk/frozen-abi/src/lib.rs


+ 0 - 0
logger/.gitignore → sdk/logger/.gitignore


+ 0 - 0
logger/Cargo.toml → sdk/logger/Cargo.toml


+ 0 - 0
logger/src/lib.rs → sdk/logger/src/lib.rs


+ 0 - 0
short-vec/Cargo.toml → sdk/short-vec/Cargo.toml


+ 0 - 0
short-vec/src/lib.rs → sdk/short-vec/src/lib.rs