From 6e6f3b9aa8647637df35a1af02fe3acc69531228 Mon Sep 17 00:00:00 2001 From: 2075 <2075@zero.io> Date: Mon, 28 Nov 2022 14:54:49 +0000 Subject: [PATCH 1/3] feat: update orml references to git --- control/Cargo.toml | 7 ++++--- flow/Cargo.toml | 7 ++++--- sense/Cargo.toml | 1 + signal/Cargo.toml | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/control/Cargo.toml b/control/Cargo.toml index c6ba4934e..4c683fcdd 100755 --- a/control/Cargo.toml +++ b/control/Cargo.toml @@ -32,7 +32,8 @@ sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkado pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" } -orml-traits = { path = "../../orml/traits", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch= "polkadot-v0.9.28", default-features = false } + gamedao-traits = { package = "gamedao-traits", path = "../traits", default-features = false } # tangram = { package = "module-tangram", path = "../../zero/tangram", default-features = false } @@ -42,8 +43,8 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkad sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" } frame-support-test = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.28" } pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" } -orml-tokens = { path = "../../orml/tokens", default-features = false } -orml-currencies = { path = "../../orml/currencies", default-features = false } +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch= "polkadot-v0.9.28", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch= "polkadot-v0.9.28", default-features = false } [features] default = ["std"] diff --git a/flow/Cargo.toml b/flow/Cargo.toml index c7ae09af7..0cc44d6f3 100644 --- a/flow/Cargo.toml +++ b/flow/Cargo.toml @@ -3,6 +3,7 @@ # ███░█▄▀█░▀▀░█░█▄█░█░▄▄█░█░█░▀▀░█░██░██ # ███▄▄▄▄█▄██▄█▄███▄█▄▄▄█▄▄██▄██▄██▄▄███ # ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ + [package] name = "gamedao-flow" version = "1.2.0" @@ -23,9 +24,9 @@ frame-system = { git = "https://github.com/paritytech/substrate", branch = "polk frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28", default-features = false, optional = true } sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.28", default-features=false } -orml-traits = { path = "../../orml/traits", default-features = false } -orml-tokens = { path = "../../orml/tokens", optional = true } -orml-currencies = { path = "../../orml/currencies", optional = true } +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch= "polkadot-v0.9.28", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch= "polkadot-v0.9.28", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch= "polkadot-v0.9.28", default-features = false } gamedao-traits = { package = "gamedao-traits", path = "../traits", default-features = false } gamedao-control = { package = "gamedao-control", path = "../control", optional = true } diff --git a/sense/Cargo.toml b/sense/Cargo.toml index cdc833795..dfe541f8f 100755 --- a/sense/Cargo.toml +++ b/sense/Cargo.toml @@ -3,6 +3,7 @@ # ███░█▄▀█░▀▀░█░█▄█░█░▄▄█░█░█░▀▀░█░██░██ # ███▄▄▄▄█▄██▄█▄███▄█▄▄▄█▄▄██▄██▄██▄▄███ # ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ + [package] name = "gamedao-sense" version = "1.2.0" diff --git a/signal/Cargo.toml b/signal/Cargo.toml index dd4fa23f9..77f5cb1b4 100644 --- a/signal/Cargo.toml +++ b/signal/Cargo.toml @@ -41,8 +41,8 @@ frame-support-test = { git = "https://github.com/paritytech/substrate.git", bran pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" } pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" } -orml-tokens = { path = "../../orml/tokens", default-features = false } -orml-currencies = { path = "../../orml/currencies", default-features = false } +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch= "polkadot-v0.9.28", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch= "polkadot-v0.9.28", default-features = false } gamedao-control = { path = "../control", default-features = true } gamedao-flow = { path = "../flow", default-features = true } From 67e162eca6898de7f19eff2c8b8499e4e13703c1 Mon Sep 17 00:00:00 2001 From: 2075 <2075@zero.io> Date: Mon, 28 Nov 2022 15:14:42 +0000 Subject: [PATCH 2/3] feat: update refs, cargo --- Cargo.dev.toml | 96 ++++++++++++++++++++++++++++++++++++++++++++++ control/Cargo.toml | 6 +-- flow/Cargo.toml | 6 +-- signal/Cargo.toml | 9 +++-- 4 files changed, 107 insertions(+), 10 deletions(-) create mode 100644 Cargo.dev.toml diff --git a/Cargo.dev.toml b/Cargo.dev.toml new file mode 100644 index 000000000..e73f4fbc4 --- /dev/null +++ b/Cargo.dev.toml @@ -0,0 +1,96 @@ +cargo-features = ["resolver"] + +[workspace] +members = [ + "control", + "signal", + "flow", + "sense", + "traits", +] + +resolver = "2" + +[profile.dev] +split-debuginfo = "unpacked" + +[patch.'https://github.com/paritytech/substrate'] +frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +frame-support = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +frame-system = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +pallet-session = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sc-executor = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sc-utils = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-api = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-core = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-io = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-session = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-staking = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-std = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-storage = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-tasks = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-trie = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-version = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" } + +[patch.'https://github.com/paritytech/cumulus'] +cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "a63ca3a370d0b1c2743b7d6fac4690a8a9ccff2d" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "a63ca3a370d0b1c2743b7d6fac4690a8a9ccff2d" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "a63ca3a370d0b1c2743b7d6fac4690a8a9ccff2d" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "a63ca3a370d0b1c2743b7d6fac4690a8a9ccff2d" } +parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "a63ca3a370d0b1c2743b7d6fac4690a8a9ccff2d" } + +[patch.'https://github.com/paritytech/polkadot'] +pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "32dd0c9cfcd1a1bda821747f6ab334f0e3577558" } +polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "32dd0c9cfcd1a1bda821747f6ab334f0e3577558" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "32dd0c9cfcd1a1bda821747f6ab334f0e3577558" } +polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "32dd0c9cfcd1a1bda821747f6ab334f0e3577558" } +polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "32dd0c9cfcd1a1bda821747f6ab334f0e3577558" } +xcm = { git = "https://github.com/paritytech//polkadot", rev = "32dd0c9cfcd1a1bda821747f6ab334f0e3577558" } +xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "32dd0c9cfcd1a1bda821747f6ab334f0e3577558" } +xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "32dd0c9cfcd1a1bda821747f6ab334f0e3577558" } +xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "32dd0c9cfcd1a1bda821747f6ab334f0e3577558" } + +[pathch.'https://github.com/open-web3-stack/open-runtime-module-library'] +orml-asset-registry = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch= "polkadot-v0.9.28" } +orml-currencies = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch= "polkadot-v0.9.28" } +orml-tokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch= "polkadot-v0.9.28" } +orml-traits = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch= "polkadot-v0.9.28" } +orml-unknown-tokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch= "polkadot-v0.9.28" } +orml-xcm = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch= "polkadot-v0.9.28" } +orml-xcm-support = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch= "polkadot-v0.9.28" } +orml-xtokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch= "polkadot-v0.9.28" } diff --git a/control/Cargo.toml b/control/Cargo.toml index 4c683fcdd..1ec80b267 100755 --- a/control/Cargo.toml +++ b/control/Cargo.toml @@ -32,7 +32,7 @@ sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkado pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch= "polkadot-v0.9.28", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch= "polkadot-v0.9.28", default-features = false } gamedao-traits = { package = "gamedao-traits", path = "../traits", default-features = false } @@ -43,8 +43,8 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkad sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" } frame-support-test = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.28" } pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" } -orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch= "polkadot-v0.9.28", default-features = false } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch= "polkadot-v0.9.28", default-features = false } +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch= "polkadot-v0.9.28", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch= "polkadot-v0.9.28", default-features = false } [features] default = ["std"] diff --git a/flow/Cargo.toml b/flow/Cargo.toml index 0cc44d6f3..84ad8982e 100644 --- a/flow/Cargo.toml +++ b/flow/Cargo.toml @@ -24,9 +24,9 @@ frame-system = { git = "https://github.com/paritytech/substrate", branch = "polk frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28", default-features = false, optional = true } sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.28", default-features=false } -orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch= "polkadot-v0.9.28", default-features = false } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch= "polkadot-v0.9.28", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch= "polkadot-v0.9.28", default-features = false } +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch= "polkadot-v0.9.28", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch= "polkadot-v0.9.28", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch= "polkadot-v0.9.28", default-features = false } gamedao-traits = { package = "gamedao-traits", path = "../traits", default-features = false } gamedao-control = { package = "gamedao-control", path = "../control", optional = true } diff --git a/signal/Cargo.toml b/signal/Cargo.toml index 77f5cb1b4..d633d7afa 100644 --- a/signal/Cargo.toml +++ b/signal/Cargo.toml @@ -29,10 +29,11 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28", default-features = false } frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28", default-features = false } frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28", default-features = false, optional = true } -orml-traits = { path = "../../orml/traits", default-features = false } -gamedao-traits = { package = "gamedao-traits", path = "../traits", default-features = false } sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.28", default-features=false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch= "polkadot-v0.9.28", default-features = false } +gamedao-traits = { package = "gamedao-traits", path = "../traits", default-features = false } + [dev-dependencies] sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" } @@ -41,8 +42,8 @@ frame-support-test = { git = "https://github.com/paritytech/substrate.git", bran pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" } pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" } -orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch= "polkadot-v0.9.28", default-features = false } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch= "polkadot-v0.9.28", default-features = false } +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch= "polkadot-v0.9.28", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch= "polkadot-v0.9.28", default-features = false } gamedao-control = { path = "../control", default-features = true } gamedao-flow = { path = "../flow", default-features = true } From b4d5e777d3ab6d79a04d344bde64f1b61dccfefc Mon Sep 17 00:00:00 2001 From: 2075 <2075@zero.io> Date: Mon, 28 Nov 2022 15:16:17 +0000 Subject: [PATCH 3/3] feat: update readme --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 0529d2f2f..e6e2abd6e 100644 --- a/README.md +++ b/README.md @@ -1 +1,7 @@ # gamedao-protocol + +## build and test local + +- `cp Cargo.dev.toml Cargo.toml` +- `cargo build` +