Merge branch 'master' into multiminer_register_assets_2

Author: obycode

.github/workflows/ci.yml

@@ -170,7 +170,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           repository: hirosystems/clarinet
-          ref: develop
+          ref: main
           submodules: recursive
       - name: Build Clarinet with 2.1
         run: cargo build -p=clarinet-cli

.github/workflows/project-automation.yml

@@ -12,5 +12,5 @@ jobs:
     steps:
       - uses: actions/add-to-project@main
         with:
-          project-url: https://github.com/orgs/hirosystems/projects/14
+          project-url: https://github.com/orgs/hirosystems/projects/24
           github-token: ${{ secrets.GH_TOKEN }}

.vscode/extensions.json

@@ -1,6 +1,6 @@
 {
     "recommendations": [
-        "matklad.rust-analyzer",
+        "rust-lang.rust-analyzer",
         "vadimcn.vscode-lldb",
         "serayuzgur.crates",
         "editorconfig.editorconfig",

Cargo.lock

@@ -1,14 +1,30 @@
 [package]
-name = "blockstack-core"
+name = "stacks-subnets"
 version = "0.0.1"
-authors = [ "Jude Nelson <[email protected]>",
-            "Aaron Blankstein <[email protected]>",
-            "Ludo Galabru <[email protected]>" ]
+authors = [
+    "Jude Nelson <[email protected]>",
+    "Aaron Blankstein <[email protected]>",
+    "Ludo Galabru <[email protected]>",
+    "Alie Slade <[email protected]>",
+    "Greg Coppola <[email protected]>",
+    "Brice Dobry <[email protected]>",
+]
 license = "GPLv3"
-homepage = "https://github.com/blockstack/stacks-blockchain"
-repository = "https://github.com/blockstack/stacks-blockchain"
-description = "Reference implementation of the Stacks 2.0 Blockchain"
-keywords = [ "stacks", "stx", "bitcoin", "crypto", "blockstack", "decentralized", "dapps", "blockchain" ]
+homepage = "https://github.com/hirosystems/stacks-subnets"
+repository = "https://github.com/hirosystems/stacks-subnets"
+description = "Reference implementation of a Subnet for the Stacks Blockchain"
+keywords = [
+    "stacks",
+    "stx",
+    "bitcoin",
+    "crypto",
+    "blockstack",
+    "decentralized",
+    "dapps",
+    "blockchain",
+    "subnet",
+    "hyperchains",
+]
 readme = "README.md"
 resolver = "2"
 edition = "2021"
@@ -17,7 +33,7 @@ edition = "2021"
 debug = true
 
 [lib]
-name = "blockstack_lib"
+name = "subnet_lib"
 path = "src/lib.rs"
 
 [[bin]]
@@ -29,7 +45,7 @@ name = "clarity-cli"
 path = "src/clarity_cli_main.rs"
 
 [[bin]]
-name = "blockstack-cli"
+name = "subnet-cli"
 path = "src/blockstack_cli.rs"
 
 [[bench]]
@@ -63,20 +79,27 @@ url = "2.1.0"
 percent-encoding = "2.1.0"
 prometheus = { version = "0.9", optional = true }
 integer-sqrt = "0.1.3"
-slog = { version = "2.5.2", features = [ "max_level_trace" ] }
+slog = { version = "2.5.2", features = ["max_level_trace"] }
 slog-term = "2.6.0"
 slog-json = { version = "2.3.0", optional = true }
 chrono = "0.4.19"
 libc = "0.2.82"
-clarity = { package = "clarity", path = "./clarity/." }
-stacks_common = { package = "stacks-common", path = "./stacks-common/." }
+clarity = { git = "https://github.com/stacks-network/stacks-blockchain.git", rev = "580e811223a389d38071dcb9fde79ab55cd6f685" }
+stacks-common = { git = "https://github.com/stacks-network/stacks-blockchain.git", rev = "580e811223a389d38071dcb9fde79ab55cd6f685" }
+# clarity = { package = "clarity", path = "../stacks-blockchain-develop/clarity" }
+# stacks-common = { package = "stacks-common", path = "../stacks-blockchain-develop/stacks-common" }
 siphasher = "0.3.7"
 
 [target.'cfg(unix)'.dependencies]
 nix = "0.23"
 
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3", features = ["consoleapi", "handleapi", "synchapi", "winbase"] }
+winapi = { version = "0.3", features = [
+    "consoleapi",
+    "handleapi",
+    "synchapi",
+    "winbase",
+] }
 
 [target.'cfg(windows)'.dev-dependencies]
 winapi = { version = "0.3", features = ["fileapi", "processenv", "winnt"] }
@@ -86,7 +109,7 @@ version = "1.0"
 features = ["arbitrary_precision", "unbounded_depth"]
 
 [dependencies.secp256k1]
-version = "0.21.0"
+version = "0.24.2"
 features = ["serde", "recovery"]
 
 [dependencies.rusqlite]
@@ -108,14 +131,28 @@ features = ["std"]
 [dev-dependencies]
 assert-json-diff = "1.0.0"
 criterion = "0.3.5"
-clarity = { package = "clarity", features = ["default", "testing"], path = "./clarity/." }
-stacks_common = { package = "stacks-common", features = ["default", "testing"], path = "./stacks-common/." }
+clarity = { git = "https://github.com/stacks-network/stacks-blockchain.git", rev = "580e811223a389d38071dcb9fde79ab55cd6f685", features = [
+    "default",
+    "testing",
+] }
+stacks-common = { git = "https://github.com/stacks-network/stacks-blockchain.git", rev = "580e811223a389d38071dcb9fde79ab55cd6f685", features = [
+    "default",
+    "testing",
+] }
+# clarity = { package = "clarity", path = "../stacks-blockchain-develop/clarity", features = [
+#     "default",
+#     "testing",
+# ] }
+# stacks-common = { package = "stacks-common", path = "../stacks-blockchain-develop/stacks-common", features = [
+#     "default",
+#     "testing",
+# ] }
 
 [features]
 default = ["developer-mode"]
 developer-mode = []
 monitoring_prom = ["prometheus"]
-slog_json = ["slog-json", "stacks_common/slog_json", "clarity/slog_json"]
+slog_json = ["slog-json", "stacks-common/slog_json", "clarity/slog_json"]
 
 
 [profile.dev.package.regex]
@@ -128,8 +165,4 @@ sha2 = { version = "0.10", features = ["asm"] }
 sha2 = { version = "0.10" }
 
 [workspace]
-members = [
-    ".",
-    "clarity",
-    "testnet/stacks-node",
-    "testnet/puppet-chain"]
+members = [".", "testnet/stacks-node", "testnet/puppet-chain"]