refactor: re-exporting anchor-lang (#114)

magicblock-labs · Dec 6, 2024 · 9a22d5c · 9a22d5c
1 parent 2420d0e
commit 9a22d5c
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 40 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/bolt-cli/src/templates/program/constants.rs.template b/crates/bolt-cli/src/templates/program/constants.rs.template
@@ -1,4 +1,4 @@
-use anchor_lang::prelude::*;
+use bolt_lang::prelude::*;
 
 #[constant]
-pub const SEED: &str = "anchor";
+pub const SEED: &str = "bolt";
diff --git a/crates/bolt-cli/src/templates/program/error.rs.template b/crates/bolt-cli/src/templates/program/error.rs.template
@@ -1,4 +1,4 @@
-use anchor_lang::prelude::*;
+use bolt_lang::prelude::*;
 
 #[error_code]
 pub enum ErrorCode {

diff --git a/crates/bolt-cli/src/templates/program/instructions/initialize.rs.template b/crates/bolt-cli/src/templates/program/instructions/initialize.rs.template
@@ -1,4 +1,4 @@
-use anchor_lang::prelude::*;
+use bolt_lang::prelude::*;
 
 #[derive(Accounts)]
 pub struct Initialize {}

diff --git a/crates/bolt-cli/src/templates/program/multiple.lib.rs.template b/crates/bolt-cli/src/templates/program/multiple.lib.rs.template
@@ -3,7 +3,7 @@ pub mod error;
 pub mod instructions;
 pub mod state;
 
-use anchor_lang::prelude::*;
+use bolt_lang::prelude::*;
 
 pub use constants::*;
 pub use instructions::*;

diff --git a/crates/bolt-cli/src/templates/program/single.lib.rs.template b/crates/bolt-cli/src/templates/program/single.lib.rs.template
@@ -1,4 +1,4 @@
-use anchor_lang::prelude::*;
+use bolt_lang::prelude::*;
 
 declare_id!("{program_id}");
 

diff --git a/crates/bolt-cli/src/templates/workspace/Cargo.serde.toml.template b/crates/bolt-cli/src/templates/workspace/Cargo.serde.toml.template
@@ -14,13 +14,12 @@ no-idl = []
 no-log-ix-name = []
 cpi = ["no-entrypoint"]
 default = []
-idl-build = ["anchor-lang/idl-build"]
-anchor-debug = ["anchor-lang/anchor-debug"]
+idl-build = ["bolt-lang/idl-build"]
+anchor-debug = ["bolt-lang/anchor-debug"]
 custom-heap = []
 custom-panic = []
 
 
 [dependencies]
 bolt-lang.workspace = true
-anchor-lang.workspace = true
-serde = {{ version = "1.0", features = ["derive"] }}
+serde = {{ version = "1.0", features = ["derive"] }}
diff --git a/crates/bolt-cli/src/templates/workspace/Cargo.toml.template b/crates/bolt-cli/src/templates/workspace/Cargo.toml.template
@@ -14,11 +14,10 @@ no-idl = []
 no-log-ix-name = []
 cpi = ["no-entrypoint"]
 default = []
-idl-build = ["anchor-lang/idl-build"]
-anchor-debug = ["anchor-lang/anchor-debug"]
+idl-build = ["bolt-lang/idl-build"]
+anchor-debug = ["bolt-lang/anchor-debug"]
 custom-heap = []
 custom-panic = []
 
 [dependencies]
 bolt-lang.workspace = true
-anchor-lang.workspace = true
diff --git a/crates/bolt-cli/src/templates/workspace/mod.rs b/crates/bolt-cli/src/templates/workspace/mod.rs
@@ -1,13 +1,8 @@
 use crate::VERSION;
 use heck::ToSnakeCase;
-pub const ANCHOR_VERSION: &str = anchor_cli::VERSION;
 
 pub fn workspace_manifest() -> String {
-    format!(
-        include_str!("workspace.toml.template"),
-        VERSION = VERSION,
-        ANCHOR_VERSION = ANCHOR_VERSION
-    )
+    format!(include_str!("workspace.toml.template"), VERSION = VERSION)
 }
 
 pub fn package_json(jest: bool) -> String {

diff --git a/crates/bolt-cli/src/templates/workspace/workspace.toml.template b/crates/bolt-cli/src/templates/workspace/workspace.toml.template
@@ -8,7 +8,6 @@ resolver = "2"
 
 [workspace.dependencies]
 bolt-lang = "{VERSION}"
-anchor-lang = "{ANCHOR_VERSION}"
 
 [profile.release]
 overflow-checks = true

diff --git a/crates/bolt-lang/Cargo.toml b/crates/bolt-lang/Cargo.toml
@@ -8,6 +8,10 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[features]
+anchor-debug = ["anchor-lang/anchor-debug"]
+idl-build = ["anchor-lang/idl-build"]
+
 [dependencies]
 anchor-lang = { workspace = true }
 

diff --git a/crates/bolt-lang/src/lib.rs b/crates/bolt-lang/src/lib.rs
@@ -1,3 +1,6 @@
+pub mod prelude;
+
+pub use anchor_lang;
 pub use anchor_lang::error::ErrorCode::AccountDidNotDeserialize as AccountDidNotDeserializeErrorCode;
 pub use anchor_lang::prelude::*;
 pub use anchor_lang::{

diff --git a/crates/bolt-lang/src/prelude.rs b/crates/bolt-lang/src/prelude.rs
@@ -0,0 +1,2 @@
+pub use anchor_lang;
+pub use anchor_lang::prelude::*;
diff --git a/examples/component-position/Cargo.toml b/examples/component-position/Cargo.toml
@@ -18,11 +18,10 @@ no-idl = []
 no-log-ix-name = []
 cpi = ["no-entrypoint"]
 default = []
-idl-build = ["anchor-lang/idl-build"]
-anchor-debug = ["anchor-lang/anchor-debug"]
+idl-build = ["bolt-lang/idl-build"]
+anchor-debug = ["bolt-lang/anchor-debug"] 
 custom-heap = []
 custom-panic = []
 
 [dependencies]
-anchor-lang = { workspace = true }
 bolt-lang = { path = "../../crates/bolt-lang" }
diff --git a/examples/component-velocity/Cargo.toml b/examples/component-velocity/Cargo.toml
@@ -18,12 +18,11 @@ no-idl = []
 no-log-ix-name = []
 cpi = ["no-entrypoint"]
 default = []
-idl-build = ["anchor-lang/idl-build"]
-anchor-debug = ["anchor-lang/anchor-debug"]
+idl-build = ["bolt-lang/idl-build"]
+anchor-debug = ["bolt-lang/anchor-debug"]
 custom-heap = []
 custom-panic = []
 
 [dependencies]
-anchor-lang = { workspace = true }
 bolt-lang = { path = "../../crates/bolt-lang" }
 
diff --git a/examples/system-apply-velocity/Cargo.toml b/examples/system-apply-velocity/Cargo.toml
@@ -18,13 +18,12 @@ no-idl = []
 no-log-ix-name = []
 cpi = ["no-entrypoint"]
 default = []
-idl-build = ["anchor-lang/idl-build"]
-anchor-debug = ["anchor-lang/anchor-debug"]
+idl-build = ["bolt-lang/idl-build"]
+anchor-debug = ["bolt-lang/anchor-debug"]
 custom-heap = []
 custom-panic = []
 
 [dependencies]
-anchor-lang = { workspace = true }
 anchor-spl = { workspace = true, features = ["metadata"]}
 bolt-lang = { path = "../../crates/bolt-lang" }
 velocity = { path = "../component-velocity", features = ["cpi"]}

diff --git a/examples/system-fly/Cargo.toml b/examples/system-fly/Cargo.toml
@@ -18,13 +18,12 @@ no-idl = []
 no-log-ix-name = []
 cpi = ["no-entrypoint"]
 default = []
-idl-build = ["anchor-lang/idl-build"]
-anchor-debug = ["anchor-lang/anchor-debug"]
+idl-build = ["bolt-lang/idl-build"]
+anchor-debug = ["bolt-lang/anchor-debug"]
 custom-heap = []
 custom-panic = []
 
 [dependencies]
-anchor-lang = { workspace = true }
 bolt-lang = { path = "../../crates/bolt-lang" }
 position = { path = "../component-position", features = ["cpi"]}
 

diff --git a/examples/system-simple-movement/Cargo.toml b/examples/system-simple-movement/Cargo.toml
@@ -18,13 +18,12 @@ no-idl = []
 no-log-ix-name = []
 cpi = ["no-entrypoint"]
 default = []
-idl-build = ["anchor-lang/idl-build"]
-anchor-debug = ["anchor-lang/anchor-debug"]
+idl-build = ["bolt-lang/idl-build"]
+anchor-debug = ["bolt-lang/anchor-debug"]
 custom-heap = []
 custom-panic = []
 
 [dependencies]
-anchor-lang = { workspace = true }
 serde = { workspace = true }
 bolt-lang = { path = "../../crates/bolt-lang" }
 bolt-types = { version = "0.1.6", path = "../../crates/types" }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		pub use anchor_lang;
		pub use anchor_lang::prelude::*;