Develop

Cargo.toml

@@ -5,8 +5,8 @@ panic = 'unwind'
 members = [
  "core/cli",
  "core/ethash",
- "core/merkle-mountain-range",
- "core/fly-client",
+# "core/merkle-mountain-range",
+# "core/fly-client",
  "core/sr-eth-primitives",
  "core/merkle-patricia-trie",
 

boot-conf/testnet/1.json

@@ -0,0 +1,6 @@
+{
+ "base-path": "/tmp/darwinia-testnet/1",
+ "name": "testnet 1",
+ "validator": true,
+ "rpc-port": 6664
+}

boot-conf/testnet/2.json

@@ -0,0 +1,6 @@
+{
+ "base-path": "/tmp/darwinia-testnet/2",
+ "name": "testnet 2",
+ "validator": true,
+ "rpc-port": 6665
+}

boot-conf/testnet/3.json

@@ -0,0 +1,6 @@
+{
+ "base-path": "/tmp/darwinia-testnet/3",
+ "name": "testnet 3",
+ "validator": true,
+ "rpc-port": 6666
+}

boot-conf/testnet/4.json

@@ -0,0 +1,6 @@
+{
+ "base-path": "/tmp/darwinia-testnet/4",
+ "name": "testnet 4",
+ "validator": true,
+ "rpc-port": 6667
+}

boot-conf/testnet/5.json

@@ -0,0 +1,6 @@
+{
+ "base-path": "/tmp/darwinia-testnet/5",
+ "name": "testnet 5",
+ "validator": true,
+ "rpc-port": 6668
+}

boot-conf/testnet/alice.json

@@ -0,0 +1,7 @@
+{
+ "base-path": "/tmp/darwinia-testnet/alice",
+ "rpc-external": true,
+ "ws-external": true,
+ "ws-port": 23333,
+ "rpc-cors": "all"
+}

node/cli/src/chain_spec.rs

@@ -247,14 +247,14 @@ pub fn darwinia_genesis(
  .iter()
  .cloned()
  .map(|k| (k, ENDOWMENT))
- .chain(initial_authorities.iter().map(|x| (x.0.clone(), ENDOWMENT)))
+ .chain(initial_authorities.iter().map(|x| (x.0.clone(), STASH)))
  .collect(),
  vesting: vec![],
  }),
  staking: Some(StakingConfig {
  current_era: 0,
- validator_count: initial_authorities.len() as u32 * 2,
- minimum_validator_count: initial_authorities.len() as u32,
+ validator_count: 7,
+ minimum_validator_count: 1,
  stakers: initial_authorities
  .iter()
  .map(|x| (x.0.clone(), x.1.clone(), STASH, StakerStatus::Validator))

node/runtime/src/constants.rs

@@ -49,9 +49,9 @@ pub mod time {
  /// <https://research.web3.foundation/en/latest/polkadot/BABE/Babe/#6-practical-results>
 
  // Develop
- // pub const MILLISECS_PER_BLOCK: Moment = 1000;
+ pub const MILLISECS_PER_BLOCK: Moment = 1000;
  // Production
- pub const MILLISECS_PER_BLOCK: Moment = 3000;
+ // pub const MILLISECS_PER_BLOCK: Moment = 3000;
  pub const SECS_PER_BLOCK: Moment = MILLISECS_PER_BLOCK / 1000;
 
  pub const SLOT_DURATION: Moment = MILLISECS_PER_BLOCK;
@@ -60,9 +60,9 @@ pub mod time {
  pub const PRIMARY_PROBABILITY: (u64, u64) = (1, 4);
 
  // Develop
- // pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = MINUTES;
+ pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = MINUTES;
  // Production
- pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = 10 * MINUTES;
+ // pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = 10 * MINUTES;
  pub const EPOCH_DURATION_IN_SLOTS: u64 = {
  const SLOT_FILL_RATE: f64 = MILLISECS_PER_BLOCK as f64 / SLOT_DURATION as f64;
 
@@ -76,9 +76,9 @@ pub mod time {
 
  pub const SESSION_DURATION: BlockNumber = EPOCH_DURATION_IN_SLOTS as _;
  // Develop
- // pub const SESSION_PER_ERA: sr_staking_primitives::SessionIndex = 1;
+ pub const SESSION_PER_ERA: sr_staking_primitives::SessionIndex = 3;
  // Production
- pub const SESSION_PER_ERA: sr_staking_primitives::SessionIndex = 5;
+ // pub const SESSION_PER_ERA: sr_staking_primitives::SessionIndex = 5;
 }
 
 // CRITICAL NOTE: The system module maintains two constants: a _maximum_ block weight and a _ratio_

node/runtime/src/lib.rs

@@ -68,8 +68,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
  spec_name: create_runtime_str!("node"),
  impl_name: create_runtime_str!("darwinia-node"),
  authoring_version: 3,
- spec_version: 80,
- impl_version: 80,
+ spec_version: 81,
+ impl_version: 81,
  apis: RUNTIME_API_VERSIONS,
 };
 
@@ -129,6 +129,16 @@ impl utility::Trait for Runtime {
  type Call = Call;
 }
 
+parameter_types! {
+ pub const EpochDuration: u64 = EPOCH_DURATION_IN_SLOTS;
+ pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK;
+}
+impl babe::Trait for Runtime {
+ type EpochDuration = EpochDuration;
+ type ExpectedBlockTime = ExpectedBlockTime;
+ type EpochChangeTrigger = babe::ExternalTrigger;
+}
+
 impl indices::Trait for Runtime {
  type AccountIndex = AccountIndex;
  type IsDeadAccount = Balances;
@@ -161,16 +171,6 @@ impl transaction_payment::Trait for Runtime {
  type FeeMultiplierUpdate = TargetedFeeAdjustment<TargetBlockFullness>;
 }
 
-parameter_types! {
- pub const EpochDuration: u64 = EPOCH_DURATION_IN_SLOTS;
- pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK;
-}
-impl babe::Trait for Runtime {
- type EpochDuration = EpochDuration;
- type ExpectedBlockTime = ExpectedBlockTime;
- type EpochChangeTrigger = babe::ExternalTrigger;
-}
-
 parameter_types! {
  pub const MinimumPeriod: Moment = SLOT_DURATION / 2;
 }
@@ -224,44 +224,6 @@ impl session::historical::Trait for Runtime {
  type FullIdentificationOf = staking::ExposureOf<Runtime>;
 }
 
-impl sudo::Trait for Runtime {
- type Event = Event;
- type Proposal = Call;
-}
-
-impl offences::Trait for Runtime {
- type Event = Event;
- type IdentificationTuple = session::historical::IdentificationTuple<Self>;
- type OnOffenceHandler = Staking;
-}
-
-type SubmitTransaction = TransactionSubmitter<ImOnlineId, Runtime, UncheckedExtrinsic>;
-parameter_types! {
- pub const SessionDuration: BlockNumber = SESSION_DURATION;
-}
-impl im_online::Trait for Runtime {
- type AuthorityId = ImOnlineId;
- type Event = Event;
- type Call = Call;
- type SubmitTransaction = SubmitTransaction;
- type SessionDuration = SessionDuration;
- type ReportUnresponsiveness = Offences;
-}
-
-impl grandpa::Trait for Runtime {
- type Event = Event;
-}
-
-parameter_types! {
- pub const WindowSize: BlockNumber = 101;
- pub const ReportLatency: BlockNumber = 1000;
-}
-impl finality_tracker::Trait for Runtime {
- type OnFinalizationStalled = Grandpa;
- type WindowSize = WindowSize;
- type ReportLatency = ReportLatency;
-}
-
 parameter_types! {
  // Develop
  pub const ContractTransferFee: Balance = MICRO;
@@ -314,6 +276,44 @@ impl contracts::Trait for Runtime {
  type BlockGasLimit = contracts::DefaultBlockGasLimit;
 }
 
+impl sudo::Trait for Runtime {
+ type Event = Event;
+ type Proposal = Call;
+}
+
+type SubmitTransaction = TransactionSubmitter<ImOnlineId, Runtime, UncheckedExtrinsic>;
+parameter_types! {
+ pub const SessionDuration: BlockNumber = SESSION_DURATION;
+}
+impl im_online::Trait for Runtime {
+ type AuthorityId = ImOnlineId;
+ type Event = Event;
+ type Call = Call;
+ type SubmitTransaction = SubmitTransaction;
+ type SessionDuration = SessionDuration;
+ type ReportUnresponsiveness = Offences;
+}
+
+impl offences::Trait for Runtime {
+ type Event = Event;
+ type IdentificationTuple = session::historical::IdentificationTuple<Self>;
+ type OnOffenceHandler = Staking;
+}
+
+impl grandpa::Trait for Runtime {
+ type Event = Event;
+}
+
+parameter_types! {
+ pub const WindowSize: BlockNumber = 101;
+ pub const ReportLatency: BlockNumber = 1000;
+}
+impl finality_tracker::Trait for Runtime {
+ type OnFinalizationStalled = Grandpa;
+ type WindowSize = WindowSize;
+ type ReportLatency = ReportLatency;
+}
+
 impl system::offchain::CreateTransaction<Runtime, UncheckedExtrinsic> for Runtime {
  type Public = <Signature as traits::Verify>::Signer;
  type Signature = Signature;
@@ -345,9 +345,9 @@ impl system::offchain::CreateTransaction<Runtime, UncheckedExtrinsic> for Runtim
 }
 
 parameter_types! {
- pub const ExistentialDeposit: Balance = 1 * COIN;
- pub const TransferFee: Balance = 1 * MICRO;
- pub const CreationFee: Balance = 1 * MICRO;
+ pub const ExistentialDeposit: Balance = COIN;
+ pub const TransferFee: Balance = MICRO;
+ pub const CreationFee: Balance = MICRO;
 }
 impl balances::Trait for Runtime {
  type Balance = Balance;