Merge pull request #352 from grindytech/dev

Testnet (#351)

Cargo.toml

@@ -1,3 +1,18 @@
+[[bin]]
+name = "gafi"
+path = "src/main.rs"
+
+[package]
+name = "gafi"
+description = "Implementation of a `https://gafi.network` node in Rust based on the Substrate framework."
+license = "Apache-2.0"
+rust-version = "1.64.0"
+readme = "README.md"
+authors.workspace = true
+edition.workspace = true
+version.workspace = true
+
+
 [workspace.package]
 authors = ["Grindy Technologies <[email protected]>"]
 edition = "2021"
@@ -6,18 +21,27 @@ homepage = "https://grindy.io/"
 license = "Apache-2.0"
 version = "4.0.0-dev"
 
+[dependencies]
+color-eyre = { version = "0.6.1", default-features = false }
+
+gafi-cli = { path = "node/cli" }
+
 [workspace]
 members = [
+  # pallets
   'pallets/pallet-faucet',
   'pallets/pallet-cache',
   'game/pallet-game',
-  'game/offchain-worker-randomness',
   'game/oracle-randomness',
-  'gafi-node/runtime',
-  'gafi-node/node',
-  'pallets/template',
   'support',
+  # runtimes
+  'runtime/devnet',
+  'runtime/testnet',
+
+  'node/cli',
+  'node/service',
 ]
+
 [profile.release]
 panic = 'unwind'
 resolver = "2"
@@ -45,7 +69,6 @@ serde = { version = "1.0.163", default-features = false, features = [
   "alloc",
 ] }
 
-
 # Substrate Client
 sc-basic-authorship = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
 sc-block-builder = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
@@ -156,3 +179,11 @@ cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/c
 cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
 cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
 cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
+
+
+[features] 
+default = []
+devnet-native = ["gafi-cli/devnet-native"]
+testnet-native = ["gafi-cli/testnet-native"]
+runtime-benchmarks= [ "gafi-cli/runtime-benchmarks" ]
+try-runtime = [ "gafi-cli/try-runtime" ]

Makefile

@@ -2,17 +2,21 @@
 build:
 	cargo build -r
 
+.PHONY: build-tesnet
+build-testnet:
+	cargo build -r --features testnet-native
+
 .PHONY: test
 test:
-	cargo test -r
+	cargo test --workspace --release
 
 .PHONY: check
 check:
 	cargo check -r
 
 .PHONY: run
 run:
-	./target/release/gafi-node \
+	./target/release/gafi \
     --tmp \
     --dev \
     --rpc-port 9944 \
@@ -39,7 +43,7 @@ clippy:
 
 .PHONY: benchmark-game
 benchmark-game:
-	./target/release/gafi-node benchmark pallet \
+	./target/release/devnet-node benchmark pallet \
     --chain dev \
     --wasm-execution compiled \
     --pallet pallet_game \
@@ -50,7 +54,7 @@ benchmark-game:
 
 .PHONY: pallet-game-weights
 pallet-game-weights:
-	./target/release/gafi-node benchmark pallet \
+	./target/release/devnet-node benchmark pallet \
     --chain dev \
     --wasm-execution compiled \
     --pallet pallet_game \