@exodus/solana-lib 3.10.0 → 3.11.0

package/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.11.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.10.1...@exodus/solana-lib@3.11.0) (2025-04-11)
+
+
+### Features
+
+
+* feat(solana): generalize verify-only-fee-payer-changed (#5434)
+
+
+
+## [3.10.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.10.0...@exodus/solana-lib@3.10.1) (2025-04-04)
+
+
+### Bug Fixes
+
+
+* fix(solana): fee payer validation (#5387)
+
+
+
 ## [3.10.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.9.5...@exodus/solana-lib@3.10.0) (2025-04-03)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "3.10.0",
+  "version": "3.11.0",
   "description": "Solana utils, such as for cryptography, address encoding/decoding, transaction building, etc.",
   "type": "module",
   "main": "src/index.js",
@@ -46,5 +46,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "59c4d4a4a7404eb915e4fa722a2afe01d1556046"
+  "gitHead": "0322939ba85d4dec4f754c6131b1a68b15aea919"
 }

package/src/tx/verify-only-fee-payer-changed.js

@@ -1,6 +1,10 @@
 import lodash from 'lodash'
 import assert from 'minimalistic-assert'
 
+import { TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID } from '../constants.js'
+import { ASSOCIATED_TOKEN_PROGRAM_ID } from '../helpers/spl-token.js'
+import { SYSVAR_RENT_PUBKEY } from '../vendor/index.js'
+
 export function verifyOnlyFeePayerChanged(beforeTx, afterTx) {
   assert(
     beforeTx.signatures.length + 1 === afterTx.signatures.length &&
@@ -18,9 +22,17 @@ export function verifyOnlyFeePayerChanged(beforeTx, afterTx) {
     beforeTx.message.accountKeys.length + 1 === afterTx.message.accountKeys.length,
     'Fee payer account key was not added'
   )
+  assert(
+    beforeTx.message.accountKeys.every(
+      (beforeAccountKey) => !lodash.isEqual(beforeAccountKey, afterTx.message.accountKeys[0])
+    ),
+    'Fee payer account key was not added'
+  )
   beforeTx.message.accountKeys.forEach((accountKey, index) => {
     assert(
-      lodash.isEqual(accountKey, afterTx.message.accountKeys[index + 1]),
+      afterTx.message.accountKeys.some((afterAccountKey) =>
+        lodash.isEqual(accountKey, afterAccountKey)
+      ),
       'Existing account keys do not match'
     )
   })
@@ -32,19 +44,43 @@ export function verifyOnlyFeePayerChanged(beforeTx, afterTx) {
 
   beforeTx.message.instructions.forEach(({ programIdIndex }, index) => {
     assert(
-      programIdIndex + 1 === afterTx.message.instructions[index]?.programIdIndex,
+      lodash.isEqual(
+        beforeTx.message.accountKeys[beforeTx.message.instructions[index].programIdIndex],
+        afterTx.message.accountKeys[afterTx.message.instructions[index]?.programIdIndex]
+      ),
       'Instructions program ids were not updated'
     )
   })
 
   beforeTx.message.instructions.forEach(({ accounts }, index) => {
-    assert(
-      lodash.isEqual(
-        accounts.map((id) => id + 1),
-        afterTx.message.instructions[index].accounts
-      ),
-      'Instructions account key indexes were not updated'
+    const programId =
+      beforeTx.message.accountKeys[beforeTx.message.instructions[index].programIdIndex].toString()
+    const isATAProgram =
+      programId === TOKEN_PROGRAM_ID.toString() ||
+      programId === TOKEN_2022_PROGRAM_ID.toString() ||
+      programId === ASSOCIATED_TOKEN_PROGRAM_ID.toString()
+    const accountsPublicKeys = accounts.map((id) => beforeTx.message.accountKeys[id])
+    const containsRentSysvar = accountsPublicKeys.some(
+      (publicKey) => publicKey.toString() === SYSVAR_RENT_PUBKEY.toString()
+    )
+
+    const afterAccountsPublicKeys = afterTx.message.instructions[index].accounts.map(
+      (id) => afterTx.message.accountKeys[id]
     )
+
+    if (containsRentSysvar && isATAProgram) {
+      const adjustedAccountsPublicKeys = [...accountsPublicKeys]
+      adjustedAccountsPublicKeys[0] = afterTx.message.accountKeys[0] // replace with the new fee payer
+      assert(
+        lodash.isEqual(adjustedAccountsPublicKeys, afterAccountsPublicKeys),
+        'Instructions account key indexes were not updated'
+      )
+    } else {
+      assert(
+        lodash.isEqual(accountsPublicKeys, afterAccountsPublicKeys),
+        'Instructions account key indexes were not updated'
+      )
+    }
   })
 
   beforeTx.message.instructions.forEach((instruction, index) => {
@@ -61,6 +97,10 @@ export function verifyOnlyFeePayerChanged(beforeTx, afterTx) {
     )
   })
 
+  afterTx.message.indexToProgramIds.forEach((value, key) => {
+    assert(afterTx.message.accountKeys[key] === value, 'IndexToProgramIds do not match accountKeys')
+  })
+
   assert(
     lodash.isEqual(
       {
@@ -85,12 +125,14 @@ export function verifyOnlyFeePayerChanged(beforeTx, afterTx) {
         header: { ...beforeTx.message.header, numRequiredSignatures: null },
         accountKeys: null,
         instructions: null,
+        indexToProgramIds: null,
       },
       {
         ...afterTx.message,
         header: { ...afterTx.message.header, numRequiredSignatures: null },
         accountKeys: null,
         instructions: null,
+        indexToProgramIds: null,
       }
     ),
     'Transactions do not match in some attributes'