Decouple contract from balances (#2081)

* decouple contract from balance

* update impls and builds

* set fees in contract module

* builds
This commit is contained in:
thiolliere
2019-03-28 13:46:30 +01:00
committed by Gav Wood
parent ff4523cbec
commit 29001cb469
13 changed files with 91 additions and 67 deletions
+8
View File
@@ -150,6 +150,10 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
burn: Permill::from_percent(50),
}),
contract: Some(ContractConfig {
transaction_base_fee: 1 * CENTS,
transaction_byte_fee: 10 * MILLICENTS,
transfer_fee: 1 * CENTS,
creation_fee: 1 * CENTS,
contract_fee: 1 * CENTS,
call_base_fee: 1000,
create_base_fee: 1000,
@@ -303,6 +307,10 @@ pub fn testnet_genesis(
burn: Permill::from_percent(50),
}),
contract: Some(ContractConfig {
transaction_base_fee: 1,
transaction_byte_fee: 0,
transfer_fee: 0,
creation_fee: 0,
contract_fee: 21,
call_base_fee: 135,
create_base_fee: 175,
+2 -1
View File
@@ -59,7 +59,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
impl_name: create_runtime_str!("substrate-node"),
authoring_version: 10,
spec_version: 46,
impl_version: 46,
impl_version: 47,
apis: RUNTIME_API_VERSIONS,
};
@@ -167,6 +167,7 @@ impl treasury::Trait for Runtime {
}
impl contract::Trait for Runtime {
type Currency = balances::Module<Runtime>;
type Call = Call;
type Event = Event;
type Gas = u64;
-1
View File
@@ -2204,7 +2204,6 @@ dependencies = [
"sr-primitives 0.1.0",
"sr-sandbox 0.1.0",
"sr-std 0.1.0",
"srml-balances 0.1.0",
"srml-support 0.1.0",
"srml-system 0.1.0",
"srml-timestamp 0.1.0",