Improve deposits migration #1636
Conversation
AurevoirXavier
added
C-Pallet
Signed-off-by: Xavier Lau <[email protected]>
AurevoirXavier
force-pushed
the
x/fix
branch
from
f410124
to
7a91c09
Compare
| @@ -86,5 +87,11 @@ fn migrate() -> frame_support::weights::Weight { | |||
| ]), | |||
| ); | |||
|
|
|||
| <Runtime as frame_system::Config>::DbWeight::get().reads_writes(r, w + 5) | |||
| let _ = Balances::transfer_all( | |||
| RuntimeOrigin::signed(PalletId(*b"dar/depo").into_account_truncating()), | |||
There was a problem hiding this comment.
The is still some CRAB left in deposit pallet account on Crab chain.
https://crab-scan.darwinia.network/address/0x6d6F646C6461722F6465706F0000000000000000
We also need to do the transfer migration for CRAB to clean it.
There was a problem hiding this comment.
I haven't noticed anything from a few days back. This might be due to the account migration.
|
@AurevoirXavier CI failed |
Signed-off-by: Xavier Lau <[email protected]>
pallet/deposit/src/lib.rs
Outdated
| @@ -216,14 +213,13 @@ pub mod pallet { | |||
| } | |||
|
|
|||
| if to_claim.0 != 0 { | |||
| T::Ring::transfer(&account_id(), who, to_claim.0, AllowDeath)?; | |||
| T::Ring::transfer(&T::Treasury::get(), who, to_claim.0, AllowDeath)?; | |||
There was a problem hiding this comment.
Also emit failure event here if error.
runtime/crab/src/migration.rs
Outdated
| @@ -52,6 +52,11 @@ fn migrate() -> frame_support::weights::Weight { | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
Please remove previous migration which have been done in last upgrade.
Signed-off-by: Xavier Lau <[email protected]>
Signed-off-by: Xavier Lau <[email protected]>
| { | ||
| Self::deposit_event(Event::MigrationFailedOnRefund); | ||
|
|
||
| Err(e)?; |
There was a problem hiding this comment.
Do not throw errors, otherwise there are still side effects l.
| Self::deposit_event(Event::DepositsClaimed { | ||
| owner: who.clone(), | ||
| deposits: to_claim.1, | ||
| }); | ||
| } | ||
| if to_migrate.0 != 0 { | ||
| T::Ring::transfer(&account_id(), &T::Treasury::get(), to_migrate.0, AllowDeath)?; | ||
| T::DepositMigrator::migrate(who.clone(), to_migrate.0, to_migrate.2)?; |
There was a problem hiding this comment.
Should not throw errors here right?
Closes #1635.