From 6e488f5d7990ffba7ab8b24fd47a1e1bf9b11101 Mon Sep 17 00:00:00 2001 From: Jernej Kos Date: Tue, 26 Sep 2023 11:56:55 +0200 Subject: [PATCH 1/2] runtime: Bump Oasis SDK to 0.7.4 and prepare 0.6.4-testnet --- runtime/Cargo.lock | 26 +++++++++++++------------- runtime/Cargo.toml | 6 +++--- runtime/src/lib.rs | 7 ++++++- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/runtime/Cargo.lock b/runtime/Cargo.lock index e844b5e8..0592647a 100644 --- a/runtime/Cargo.lock +++ b/runtime/Cargo.lock @@ -2225,7 +2225,7 @@ dependencies = [ [[package]] name = "oasis-runtime-sdk" version = "0.7.0" -source = "git+https://github.com/oasisprotocol/oasis-sdk?tag=runtime-sdk/v0.7.3#54f5df8c4ef4b87f22be6657d129a51c429df942" +source = "git+https://github.com/oasisprotocol/oasis-sdk?tag=runtime-sdk/v0.7.4#9e8c6e976ae01ec1c9eea0b5ea8d46bfb0bbf6fe" dependencies = [ "anyhow", "base64", @@ -2264,7 +2264,7 @@ dependencies = [ [[package]] name = "oasis-runtime-sdk-evm" version = "0.5.0" -source = "git+https://github.com/oasisprotocol/oasis-sdk?tag=runtime-sdk/v0.7.3#54f5df8c4ef4b87f22be6657d129a51c429df942" +source = "git+https://github.com/oasisprotocol/oasis-sdk?tag=runtime-sdk/v0.7.4#9e8c6e976ae01ec1c9eea0b5ea8d46bfb0bbf6fe" dependencies = [ "anyhow", "base64", @@ -2296,7 +2296,7 @@ dependencies = [ [[package]] name = "oasis-runtime-sdk-macros" version = "0.3.0" -source = "git+https://github.com/oasisprotocol/oasis-sdk?tag=runtime-sdk/v0.7.3#54f5df8c4ef4b87f22be6657d129a51c429df942" +source = "git+https://github.com/oasisprotocol/oasis-sdk?tag=runtime-sdk/v0.7.4#9e8c6e976ae01ec1c9eea0b5ea8d46bfb0bbf6fe" dependencies = [ "darling 0.20.3", "proc-macro2 1.0.67", @@ -2913,7 +2913,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.18", + "semver 1.0.19", ] [[package]] @@ -2955,7 +2955,7 @@ dependencies = [ [[package]] name = "sapphire-paratime" -version = "0.6.3-testnet" +version = "0.6.4-testnet" dependencies = [ "keymanager", "oasis-runtime-sdk", @@ -3036,9 +3036,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" [[package]] name = "semver-parser" @@ -3549,9 +3549,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" dependencies = [ "deranged", "itoa", @@ -3562,15 +3562,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 64c6537b..b464f6b3 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sapphire-paratime" -version = "0.6.3-testnet" +version = "0.6.4-testnet" authors = ["Oasis Protocol Foundation "] edition = "2021" license = "Apache-2.0" @@ -21,8 +21,8 @@ debug = false keymanager = { git = "https://github.com/oasisprotocol/keymanager-paratime", tag = "v0.3.3-testnet" } # SDK. -module-evm = { git = "https://github.com/oasisprotocol/oasis-sdk", tag = "runtime-sdk/v0.7.3", package = "oasis-runtime-sdk-evm" } -oasis-runtime-sdk = { git = "https://github.com/oasisprotocol/oasis-sdk", tag = "runtime-sdk/v0.7.3" } +module-evm = { git = "https://github.com/oasisprotocol/oasis-sdk", tag = "runtime-sdk/v0.7.4", package = "oasis-runtime-sdk-evm" } +oasis-runtime-sdk = { git = "https://github.com/oasisprotocol/oasis-sdk", tag = "runtime-sdk/v0.7.4" } # Third party. once_cell = "1.8.0" diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 5dfdf8fa..972da6f8 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -44,7 +44,7 @@ const fn chain_id() -> u64 { const fn state_version() -> u32 { if is_testnet() { // Testnet. - 2 + 3 } else { // Mainnet. 1 @@ -192,6 +192,8 @@ impl sdk::Runtime for Runtime { consensus_denomination: Denomination::NATIVE, // Scale to 18 decimal places as this is what is expected in the EVM ecosystem. consensus_scaling_factor: 1_000_000_000, + // Minimum delegation amount that matches the consensus layer. + min_delegate_amount: 100_000_000_000, }, }, modules::consensus_accounts::Genesis { @@ -201,6 +203,9 @@ impl sdk::Runtime for Runtime { tx_withdraw: 60_000, tx_delegate: 60_000, tx_undelegate: 120_000, + + store_receipt: 20_000, + take_receipt: 15_000, }, disable_delegate: false, disable_undelegate: false, From 39bae5e185237b7d3e45d31dd7abf34b57a776fe Mon Sep 17 00:00:00 2001 From: Jernej Kos Date: Tue, 26 Sep 2023 11:57:54 +0200 Subject: [PATCH 2/2] runtime: Bump Testnet trust root --- runtime/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 972da6f8..04daa9f1 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -133,8 +133,8 @@ impl sdk::Runtime for Runtime { if is_testnet() { // Testnet. Some(TrustRoot { - height: 17422276, - hash: "f1786d6cdce85a4351dde8c4694985c6e8ae2c8e14b75e3eaf2bf127fe2b9759".into(), + height: 17500584, + hash: "f93d453a2f3fda4e06e5f098d5b9853fa063fd652e758b680155aa72a873166c".into(), runtime_id: "000000000000000000000000000000000000000000000000a6d1e3ebf60dff6c" .into(), chain_context: "50304f98ddb656620ea817cc1446c401752a05a249b36c9b90dba4616829977a"