Fixup client bindings and otherwise

Author: joncinque

token-swap/js/src/index.ts

@@ -66,7 +66,7 @@ export const TokenSwapLayout = BufferLayout.struct([
   BufferLayout.u8('version'),
   BufferLayout.u8('isInitialized'),
   BufferLayout.u8('bumpSeed'),
-  Layout.publicKey('tokenProgramId'),
+  Layout.publicKey('poolTokenProgramId'),
   Layout.publicKey('tokenAccountA'),
   Layout.publicKey('tokenAccountB'),
   Layout.publicKey('tokenPool'),
@@ -101,7 +101,7 @@ export class TokenSwap {
    * @param connection The connection to use
    * @param tokenSwap The token swap account
    * @param swapProgramId The program ID of the token-swap program
-   * @param tokenProgramId The program ID of the token program
+   * @param poolTokenProgramId The program ID of the token program for the pool tokens
    * @param poolToken The pool token
    * @param authority The authority over the swap and accounts
    * @param tokenAccountA The token swap's Token A account
@@ -123,7 +123,7 @@ export class TokenSwap {
     private connection: Connection,
     public tokenSwap: PublicKey,
     public swapProgramId: PublicKey,
-    public tokenProgramId: PublicKey,
+    public poolTokenProgramId: PublicKey,
     public poolToken: PublicKey,
     public feeAccount: PublicKey,
     public authority: PublicKey,
@@ -145,7 +145,7 @@ export class TokenSwap {
     this.connection = connection;
     this.tokenSwap = tokenSwap;
     this.swapProgramId = swapProgramId;
-    this.tokenProgramId = tokenProgramId;
+    this.poolTokenProgramId = poolTokenProgramId;
     this.poolToken = poolToken;
     this.feeAccount = feeAccount;
     this.authority = authority;
@@ -186,7 +186,7 @@ export class TokenSwap {
     tokenPool: PublicKey,
     feeAccount: PublicKey,
     tokenAccountPool: PublicKey,
-    tokenProgramId: PublicKey,
+    poolTokenProgramId: PublicKey,
     swapProgramId: PublicKey,
     tradeFeeNumerator: number,
     tradeFeeDenominator: number,
@@ -207,7 +207,7 @@ export class TokenSwap {
       {pubkey: tokenPool, isSigner: false, isWritable: true},
       {pubkey: feeAccount, isSigner: false, isWritable: false},
       {pubkey: tokenAccountPool, isSigner: false, isWritable: true},
-      {pubkey: tokenProgramId, isSigner: false, isWritable: false},
+      {pubkey: poolTokenProgramId, isSigner: false, isWritable: false},
     ];
     const commandDataLayout = BufferLayout.struct([
       BufferLayout.u8('instruction'),
@@ -279,7 +279,7 @@ export class TokenSwap {
     const tokenAccountB = new PublicKey(tokenSwapData.tokenAccountB);
     const mintA = new PublicKey(tokenSwapData.mintA);
     const mintB = new PublicKey(tokenSwapData.mintB);
-    const tokenProgramId = new PublicKey(tokenSwapData.tokenProgramId);
+    const poolTokenProgramId = new PublicKey(tokenSwapData.poolTokenProgramId);
 
     const tradeFeeNumerator = Numberu64.fromBuffer(
       tokenSwapData.tradeFeeNumerator,
@@ -311,7 +311,7 @@ export class TokenSwap {
       connection,
       address,
       programId,
-      tokenProgramId,
+      poolTokenProgramId,
       poolToken,
       feeAccount,
       authority,
@@ -343,7 +343,7 @@ export class TokenSwap {
    * @param tokenAccountB: The token swap's Token B account
    * @param poolToken The pool token
    * @param tokenAccountPool The token swap's pool token account
-   * @param tokenProgramId The program ID of the token program
+   * @param poolTokenProgramId The program ID of the token program for pool tokens
    * @param swapProgramId The program ID of the token-swap program
    * @param feeNumerator Numerator of the fee ratio
    * @param feeDenominator Denominator of the fee ratio
@@ -362,7 +362,7 @@ export class TokenSwap {
     feeAccount: PublicKey,
     tokenAccountPool: PublicKey,
     swapProgramId: PublicKey,
-    tokenProgramId: PublicKey,
+    poolTokenProgramId: PublicKey,
     tradeFeeNumerator: number,
     tradeFeeDenominator: number,
     ownerTradeFeeNumerator: number,
@@ -380,7 +380,7 @@ export class TokenSwap {
       connection,
       tokenSwapAccount.publicKey,
       swapProgramId,
-      tokenProgramId,
+      poolTokenProgramId,
       poolToken,
       feeAccount,
       authority,
@@ -423,7 +423,7 @@ export class TokenSwap {
       poolToken,
       feeAccount,
       tokenAccountPool,
-      tokenProgramId,
+      poolTokenProgramId,
       swapProgramId,
       tradeFeeNumerator,
       tradeFeeDenominator,
@@ -455,6 +455,8 @@ export class TokenSwap {
    * @param poolSource Pool's source token account
    * @param poolDestination Pool's destination token account
    * @param userDestination User's destination token account
+   * @param sourceTokenProgramId Program id for the source token
+   * @param destinationTokenProgramId Program id for the destination token
    * @param hostFeeAccount Host account to gather fees
    * @param userTransferAuthority Account delegated to transfer user's tokens
    * @param amountIn Amount to transfer from source account
@@ -465,6 +467,8 @@ export class TokenSwap {
     poolSource: PublicKey,
     poolDestination: PublicKey,
     userDestination: PublicKey,
+    sourceTokenProgramId: PublicKey,
+    destinationTokenProgramId: PublicKey,
     hostFeeAccount: PublicKey | null,
     userTransferAuthority: Account,
     amountIn: number | Numberu64,
@@ -486,7 +490,9 @@ export class TokenSwap {
           this.feeAccount,
           hostFeeAccount,
           this.swapProgramId,
-          this.tokenProgramId,
+          sourceTokenProgramId,
+          destinationTokenProgramId,
+          this.poolTokenProgramId,
           amountIn,
           minimumAmountOut,
         ),
@@ -508,7 +514,9 @@ export class TokenSwap {
     feeAccount: PublicKey,
     hostFeeAccount: PublicKey | null,
     swapProgramId: PublicKey,
-    tokenProgramId: PublicKey,
+    sourceTokenProgramId: PublicKey,
+    destinationTokenProgramId: PublicKey,
+    poolTokenProgramId: PublicKey,
     amountIn: number | Numberu64,
     minimumAmountOut: number | Numberu64,
   ): TransactionInstruction {
@@ -538,7 +546,9 @@ export class TokenSwap {
       {pubkey: userDestination, isSigner: false, isWritable: true},
       {pubkey: poolMint, isSigner: false, isWritable: true},
       {pubkey: feeAccount, isSigner: false, isWritable: true},
-      {pubkey: tokenProgramId, isSigner: false, isWritable: false},
+      {pubkey: sourceTokenProgramId, isSigner: false, isWritable: false},
+      {pubkey: destinationTokenProgramId, isSigner: false, isWritable: false},
+      {pubkey: poolTokenProgramId, isSigner: false, isWritable: false},
     ];
     if (hostFeeAccount !== null) {
       keys.push({pubkey: hostFeeAccount, isSigner: false, isWritable: true});
@@ -555,6 +565,8 @@ export class TokenSwap {
    * @param userAccountA User account for token A
    * @param userAccountB User account for token B
    * @param poolAccount User account for pool token
+   * @param tokenProgramIdA Program id for token A
+   * @param tokenProgramIdB Program id for token B
    * @param userTransferAuthority Account delegated to transfer user's tokens
    * @param poolTokenAmount Amount of pool tokens to mint
    * @param maximumTokenA The maximum amount of token A to deposit
@@ -564,6 +576,8 @@ export class TokenSwap {
     userAccountA: PublicKey,
     userAccountB: PublicKey,
     poolAccount: PublicKey,
+    tokenProgramIdA: PublicKey,
+    tokenProgramIdB: PublicKey,
     userTransferAuthority: Account,
     poolTokenAmount: number | Numberu64,
     maximumTokenA: number | Numberu64,
@@ -584,7 +598,9 @@ export class TokenSwap {
           this.poolToken,
           poolAccount,
           this.swapProgramId,
-          this.tokenProgramId,
+          tokenProgramIdA,
+          tokenProgramIdB,
+          this.poolTokenProgramId,
           poolTokenAmount,
           maximumTokenA,
           maximumTokenB,
@@ -606,7 +622,9 @@ export class TokenSwap {
     poolToken: PublicKey,
     poolAccount: PublicKey,
     swapProgramId: PublicKey,
-    tokenProgramId: PublicKey,
+    tokenProgramIdA: PublicKey,
+    tokenProgramIdB: PublicKey,
+    poolTokenProgramId: PublicKey,
     poolTokenAmount: number | Numberu64,
     maximumTokenA: number | Numberu64,
     maximumTokenB: number | Numberu64,
@@ -639,7 +657,9 @@ export class TokenSwap {
       {pubkey: intoB, isSigner: false, isWritable: true},
       {pubkey: poolToken, isSigner: false, isWritable: true},
       {pubkey: poolAccount, isSigner: false, isWritable: true},
-      {pubkey: tokenProgramId, isSigner: false, isWritable: false},
+      {pubkey: tokenProgramIdA, isSigner: false, isWritable: false},
+      {pubkey: tokenProgramIdB, isSigner: false, isWritable: false},
+      {pubkey: poolTokenProgramId, isSigner: false, isWritable: false},
     ];
     return new TransactionInstruction({
       keys,
@@ -654,6 +674,8 @@ export class TokenSwap {
    * @param userAccountA User account for token A
    * @param userAccountB User account for token B
    * @param poolAccount User account for pool token
+   * @param tokenProgramIdA Program id for token A
+   * @param tokenProgramIdB Program id for token B
    * @param userTransferAuthority Account delegated to transfer user's tokens
    * @param poolTokenAmount Amount of pool tokens to burn
    * @param minimumTokenA The minimum amount of token A to withdraw
@@ -663,6 +685,8 @@ export class TokenSwap {
     userAccountA: PublicKey,
     userAccountB: PublicKey,
     poolAccount: PublicKey,
+    tokenProgramIdA: PublicKey,
+    tokenProgramIdB: PublicKey,
     userTransferAuthority: Account,
     poolTokenAmount: number | Numberu64,
     minimumTokenA: number | Numberu64,
@@ -684,7 +708,9 @@ export class TokenSwap {
           userAccountA,
           userAccountB,
           this.swapProgramId,
-          this.tokenProgramId,
+          this.poolTokenProgramId,
+          tokenProgramIdA,
+          tokenProgramIdB,
           poolTokenAmount,
           minimumTokenA,
           minimumTokenB,
@@ -707,7 +733,9 @@ export class TokenSwap {
     userAccountA: PublicKey,
     userAccountB: PublicKey,
     swapProgramId: PublicKey,
-    tokenProgramId: PublicKey,
+    poolTokenProgramId: PublicKey,
+    tokenProgramIdA: PublicKey,
+    tokenProgramIdB: PublicKey,
     poolTokenAmount: number | Numberu64,
     minimumTokenA: number | Numberu64,
     minimumTokenB: number | Numberu64,
@@ -741,7 +769,9 @@ export class TokenSwap {
       {pubkey: userAccountA, isSigner: false, isWritable: true},
       {pubkey: userAccountB, isSigner: false, isWritable: true},
       {pubkey: feeAccount, isSigner: false, isWritable: true},
-      {pubkey: tokenProgramId, isSigner: false, isWritable: false},
+      {pubkey: poolTokenProgramId, isSigner: false, isWritable: false},
+      {pubkey: tokenProgramIdA, isSigner: false, isWritable: false},
+      {pubkey: tokenProgramIdB, isSigner: false, isWritable: false},
     ];
     return new TransactionInstruction({
       keys,
@@ -754,13 +784,15 @@ export class TokenSwap {
    * Deposit one side of tokens into the pool
    * @param userAccount User account to deposit token A or B
    * @param poolAccount User account to receive pool tokens
+   * @param sourceTokenProgramId Program id for the source token
    * @param userTransferAuthority Account delegated to transfer user's tokens
    * @param sourceTokenAmount The amount of token A or B to deposit
    * @param minimumPoolTokenAmount Minimum amount of pool tokens to mint
    */
   async depositSingleTokenTypeExactAmountIn(
     userAccount: PublicKey,
     poolAccount: PublicKey,
+    sourceTokenProgramId: PublicKey,
     userTransferAuthority: Account,
     sourceTokenAmount: number | Numberu64,
     minimumPoolTokenAmount: number | Numberu64,
@@ -779,7 +811,8 @@ export class TokenSwap {
           this.poolToken,
           poolAccount,
           this.swapProgramId,
-          this.tokenProgramId,
+          sourceTokenProgramId,
+          this.poolTokenProgramId,
           sourceTokenAmount,
           minimumPoolTokenAmount,
         ),
@@ -799,7 +832,8 @@ export class TokenSwap {
     poolToken: PublicKey,
     poolAccount: PublicKey,
     swapProgramId: PublicKey,
-    tokenProgramId: PublicKey,
+    sourceTokenProgramId: PublicKey,
+    poolTokenProgramId: PublicKey,
     sourceTokenAmount: number | Numberu64,
     minimumPoolTokenAmount: number | Numberu64,
   ): TransactionInstruction {
@@ -830,7 +864,8 @@ export class TokenSwap {
       {pubkey: intoB, isSigner: false, isWritable: true},
       {pubkey: poolToken, isSigner: false, isWritable: true},
       {pubkey: poolAccount, isSigner: false, isWritable: true},
-      {pubkey: tokenProgramId, isSigner: false, isWritable: false},
+      {pubkey: sourceTokenProgramId, isSigner: false, isWritable: false},
+      {pubkey: poolTokenProgramId, isSigner: false, isWritable: false},
     ];
     return new TransactionInstruction({
       keys,
@@ -844,13 +879,15 @@ export class TokenSwap {
    *
    * @param userAccount User account to receive token A or B
    * @param poolAccount User account to burn pool token
+   * @param destinationTokenProgramId Program id for the destination token
    * @param userTransferAuthority Account delegated to transfer user's tokens
    * @param destinationTokenAmount The amount of token A or B to withdraw
    * @param maximumPoolTokenAmount Maximum amount of pool tokens to burn
    */
   async withdrawSingleTokenTypeExactAmountOut(
     userAccount: PublicKey,
     poolAccount: PublicKey,
+    destinationTokenProgramId: PublicKey,
     userTransferAuthority: Account,
     destinationTokenAmount: number | Numberu64,
     maximumPoolTokenAmount: number | Numberu64,
@@ -870,7 +907,8 @@ export class TokenSwap {
           this.tokenAccountB,
           userAccount,
           this.swapProgramId,
-          this.tokenProgramId,
+          this.poolTokenProgramId,
+          destinationTokenProgramId,
           destinationTokenAmount,
           maximumPoolTokenAmount,
         ),
@@ -891,7 +929,8 @@ export class TokenSwap {
     fromB: PublicKey,
     userAccount: PublicKey,
     swapProgramId: PublicKey,
-    tokenProgramId: PublicKey,
+    poolTokenProgramId: PublicKey,
+    destinationTokenProgramId: PublicKey,
     destinationTokenAmount: number | Numberu64,
     maximumPoolTokenAmount: number | Numberu64,
   ): TransactionInstruction {
@@ -925,7 +964,8 @@ export class TokenSwap {
       {pubkey: fromB, isSigner: false, isWritable: true},
       {pubkey: userAccount, isSigner: false, isWritable: true},
       {pubkey: feeAccount, isSigner: false, isWritable: true},
-      {pubkey: tokenProgramId, isSigner: false, isWritable: false},
+      {pubkey: poolTokenProgramId, isSigner: false, isWritable: false},
+      {pubkey: destinationTokenProgramId, isSigner: false, isWritable: false},
     ];
     return new TransactionInstruction({
       keys,