Skip to content

Commit

Permalink
Merge pull request #137 from InvArch/gabriel-move_stake
Browse files Browse the repository at this point in the history
Upgrade OCIF pallet: Move stake
  • Loading branch information
arrudagates authored Dec 1, 2023
2 parents 70edf5f + 6d92383 commit 121deff
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 19 deletions.
14 changes: 7 additions & 7 deletions tinkernet/Cargo.lock

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

2 changes: 1 addition & 1 deletion tinkernet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ members = [
]

[workspace.package]
version = "1.5.0"
version = "1.5.1"
edition = "2021"

license = "GPL-3.0"
Expand Down
8 changes: 4 additions & 4 deletions tinkernet/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
10 changes: 3 additions & 7 deletions tinkernet/runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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},
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 121deff

Please sign in to comment.