Allow performing migration for others (#1588)

* Allow performing migration for others * Update contract addrs * Update abi * Update sol * Fix tests * Fix * Fix Signed-off-by: Xavier Lau <[email protected]> --------- Signed-off-by: Xavier Lau <[email protected]>
darwinia-network · Sep 3, 2024 · fc952a6 · fc952a6
1 parent bdcfc09
commit fc952a6
Show file tree

Hide file tree

Showing 16 changed files with 65 additions and 52 deletions.
diff --git a/pallet/deposit/src/benchmarking.rs b/pallet/deposit/src/benchmarking.rs
@@ -117,6 +117,7 @@ mod benchmarks {
 	#[benchmark]
 	fn migrate() {
 		let a = frame_benchmarking::whitelisted_caller::<T::AccountId>();
+		let a_ = a.clone();
 		let max_deposits = T::MaxDeposits::get();
 
 		<Pallet<T>>::set_deposit_contract(RawOrigin::Root.into(), a.clone()).unwrap();
@@ -133,7 +134,7 @@ mod benchmarks {
 		});
 
 		#[extrinsic_call]
-		_(RawOrigin::Signed(a));
+		_(RawOrigin::Signed(a), a_);
 	}
 
 	#[benchmark]

diff --git a/pallet/deposit/src/lib.rs b/pallet/deposit/src/lib.rs
@@ -312,11 +312,12 @@ pub mod pallet {
 			Ok(())
 		}
 
-		/// Migration data to deposit contract.
+		/// Migrate the specified account's data to deposit contract.
 		#[pallet::call_index(3)]
 		#[pallet::weight(<T as Config>::WeightInfo::migrate())]
-		pub fn migrate(origin: OriginFor<T>) -> DispatchResult {
-			let who = ensure_signed(origin)?;
+		pub fn migrate(origin: OriginFor<T>, who: T::AccountId) -> DispatchResult {
+			ensure_signed(origin)?;
+
 			let Some(ds) = <Deposits<T>>::take(&who) else { return Ok(()) };
 			let now = Self::now();
 			let mut ds = ds.into_iter();

diff --git a/pallet/deposit/src/tests.rs b/pallet/deposit/src/tests.rs
@@ -365,11 +365,11 @@ fn migrate_should_work() {
 
 		mock::set_in_use(1, true);
 
-		assert_noop!(Deposit::migrate(RuntimeOrigin::signed(1)), <Error<Runtime>>::DepositInUse);
+		assert_noop!(Deposit::migrate(RuntimeOrigin::signed(1), 1), <Error<Runtime>>::DepositInUse);
 
 		mock::set_in_use(1, false);
 
-		assert_ok!(Deposit::migrate(RuntimeOrigin::signed(1)));
+		assert_ok!(Deposit::migrate(RuntimeOrigin::signed(1), 1));
 		assert!(Deposit::deposit_of(1).is_none());
 	});
 }
diff --git a/precompile/deposit/src/lib.rs b/precompile/deposit/src/lib.rs
@@ -44,8 +44,10 @@ pub struct Deposit<Runtime>(PhantomData<Runtime>);
 impl<Runtime> Deposit<Runtime>
 where
 	Runtime: darwinia_deposit::Config + pallet_evm::Config,
-	Runtime::RuntimeCall: Dispatchable<PostInfo = PostDispatchInfo> + GetDispatchInfo,
-	Runtime::RuntimeCall: From<darwinia_deposit::Call<Runtime>>,
+	Runtime::RuntimeCall: From<darwinia_deposit::Call<Runtime>>
+		+ Dispatchable<PostInfo = PostDispatchInfo>
+		+ GetDispatchInfo,
+	<Runtime as frame_system::Config>::AccountId: From<H160>,
 	<<Runtime as frame_system::Config>::RuntimeCall as Dispatchable>::RuntimeOrigin: OriginTrait,
 	<Runtime::RuntimeCall as Dispatchable>::RuntimeOrigin: From<Option<Runtime::AccountId>>,
 	AccountIdOf<Runtime>: From<H160>,
@@ -89,13 +91,13 @@ where
 		Ok(true)
 	}
 
