fix(cargo-tangle): bake blueprint json (#397)

tangle-network · Oct 24, 2024 · ea0aadb · ea0aadb
1 parent 0a06ad9
commit ea0aadb
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/blueprints/incredible-squaring-eigenlayer/contracts/lib/forge-std b/blueprints/incredible-squaring-eigenlayer/contracts/lib/forge-std
diff --git a/blueprints/incredible-squaring/Cargo.toml b/blueprints/incredible-squaring/Cargo.toml
@@ -39,4 +39,4 @@ default = ["std"]
 std = []
 
 [package.metadata.blueprint]
-manager = { evm = "IncredibleSquaringBlueprint" }
+manager = { Evm = "IncredibleSquaringBlueprint" }
diff --git a/blueprints/incredible-squaring/contracts/lib/forge-std b/blueprints/incredible-squaring/contracts/lib/forge-std
diff --git a/blueprints/incredible-squaring/contracts/lib/tnt-core b/blueprints/incredible-squaring/contracts/lib/tnt-core
diff --git a/cli/src/deploy.rs b/cli/src/deploy.rs
@@ -264,9 +264,16 @@ fn bake_blueprint(
     convert_to_bytes_or_null(&mut blueprint_json["metadata"]["website"]);
     convert_to_bytes_or_null(&mut blueprint_json["metadata"]["code_repository"]);
     convert_to_bytes_or_null(&mut blueprint_json["metadata"]["category"]);
+
+    // Set the Hooks to be empty to be compatible with the old blueprint format.
+    // This is because the new blueprint format has manager field instead of different hooks.
+    blueprint_json["registration_hook"] = serde_json::json!("None");
+    blueprint_json["request_hook"] = serde_json::json!("None");
     for job in blueprint_json["jobs"].as_array_mut().unwrap() {
         convert_to_bytes_or_null(&mut job["metadata"]["name"]);
         convert_to_bytes_or_null(&mut job["metadata"]["description"]);
+        // Set an empty verifier to be compatible with the old blueprint format.
+        job["verifier"] = serde_json::json!("None");
     }
 
     // Retrieves the Gadget information from the blueprint.json file.
@@ -308,7 +315,6 @@ fn bake_blueprint(
         }
     }
 
-    println!("Job: {blueprint_json}");
     let blueprint = serde_json::from_value(blueprint_json)?;
     Ok(blueprint)
 }

diff --git a/macros/blueprint-proc-macro-core/src/lib.rs b/macros/blueprint-proc-macro-core/src/lib.rs
@@ -201,7 +201,6 @@ pub struct ReportMetadata<'a> {
 
 /// Service Blueprint Manager is a smart contract that will manage the service lifecycle.
 #[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "lowercase")]
 #[non_exhaustive]
 pub enum BlueprintManager {
     /// A Smart contract that will manage the service lifecycle.

diff --git a/macros/playground/Cargo.toml b/macros/playground/Cargo.toml
@@ -9,7 +9,7 @@ repository.workspace = true
 publish = false
 
 [package.metadata.blueprint]
-manager = { evm = "" }
+manager = { Evm = "" }
 
 [[package.metadata.gadget.Native.sources]]
 owner = "tangle-network"
+193 −0		CONTRIBUTING.md
+16 −0		README.md
+73 −8		src/Vm.sol
+2 −2		test/Vm.t.sol
+47 −46		examples/IncredibleSquaringBlueprint.sol
+0 −111		src/BlueprintServiceManager.sol
+159 −0		src/BlueprintServiceManagerBase.sol
+94 −0		src/IBlueprintServiceManager.sol