diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 783258e..21b6d60 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,5 +1,7 @@ name: Continuous Integration on: [push, pull_request] +branches-ignore: + - grim jobs: linux-tests: diff --git a/Cargo.lock b/Cargo.lock index 0611770..b743427 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1279,7 +1279,6 @@ dependencies = [ [[package]] name = "grin_api" version = "5.4.0" -source = "git+https://github.com/mimblewimble/grin?rev=cf2ed3f3becd62b5e754ec964fd90e332b9a021f#cf2ed3f3becd62b5e754ec964fd90e332b9a021f" dependencies = [ "async-stream", "bytes 1.11.1", @@ -1313,7 +1312,6 @@ dependencies = [ [[package]] name = "grin_chain" version = "5.4.0" -source = "git+https://github.com/mimblewimble/grin?rev=cf2ed3f3becd62b5e754ec964fd90e332b9a021f#cf2ed3f3becd62b5e754ec964fd90e332b9a021f" dependencies = [ "bit-vec", "bitflags 1.3.2", @@ -1336,7 +1334,6 @@ dependencies = [ [[package]] name = "grin_core" version = "5.4.0" -source = "git+https://github.com/mimblewimble/grin?rev=cf2ed3f3becd62b5e754ec964fd90e332b9a021f#cf2ed3f3becd62b5e754ec964fd90e332b9a021f" dependencies = [ "blake2-rfc", "byteorder", @@ -1362,7 +1359,6 @@ dependencies = [ [[package]] name = "grin_keychain" version = "5.4.0" -source = "git+https://github.com/mimblewimble/grin?rev=cf2ed3f3becd62b5e754ec964fd90e332b9a021f#cf2ed3f3becd62b5e754ec964fd90e332b9a021f" dependencies = [ "blake2-rfc", "byteorder", @@ -1384,7 +1380,6 @@ dependencies = [ [[package]] name = "grin_p2p" version = "5.4.0" -source = "git+https://github.com/mimblewimble/grin?rev=cf2ed3f3becd62b5e754ec964fd90e332b9a021f#cf2ed3f3becd62b5e754ec964fd90e332b9a021f" dependencies = [ "bitflags 1.3.2", "built", @@ -1407,7 +1402,6 @@ dependencies = [ [[package]] name = "grin_pool" version = "5.4.0" -source = "git+https://github.com/mimblewimble/grin?rev=cf2ed3f3becd62b5e754ec964fd90e332b9a021f#cf2ed3f3becd62b5e754ec964fd90e332b9a021f" dependencies = [ "blake2-rfc", "chrono", @@ -1439,7 +1433,6 @@ dependencies = [ [[package]] name = "grin_store" version = "5.4.0" -source = "git+https://github.com/mimblewimble/grin?rev=cf2ed3f3becd62b5e754ec964fd90e332b9a021f#cf2ed3f3becd62b5e754ec964fd90e332b9a021f" dependencies = [ "byteorder", "croaring", @@ -1458,7 +1451,6 @@ dependencies = [ [[package]] name = "grin_util" version = "5.4.0" -source = "git+https://github.com/mimblewimble/grin?rev=cf2ed3f3becd62b5e754ec964fd90e332b9a021f#cf2ed3f3becd62b5e754ec964fd90e332b9a021f" dependencies = [ "anyhow", "backtrace", diff --git a/Cargo.toml b/Cargo.toml index acef614..4114970 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,10 +54,10 @@ grin_wallet_util = { path = "./util", version = "5.4.0-alpha.1" } # grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } # For bleeding edge -grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } -grin_keychain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } -grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } -grin_api = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_keychain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_api = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } # For local testing # grin_core = { path = "../grin/core"} @@ -65,7 +65,13 @@ grin_api = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62 # grin_util = { path = "../grin/util"} # grin_api = { path = "../grin/api"} -###### +# Grim monorepo +grin_core = { path = "../node/core"} +grin_keychain = { path = "../node/keychain"} +grin_util = { path = "../node/util"} +grin_api = { path = "../node/api"} + +###### [build-dependencies] built = { version = "0.8.0", features = ["git2"]} diff --git a/api/Cargo.toml b/api/Cargo.toml index b86cfbd..f1a621c 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -41,15 +41,20 @@ grin_wallet_util = { path = "../util", version = "5.4.0-alpha.1" } # grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } # For bleeding edge -grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } -grin_keychain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } -grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_keychain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } # For local testing # grin_core = { path = "../../grin/core"} # grin_keychain = { path = "../../grin/keychain"} # grin_util = { path = "../../grin/util"} +# Monorepo deps +grin_core = { path = "../../node/core"} +grin_keychain = { path = "../../node/keychain"} +grin_util = { path = "../../node/util"} + ##### [dev-dependencies] diff --git a/config/Cargo.toml b/config/Cargo.toml index 137dc36..09fdbc9 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -30,13 +30,17 @@ grin_wallet_util = { path = "../util", version = "5.4.0-alpha.1" } #grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } # For bleeding edge -grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } -grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } # For local testing # grin_core = { path = "../../grin/core"} # grin_util = { path = "../../grin/util"} +# Monorepo deps +grin_core = { path = "../../node/core"} +grin_util = { path = "../../node/util"} + ##### [dev-dependencies] diff --git a/controller/Cargo.toml b/controller/Cargo.toml index 3425119..6678320 100644 --- a/controller/Cargo.toml +++ b/controller/Cargo.toml @@ -54,11 +54,11 @@ grin_wallet_config = { path = "../config", version = "5.4.0-alpha.1" } # grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } # For bleeding edge -grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } -grin_keychain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } -grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } -grin_api = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } -grin_chain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_keychain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_api = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_chain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } # For local testing # grin_core = { path = "../../grin/core"} @@ -67,6 +67,13 @@ grin_chain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd # grin_api = { path = "../../grin/api"} # grin_chain = { path = "../../grin/chain"} +# Monorepo deps +grin_core = { path = "../../node/core"} +grin_keychain = { path = "../../node/keychain"} +grin_util = { path = "../../node/util"} +grin_api = { path = "../../node/api"} +grin_chain = { path = "../../node/chain"} + ##### [dev-dependencies] diff --git a/impls/Cargo.toml b/impls/Cargo.toml index 9625570..995a4de 100644 --- a/impls/Cargo.toml +++ b/impls/Cargo.toml @@ -60,12 +60,12 @@ grin_wallet_libwallet = { path = "../libwallet", version = "5.4.0-alpha.1" } # grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } # For bleeding edge -grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } -grin_keychain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } -grin_chain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } -grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } -grin_api = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } -grin_store = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_keychain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_chain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_api = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_store = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } # For local testing # grin_core = { path = "../../grin/core"} @@ -75,6 +75,14 @@ grin_store = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd # grin_api = { path = "../../grin/api"} # grin_store = { path = "../../grin/store"} +# Monorepo deps +grin_core = { path = "../../node/core"} +grin_keychain = { path = "../../node/keychain"} +grin_chain = { path = "../../node/chain"} +grin_util = { path = "../../node/util"} +grin_api = { path = "../../node/api"} +grin_store = { path = "../../node/store"} + ##### [dev-dependencies] diff --git a/libwallet/Cargo.toml b/libwallet/Cargo.toml index 65354a6..a06b956 100644 --- a/libwallet/Cargo.toml +++ b/libwallet/Cargo.toml @@ -59,10 +59,10 @@ grin_wallet_config = { path = "../config", version = "5.4.0-alpha.1" } # grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } # For bleeding edge -grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } -grin_keychain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } -grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } -grin_store = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_keychain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_store = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } # For local testing # grin_core = { path = "../../grin/core"} @@ -70,4 +70,10 @@ grin_store = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd # grin_util = { path = "../../grin/util"} # grin_store = { path = "../../grin/store"} +# Monorepo deps +grin_core = { path = "../../node/core"} +grin_keychain = { path = "../../node/keychain"} +grin_util = { path = "../../node/util"} +grin_store = { path = "../../node/store"} + ##### diff --git a/util/Cargo.toml b/util/Cargo.toml index 1cb5aa8..f490b42 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -28,12 +28,15 @@ thiserror = "1" # grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } # For bleeding edge -grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } +#grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } # For local testing # grin_util = { path = "../../grin/util"} +# Monorepo deps +grin_util = { path = "../../node/util"} + ##### [dev-dependencies]