-	#[precompile::public("migrate()")]
-	fn migrate(handle: &mut impl PrecompileHandle) -> EvmResult<bool> {
+	#[precompile::public("migrate(address)")]
+	fn migrate(handle: &mut impl PrecompileHandle, who: Address) -> EvmResult<bool> {
 		let origin: AccountIdOf<Runtime> = handle.context().caller.into();
 		RuntimeHelper::<Runtime>::try_dispatch(
 			handle,
 			Some(origin).into(),
-			darwinia_deposit::Call::<Runtime>::migrate {},
+			darwinia_deposit::Call::<Runtime>::migrate { who: H160::from(who).into() },
 		)?;
 		Ok(true)
 	}

diff --git a/precompile/deposit/src/tests.rs b/precompile/deposit/src/tests.rs
@@ -36,7 +36,7 @@ fn selectors() {
 	assert!(PCall::lock_selectors().contains(&0x998e4242));
 	assert!(PCall::claim_selectors().contains(&0x4e71d92d));
 	assert!(PCall::claim_with_penalty_selectors().contains(&0xfa04a9bf));
-	assert!(PCall::migrate_selectors().contains(&0x8fd3ab80));
+	assert!(PCall::migrate_selectors().contains(&0xce5494bb));
 }
 
 #[test]

diff --git a/precompile/metadata/abi-creator.sh b/precompile/metadata/abi-creator.sh
@@ -1,6 +1,11 @@
-#!/bin/bash
+#!/bin/sh
 
-# Usage: Run `bash abi-creator.sh` in the root of the metadata folder.
+# ## Usage
+#
+# ```sh
+# brew install solidity # macOS only
+# cd precompile/metadata && ./abi-generator.sh
+# ```
 
 sol_directory="sol"
 abi_directory="abi"

diff --git a/precompile/metadata/abi/asset.json b/precompile/metadata/abi/asset.json
@@ -371,5 +371,5 @@
       }
     }
   },
-  "version": "0.8.17+commit.8df45f5f.Linux.g++"
+  "version": "0.8.25+commit.b61c2a91.Darwin.appleclang"
 }
diff --git a/precompile/metadata/abi/bls12-381.json b/precompile/metadata/abi/bls12-381.json
@@ -66,5 +66,5 @@
       }
     }
   },
-  "version": "0.8.17+commit.8df45f5f.Linux.g++"
+  "version": "0.8.25+commit.b61c2a91.Darwin.appleclang"
 }
diff --git a/precompile/metadata/abi/conviction-voting.json b/precompile/metadata/abi/conviction-voting.json
@@ -1021,5 +1021,5 @@
       }
     }
   },
-  "version": "0.8.17+commit.8df45f5f.Linux.g++"
+  "version": "0.8.25+commit.b61c2a91.Darwin.appleclang"
 }
diff --git a/precompile/metadata/abi/deposit.json b/precompile/metadata/abi/deposit.json
@@ -67,7 +67,14 @@
           "type": "function"
         },
         {
-          "inputs": [],
+          "inputs":
+          [
+            {
+              "internalType": "address",
+              "name": "who",
+              "type": "address"
+            }
+          ],
           "name": "migrate",
           "outputs":
           [
@@ -119,7 +126,7 @@
               "_0": "returns true on success, false otherwise."
             }
           },
-          "migrate()":
+          "migrate(address)":
           {
             "details": "Migrate data to deposit contract"
           }
@@ -132,9 +139,9 @@
         "claim()": "4e71d92d",
         "claim_with_penalty(uint8)": "fa04a9bf",
         "lock(uint256,uint8)": "998e4242",
-        "migrate()": "8fd3ab80"
+        "migrate(address)": "ce5494bb"
       }
     }
   },
-  "version": "0.8.17+commit.8df45f5f.Linux.g++"
+  "version": "0.8.25+commit.b61c2a91.Darwin.appleclang"
 }
diff --git a/precompile/metadata/abi/staking.json b/precompile/metadata/abi/staking.json
@@ -225,5 +225,5 @@
       }
     }
   },
-  "version": "0.8.17+commit.8df45f5f.Linux.g++"
+  "version": "0.8.25+commit.b61c2a91.Darwin.appleclang"
 }
diff --git a/precompile/metadata/abi/state-storage.json b/precompile/metadata/abi/state-storage.json
@@ -54,5 +54,5 @@
       }
     }
   },
-  "version": "0.8.17+commit.8df45f5f.Linux.g++"
+  "version": "0.8.25+commit.b61c2a91.Darwin.appleclang"
 }
diff --git a/precompile/metadata/sol/deposit.sol b/precompile/metadata/sol/deposit.sol
@@ -43,5 +43,5 @@ interface Deposit {
 	function claim_with_penalty(uint8 depositId) external returns (bool);
 
 	/// @dev Migrate data to deposit contract
-	function migrate() external returns (bool);
+	function migrate(address who) external returns (bool);
 }
diff --git a/runtime/crab/src/migration.rs b/runtime/crab/src/migration.rs
@@ -56,7 +56,7 @@ fn migrate() -> frame_support::weights::Weight {
 	}
 
 	if let Ok(dao) =
