system: Use solana-system-interface symbols (#3809)

* Add system interface dependency * Re-export symbols * Lock file changes * Patch extra crates needed to unify build * Use interface crate impl * Use empty mod * Relax dependency version
anza-xyz · Dec 2, 2024 · 52c0382 · 52c0382
1 parent dbbe367
commit 52c0382
Show file tree

Hide file tree

Showing 12 changed files with 86 additions and 1,918 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -559,6 +559,7 @@ solana-svm = { path = "svm", version = "=2.2.0" }
 solana-svm-conformance = { path = "svm-conformance", version = "=2.2.0" }
 solana-svm-rent-collector = { path = "svm-rent-collector", version = "=2.2.0" }
 solana-svm-transaction = { path = "svm-transaction", version = "=2.2.0" }
+solana-system-interface = "1.0"
 solana-system-program = { path = "programs/system", version = "=2.2.0" }
 solana-sysvar = { path = "sdk/sysvar", version = "=2.2.0" }
 solana-sysvar-id = { path = "sdk/sysvar-id", version = "=2.2.0" }

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/sdk/cargo-build-sbf/tests/crates/fail/Cargo.toml b/sdk/cargo-build-sbf/tests/crates/fail/Cargo.toml
@@ -15,4 +15,9 @@ solana-program = { path = "../../../../program", version = "=2.2.0" }
 [lib]
 crate-type = ["cdylib"]
 
+[patch.crates-io]
+solana-decode-error = { path = "../../../../decode-error" }
+solana-instruction = { path = "../../../../instruction" }
+solana-pubkey = { path = "../../../../pubkey" }
+
 [workspace]
diff --git a/sdk/cargo-build-sbf/tests/crates/noop/Cargo.toml b/sdk/cargo-build-sbf/tests/crates/noop/Cargo.toml
@@ -15,4 +15,9 @@ solana-program = { path = "../../../../program", version = "=2.2.0" }
 [lib]
 crate-type = ["cdylib"]
 
+[patch.crates-io]
+solana-decode-error = { path = "../../../../decode-error" }
+solana-instruction = { path = "../../../../instruction" }
+solana-pubkey = { path = "../../../../pubkey" }
+
 [workspace]
diff --git a/sdk/cargo-build-sbf/tests/crates/package-metadata/Cargo.toml b/sdk/cargo-build-sbf/tests/crates/package-metadata/Cargo.toml
@@ -20,4 +20,9 @@ solana-program = { path = "../../../../program", version = "=2.2.0" }
 [lib]
 crate-type = ["cdylib"]
 
+[patch.crates-io]
+solana-decode-error = { path = "../../../../decode-error" }
+solana-instruction = { path = "../../../../instruction" }
+solana-pubkey = { path = "../../../../pubkey" }
+
 [workspace]
diff --git a/sdk/cargo-build-sbf/tests/crates/workspace-metadata/Cargo.toml b/sdk/cargo-build-sbf/tests/crates/workspace-metadata/Cargo.toml
@@ -15,6 +15,11 @@ solana-program = { path = "../../../../program", version = "=2.2.0" }
 [lib]
 crate-type = ["cdylib"]
 
+[patch.crates-io]
+solana-decode-error = { path = "../../../../decode-error" }
+solana-instruction = { path = "../../../../instruction" }
+solana-pubkey = { path = "../../../../pubkey" }
+
 [workspace]
 
 [workspace.metadata.solana]

diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml
@@ -77,6 +77,7 @@ solana-short-vec = { workspace = true }
 solana-slot-hashes = { workspace = true, features = ["serde", "sysvar"] }
 solana-slot-history = { workspace = true, features = ["serde", "sysvar"] }
 solana-stable-layout = { workspace = true }
+solana-system-interface = { workspace = true, features = ["bincode"] }
 solana-sysvar = { workspace = true, features = ["bincode", "bytemuck"] }
 solana-sysvar-id = { workspace = true }
 thiserror = { workspace = true }