From baeb7744195908c2a90d6a574373b0e87b4cbc53 Mon Sep 17 00:00:00 2001 From: Gabriel Facco de Arruda Date: Thu, 30 Nov 2023 16:12:59 -0300 Subject: [PATCH 1/4] Upgrade OCIF pallet: Move stake --- tinkernet/Cargo.lock | 10 +++++----- tinkernet/runtime/Cargo.toml | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tinkernet/Cargo.lock b/tinkernet/Cargo.lock index ef5e166..5c53d8d 100644 --- a/tinkernet/Cargo.lock +++ b/tinkernet/Cargo.lock @@ -3845,7 +3845,7 @@ dependencies = [ [[package]] name = "invarch-primitives" version = "0.1.0-dev" -source = "git+https://github.com/InvArch/InvArch-Frames?rev=82061c35b7b73d77b3a073789ef03fd56771e9fb#82061c35b7b73d77b3a073789ef03fd56771e9fb" +source = "git+https://github.com/InvArch/InvArch-Frames?rev=2830b0abc6e29e1b3412480f2e95265fafd73cb5#2830b0abc6e29e1b3412480f2e95265fafd73cb5" dependencies = [ "frame-system", "parity-scale-codec", @@ -6020,7 +6020,7 @@ dependencies = [ [[package]] name = "pallet-checked-inflation" version = "0.1.0-dev" -source = "git+https://github.com/InvArch/InvArch-Frames?rev=82061c35b7b73d77b3a073789ef03fd56771e9fb#82061c35b7b73d77b3a073789ef03fd56771e9fb" +source = "git+https://github.com/InvArch/InvArch-Frames?rev=2830b0abc6e29e1b3412480f2e95265fafd73cb5#2830b0abc6e29e1b3412480f2e95265fafd73cb5" dependencies = [ "frame-benchmarking", "frame-support", @@ -6279,7 +6279,7 @@ dependencies = [ [[package]] name = "pallet-inv4" version = "0.1.0-dev" -source = "git+https://github.com/InvArch/InvArch-Frames?rev=82061c35b7b73d77b3a073789ef03fd56771e9fb#82061c35b7b73d77b3a073789ef03fd56771e9fb" +source = "git+https://github.com/InvArch/InvArch-Frames?rev=2830b0abc6e29e1b3412480f2e95265fafd73cb5#2830b0abc6e29e1b3412480f2e95265fafd73cb5" dependencies = [ "frame-benchmarking", "frame-support", @@ -6451,7 +6451,7 @@ dependencies = [ [[package]] name = "pallet-ocif-staking" version = "0.1.0-dev" -source = "git+https://github.com/InvArch/InvArch-Frames?rev=82061c35b7b73d77b3a073789ef03fd56771e9fb#82061c35b7b73d77b3a073789ef03fd56771e9fb" +source = "git+https://github.com/InvArch/InvArch-Frames?rev=2830b0abc6e29e1b3412480f2e95265fafd73cb5#2830b0abc6e29e1b3412480f2e95265fafd73cb5" dependencies = [ "frame-benchmarking", "frame-support", @@ -6600,7 +6600,7 @@ dependencies = [ [[package]] name = "pallet-rings" version = "0.1.0-dev" -source = "git+https://github.com/InvArch/InvArch-Frames?rev=82061c35b7b73d77b3a073789ef03fd56771e9fb#82061c35b7b73d77b3a073789ef03fd56771e9fb" +source = "git+https://github.com/InvArch/InvArch-Frames?rev=2830b0abc6e29e1b3412480f2e95265fafd73cb5#2830b0abc6e29e1b3412480f2e95265fafd73cb5" dependencies = [ "frame-benchmarking", "frame-support", diff --git a/tinkernet/runtime/Cargo.toml b/tinkernet/runtime/Cargo.toml index 9835f0f..a3247ec 100644 --- a/tinkernet/runtime/Cargo.toml +++ b/tinkernet/runtime/Cargo.toml @@ -24,10 +24,10 @@ smallvec = "1.6.1" getrandom = { version = "0.2.4", default-features = false, features = ["js"] } # InvArch Pallets -pallet-inv4 = { git = "https://github.com/InvArch/InvArch-Frames", rev = "82061c35b7b73d77b3a073789ef03fd56771e9fb", default-features = false } -pallet-ocif-staking = { git = "https://github.com/InvArch/InvArch-Frames", rev = "82061c35b7b73d77b3a073789ef03fd56771e9fb", default-features = false } -pallet-checked-inflation = { git = "https://github.com/InvArch/InvArch-Frames", rev = "82061c35b7b73d77b3a073789ef03fd56771e9fb", default-features = false } -pallet-rings = { git = "https://github.com/InvArch/InvArch-Frames", rev = "82061c35b7b73d77b3a073789ef03fd56771e9fb", default-features = false } +pallet-inv4 = { git = "https://github.com/InvArch/InvArch-Frames", rev = "2830b0abc6e29e1b3412480f2e95265fafd73cb5", default-features = false } +pallet-ocif-staking = { git = "https://github.com/InvArch/InvArch-Frames", rev = "2830b0abc6e29e1b3412480f2e95265fafd73cb5", default-features = false } +pallet-checked-inflation = { git = "https://github.com/InvArch/InvArch-Frames", rev = "2830b0abc6e29e1b3412480f2e95265fafd73cb5", default-features = false } +pallet-rings = { git = "https://github.com/InvArch/InvArch-Frames", rev = "2830b0abc6e29e1b3412480f2e95265fafd73cb5", default-features = false } #pallet-inv4 = { path = "../../../InvArch-Frames/INV4/pallet-inv4", default-features = false } #pallet-ocif-staking = { path = "../../../InvArch-Frames/OCIF/staking", default-features = false } From ee065b84a8a50662377ccb22c77588f4c1163ea9 Mon Sep 17 00:00:00 2001 From: Gabriel Facco de Arruda Date: Fri, 1 Dec 2023 10:22:33 -0300 Subject: [PATCH 2/4] bump spec version --- tinkernet/runtime/src/lib.rs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tinkernet/runtime/src/lib.rs b/tinkernet/runtime/src/lib.rs index 3dc62aa..f054c9b 100644 --- a/tinkernet/runtime/src/lib.rs +++ b/tinkernet/runtime/src/lib.rs @@ -32,9 +32,7 @@ use frame_support::{ weights::constants::WEIGHT_REF_TIME_PER_SECOND, }; pub use frame_support::{ - // construct_runtime, - match_types, - parameter_types, + match_types, parameter_types, traits::{ AsEnsureOriginWithArg, Contains, Currency, EqualPrivilegeOnly, Everything, FindAuthor, Get, Imbalance, KeyOwnerProofSystem, Nothing, OnUnbalanced, Randomness, StorageInfo, @@ -44,9 +42,7 @@ pub use frame_support::{ ConstantMultiplier, IdentityFee, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, }, - BoundedVec, - ConsensusEngineId, - PalletId, + BoundedVec, ConsensusEngineId, PalletId, }; use frame_system::{ limits::{BlockLength, BlockWeights}, @@ -192,7 +188,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("tinkernet_node"), impl_name: create_runtime_str!("tinkernet_node"), authoring_version: 1, - spec_version: 19, + spec_version: 20, impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -1110,3 +1106,4 @@ cumulus_pallet_parachain_system::register_validate_block! { BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::, CheckInherents = CheckInherents, } + \ No newline at end of file From 572b9fe4f9ba08dcae32569730c0e7e8fa90b552 Mon Sep 17 00:00:00 2001 From: Gabriel Facco de Arruda Date: Fri, 1 Dec 2023 10:24:58 -0300 Subject: [PATCH 3/4] bump workspace version --- tinkernet/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tinkernet/Cargo.toml b/tinkernet/Cargo.toml index 339901e..1a5083c 100644 --- a/tinkernet/Cargo.toml +++ b/tinkernet/Cargo.toml @@ -7,7 +7,7 @@ members = [ ] [workspace.package] -version = "1.5.0" +version = "1.5.1" edition = "2021" license = "GPL-3.0" From 6d92383f12b87aa35f628936518630bccbbb6384 Mon Sep 17 00:00:00 2001 From: Gabriel Facco de Arruda Date: Fri, 1 Dec 2023 10:55:18 -0300 Subject: [PATCH 4/4] fix weird newline character issue --- tinkernet/Cargo.lock | 4 ++-- tinkernet/runtime/src/lib.rs | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tinkernet/Cargo.lock b/tinkernet/Cargo.lock index 5c53d8d..d2cbe73 100644 --- a/tinkernet/Cargo.lock +++ b/tinkernet/Cargo.lock @@ -12333,7 +12333,7 @@ dependencies = [ [[package]] name = "tinkernet-node" -version = "1.5.0" +version = "1.5.1" dependencies = [ "async-trait", "clap", @@ -12407,7 +12407,7 @@ dependencies = [ [[package]] name = "tinkernet-runtime" -version = "1.5.0" +version = "1.5.1" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", diff --git a/tinkernet/runtime/src/lib.rs b/tinkernet/runtime/src/lib.rs index f054c9b..2c066c1 100644 --- a/tinkernet/runtime/src/lib.rs +++ b/tinkernet/runtime/src/lib.rs @@ -1106,4 +1106,3 @@ cumulus_pallet_parachain_system::register_validate_block! { BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::, CheckInherents = CheckInherents, } - \ No newline at end of file