feat!: Snakenet gen2 - governance, epoch times and treasury

.gitignore

@@ -24,5 +24,11 @@
 .local
 
 .idea/
+.vscode/
 
 .env
+
+*.orig
+
+# Custom chainspec(frido)
+balice*

Cargo.toml

@@ -7,16 +7,17 @@ frame-system = {git = 'https://github.com/paritytech/substrate', rev = 'e84d2ae4
 frame-system-benchmarking = {git = 'https://github.com/paritytech/substrate', rev = 'e84d2ae4e519d77f59ef68c8efd48909a70d58e8'}
 frame-system-rpc-runtime-api = {git = 'https://github.com/paritytech/substrate', rev = 'e84d2ae4e519d77f59ef68c8efd48909a70d58e8'}
 pallet-balances = {git = 'https://github.com/paritytech/substrate', rev = 'e84d2ae4e519d77f59ef68c8efd48909a70d58e8'}
-pallet-grandpa = {git = 'https://github.com/paritytech/substrate', rev = 'e84d2ae4e519d77f59ef68c8efd48909a70d58e8'}
+pallet-democracy = {git = 'https://github.com/paritytech/substrate', rev = 'e84d2ae4e519d77f59ef68c8efd48909a70d58e8'}
 pallet-election-provider-multi-phase = {git = 'https://github.com/paritytech/substrate', rev = 'e84d2ae4e519d77f59ef68c8efd48909a70d58e8'}
+pallet-grandpa = {git = 'https://github.com/paritytech/substrate', rev = 'e84d2ae4e519d77f59ef68c8efd48909a70d58e8'}
+pallet-identity = {git = 'https://github.com/paritytech/substrate', rev = 'e84d2ae4e519d77f59ef68c8efd48909a70d58e8'}
 pallet-randomness-collective-flip = {git = 'https://github.com/paritytech/substrate', rev = 'e84d2ae4e519d77f59ef68c8efd48909a70d58e8'}
 pallet-scheduler = {git = 'https://github.com/paritytech/substrate', rev = 'e84d2ae4e519d77f59ef68c8efd48909a70d58e8'}
 pallet-sudo = {git = 'https://github.com/paritytech/substrate', rev = 'e84d2ae4e519d77f59ef68c8efd48909a70d58e8'}
 pallet-timestamp = {git = 'https://github.com/paritytech/substrate', rev = 'e84d2ae4e519d77f59ef68c8efd48909a70d58e8'}
 pallet-tips = {git = 'https://github.com/paritytech/substrate', rev = 'e84d2ae4e519d77f59ef68c8efd48909a70d58e8'}
 pallet-transaction-payment-rpc = {git = 'https://github.com/paritytech/substrate', rev = 'e84d2ae4e519d77f59ef68c8efd48909a70d58e8'}
 pallet-transaction-payment-rpc-runtime-api = {git = 'https://github.com/paritytech/substrate', rev = 'e84d2ae4e519d77f59ef68c8efd48909a70d58e8'}
-pallet-identity = {git = 'https://github.com/paritytech/substrate', rev = 'e84d2ae4e519d77f59ef68c8efd48909a70d58e8'}
 sc-basic-authorship = {git = 'https://github.com/paritytech/substrate', rev = 'e84d2ae4e519d77f59ef68c8efd48909a70d58e8'}
 sc-chain-spec = {git = 'https://github.com/paritytech/substrate', rev = 'e84d2ae4e519d77f59ef68c8efd48909a70d58e8'}
 sc-cli = {git = 'https://github.com/paritytech/substrate', rev = 'e84d2ae4e519d77f59ef68c8efd48909a70d58e8'}
@@ -103,6 +104,7 @@ members = [
   'pallets/asset-registry',
   'pallets/exchange',
   'pallets/transaction-multi-payment',
+  'pallets/genesis-history',
   'primitives',
   'runtime',
 ]

README.md

@@ -95,12 +95,16 @@ Then open settings screen -> developer and paste
     ]
   },
   "LookupSource": "AccountId",
-  "Price": "Balance"
+  "Price": "Balance",
+  "Chain": {
+    "genesisHash": "Vec<u8>",
+    "lastBlockHash": "Vec<u8>"
+  }
 }
 ```
 
-Connect to the 
-- Hacknet: `wss://hack.hydradx.io:9944` 
+Connect to the
+- Hacknet: `wss://hack.hydradx.io:9944`
 - [Stakenet](https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Frpc-01.snakenet.hydradx.io): `wss://rpc-01.snakenet.hydradx.io`
 - or local node.
 
