undo changes to audio claim flow

Author: schottra

api/v1_claim_rewards.go

@@ -217,6 +217,7 @@ func fetchAttestations(
 	hasAntiAbuseOracleAttestation bool,
 	minVotes int,
 ) ([]SenderAttestation, error) {
+
 	// Shuffle the validators
 	shuffled := slices.Clone(allValidators)
 	rand.Shuffle(len(shuffled), func(i, j int) {
@@ -354,7 +355,6 @@ func sendRewardClaimTransactions(
 	transactionSender *spl.TransactionSender,
 	rewardClaim RewardClaim,
 	attestations []SenderAttestation,
-	sourceTokenAccount *solana.PublicKey,
 ) ([]solana.Signature, error) {
 	// Transaction to send attestations in a separate transaction
 	partialTx := solana.NewTransactionBuilder()
@@ -445,17 +445,14 @@ func sendRewardClaimTransactions(
 	if err != nil {
 		return nil, err
 	}
-	if sourceTokenAccount == nil {
-		sourceTokenAccount = &state.TokenAccount
-	}
 	evaluateAttestationInstruction, err := reward_manager.NewEvaluateAttestationInstruction(
 		rewardClaim.RewardID,
 		rewardClaim.Specifier,
 		common.HexToAddress(rewardClaim.RecipientEthAddress),
-		rewardClaim.Amount*rewardClaim.TokenDecimals, // Convert to token wei
+		rewardClaim.Amount*1e8, // Convert to wAUDIO wei
 		common.HexToAddress(rewardClaim.ClaimAuthority),
 		rewardManagerClient.GetProgramStateAccount(),
-		*sourceTokenAccount,
+		state.TokenAccount,
 		rewardClaim.UserBank,
 		feePayer.PublicKey(),
 	)
@@ -555,7 +552,6 @@ func claimReward(
 		transactionSender,
 		rewardClaim,
 		attestations,
-		nil, // No ATA needed for AUDIO rewards
 	)
 	if err != nil {
 		return nil, err
@@ -617,9 +613,8 @@ func getReward(rewardId string, rewardsList []rewards.Reward) (rewards.Reward, e
 
 type RewardClaim struct {
 	rewards.RewardClaim
-	Handle        string
-	UserBank      solana.PublicKey
-	TokenDecimals uint64
+	Handle   string
+	UserBank solana.PublicKey
 }
 
 type ClaimResult struct {
@@ -716,9 +711,8 @@ func (app *ApiServer) v1ClaimRewards(c *fiber.Ctx) error {
 					RecipientEthAddress: row.Wallet.String,
 					ClaimAuthority:      antiAbuseOracle.DelegateOwnerWallet,
 				},
-				Handle:        row.Handle.String,
-				UserBank:      *bankAccount,
-				TokenDecimals: 8, // wAUDIO wei
+				Handle:   row.Handle.String,
+				UserBank: *bankAccount,
 			}
 
 			validators := app.validators.GetNodes()

api/v1_coins_post_redeem.go

@@ -115,7 +115,6 @@ func (app *ApiServer) v1CoinsPostRedeem(c *fiber.Ctx) error {
 	if err != nil {
 		return fmt.Errorf("failed to get init pubkey for reward manager state address: %w", err)
 	}
-	tokenSourcePubkey, err := solana.PublicKeyFromBase58(tokenSourceAddress)
 	if err != nil {
 		return fmt.Errorf("failed to init pubkey for token source address: %w", err)
 	}
@@ -241,10 +240,9 @@ func (app *ApiServer) v1CoinsPostRedeem(c *fiber.Ctx) error {
 	}
 
 	decoratedRewardClaim := RewardClaim{
-		RewardClaim:   rewardClaim,
-		Handle:        userHandle,
-		UserBank:      *bankAccount,
-		TokenDecimals: uint64(coinDecimals),
+		RewardClaim: rewardClaim,
+		Handle:      userHandle,
+		UserBank:    *bankAccount,
 	}
 
 	claimMessage, err := rewardClaim.Compile()
@@ -305,7 +303,6 @@ func (app *ApiServer) v1CoinsPostRedeem(c *fiber.Ctx) error {
 		app.transactionSender,
 		decoratedRewardClaim,
 		attestations,
-		&tokenSourcePubkey,
 	)
 
 	if err != nil {