Merge pull request #9778 from vegaprotocol/9773

fix: Ensure new account types are created for existing assets

CHANGELOG.md

@@ -465,6 +465,7 @@
 - [8703](https://github.com/vegaprotocol/vega/issues/8703) - Wire stop orders cancellation
 - [8698](https://github.com/vegaprotocol/vega/issues/8698) - Always set the `ToAccount` field when clearing fees.
 - [9773](https://github.com/vegaprotocol/vega/issues/9773) - Ensure invalid market for transfer doesn't panic
+- [9777](https://github.com/vegaprotocol/vega/issues/9777) - Ensure new account types are created for existing assets
 
 ## 0.71.0
 

core/collateral/checkpoint.go

@@ -155,8 +155,6 @@ func (e *Engine) Load(ctx context.Context, data []byte) error {
 		ledgerMovements = append(ledgerMovements, lm)
 	}
 
-	e.getOrCreateNetTreasuryAndGlobalInsForAssets(ctx, assets)
-
 	if len(ledgerMovements) > 0 {
 		e.broker.Send(events.NewLedgerMovements(ctx, ledgerMovements))
 	}

core/collateral/snapshot.go

@@ -109,26 +109,12 @@ func (e *Engine) restoreAccounts(ctx context.Context, accs *types.CollateralAcco
 	e.broker.SendBatch(pevts)
 	var err error
 	e.state.serialisedAccounts, err = proto.Marshal(p.IntoProto())
-	e.getOrCreateNetTreasuryAndGlobalInsForAssets(ctx, assets)
 	e.updateNextBalanceSnapshot(accs.NextBalanceSnapshot)
 	e.snapshotBalances()
 	e.activeRestore = true
 	return err
 }
 
-func (e *Engine) getOrCreateNetTreasuryAndGlobalInsForAssets(ctx context.Context, assets map[string]struct{}) {
-	// bit of migration - ensure that the network treasury and global insurance account are created for all assets
-	assetStr := make([]string, 0, len(assets))
-	for k := range assets {
-		assetStr = append(assetStr, k)
-	}
-	sort.Strings(assetStr)
-	for _, asset := range assetStr {
-		e.GetOrCreateNetworkTreasuryAccount(ctx, asset)
-		e.GetOrCreateGlobalInsuranceAccount(ctx, asset)
-	}
-}
-
 func (e *Engine) restoreAssets(assets *types.CollateralAssets, p *types.Payload) error {
 	// @TODO the ID and name might not be the same, perhaps we need
 	// to wrap the asset details to preserve that data