diff --git a/Cargo.lock b/Cargo.lock index db180ad..06ff801 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1274,7 +1274,7 @@ dependencies = [ "ed25519", "rand 0.7.3", "serde", - "sha2 0.9.5", + "sha2 0.9.8", "zeroize", ] @@ -1872,8 +1872,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ "cfg-if 1.0.0", + "js-sys", "libc", "wasi 0.9.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -2148,7 +2150,7 @@ dependencies = [ [[package]] name = "ias-verify" version = "0.1.4" -source = "git+https://github.com/integritee-network/pallets.git?branch=master#eb4a5c8347c90814c2e175ab50755b213d636b1f" +source = "git+https://github.com/integritee-network/pallets.git?branch=master#eb54aedc5c1d0cf452975b66501ccc91671f7e0f" dependencies = [ "base64 0.11.0", "chrono", @@ -2339,6 +2341,7 @@ dependencies = [ "pallet-randomness-collective-flip", "pallet-scheduler", "pallet-sudo", + "pallet-teeracle", "pallet-teerex", "pallet-timestamp", "pallet-transaction-payment", @@ -2647,9 +2650,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.101" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21" +checksum = "a60553f9a9e039a333b4e9b20573b9e9b9c0bb3a11e201ccc48ef4283456d673" [[package]] name = "libloading" @@ -2742,7 +2745,7 @@ dependencies = [ "rand 0.7.3", "ring 0.16.20", "rw-stream-sink", - "sha2 0.9.5", + "sha2 0.9.8", "smallvec", "thiserror", "unsigned-varint 0.7.0", @@ -2813,7 +2816,7 @@ dependencies = [ "prost-build", "rand 0.7.3", "regex", - "sha2 0.9.5", + "sha2 0.9.8", "smallvec", "unsigned-varint 0.7.0", "wasm-timer", @@ -2853,7 +2856,7 @@ dependencies = [ "prost", "prost-build", "rand 0.7.3", - "sha2 0.9.5", + "sha2 0.9.8", "smallvec", "uint", "unsigned-varint 0.7.0", @@ -2915,7 +2918,7 @@ dependencies = [ "prost", "prost-build", "rand 0.8.4", - "sha2 0.9.5", + "sha2 0.9.8", "snow", "static_assertions", "x25519-dalek", @@ -3138,7 +3141,7 @@ dependencies = [ "libsecp256k1-gen-genmult 0.2.1", "rand 0.7.3", "serde", - "sha2 0.9.5", + "sha2 0.9.8", "typenum", ] @@ -3157,7 +3160,7 @@ dependencies = [ "libsecp256k1-gen-genmult 0.2.1", "rand 0.7.3", "serde", - "sha2 0.9.5", + "sha2 0.9.8", "typenum", ] @@ -3176,7 +3179,7 @@ dependencies = [ "libsecp256k1-gen-genmult 0.3.0", "rand 0.8.4", "serde", - "sha2 0.9.5", + "sha2 0.9.8", "typenum", ] @@ -3266,9 +3269,9 @@ dependencies = [ [[package]] name = "linregress" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6e407dadb4ca4b31bc69c27aff00e7ca4534fdcee855159b039a7cebb5f395" +checksum = "d6c601a85f5ecd1aba625247bca0031585fb1c446461b142878a16f8245ddeb8" dependencies = [ "nalgebra", "statrs", @@ -3580,7 +3583,7 @@ dependencies = [ "digest 0.9.0", "generic-array 0.14.4", "multihash-derive", - "sha2 0.9.5", + "sha2 0.9.8", "sha3", "unsigned-varint 0.5.1", ] @@ -3594,7 +3597,7 @@ dependencies = [ "digest 0.9.0", "generic-array 0.14.4", "multihash-derive", - "sha2 0.9.5", + "sha2 0.9.8", "unsigned-varint 0.7.0", ] @@ -3811,9 +3814,6 @@ name = "once_cell" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" -dependencies = [ - "parking_lot 0.11.1", -] [[package]] name = "opaque-debug" @@ -3888,7 +3888,7 @@ dependencies = [ [[package]] name = "pallet-claims" version = "0.9.12" -source = "git+https://github.com/integritee-network/pallets.git?branch=master#d885e0f5ae53cc4ff688b21e1843d2312e062def" +source = "git+https://github.com/integritee-network/pallets.git?branch=master#eb54aedc5c1d0cf452975b66501ccc91671f7e0f" dependencies = [ "frame-benchmarking", "frame-support", @@ -4015,10 +4015,32 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-teeracle" +version = "0.1.0" +source = "git+https://github.com/integritee-network/pallets.git?branch=master#eb54aedc5c1d0cf452975b66501ccc91671f7e0f" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "hex-literal", + "log", + "pallet-balances", + "pallet-teerex", + "pallet-timestamp", + "parity-scale-codec", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "substrate-fixed", + "test-utils", +] + [[package]] name = "pallet-teerex" version = "0.9.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=master#eb4a5c8347c90814c2e175ab50755b213d636b1f" +source = "git+https://github.com/integritee-network/pallets.git?branch=master#eb54aedc5c1d0cf452975b66501ccc91671f7e0f" dependencies = [ "frame-benchmarking", "frame-support", @@ -4034,6 +4056,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", + "test-utils", ] [[package]] @@ -4144,9 +4167,9 @@ dependencies = [ [[package]] name = "parity-db" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241f9c5d25063080f2c02846221f13e1d0e5e18fa00c32c234aad585b744ee55" +checksum = "e7ccc4a8687027deb53d45c5434a1f1b330c9d1069a59cfe80a62aa9a1da25ae" dependencies = [ "blake2-rfc", "crc32fast", @@ -5030,9 +5053,9 @@ dependencies = [ [[package]] name = "retain_mut" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9c17925a9027d298a4603d286befe3f9dc0e8ed02523141914eb628798d6e5b" +checksum = "448296241d034b96c11173591deaa1302f2c17b56092106c1f92c1bc0183a8c9" [[package]] name = "ring" @@ -6206,13 +6229,13 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.5" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" +checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpufeatures 0.1.5", + "cpufeatures 0.2.1", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -6321,7 +6344,7 @@ dependencies = [ "rand_core 0.6.3", "ring 0.16.20", "rustc_version 0.3.3", - "sha2 0.9.5", + "sha2 0.9.8", "subtle 2.4.1", "x25519-dalek", ] @@ -6535,7 +6558,7 @@ dependencies = [ "schnorrkel", "secrecy", "serde", - "sha2 0.9.5", + "sha2 0.9.8", "sp-debug-derive", "sp-externalities", "sp-runtime-interface", @@ -7049,6 +7072,15 @@ dependencies = [ "platforms", ] +[[package]] +name = "substrate-fixed" +version = "0.5.6" +source = "git+https://github.com/encointer/substrate-fixed.git#b33d186888c60f38adafcfc0ec3a21aab263aef1" +dependencies = [ + "parity-scale-codec", + "typenum", +] + [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" @@ -7170,6 +7202,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "test-utils" +version = "0.1.0" +source = "git+https://github.com/integritee-network/pallets.git?branch=master#eb54aedc5c1d0cf452975b66501ccc91671f7e0f" +dependencies = [ + "hex-literal", + "log", +] + [[package]] name = "textwrap" version = "0.11.0" @@ -7230,9 +7271,9 @@ dependencies = [ [[package]] name = "tiny-bip39" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9e44c4759bae7f1032e286a7ef990bd9ed23fe831b7eeba0beb97484c2e59b8" +checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d" dependencies = [ "anyhow", "hmac 0.8.1", @@ -7240,9 +7281,10 @@ dependencies = [ "pbkdf2 0.4.0", "rand 0.7.3", "rustc-hash", - "sha2 0.9.5", + "sha2 0.9.8", "thiserror", "unicode-normalization", + "wasm-bindgen", "zeroize", ] @@ -7341,9 +7383,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.26" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" +checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" dependencies = [ "cfg-if 1.0.0", "pin-project-lite 0.2.7", @@ -7353,9 +7395,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.15" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2" +checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" dependencies = [ "proc-macro2", "quote", @@ -7364,9 +7406,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.18" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052" +checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" dependencies = [ "lazy_static", ] @@ -7404,9 +7446,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.19" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab69019741fca4d98be3c62d2b75254528b5432233fd8a4d2739fec20278de48" +checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" dependencies = [ "ansi_term 0.12.1", "chrono", @@ -7497,12 +7539,12 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "twox-hash" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59" +checksum = "1f559b464de2e2bdabcac6a210d12e9b5a5973c251e102c44c585c71d51bd78e" dependencies = [ - "cfg-if 0.1.10", - "rand 0.7.3", + "cfg-if 1.0.0", + "rand 0.3.23", "static_assertions", ] @@ -7885,7 +7927,7 @@ dependencies = [ "libc", "log", "serde", - "sha2 0.9.5", + "sha2 0.9.8", "toml", "winapi 0.3.9", "zstd", diff --git a/Cargo.toml b/Cargo.toml index 98bc4b7..fdcc99c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,3 +9,5 @@ members = [ #[patch."https://github.com/integritee-network/pallets.git"] #pallet-claims = { path = '../pallets/claims' } +#pallet-teerex = { path = '../pallets/teerex' } +#pallet-teeracle = { path = '../pallets/teeracle' } diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 5a88dc7..25641d3 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -29,6 +29,7 @@ pallet-utility = { version = "4.0.0-dev", default-features = false, git = "https # local pallets pallet-teerex = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "master" } pallet-claims = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "master" } +pallet-teeracle = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "master" } sp-api = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" } sp-block-builder = { default-features = false, version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" } @@ -95,6 +96,7 @@ std = [ "pallet-claims/std", "pallet-proxy/std", "pallet-utility/std", + "pallet-teeracle/std", ] runtime-benchmarks = [ "frame-benchmarking", @@ -114,5 +116,6 @@ runtime-benchmarks = [ "pallet-treasury/runtime-benchmarks", "pallet-vesting/runtime-benchmarks", "pallet-utility/runtime-benchmarks", + "pallet-teeracle/runtime-benchmarks", ] -mainnet-launch = [] +mainnet-launch = [] \ No newline at end of file diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index a5bba80..03e3772 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -55,6 +55,8 @@ pub use pallet_balances::Call as BalancesCall; /// added by Integritee pub use pallet_claims; /// added by Integritee +pub use pallet_teeracle; +/// added by Integritee pub use pallet_teerex; pub use pallet_timestamp::Call as TimestampCall; use pallet_transaction_payment::CurrencyAdapter; @@ -391,6 +393,11 @@ impl pallet_claims::Config for Runtime { type MoveClaimOrigin = frame_system::EnsureRoot; type WeightInfo = weights::pallet_claims::WeightInfo; } +/// added by Integritee +impl pallet_teeracle::Config for Runtime { + type Event = Event; + type WeightInfo = (); +} parameter_types! { pub const ProposalBond: Permill = Permill::from_percent(5); @@ -587,6 +594,7 @@ construct_runtime!( // utility Teerex: pallet_teerex::{Pallet, Call, Config, Storage, Event} = 50, Claims: pallet_claims::{Pallet, Call, Storage, Config, Event, ValidateUnsigned} = 51, + Teeracle: pallet_teeracle::{Pallet, Call, Storage, Event} = 52, } ); @@ -771,6 +779,7 @@ impl_runtime_apis! { list_benchmark!(list, extra, pallet_treasury, Treasury); list_benchmark!(list, extra, pallet_vesting, Vesting); list_benchmark!(list, extra, pallet_utility, Utility); + list_benchmark!(list, extra, pallet_teeracle, teeracle); let storage_info = AllPalletsWithSystem::storage_info(); @@ -814,6 +823,7 @@ impl_runtime_apis! { add_benchmark!(params, batches, pallet_treasury, Treasury); add_benchmark!(params, batches, pallet_vesting, Vesting); add_benchmark!(params, batches, pallet_utility, Utility); + add_benchmark!(params, batches, pallet_teeracle, teeracle); if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) } Ok(batches)