Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

migrate: Core-1 vesting accounts to the Charter #741

Closed
wants to merge 35 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
4946d28
Major WIP - still just messing about
Reecepbcups Jun 28, 2023
279246a
Clean up migration vesting massively, actually works now
Reecepbcups Jun 28, 2023
c7047f1
Cleanup force undelegate & redelegate logic
Reecepbcups Jun 28, 2023
677deef
Merge branch 'main' into reece/remove-wolf-vesting
Reecepbcups Jun 28, 2023
d8e94c6
Only migrate Core1 on juno-1 chainId
Reecepbcups Jun 28, 2023
d401f7f
Fix upgrade test for vesting with ictest
Reecepbcups Jun 29, 2023
03f2aab
Fix upgrade test (due to changed GFee params)
Reecepbcups Jun 28, 2023
5c4fef5
TF: if feeCoin != "", then add the fees
Reecepbcups Jun 28, 2023
1820573
WIP for PeriodicVestingAccount
Reecepbcups Jul 1, 2023
c3e33b8
Wip2
Reecepbcups Jul 1, 2023
1d8a40e
Much cleaner vesting functions for Core-1 transfer
Reecepbcups Jul 1, 2023
be42155
lintorrr
Reecepbcups Jul 1, 2023
88cb307
Only move non vested funds to Core-1. Validation checks
Reecepbcups Jul 3, 2023
ff36245
Comments
Reecepbcups Jul 3, 2023
cd2b106
Merge branch 'main' into reece/remove-wolf-vesting
Reecepbcups Jul 3, 2023
62d2dc6
Use Wolfs actual account
Reecepbcups Jul 3, 2023
f81e91f
Migrate Core-1 rough draft
Reecepbcups Jul 3, 2023
3392ee1
lint
Reecepbcups Jul 3, 2023
6ca1e8e
VestingContract{}, better logs, no more mint logic, insta complete ve…
Reecepbcups Jul 3, 2023
8f1c444
lint
Reecepbcups Jul 3, 2023
bb40aa1
Remove stale func, new newVestingContract func
Reecepbcups Jul 3, 2023
30596ad
stale comments
Reecepbcups Jul 3, 2023
fa09054
Merge branch 'main' into reece/migrate-core1-vesting
Reecepbcups Jul 10, 2023
d9978db
Merge branch 'main' into reece/migrate-core1-vesting
Reecepbcups Jul 19, 2023
6c05f90
Merge branch 'main' into reece/migrate-core1-vesting
Reecepbcups Aug 8, 2023
87558ef
Merge branch 'main' of https://github.com/CosmosContracts/juno into r…
joelsmith-2019 Dec 24, 2023
24f679d
Move Upgrade Logic to v19
joelsmith-2019 Dec 24, 2023
57ffcaa
Update Vesting Transfer Logic,
joelsmith-2019 Jan 23, 2024
5a79ce8
Unbond All Except Jack,
joelsmith-2019 Jan 25, 2024
f029efe
Implement Test Cases
joelsmith-2019 Jan 29, 2024
87c5ad1
Add v20 Upgrade Handler
joelsmith-2019 Jan 29, 2024
bd4df59
Remove Multisig (Handled in v19)
joelsmith-2019 Jan 29, 2024
c04a213
Merge branch 'main' of https://github.com/CosmosContracts/juno into r…
joelsmith-2019 Jan 29, 2024
c28a225
Merge branch 'main' into reece/migrate-core1-vesting
joelsmith-2019 Feb 2, 2024
1e1a2b2
Send Funds After Disabling Vesting,
joelsmith-2019 Feb 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into reece/migrate-core1-vesting
Reecepbcups authored Jul 19, 2023
commit d9978db1e3f76d18d521412b5095783d7aff260f
15 changes: 15 additions & 0 deletions app/upgrades/v16/upgrades.go
Original file line number Diff line number Diff line change
@@ -169,6 +169,21 @@ func CreateV16UpgradeHandler(
if err := migrateCore1VestingAccounts(ctx, keepers, nativeDenom); err != nil {
return nil, err
}
}

// x/POB
pobAddr := keepers.AccountKeeper.GetModuleAddress(buildertypes.ModuleName)

builderParams := buildertypes.DefaultGenesisState().GetParams()
builderParams.EscrowAccountAddress = pobAddr
builderParams.MaxBundleSize = 4
builderParams.FrontRunningProtection = false
builderParams.MinBidIncrement.Denom = nativeDenom
builderParams.MinBidIncrement.Amount = math.NewInt(1000000)
builderParams.ReserveFee.Denom = nativeDenom
builderParams.ReserveFee.Amount = math.NewInt(1000000)
if err := keepers.BuildKeeper.SetParams(ctx, builderParams); err != nil {
return nil, err
}

return versionMap, err
You are viewing a condensed version of this merge commit. You can view the full changes here.