Do not enter estimate mode when binary flag is enabled (#102)

* Do not enter estimate mode when binary flag is enabled * Update README.md * Fix assets-bridge set_admin Co-authored-by: icodezjb <[email protected]>
chainx-org · Jun 9, 2022 · 9b6057d · 9b6057d
1 parent 0cba3d8
commit 9b6057d
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -8,10 +8,8 @@ How to use/test locally
 ## 1. Supported dependencies
 
 It should at least work until the following commits
-
--   polkadot.js.org (apps v0.98.2-106)
--   Polkadot release-v0.9.11 @ `eb9f107e3a04687dcf80111563f2bcea7d5b15d3`
--   Substrate polkadot-v0.9.18  @ `57346f6b24875f8935280dba51fa8ab0a9ba1e39`
+- Substrate: polkadot-v0.9.18  @ `fc3fd073d3a0acf9933c3994b660ebd7b5833f65`
+- ChainX frontier: polkadot-v0.9.18 @ `eb579d4dda77724be438bf090596b347ca6a5a37`
 
 ## 2. Local Test
 

diff --git a/contracts/AssetsBridgeErc20_OnlyOwner.sol b/contracts/AssetsBridgeErc20_OnlyOwner.sol
@@ -10,7 +10,6 @@ import "https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.4.1/contr
 import "https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.4.1/contracts/access/Ownable.sol";
 
 import "./AssetsBridgeAdaptor.sol";
-import "./erc20-contracts/contracts/AssetsBridgeAdaptor.sol";
 
 /**
  * @dev Implementation of the {IERC20} interface.

diff --git a/xpallets/assets-bridge/src/lib.rs b/xpallets/assets-bridge/src/lib.rs
@@ -569,7 +569,14 @@ pub mod pallet {
             origin: OriginFor<T>,
             new_admin: <T::Lookup as StaticLookup>::Source,
         ) -> DispatchResultWithPostInfo {
-            ensure_root(origin)?;
+            let require = match ensure_signed_or_root(origin) {
+                Ok(s) if s == Self::admin_key() => true,
+                Ok(None) => true,
+                _ => false
+            };
+
+            ensure!(require, Error::<T>::RequireAdmin);
+
             let new_admin = T::Lookup::lookup(new_admin)?;
 
             Admin::<T>::mutate(|admin| *admin = Some(new_admin.clone()));