@@ -117,7 +121,7 @@ From the top-level node directory:
 ./scripts/check_performance.sh
 ```
 
-This will run series of benchmarks ( which may take a while). 
+This will run series of benchmarks ( which may take a while).
 The output will show benchmark results of HydraDX pallets and comparison against reference values.
 
 The most interesting information would be the difference between the HydraDx benchmark value and the local machine's benchmark.

node/Cargo.toml

@@ -4,7 +4,7 @@ build = 'build.rs'
 description = 'Hydra DX'
 edition = '2018'
 homepage = 'https://github.com/galacticcouncil/hydradx-node'
-license = 'Unlicense'
+license = 'Apache 2.0'
 name = 'hydra-dx'
 repository = 'https://github.com/galacticcouncil/hydradx-node'
 version = '3.0.1'

node/src/chain_spec.rs

@@ -6,7 +6,8 @@ use hydra_dx_runtime::pallet_claims::EthereumAddress;
 use hydra_dx_runtime::{
 	AccountId, AssetRegistryConfig, AuthorityDiscoveryConfig, BabeConfig, BalancesConfig, ClaimsConfig, CouncilConfig,
 	ElectionsConfig, FaucetConfig, GenesisConfig, GrandpaConfig, ImOnlineConfig, Perbill, SessionConfig, Signature,
-	StakerStatus, StakingConfig, SudoConfig, SystemConfig, TokensConfig, CORE_ASSET_ID, WASM_BINARY,
+	StakerStatus, StakingConfig, SudoConfig, SystemConfig, TechnicalCommitteeConfig, TokensConfig, GenesisHistoryConfig,
+	CORE_ASSET_ID, WASM_BINARY,
 };
 use pallet_staking::Forcing;
 use sc_service::ChainType;
@@ -107,6 +108,8 @@ pub fn development_config() -> Result<ChainSpec, String> {
 					get_account_id_from_seed::<sr25519::Public>("Bob"),
 					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
 					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+					// Treasury
+					hex!["6d6f646c70792f74727372790000000000000000000000000000000000000000"].into(),
 				],
 				true,
 			)
@@ -253,6 +256,8 @@ pub fn local_testnet_config() -> Result<ChainSpec, String> {
 					get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
 					get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
 					get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
+					// Treasury
+					hex!["6d6f646c70792f74727372790000000000000000000000000000000000000000"].into(),
 				],
 				true,
 			)
@@ -299,7 +304,7 @@ fn testnet_genesis(
 				.map(|k| (k, 1_000_000u128 * HDX))
 				.collect(),
 		}),
-		pallet_grandpa: Some(GrandpaConfig { authorities: vec![] }),
+		pallet_grandpa: Default::default(),
 		pallet_sudo: Some(SudoConfig {
 			// Assign network admin rights.
 			key: root_key,
@@ -339,8 +344,8 @@ fn testnet_genesis(
 		}),
 		pallet_babe: Some(BabeConfig { authorities: vec![] }),
 		pallet_authority_discovery: Some(AuthorityDiscoveryConfig { keys: vec![] }),
-		pallet_im_online: Some(ImOnlineConfig { keys: vec![] }),
-		pallet_treasury: Some(Default::default()),
+		pallet_im_online: Default::default(),
+		pallet_treasury: Default::default(),
 		pallet_session: Some(SessionConfig {
 			keys: initial_authorities
 				.iter()
@@ -365,11 +370,25 @@ fn testnet_genesis(
 			slash_reward_fraction: Perbill::from_percent(10),
 			..Default::default()
 		}),
-		pallet_elections_phragmen: Some(ElectionsConfig { members: vec![] }),
-		pallet_collective_Instance1: Some(CouncilConfig::default()),
+		pallet_elections_phragmen: Some(ElectionsConfig {
+			members: vec![(get_account_id_from_seed::<sr25519::Public>("Alice"), STASH / 2)],
+		}),
+		pallet_collective_Instance1: Some(CouncilConfig {
+			members: vec![get_account_id_from_seed::<sr25519::Public>("Alice")],
+			phantom: Default::default(),
+		}),
+		pallet_collective_Instance2: Some(TechnicalCommitteeConfig {
+			members: vec![
+				get_account_id_from_seed::<sr25519::Public>("Alice"),
+				get_account_id_from_seed::<sr25519::Public>("Bob"),
+				get_account_id_from_seed::<sr25519::Public>("Eve"),
+			],
+			phantom: Default::default(),
+		}),
 		pallet_claims: Some(ClaimsConfig {
 			claims: create_testnet_claims(),
 		}),
+		pallet_genesis_history: Some(GenesisHistoryConfig::default()),
 	}
 }
 
@@ -469,9 +488,30 @@ fn lerna_genesis(
 			slash_reward_fraction: Perbill::from_percent(10),
 			..Default::default()
 		}),
-		pallet_elections_phragmen: Some(ElectionsConfig { members: vec![] }),
-		pallet_collective_Instance1: Some(CouncilConfig::default()),
+		pallet_elections_phragmen: Some(ElectionsConfig {
+			members: vec![(
+				hex!["0abad795adcb5dee45d29528005b1f78d55fc170844babde88df84016c6cd14d"].into(),
+				STASH,
+			)],
+		}),
+		pallet_collective_Instance1: Some(CouncilConfig {
+			// Intergalactic council member
+			members: vec![hex!["0abad795adcb5dee45d29528005b1f78d55fc170844babde88df84016c6cd14d"].into()],
+			phantom: Default::default(),
+		}),
+		pallet_collective_Instance2: Some(TechnicalCommitteeConfig {
+			members: vec![
+				hex!["d6cf8789dce651cb54a4036406f4aa0c771914d345c004ad0567b814c71fb637"].into(),
+				hex!["bc96ec00952efa8f0e3e08b36bf5096bcb877acac536e478aecb72868db5db02"].into(),
+				hex!["2875dd47bc1bcb70e23de79e7538c312be12c716033bbae425130e46f5f2b35e"].into(),
+				hex!["644643bf953233d08c4c9bae0acd49f3baa7658d9b342b7e6879bb149ee6e44c"].into(),
+				hex!["ccdb435892c9883656d0398b2b67023ba1e11bda0c7f213f70fdac54c6abab3f"].into(),
+				hex!["f461c5ae6e80bf4af5b84452789c17b0b0a095a2d77c2a407978147de2d5b572"].into(),
+			],
+			phantom: Default::default(),
+		}),
 		pallet_claims: Some(ClaimsConfig { claims: vec![] }),
+		pallet_genesis_history: Some(GenesisHistoryConfig::default()),
 	}
 }
 

pallets/amm/Cargo.toml

@@ -3,7 +3,7 @@ authors = ['GalacticCouncil']
 description = 'HydraDX AMM Module'
 edition = '2018'
 homepage = 'https://github.com/galacticcouncil/hydradx-node'
-license = 'Unlicense'
+license = 'Apache 2.0'
 name = 'pallet-amm'
 repository = 'https://github.com/galacticcouncil/hydradx-node'
 version = '3.0.0'
@@ -25,7 +25,7 @@ version = '2.0.0'
 primitive-types = {default-features = false, version = '0.8.0'}
 serde = {features = ['derive'], optional = true, version = '1.0.101'}
 
-hydra-dx-math = {default-features = false, version = "1.0.0", git = "https://github.com/galacticcouncil/hydraDX-math", tag="v1.0.0"}
+hydra-dx-math = {default-features = false, version = "1.0.0", git = "https://github.com/galacticcouncil/hydraDX-math", tag = "v1.0.0"}
 
 # Local dependencies
 pallet-asset-registry = {path = '../asset-registry', default-features = false}

pallets/asset-registry/Cargo.toml

@@ -3,7 +3,7 @@ authors = ['GalacticCouncil']
 description = 'FRAME Pallet for asset registry management'
 edition = '2018'
 homepage = 'https://github.com/galacticcouncil/hydradx-node'
-license = 'Unlicense'
+license = 'Apache 2.0'
 name = 'pallet-asset-registry'
 repository = 'https://github.com/galacticcouncil/hydradx-node'
 version = '3.0.0'

pallets/balances/Cargo.toml

@@ -0,0 +1,41 @@
+[package]
+authors = ["Parity Technologies <[email protected]>"]
+description = "FRAME pallet to manage balances"
+edition = "2018"
+homepage = "https://substrate.dev"
+license = "Apache-2.0"
+name = "pallet-balances"
+readme = "README.md"
+repository = "https://github.com/paritytech/substrate/"
+version = "3.0.0"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+codec = {package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"]}
+frame-benchmarking = {version = "3.1.0", default-features = false, optional = true}
+frame-support = {version = "3.0.0", default-features = false}
+frame-system = {version = "3.0.0", default-features = false}
+serde = {version = "1.0.101", optional = true}
+sp-runtime = {version = "3.0.0", default-features = false}
+sp-std = {version = "3.0.0", default-features = false}
+
+[dev-dependencies]
+pallet-transaction-payment = {version = "3.0.0"}
+sp-core = {version = "3.0.0"}
+sp-io = {version = "3.0.0"}
+
+[features]
+default = ["std"]
+runtime-benchmarks = ["frame-benchmarking"]
+std = [
+  "serde",
+  "codec/std",
+  "sp-std/std",
+  "sp-runtime/std",
+  "frame-benchmarking/std",
+  "frame-support/std",
+  "frame-system/std",
+]
+try-runtime = ["frame-support/try-runtime"]