Add mpc blueprint starting point, cleanup abstractions (#252)

* Add mpc blueprint starting point

* Updates

* Merge main

* Work on integrating network for MPC and cleaning up common

* Attempts to clean up and add comments

* Remove core/common/environments (#251)

* Remove core, common, refactor into SDK

* Reworking blueprint manager and mpc blueprint

* Continuing refactoring keygen job

* Continuing refactoring keygen job

* Cleanup

* Remove core, common, refactor into SDK

* Remove common/core/environments from main merge

* Logger fix

* Remove old packages from CI

* Fix all features build

* Remove `Error` suffix from error variants

* fmt

* allow clippy::let_underscore_future

* Fix a few more clippy warnings

* Remove invalid package category

---------

Co-authored-by: Serial <[email protected]>

.github/workflows/ci.yml

@@ -40,9 +40,7 @@ jobs:
     strategy:
       matrix:
         package: [
-          gadget-core,
-          gadget-common,
-          gadget-sdk,
+          gadget-sdk
         ]
     steps:
       - name: Checkout code
@@ -77,8 +75,7 @@ jobs:
     strategy:
       matrix:
         package: [
-          gadget-core,
-          gadget-common,
+          gadget-sdk,
           blueprint-manager
         ]
     steps:
@@ -107,8 +104,7 @@ jobs:
     strategy:
       matrix:
         package: [
-          gadget-core,
-          gadget-common,
+          gadget-sdk,
           blueprint-manager,
         ]
     steps:
@@ -136,4 +132,4 @@ jobs:
         run: cargo install cargo-nextest --locked
 
       - name: tests
-        run: cargo nextest run --nocapture --package ${{ matrix.package }}
+        run: cargo nextest run --nocapture --package ${{ matrix.package }}

.gitignore

@@ -20,3 +20,4 @@ target/
 certs
 .DS_Store
 CODEGEN_LOCK
+blueprints/**/lib

.gitmodules

@@ -1,6 +1,16 @@
+# For the incredible-squaring blueprint
 [submodule "blueprints/incredible-squaring/contracts/lib/forge-std"]
 	path = blueprints/incredible-squaring/contracts/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
 [submodule "blueprints/incredible-squaring/contracts/lib/eigenlayer-middleware"]
 	path = blueprints/incredible-squaring/contracts/lib/eigenlayer-middleware
-	url = https://github.com/Layr-Labs/eigenlayer-middleware
+	url = https://github.com/Layr-Labs/eigenlayer-middleware
+
+# For the ecdsa-threshold-mpc blueprint
+[submodule "blueprints/ecdsa-threshold-mpc/contracts/lib/forge-std"]
+	path = blueprints/ecdsa-threshold-mpc/contracts/lib/forge-std
+	url = https://github.com/foundry-rs/forge-std
+[submodule "blueprints/ecdsa-threshold-mpc/contracts/lib/tnt-core"]
+	path = blueprints/ecdsa-threshold-mpc/contracts/lib/tnt-core
+	url = https://github.com/webb-tools/tnt-core
+	branch = main

Cargo.toml

@@ -2,16 +2,11 @@
 resolver = "2"
 members = [
     "blueprint-metadata",
-    "blueprints/*",
+    "blueprints/incredible-squaring",
     "cli",
-    "core",
-    "common",
     "executor",
-    "environments/tangle",
-    "environments/utils",
     "gadget-io",
     "blueprint-test-utils",
-    "protocol-macros",
     "blueprint-manager",
     "sdk",
     # Commented out, since it uses jobs-v1 code
@@ -45,16 +40,11 @@ single_match_else = "allow"
 broken_intra_doc_links = "deny"
 
 [workspace.dependencies]
-gadget-core = { version = "0.0.1", path = "./core", default-features = false }
-gadget-common = { version = "0.1.0", path = "./common", default-features = false }
 gadget-io = { version = "0.0.1", path = "./gadget-io", default-features = false }
 gadget-executor = { version = "0.1.0", path = "./executor" }
 blueprint-manager = { version = "0.1.1", path = "./blueprint-manager" }
 blueprint-test-utils = { path = "./blueprint-test-utils" }
 gadget-sdk = { path = "./sdk", default-features = false }
-protocol-macros = { path = "./protocol-macros" }
-tangle-environment = { path = "./environments/tangle", default-features = false }
-environment-utils = { path = "./environments/utils", default-features = false }
 
 gadget-blueprint-proc-macro = { path = "./macros/blueprint-proc-macro", default-features = false, version = "0.1.0" }
 gadget-blueprint-proc-macro-core = { path = "./macros/blueprint-proc-macro-core", default-features = false, version = "0.1.0" }
@@ -192,6 +182,7 @@ hex = { version = "0.4.3", default-features = false }
 hex-literal = "0.4.1"
 http-body-util = "0.1.2"
 hyper = { version = "1.4.1", default-features = false }
+hyper-util = "0.1.7"
 itertools = "0.13.0"
 jsonrpsee = "0.24.3"
 jsonwebtoken = "9.3.0"

blueprint-manager/Cargo.toml

@@ -9,8 +9,6 @@ path = "src/cli.rs"
 
 [dependencies]
 sp-core = { workspace = true }
-gadget-core = { workspace = true }
-gadget-common = { workspace = true }
 gadget-io = { workspace = true }
 gadget-sdk = { workspace = true }
 color-eyre = { workspace = true, features = ["tracing-error", "color-spantrace", "issue-url"] }
@@ -22,7 +20,6 @@ hex = { workspace = true }
 tokio = { workspace = true, features = ["process", "io-util", "signal"] }
 reqwest = { workspace = true }
 sha2 = { workspace = true }
-tangle-environment = { workspace = true }
 futures = { workspace = true }
 
 log = { workspace = true }
@@ -35,7 +32,6 @@ libp2p = { workspace = true }
 [features]
 default = ["std"]
 std = [
-    "gadget-common/std",
     "gadget-io/std",
     "gadget-sdk/default",
 ]

blueprint-manager/src/cli.rs

@@ -3,7 +3,6 @@ use blueprint_manager::config::BlueprintManagerConfig;
 use blueprint_manager::run_blueprint_manager;
 use blueprint_manager::sdk;
 use blueprint_manager::sdk::utils::msg_to_error;
-use gadget_common::gadget_io;
 use gadget_io::GadgetConfig;
 use structopt::StructOpt;