Skip to content

Commit

Permalink
Merge branch 'local-dev-lin'
Browse files Browse the repository at this point in the history
  • Loading branch information
@kami1983
kami1983 committed Dec 22, 2021
2 parents ec444e4 + 4cd6203 commit c7b9e08
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 35 deletions.
22 changes: 11 additions & 11 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,15 @@ version = '0.10.0-dev'
#path = '../ocw-aura'
#version = '0.10.0-dev'

[dependencies.ares-oracle-provider-support]
#[dependencies.ares-oracle-provider-support]
#path = '../../ares-ocw-suit/pallets/ares-oracle-provider-support'
#version = '3.0.1'

[dependencies.ares-oracle-provider-support]
git = 'https://github.com/aresprotocols/ocw-suit.git'
branch = 'monthly-2021-09+1'
version = '3.0.1'


[dependencies.sc-executor]
features = ['wasmtime']
git = 'https://github.com/paritytech/substrate.git'
Expand Down
2 changes: 1 addition & 1 deletion node/res/chain-data-ares-aura.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion node/res/wasm.aura.v102.hex
View file

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions runtime/gladios/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ pallet-vesting = { version = "4.0.0-dev", default-features = false, git = "https
pallet-elections-phragmen = { version = "5.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "monthly-2021-09+1" }

ares-oracle-provider-support = {default-features = false, git = 'https://github.com/aresprotocols/ocw-suit.git', branch = 'monthly-2021-09+1', version = '3.0.1'}
ares-oracle = {default-features = false, git = 'https://github.com/aresprotocols/ocw-suit.git', branch = 'monthly-2021-09+1', version = '3.5.1'}
ares-oracle = {default-features = false, git = 'https://github.com/aresprotocols/ocw-suit.git', branch = 'monthly-2021-09+1', version = '3.6.1'}
oracle-finance = {default-features = false, git = 'https://github.com/aresprotocols/ocw-suit.git', branch = 'monthly-2021-09+1', version = '3.1.1'}
member-extend = {default-features = false, git = 'https://github.com/aresprotocols/ocw-suit.git', branch = 'monthly-2021-09+1', version = '3.1.0'}
pallet-ares-challenge = {default-features = false, git = 'https://github.com/aresprotocols/ocw-suit.git', branch = 'monthly-2021-09+1', version='3.0.1'}
Expand All @@ -202,15 +202,15 @@ pallet-price-estimates = {default-features = false, git = 'https://github.com/ar
staking-extend = {default-features = false, git = 'https://github.com/aresprotocols/ocw-suit.git', branch = 'monthly-2021-09+1', version = '3.0.4'}
pallet-session = {default-features = false, git = 'https://github.com/aresprotocols/ocw-suit.git', branch = 'monthly-2021-09+1', version = '4.0.0-dev' }

#ares-oracle-provider-support = {default-features = false, path = '../../ares-ocw-suit/pallets/ares-oracle-provider-support', version = '3.0.1'}
#ares-oracle = {default-features = false, path = '../../ares-ocw-suit/pallets/ares-oracle', version = '3.5.1'}
#oracle-finance = {default-features = false, path = '../../ares-ocw-suit/pallets/oracle-finance', version = '3.1.1'}
#member-extend = {default-features = false, path = '../../ares-ocw-suit/pallets/member-extend', version = '3.1.0'}
#pallet-ares-challenge = {default-features = false, path = '../../ares-ocw-suit/pallets/challenge', version='3.0.1'}
#pallet-ares-collective = {default-features = false, path = '../../ares-ocw-suit/pallets/collective', version = '4.0.0-dev'}
#pallet-price-estimates = {default-features = false, path = '../../ares-ocw-suit/pallets/price-estimates', version = '3.0.1'}
#staking-extend = {default-features = false, path = '../../ares-ocw-suit/pallets/staking-extend', version = '3.0.4'}
#pallet-session = {default-features = false, path = '../../ares-ocw-suit/pallets/session', version = '4.0.0-dev'}
#ares-oracle-provider-support = {default-features = false, path = '../../../ares-ocw-suit/pallets/ares-oracle-provider-support', version = '3.0.1'}
#ares-oracle = {default-features = false, path = '../../../ares-ocw-suit/pallets/ares-oracle', version = '3.6.1'}
#oracle-finance = {default-features = false, path = '../../../ares-ocw-suit/pallets/oracle-finance', version = '3.1.1'}
#member-extend = {default-features = false, path = '../../../ares-ocw-suit/pallets/member-extend', version = '3.1.0'}
#pallet-ares-challenge = {default-features = false, path = '../../../ares-ocw-suit/pallets/challenge', version='3.0.1'}
#pallet-ares-collective = {default-features = false, path = '../../../ares-ocw-suit/pallets/collective', version = '4.0.0-dev'}
#pallet-price-estimates = {default-features = false, path = '../../../ares-ocw-suit/pallets/price-estimates', version = '3.0.1'}
#staking-extend = {default-features = false, path = '../../../ares-ocw-suit/pallets/staking-extend', version = '3.0.4'}
#pallet-session = {default-features = false, path = '../../../ares-ocw-suit/pallets/session', version = '4.0.0-dev'}

[features]
default = ['std']
Expand Down
2 changes: 2 additions & 0 deletions runtime/gladios/src/part_ocw.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ pub type EnsureRootOrHalfTechnicalCollective = EnsureOneOf<
parameter_types! {
pub const UnsignedPriority: u64 = 1 << 20;
pub const CalculationKind: u8 = 1;
pub const ErrLogPoolDepth: u32 = 1000;
}

impl ares_oracle::aura_handler::Config for Runtime {
Expand All @@ -43,6 +44,7 @@ impl ares_oracle::Config for Runtime {
type AuthorityCount = AresOracle; // ares_oracle::aura_handler::Pallet<Runtime>;
type OracleFinanceHandler = OracleFinance;
type AresIStakingNpos = Self;
type ErrLogPoolDepth = ErrLogPoolDepth;
}

//
Expand Down
20 changes: 10 additions & 10 deletions runtime/pioneer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ pallet-vesting = { version = "4.0.0-dev", default-features = false, git = "https
pallet-elections-phragmen = { version = "5.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "monthly-2021-09+1" }

ares-oracle-provider-support = {default-features = false, git = 'https://github.com/aresprotocols/ocw-suit.git', branch = 'monthly-2021-09+1', version = '3.0.1'}
ares-oracle = {default-features = false, git = 'https://github.com/aresprotocols/ocw-suit.git', branch = 'monthly-2021-09+1', version = '3.5.1'}
ares-oracle = {default-features = false, git = 'https://github.com/aresprotocols/ocw-suit.git', branch = 'monthly-2021-09+1', version = '3.6.1'}
oracle-finance = {default-features = false, git = 'https://github.com/aresprotocols/ocw-suit.git', branch = 'monthly-2021-09+1', version = '3.1.1'}
member-extend = {default-features = false, git = 'https://github.com/aresprotocols/ocw-suit.git', branch = 'monthly-2021-09+1', version = '3.1.0'}
pallet-ares-challenge = {default-features = false, git = 'https://github.com/aresprotocols/ocw-suit.git', branch = 'monthly-2021-09+1', version='3.0.1'}
Expand All @@ -202,15 +202,15 @@ pallet-price-estimates = {default-features = false, git = 'https://github.com/ar
staking-extend = {default-features = false, git = 'https://github.com/aresprotocols/ocw-suit.git', branch = 'monthly-2021-09+1', version = '3.0.4'}
pallet-session = {default-features = false, git = 'https://github.com/aresprotocols/ocw-suit.git', branch = 'monthly-2021-09+1', version = '4.0.0-dev' }

#ares-oracle-provider-support = {default-features = false, path = '../../ares-ocw-suit/pallets/ares-oracle-provider-support', version = '3.0.1'}
#ares-oracle = {default-features = false, path = '../../ares-ocw-suit/pallets/ares-oracle', version = '3.5.1'}
#oracle-finance = {default-features = false, path = '../../ares-ocw-suit/pallets/oracle-finance', version = '3.1.1'}
#member-extend = {default-features = false, path = '../../ares-ocw-suit/pallets/member-extend', version = '3.1.0'}
#pallet-ares-challenge = {default-features = false, path = '../../ares-ocw-suit/pallets/challenge', version='3.0.1'}
#pallet-ares-collective = {default-features = false, path = '../../ares-ocw-suit/pallets/collective', version = '4.0.0-dev'}
#pallet-price-estimates = {default-features = false, path = '../../ares-ocw-suit/pallets/price-estimates', version = '3.0.1'}
#staking-extend = {default-features = false, path = '../../ares-ocw-suit/pallets/staking-extend', version = '3.0.4'}
#pallet-session = {default-features = false, path = '../../ares-ocw-suit/pallets/session', version = '4.0.0-dev'}
#ares-oracle-provider-support = {default-features = false, path = '../../../ares-ocw-suit/pallets/ares-oracle-provider-support', version = '3.0.1'}
#ares-oracle = {default-features = false, path = '../../../ares-ocw-suit/pallets/ares-oracle', version = '3.6.1'}
#oracle-finance = {default-features = false, path = '../../../ares-ocw-suit/pallets/oracle-finance', version = '3.1.1'}
#member-extend = {default-features = false, path = '../../../ares-ocw-suit/pallets/member-extend', version = '3.1.0'}
#pallet-ares-challenge = {default-features = false, path = '../../../ares-ocw-suit/pallets/challenge', version='3.0.1'}
#pallet-ares-collective = {default-features = false, path = '../../../ares-ocw-suit/pallets/collective', version = '4.0.0-dev'}
#pallet-price-estimates = {default-features = false, path = '../../../ares-ocw-suit/pallets/price-estimates', version = '3.0.1'}
#staking-extend = {default-features = false, path = '../../../ares-ocw-suit/pallets/staking-extend', version = '3.0.4'}
#pallet-session = {default-features = false, path = '../../../ares-ocw-suit/pallets/session', version = '4.0.0-dev'}

[features]
default = ['std']
Expand Down
2 changes: 2 additions & 0 deletions runtime/pioneer/src/part_ocw.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ parameter_types! {
// pub const NeedVerifierCheck: bool = true;
pub const FractionLengthNum: u32 = 2;
pub const CalculationKind: u8 = 1;
pub const ErrLogPoolDepth: u32 = 10;
}

impl ares_oracle::aura_handler::Config for Runtime {
Expand All @@ -45,6 +46,7 @@ impl ares_oracle::Config for Runtime {
type AuthorityCount = AresOracle; // ares_oracle::aura_handler::Pallet<Runtime>;
type OracleFinanceHandler = OracleFinance;
type AresIStakingNpos = Self;
type ErrLogPoolDepth = ErrLogPoolDepth;
}

//
Expand Down

0 comments on commit c7b9e08

Please sign in to comment.