sync glam program changes.

programs/src/main/java/software/sava/anchor/programs/glam/GlamMarinadeClientImpl.java

@@ -1,5 +1,10 @@
 package software.sava.anchor.programs.glam;
 
+import software.sava.anchor.programs.glam.anchor.GlamProgram;
+import software.sava.anchor.programs.marinade.MarinadeAccounts;
+import software.sava.anchor.programs.marinade.MarinadeProgramClient;
+import software.sava.anchor.programs.marinade.anchor.types.State;
+import software.sava.anchor.programs.marinade.anchor.types.TicketAccountData;
 import software.sava.core.accounts.ProgramDerivedAddress;
 import software.sava.core.accounts.PublicKey;
 import software.sava.core.accounts.SolanaAccounts;
@@ -8,11 +13,6 @@
 import software.sava.core.tx.Instruction;
 import software.sava.rpc.json.http.client.SolanaRpcClient;
 import software.sava.rpc.json.http.response.AccountInfo;
-import software.sava.anchor.programs.glam.anchor.GlamProgram;
-import software.sava.anchor.programs.marinade.MarinadeAccounts;
-import software.sava.anchor.programs.marinade.MarinadeProgramClient;
-import software.sava.anchor.programs.marinade.anchor.types.State;
-import software.sava.anchor.programs.marinade.anchor.types.TicketAccountData;
 
 import java.util.Collection;
 import java.util.List;
@@ -60,7 +60,7 @@ public FundPDA createMarinadeTicket() {
 
   @Override
   public Instruction marinadeDeposit(final PublicKey mSolTokenAccount, final long lamports) {
-    return GlamProgram.marinadeDeposit(
+    return GlamProgram.marinadeDepositSol(
         invokedProgram,
         feePayer,
         glamFundAccounts.fundPublicKey(),
@@ -121,8 +121,8 @@ public Instruction orderUnstake(final PublicKey mSolTokenAccount,
         solanaAccounts.tokenProgram(),
         marinadeAccounts.marinadeProgram(),
         lamports,
-        ticketPDA.nonce(),
-        ticketAccount.accountId()
+        ticketAccount.accountId(),
+        ticketPDA.nonce()
     );
   }
 
@@ -132,7 +132,7 @@ public CompletableFuture<List<AccountInfo<TicketAccountData>>> fetchTicketAccoun
   }
 
   private Instruction marinadeClaim() {
-    return GlamProgram.marinadeClaim(
+    return GlamProgram.marinadeClaimTickets(
         glamFundAccounts.glamAccounts().invokedProgram(),
         feePayer,
         glamFundAccounts.fundPublicKey(),

programs/src/main/java/software/sava/anchor/programs/glam/GlamNativeClientImpl.java

@@ -1,5 +1,6 @@
 package software.sava.anchor.programs.glam;
 
+import software.sava.anchor.programs.glam.anchor.GlamProgram;
 import software.sava.core.accounts.ProgramDerivedAddress;
 import software.sava.core.accounts.PublicKey;
 import software.sava.core.accounts.SolanaAccounts;
@@ -11,7 +12,6 @@
 import software.sava.rpc.json.http.response.AccountInfo;
 import software.sava.solana.programs.clients.NativeProgramClient;
 import software.sava.solana.programs.token.AssociatedTokenProgram;
-import software.sava.anchor.programs.glam.anchor.GlamProgram;
 
 import java.util.Collection;
 import java.util.List;
@@ -141,7 +141,7 @@ public FundPDA createStakeAccountPDA() {
   public Instruction initializeAndDelegateStake(final FundPDA stakeAccountPDA,
                                                 final PublicKey validatorVoteAccount,
                                                 final long lamports) {
-    return GlamProgram.nativeStakeDeposit(
+    return GlamProgram.initializeAndDelegateStake(
         invokedProgram,
         feePayer,
         glamFundAccounts.fundPublicKey(),

programs/src/main/java/software/sava/anchor/programs/glam/GlamStakePoolProgramClientImpl.java

@@ -36,7 +36,7 @@ public Instruction depositSol(final AccountInfo<StakePoolState> stakePoolStateAc
                                 final long lamportsIn) {
     final var stakePoolState = stakePoolStateAccountInfo.data();
     final var stakePoolWithdrawAuthority = findStakePoolWithdrawAuthority(stakePoolStateAccountInfo);
-    return GlamProgram.stakePoolDeposit(
+    return GlamProgram.stakePoolDepositSol(
         invokedProgram,
         feePayer,
         glamFundAccounts.fundPublicKey(),

programs/src/main/java/software/sava/anchor/programs/glam/anchor/types/Action.java

@@ -0,0 +1,13 @@
+package software.sava.anchor.programs.glam.anchor.types;
+
+import software.sava.core.borsh.Borsh;
+
+public enum Action implements Borsh.Enum {
+
+  Subscribe,
+  Redeem;
+
+  public static Action read(final byte[] _data, final int offset) {
+    return Borsh.read(Action.values(), _data, offset);
+  }
+}

programs/src/main/java/software/sava/anchor/programs/glam/anchor/types/InvestorError.java

@@ -8,8 +8,11 @@ public enum InvestorError implements Borsh.Enum {
   InvalidShareClass,
   InvalidAssetSubscribe,
   InvalidPricingOracle,
-  InvalidAssetsRedeem,
-  InvalidTreasuryAccount;
+  InvalidRemainingAccounts,
+  InvalidTreasuryAccount,
+  InvalidSignerAccount,
+  InvalidAssetPrice,
+  InvalidStableCoinPriceForSubscribe;
 
   public static InvestorError read(final byte[] _data, final int offset) {
     return Borsh.read(InvestorError.values(), _data, offset);

programs/src/main/java/software/sava/anchor/programs/glam/anchor/types/PriceDenom.java

@@ -0,0 +1,15 @@
+package software.sava.anchor.programs.glam.anchor.types;
+
+import software.sava.core.borsh.Borsh;
+
+public enum PriceDenom implements Borsh.Enum {
+
+  Asset,
+  SOL,
+  USD,
+  EUR;
+
+  public static PriceDenom read(final byte[] _data, final int offset) {
+    return Borsh.read(PriceDenom.values(), _data, offset);
+  }
+}

programs/src/main/java/software/sava/anchor/programs/marinade/MarinadeValidatorList.java

@@ -1,8 +1,8 @@
 package software.sava.anchor.programs.marinade;
 
+import software.sava.anchor.programs.marinade.anchor.types.ValidatorRecord;
 import software.sava.core.accounts.PublicKey;
 import software.sava.core.accounts.lookup.AccountIndexLookupTableEntry;
-import software.sava.anchor.programs.marinade.anchor.types.ValidatorRecord;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -41,7 +41,7 @@ public ValidatorRecord validatorRecord(final PublicKey validator) {
     }
     final var reverseLookupTable = new AccountIndexLookupTableEntry[validators.size()];
     int i = 0;
-    for (final ValidatorRecord validatorRecord : validators) {
+    for (final var validatorRecord : validators) {
       reverseLookupTable[i] = new AccountIndexLookupTableEntry(validatorRecord.validatorAccount().toByteArray(), i);
       ++i;
     }