update client to allow transfer to off curve addresses

xchainjs · Feb 18, 2025 · b6a6e29 · b6a6e29
1 parent 5458003
commit b6a6e29
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/.changeset/chilly-beans-roll.md b/.changeset/chilly-beans-roll.md
@@ -0,0 +1,5 @@
+---
+'@xchainjs/xchain-solana': patch
+---
+
+Allows tranfers to off-curve-addresses
diff --git a/packages/xchain-solana/__e2e__/client.ts b/packages/xchain-solana/__e2e__/client.ts
@@ -60,6 +60,11 @@ describe('Solana client', () => {
     console.log(address)
   })
 
+  it('Should validate address', async () => {
+    const res = await client.validateAddress('GHityuQumkHn8JPpHYt9oxR5xi9X8R2kWsprdH9nPvT7')
+    console.log(res)
+  })
+
   it('Should get all address balances', async () => {
     const balances = await client.getBalance('94bPUbh8iazbg2UgUDrmMkgWoZz9Q1H813JZifZRB35v')
 

diff --git a/packages/xchain-solana/jest.config.e2e.js b/packages/xchain-solana/jest.config.e2e.js
@@ -0,0 +1,7 @@
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  testPathIgnorePatterns: ['<rootDir>/node_modules', '<rootDir>/lib'],
+  testMatch: ['<rootDir>/__e2e__/**/*.[jt]s?(x)'],
+  setupFilesAfterEnv: ['./jest.setup.js'],
+}
diff --git a/packages/xchain-solana/src/client.ts b/packages/xchain-solana/src/client.ts
@@ -496,7 +496,7 @@ export class Client extends BaseXChainClient {
         } else {
           // Token transfer
           const mintAddress = new PublicKey(getContractAddressFromAsset(params.asset as TokenAsset))
-          const associatedTokenAddress = getAssociatedTokenAddressSync(mintAddress, toPubkey)
+          const associatedTokenAddress = getAssociatedTokenAddressSync(mintAddress, toPubkey, true) // allow off curve owners
 
           try {
             await getAccount(provider.solanaProvider, associatedTokenAddress, undefined, TOKEN_PROGRAM_ID)
@@ -647,11 +647,13 @@ export class Client extends BaseXChainClient {
         if (asset && !eqAsset(asset, this.getAssetInfo().asset)) {
           // Check if receipt token account is created, otherwise, create it
           const mintAddress = new PublicKey(getContractAddressFromAsset(asset as TokenAsset))
+
           await getOrCreateAssociatedTokenAccount(
             provider.solanaProvider,
             senderKeyPair,
             mintAddress,
             new PublicKey(recipient),
+            true,
           )
         }
 
@@ -720,7 +722,6 @@ export class Client extends BaseXChainClient {
     try {
       for (const provider of this.providers) {
         const transaction = new Transaction()
-
         const fromPubkey = new PublicKey(sender)
         const toPubkey = new PublicKey(recipient)
 
@@ -741,7 +742,6 @@ export class Client extends BaseXChainClient {
         } else {
           // Token transfer
           const mintAddress = new PublicKey(getContractAddressFromAsset(asset as TokenAsset))
-
           const fromAssociatedAccount = getAssociatedTokenAddressSync(mintAddress, fromPubkey)
           let fromTokenAccount: Account
           try {
@@ -753,7 +753,7 @@ export class Client extends BaseXChainClient {
             throw error
           }
 
-          const toAssociatedAccount = getAssociatedTokenAddressSync(mintAddress, toPubkey)
+          const toAssociatedAccount = getAssociatedTokenAddressSync(mintAddress, toPubkey, true)
           let toTokenAccount: Account
           try {
             toTokenAccount = await getAccount(provider.solanaProvider, toAssociatedAccount)