-		array_bytes::hex_n_into::<_, AccountId, 20>("0x7FAcDaFB282028E4B3264fB08cd633A9142514df")
+		array_bytes::hex_n_into::<_, AccountId, 20>("0x08837De0Ae21C270383D9F2de4DB03c7b1314632")
 	{
 		let _ = <pallet_assets::Pallet<Runtime>>::transfer_ownership(
 			RuntimeOrigin::signed(ROOT),
@@ -65,7 +65,7 @@ fn migrate() -> frame_support::weights::Weight {
 		);
 
 		if let Ok(deposit) = array_bytes::hex_n_into::<_, AccountId, 20>(
-			"0x08837De0Ae21C270383D9F2de4DB03c7b1314632",
+			"0xDeC9cD45e921F2AedE72f694743265af37d47Fa7",
 		) {
 			let _ = <pallet_assets::Pallet<Runtime>>::set_team(
 				RuntimeOrigin::signed(dao),
@@ -76,6 +76,16 @@ fn migrate() -> frame_support::weights::Weight {
 			);
 		}
 	}
+	if let Ok(who) =
+		array_bytes::hex_n_into::<_, AccountId, 20>("0xDeC9cD45e921F2AedE72f694743265af37d47Fa7")
+	{
+		<darwinia_deposit::DepositContract<Runtime>>::put(who);
+	}
+	if let Ok(who) =
+		array_bytes::hex_n_into::<_, AccountId, 20>("0xb037E75fE2BFA42DdDC17BB90963Dafe10A5Dd11")
+	{
+		<darwinia_staking::RingStakingContract<Runtime>>::put(who);
+	}
 
 	// frame_support::weights::Weight::zero()
 	<Runtime as frame_system::Config>::DbWeight::get().reads_writes(7, 7)

diff --git a/runtime/darwinia/src/migration.rs b/runtime/darwinia/src/migration.rs
@@ -64,7 +64,7 @@ fn migrate() -> frame_support::weights::Weight {
 	}
 
 	if let Ok(dao) =
-		array_bytes::hex_n_into::<_, AccountId, 20>("0x7FAcDaFB282028E4B3264fB08cd633A9142514df")
+		array_bytes::hex_n_into::<_, AccountId, 20>("0x08837De0Ae21C270383D9F2de4DB03c7b1314632")
 	{
 		let _ = <pallet_assets::Pallet<Runtime>>::transfer_ownership(
 			RuntimeOrigin::signed(ROOT),
@@ -73,7 +73,7 @@ fn migrate() -> frame_support::weights::Weight {
 		);
 
 		if let Ok(deposit) = array_bytes::hex_n_into::<_, AccountId, 20>(
-			"0x08837De0Ae21C270383D9F2de4DB03c7b1314632",
+			"0xDeC9cD45e921F2AedE72f694743265af37d47Fa7",
 		) {
 			let _ = <pallet_assets::Pallet<Runtime>>::set_team(
 				RuntimeOrigin::signed(dao),
@@ -84,6 +84,16 @@ fn migrate() -> frame_support::weights::Weight {
 			);
 		}
 	}
+	if let Ok(who) =
+		array_bytes::hex_n_into::<_, AccountId, 20>("0xDeC9cD45e921F2AedE72f694743265af37d47Fa7")
+	{
+		<darwinia_deposit::DepositContract<Runtime>>::put(who);
+	}
+	if let Ok(who) =
+		array_bytes::hex_n_into::<_, AccountId, 20>("0xb037E75fE2BFA42DdDC17BB90963Dafe10A5Dd11")
+	{
+		<darwinia_staking::RingStakingContract<Runtime>>::put(who);
+	}
 
 	// frame_support::weights::Weight::zero()
 	<Runtime as frame_system::Config>::DbWeight::get().reads_writes(7, 107)

diff --git a/runtime/koi/src/migration.rs b/runtime/koi/src/migration.rs
@@ -45,28 +45,5 @@ impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
 }
 
 fn migrate() -> frame_support::weights::Weight {
-	if let Ok(dao) =
-		array_bytes::hex_n_into::<_, AccountId, 20>("0x7FAcDaFB282028E4B3264fB08cd633A9142514df")
-	{
-		let _ = <pallet_assets::Pallet<Runtime>>::transfer_ownership(
-			RuntimeOrigin::signed(ROOT),
-			codec::Compact(AssetIds::KKton as AssetId),
-			dao,
-		);
-
-		if let Ok(deposit) = array_bytes::hex_n_into::<_, AccountId, 20>(
-			"0x08837De0Ae21C270383D9F2de4DB03c7b1314632",
-		) {
-			let _ = <pallet_assets::Pallet<Runtime>>::set_team(
-				RuntimeOrigin::signed(dao),
-				codec::Compact(AssetIds::KKton as AssetId),
-				deposit,
-				deposit,
-				dao,
-			);
-		}
-	}
-
-	// frame_support::weights::Weight::zero()
-	<Runtime as frame_system::Config>::DbWeight::get().reads_writes(5, 5)
+	frame_support::weights::Weight::zero()
 }