@@ -296,7 +296,7 @@ func (h *OpenAccountsIntentHandler) validateActions(
296296 }
297297 }
298298
299- expectedVaultAccount , err := getExpectedTimelockVaultFromProtoAccounts (ctx , h .data , openAction .GetOpenAccount ().Authority , openAction .GetFeePayment ().Mint )
299+ expectedVaultAccount , err := getExpectedTimelockVaultFromProtoAccounts (ctx , h .data , openAction .GetOpenAccount ().Authority , openAction .GetOpenAccount ().Mint )
300300 if err != nil {
301301 return err
302302 }
@@ -1515,7 +1515,7 @@ func validateMoneyMovementActionUserAccounts(
15151515 case * transactionpb.Action_NoPrivacyTransfer :
15161516 // No privacy transfers are always come from a deposit account
15171517
1518- mint , err = common .NewAccountFromProto (typedAction .NoPrivacyTransfer .Mint )
1518+ mint , err = common .GetBackwardsCompatMint (typedAction .NoPrivacyTransfer .Mint )
15191519 if err != nil {
15201520 return err
15211521 }
@@ -1539,7 +1539,7 @@ func validateMoneyMovementActionUserAccounts(
15391539 // 1. As an auto-return action back to the payer's primary account in a public payment intent for remote send
15401540 // 2. As a receiver of funds to the primary account in a public receive
15411541
1542- mint , err = common .NewAccountFromProto (typedAction .NoPrivacyWithdraw .Mint )
1542+ mint , err = common .GetBackwardsCompatMint (typedAction .NoPrivacyWithdraw .Mint )
15431543 if err != nil {
15441544 return err
15451545 }
@@ -1569,7 +1569,7 @@ func validateMoneyMovementActionUserAccounts(
15691569 case * transactionpb.Action_FeePayment :
15701570 // Fee payments always come from the primary account
15711571
1572- mint , err = common .NewAccountFromProto (typedAction .FeePayment .Mint )
1572+ mint , err = common .GetBackwardsCompatMint (typedAction .FeePayment .Mint )
15731573 if err != nil {
15741574 return err
15751575 }
@@ -1913,7 +1913,7 @@ func validateDistributedPool(ctx context.Context, data code_data.Provider, poolV
19131913}
19141914
19151915func validateTimelockUnlockStateDoesntExist (ctx context.Context , data code_data.Provider , openAction * transactionpb.OpenAccountAction ) error {
1916- mintAccount , err := common .NewAccountFromProto (openAction .Mint )
1916+ mintAccount , err := common .GetBackwardsCompatMint (openAction .Mint )
19171917 if err != nil {
19181918 return err
19191919 }
@@ -1972,7 +1972,7 @@ func validateIntentAndActionMintsMatch(intentMint *common.Account, actions []*tr
19721972}
19731973
19741974func getExpectedTimelockVaultFromProtoAccounts (ctx context.Context , data code_data.Provider , authorityProto , mintProto * commonpb.SolanaAccountId ) (* common.Account , error ) {
1975- mintAccount , err := common .NewAccountFromProto (mintProto )
1975+ mintAccount , err := common .GetBackwardsCompatMint (mintProto )
19761976 if err != nil {
19771977 return nil , err
19781978 }
0 commit comments