Move helper traits to new pkg plasm-support (#268)

* initial * downgrade log package * fix formatter * plasm version updates to 1.7.0
AstarNetwork · Feb 8, 2021 · 432d568 · 432d568
1 parent f8400c6
commit 432d568
Show file tree

Hide file tree

Showing 11 changed files with 912 additions and 835 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,6 +9,7 @@ members = [
     "frame/dapps-staking",
     "frame/plasm-rewards",
     "frame/plasm-lockdrop",
+    "frame/plasm-support",
     "frame/plasm-validator",
     "frame/ovm",
     "frame/ovm/rpc/runtime-api",

diff --git a/frame/dapps-staking/Cargo.toml b/frame/dapps-staking/Cargo.toml
@@ -27,8 +27,9 @@ pallet-contracts = { version = "2.0.0", default_features = false }
 pallet-staking = { version = "2.0.0", default_features = false }
 sp-staking = { version = "2.0.0", default_features = false }
 
-pallet-contract-operator = { path = "../operator", version = "1.4.0", default_features = false }
-pallet-plasm-rewards = { path = "../plasm-rewards", version = "1.4.0", default_features = false }
+pallet-contract-operator = { path = "../operator", version = "1.7.0", default_features = false }
+pallet-plasm-rewards = { path = "../plasm-rewards", version = "1.7.0", default_features = false }
+pallet-plasm-support = { path = "../plasm-support", version = "1.7.0", default_features = false }
 
 [dev-dependencies]
 wabt = "0.10.0"
@@ -57,5 +58,6 @@ std = [
     "pallet-staking/std",
     "pallet-contract-operator/std",
     "pallet-plasm-rewards/std",
+    "pallet-plasm-support/std",
     "sp-staking/std",
 ]
diff --git a/frame/dapps-staking/src/lib.rs b/frame/dapps-staking/src/lib.rs
@@ -16,11 +16,11 @@ use frame_support::{
     IterableStorageDoubleMap, StorageMap, StorageValue,
 };
 use frame_system::{self as system, ensure_signed};
-use pallet_contract_operator::ContractFinder;
 use pallet_plasm_rewards::{
     traits::{ComputeEraWithParam, EraFinder, ForDappsEraRewardFinder, HistoryDepthFinder},
     EraIndex, Releases,
 };
+use pallet_plasm_support::ContractFinder;
 pub use pallet_staking::{Forcing, RewardDestination};
 use sp_runtime::{
     traits::{AtLeast32BitUnsigned, CheckedSub, Saturating, StaticLookup, Zero},

diff --git a/frame/operator/Cargo.toml b/frame/operator/Cargo.toml
@@ -21,6 +21,7 @@ frame-support = { version = "2.0.0", default_features = false }
 pallet-timestamp = { version = "2.0.0", default_features = false }
 frame-system = { version = "2.0.0", default_features = false }
 pallet-contracts = { version = "2.0.0", default_features = false }
+pallet-plasm-support = { path = "../plasm-support", version = "1.7.0", default_features = false }
 
 [dev-dependencies]
 wabt = "0.10.0"
@@ -43,4 +44,5 @@ std = [
     "pallet-timestamp/std",
     "frame-system/std",
     "pallet-contracts/std",
+    "pallet-plasm-support/std",
 ]
diff --git a/frame/operator/src/lib.rs b/frame/operator/src/lib.rs
@@ -4,10 +4,7 @@ use frame_support::dispatch::UnfilteredDispatchable;
 use frame_support::{decl_event, decl_module, decl_storage, Parameter};
 use frame_system::{ensure_signed, RawOrigin};
 use pallet_contracts::{BalanceOf, CodeHash, ContractAddressFor, Gas};
-use sp_runtime::{
-    traits::{MaybeDisplay, MaybeSerialize, Member},
-    DispatchError,
-};
+use sp_runtime::traits::{MaybeDisplay, MaybeSerialize, Member};
 use sp_std::prelude::*;
 
 pub mod parameters;
@@ -16,50 +13,7 @@ mod tests;
 
 use crate::parameters::Verifiable;
 
-pub trait ContractFinder<AccountId, Parameter> {
-    fn is_exists_contract(contract_id: &AccountId) -> bool;
-    fn operator(contract_id: &AccountId) -> Option<AccountId>;
-    fn parameters(contract_id: &AccountId) -> Option<Parameter>;
-}
-
-pub trait OperatorFinder<AccountId: Parameter> {
-    fn contracts(operator_id: &AccountId) -> Vec<AccountId>;
-}
-
-pub trait TransferOperator<AccountId: Parameter>: OperatorFinder<AccountId> {
-    /// Changes an operator for identified contracts with verify.
-    fn transfer_operator(
-        current_operator: AccountId,
-        contracts: Vec<AccountId>,
-        new_operator: AccountId,
-    ) -> Result<(), DispatchError> {
-        Self::verify_transfer_operator(&current_operator, &contracts)?;
-        Self::force_transfer_operator(current_operator, contracts, new_operator);
-        Ok(())
-    }
-
-    fn verify_transfer_operator(
-        current_operator: &AccountId,
-        contracts: &Vec<AccountId>,
-    ) -> Result<(), DispatchError> {
-        let operate_contracts = Self::contracts(current_operator);
-
-        // check the actually operate the contract.
-        if !contracts.iter().all(|c| operate_contracts.contains(c)) {
-            Err(DispatchError::Other(
-                "The sender don't operate the contracts address.",
-            ))?
-        }
-        Ok(())
-    }
-
-    /// Force Changes an operator for identified contracts without verify.
-    fn force_transfer_operator(
-        current_operator: AccountId,
-        contracts: Vec<AccountId>,
-        new_operator: AccountId,
-    );
-}
+use pallet_plasm_support::{ContractFinder, OperatorFinder, TransferOperator};
 
 /// The module's configuration trait.
 pub trait Trait: pallet_contracts::Trait {

diff --git a/frame/plasm-support/Cargo.toml b/frame/plasm-support/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "pallet-plasm-support"
+version = "1.7.0"
+authors = ["Stake Technologies <devops@stake.co.jp>"]
+edition = "2018"
+license = "Apache-2.0"
+homepage = "https://docs.plasmnet.io/"
+repository = "https://github.com/staketechnologies/Plasm/"
+description = "FRAME support pallet for Plasm traits"
+
+[dependencies]
+sp-runtime = { version = "2.0.0", default_features = false }
+frame-support = { version = "2.0.0", default_features = false }
+sp-std = { version = "2.0.0", default_features = false }
+
+
+[dev-dependencies]
+
+
+[features]
+default = ["std"]
+std = [
+    "sp-runtime/std",
+    "frame-support/std",
+    "sp-std/std",
+]
diff --git a/frame/plasm-support/src/lib.rs b/frame/plasm-support/src/lib.rs
@@ -0,0 +1,50 @@
+#![cfg_attr(not(feature = "std"), no_std)]
+
+use frame_support::Parameter;
+use sp_runtime::DispatchError;
+use sp_std::prelude::*;
+
+pub trait ContractFinder<AccountId, Parameter> {
+    fn is_exists_contract(contract_id: &AccountId) -> bool;
+    fn operator(contract_id: &AccountId) -> Option<AccountId>;
+    fn parameters(contract_id: &AccountId) -> Option<Parameter>;
+}
+
+pub trait OperatorFinder<AccountId: Parameter> {
+    fn contracts(operator_id: &AccountId) -> Vec<AccountId>;
+}
+
+pub trait TransferOperator<AccountId: Parameter>: OperatorFinder<AccountId> {
+    /// Changes an operator for identified contracts with verify.
+    fn transfer_operator(
+        current_operator: AccountId,
+        contracts: Vec<AccountId>,
+        new_operator: AccountId,
+    ) -> Result<(), DispatchError> {
+        Self::verify_transfer_operator(&current_operator, &contracts)?;
+        Self::force_transfer_operator(current_operator, contracts, new_operator);
+        Ok(())
+    }
+
+    fn verify_transfer_operator(
+        current_operator: &AccountId,
+        contracts: &Vec<AccountId>,
+    ) -> Result<(), DispatchError> {
+        let operate_contracts = Self::contracts(current_operator);
+
+        // check the actually operate the contract.
+        if !contracts.iter().all(|c| operate_contracts.contains(c)) {
+            Err(DispatchError::Other(
+                "The sender don't operate the contracts address.",
+            ))?
+        }
+        Ok(())
+    }
+
+    /// Force Changes an operator for identified contracts without verify.
+    fn force_transfer_operator(
+        current_operator: AccountId,
+        contracts: Vec<AccountId>,
+        new_operator: AccountId,
+    );
+}
diff --git a/frame/plasm-validator/Cargo.toml b/frame/plasm-validator/Cargo.toml
@@ -22,7 +22,7 @@ frame-support = { version = "2.0.0", default_features = false }
 frame-system = { version = "2.0.0", default_features = false }
 sp-staking = { version = "2.0.0", default_features = false }
 
-pallet-plasm-rewards = { path = "../plasm-rewards", version = "1.4.0", default_features = false }
+pallet-plasm-rewards = { path = "../plasm-rewards", version = "1.7.0", default_features = false }
 
 [dev-dependencies]
 hex-literal = "0.2.1"

diff --git a/frame/trading/Cargo.toml b/frame/trading/Cargo.toml
@@ -20,7 +20,7 @@ frame-support = { version = "2.0.0", default_features = false }
 pallet-timestamp = { version = "2.0.0", default_features = false }
 frame-system = { version = "2.0.0", default_features = false }
 
-pallet-contract-operator = { path = "../operator", version = "1.4.0", default_features = false }
+pallet-plasm-support = { path = "../plasm-support", version = "1.7.0", default_features = false }
 
 [features]
 default = ["std"]
@@ -35,5 +35,5 @@ std = [
     "frame-support/std",
     "pallet-timestamp/std",
     "frame-system/std",
-    "pallet-contract-operator/std",
+    "pallet-plasm-support/std",
 ]
diff --git a/frame/trading/src/lib.rs b/frame/trading/src/lib.rs
@@ -6,7 +6,7 @@ use frame_support::{
     traits::{Currency, ExistenceRequirement, LockIdentifier, LockableCurrency, WithdrawReasons},
 };
 use frame_system::ensure_signed;
-use pallet_contract_operator::{OperatorFinder, TransferOperator};
+use pallet_plasm_support::{OperatorFinder, TransferOperator};
 use sp_std::prelude::*;
 
 #[cfg(feature = "std")]