chore: minor copy updates (#662)

* chore: minor copy updates

* chore: update ultra api key copy

* chore: remove anchor dep

* chore: add exactout supported amm to schema

* chore: add better description for wrapAndUnwrapSol

* chore: update portal plans image

Author: 0xYankee-Raccoons

docs/1-environment-setup.md

@@ -18,11 +18,8 @@ In the documentation, we are using the Solana `web3.js` library to set up connec
 **JavaScript Libraries**
 
 - `@solana/web3.js`
-- `@coral-xyz/anchor`
 - `@solana/spl-token`
 - `@jup-ag/referral-sdk`
-- `bs58`
-- `cross-fetch`
 
 ## Useful Scripts
 
@@ -48,11 +45,10 @@ To set up a development wallet via `.env` file, you can use the following script
 ```jsx
 // index.js
 import { Keypair } from '@solana/web3.js';
-import { Wallet } from '@coral-xyz/anchor';
 import dotenv from 'dotenv';
 require('dotenv').config();
 
-const wallet = new Wallet(Keypair.fromSecretKey(bs58.decode(process.env.PRIVATE_KEY || '')));
+const wallet = Keypair.fromSecretKey(bs58.decode(process.env.PRIVATE_KEY || '')));
 ```
 
 ```
@@ -64,9 +60,8 @@ To set up a development wallet via a wallet generated via [Solana CLI](https://s
 
 ```jsx
 import { Keypair } from '@solana/web3.js';
-import { Wallet } from '@coral-xyz/anchor';
 import fs from 'fs';
 
-const privateKeyArray = JSON.parse(fs.readFileSync('../.config/solana/id.json', 'utf8').trim());
-const wallet = new Wallet(Keypair.fromSecretKey(new Uint8Array(privateKeyArray)));
+const privateKeyArray = JSON.parse(fs.readFileSync('/Path/to/.config/solana/id.json', 'utf8').trim());
+const wallet = Keypair.fromSecretKey(new Uint8Array(privateKeyArray));
 ```

docs/100-swap-api/2-build-swap-transaction.md

@@ -68,7 +68,7 @@ await fetch('https://lite-api.jup.ag/swap/v1/swap', {
     },
     body: JSON.stringify({
     quoteResponse,
-    userPublicKey: wallet.publicKey.toString(),
+    userPublicKey: wallet.publicKey,
 
     // ADDITIONAL PARAMETERS TO OPTIMIZE FOR TRANSACTION LANDING
     // See next guide to optimize for transaction landing
@@ -152,7 +152,7 @@ const instructions = await (
     },
     body: JSON.stringify({
         quoteResponse,
-        userPublicKey: wallet.publicKey.toString(),
+        userPublicKey: wallet.publicKey,
     })
     })
 ).json();

docs/100-swap-api/3-send-swap-transaction.md

@@ -48,7 +48,7 @@ const transactionBase64 = swapResponse.swapTransaction
 const transaction = VersionedTransaction.deserialize(Buffer.from(transactionBase64, 'base64'));
 console.log(transaction);
 
-transaction.sign([wallet.payer]);
+transaction.sign([wallet]);
 
 const transactionBinary = transaction.serialize();
 console.log(transactionBinary);
@@ -141,7 +141,7 @@ const swapResponse = await (
       },
       body: JSON.stringify({
           quoteResponse,
-          userPublicKey: wallet.publicKey.toBase58(),
+          userPublicKey: wallet.publicKey,
           prioritizationFeeLamports: {
               priorityLevelWithMaxLamports: {
                   maxLamports: 10000000,
@@ -171,7 +171,7 @@ const swapTransaction = await (
     },
     body: JSON.stringify({
       quoteResponse,
-      userPublicKey: wallet.publicKey.toBase58(),
+      userPublicKey: wallet.publicKey,
       dynamicComputeUnitLimit: true
     })
   })
@@ -209,7 +209,7 @@ const swapTransaction = await (
     },
     body: JSON.stringify({
       quoteResponse,
-      userPublicKey: wallet.publicKey.toBase58(),
+      userPublicKey: wallet.publicKey,
       dynamicSlippage: true,
     })
   })
@@ -261,7 +261,7 @@ const swapTransaction = await (
     },
     body: JSON.stringify({
       quoteResponse,
-      userPublicKey: wallet.publicKey.toBase58(),
+      userPublicKey: wallet.publicKey,
       prioritizationFeeLamports: {
         jitoTipLamports: 1000000 // note that this is FIXED LAMPORTS not a max cap
       }

docs/100-swap-api/4-add-fees-to-swap.md

@@ -150,8 +150,6 @@ const swapResponse = await (
         })
     })
 ).json();
-
-console.log(swapResponse);
 ```
 
 </details>
@@ -172,8 +170,6 @@ const quoteResponse = await (
         'https://lite-api.jup.ag/swap/v1/quote?inputMint=So11111111111111111111111111111111111111112&outputMint=EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v&amount=100000&slippageBps=50&restrictIntermediateTokens=true&platformFeeBps=20'
     )
   ).json();
-  
-console.log(JSON.stringify(quoteResponse, null, 2));
 ```
 
 ### 3. Set your feeAccount in Swap
@@ -189,7 +185,7 @@ const swapResponse = await (
         },
         body: JSON.stringify({
             quoteResponse,
-            userPublicKey: wallet.publicKey.toBase58(), // Pass in actual referred user in production
+            userPublicKey: wallet.publicKey, // Pass in actual referred user in production
             feeAccount: feeAccount,
         })
     })

docs/100-swap-api/5-payments-through-swap.md

@@ -13,7 +13,7 @@ The Jupiter Swap API can be utilized such that you, a merchant can allow your cu
 
 ## Use Case
 
-Let’s set the stage. You are selling a **jupcake!!!** to your customer and merchant might only accept in 1 USDC, but Alice only has 1 SOL for various reasons. Well, you’re at the right place! By using the Swap API, merchant can let customer pay in SOL while merchant still receive USDC in order to complete the payment for a jupcake.
+Let’s set the stage. You are selling a **jupcake!!!** to your customer and merchant might only accept in 1 USDC, but your customer only has 1 SOL. Well, you’re at the right place! By using the Swap API, merchant can let customer pay in SOL while merchant still receive USDC in order to complete the payment for a jupcake.
 
 - Customer has 1,000,000 SOL.
 - Merchant sells 1 jupcake for 1 USDC.
@@ -33,31 +33,30 @@ npm i @solana/spl-token
 ```jsx
 import { PublicKey, Connection, Keypair, VersionedTransaction } from '@solana/web3.js';
 import { getAssociatedTokenAddress, TOKEN_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID } from '@solana/spl-token';
-import { Wallet } from '@coral-xyz/anchor';
-import fetch from 'cross-fetch';
 ```
 
-Before we start getting a quote and swap transaction, for example sake, we will need to prepare your and Alice's accounts. In production scenario, you will need to dynamically pass this in and allow users to sign in their device interfaces.
+Before we start getting a quote and swap transaction, for example sake, we will need to prepare both merchant and customer accounts. In production scenario, you will need to dynamically pass this in and allow users to sign in their device interfaces.
 
+:::note
 Do note that you will need to have already set up:
-- A wallet in your machine to simulate yourself as the customer as the customer is the signer of the transaction (similar to how we set up in [Environment Setup](/docs/environment-setup)).
+- **A wallet in your machine to simulate yourself as the customer as the customer is the signer of the transaction** (similar to how we set up in [Environment Setup](/docs/environment-setup)).
 - `trackingAccount` is an additional Solana Account you can pass in to track only Jupiter transactions easily.
+:::
 
 #### Set Up Accounts
 
 ```jsx
-const customerAccount = new Wallet(...);
-
-console.log("customerAccount:", customerAccount.publicKey.toBase58());
+const privateKeyArray = JSON.parse(fs.readFileSync('/Path/to/.config/solana/id.json', 'utf8').trim());
+const customerWallet = Keypair.fromSecretKey(new Uint8Array(privateKeyArray));
 
 const USDC_MINT = new PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'); // Your preferred token payment
-
+const customerAccount = customerWallet.publicKey;
 const merchantAccount = new PublicKey('ReplaceWithMerchantPubkey');
-// const trackingAccount = new PublicKey('ReplaceWithPubkey');
+// const trackingAccount = new PublicKey('ReplaceWithPubkey'); // If required
 
-console.log("USDC_MINT:", USDC_MINT.toBase58());
-console.log("merchantAccount:", merchantAccount.toBase58());
-// console.log("trackingAccount:", trackingAccount.toBase58());
+console.log("USDC_MINT:", USDC_MINT.publicKey);
+console.log("merchantAccount:", merchantAccount.publicKey);
+// console.log("trackingAccount:", trackingAccount.publicKey);
 ```
 
 #### Set Up `destinationTokenAccount`
@@ -74,7 +73,7 @@ const merchantUSDCTokenAccount = await getAssociatedTokenAddress(
 	  ASSOCIATED_TOKEN_PROGRAM_ID
 );
 
-console.log("merchantUSDCTokenAccount:", merchantUSDCTokenAccount.toBase58());
+console.log("merchantUSDCTokenAccount:", merchantUSDCTokenAccount.publicKey);
 ```
 
 ### 2. Set `swapMode` to `ExactOut` in Quote
@@ -128,14 +127,12 @@ const swapResponse = await (
         },
         body: JSON.stringify({
             quoteResponse,
-            userPublicKey: customerAccount.publicKey.toBase58(),
-            destinationTokenAccount: merchantUSDCTokenAccount.toBase58(),
-            // trackingAccount: trackingAccount.toBase58(),
+            userPublicKey: customerAccount.publicKey,
+            destinationTokenAccount: merchantUSDCTokenAccount.publicKey,
+            // trackingAccount: trackingAccount.publicKey,
         })
     })
 ).json();
-
-console.log(swapResponse);
 ```
 
 ### 4. Prepare Transaction
@@ -145,11 +142,8 @@ We have walked through the steps here and explained some of the code, you can re
 ```jsx
 const transactionBase64 = swapResponse.swapTransaction
 const transaction = VersionedTransaction.deserialize(Buffer.from(transactionBase64, 'base64'));
-
 transaction.feePayer = customerAccount.publicKey;
-
-transaction.sign([customerAccount.payer]);
-
+transaction.sign([customerWallet]);
 const transactionBinary = transaction.serialize();
 ```
 

docs/101-ultra-api/1-get-order.md

@@ -12,7 +12,9 @@ title: "Get Order"
 :::note
 Base URL: `https://lite-api.jup.ag/ultra/v1/order`
 
-For higher rate limits, [refer to the API Key Setup doc](/docs/api-setup).
+For higher rate limits, please reach out to us in [Discord](https://discord.gg/jup).
+
+Portal API keys currently do not apply for Ultra API.
 :::
 
 :::tip API Reference

docs/101-ultra-api/2-execute-order.md

@@ -12,7 +12,9 @@ title: "Execute Order"
 :::note
 Base URL: `https://lite-api.jup.ag/ultra/v1/execute`
 
-For higher rate limits, [refer to the API Key Setup doc](/docs/api-setup).
+For higher rate limits, please reach out to us in [Discord](https://discord.gg/jup).
+
+Portal API keys currently do not apply for Ultra API.
 :::
 
 :::tip API Reference
@@ -33,7 +35,7 @@ const transactionBase64 = orderResponse.transaction
 const transaction = VersionedTransaction.deserialize(Buffer.from(transactionBase64, 'base64'));
 
 // Sign the transaction
-transaction.sign([wallet.payer]);
+transaction.sign([wallet]);
 
 // Serialize the transaction to base64 format
 const signedTransaction = Buffer.from(transaction.serialize()).toString('base64');

docs/101-ultra-api/3-get-balances.md

@@ -12,7 +12,9 @@ title: "Get Balances"
 :::note
 Base URL: `https://lite-api.jup.ag/ultra/v1/balances`
 
-For higher rate limits, [refer to the API Key Setup doc](/docs/api-setup).
+For higher rate limits, please reach out to us in [Discord](https://discord.gg/jup).
+
+Portal API keys currently do not apply for Ultra API.
 :::
 
 :::tip API Reference

docs/101-ultra-api/4-get-shield.md

@@ -12,7 +12,9 @@ title: "Get Shield"
 :::note
 Base URL: `https://lite-api.jup.ag/ultra/v1/shield`
 
-For higher rate limits, [refer to the API Key Setup doc](/docs/api-setup).
+For higher rate limits, please reach out to us in [Discord](https://discord.gg/jup).
+
+Portal API keys currently do not apply for Ultra API.
 :::
 
 :::tip API Reference

docs/101-ultra-api/README.md

@@ -19,6 +19,7 @@ The Jupiter Ultra API is the *only* API you ever need to experience or build the
 | **Blazing fast** | 95% of all swaps are executed under 2 seconds via our proprietary transaction sending engine. |
 | **MEV-protected** | The lowest incidence of MEV attacks across all existing applications, by far. |
 | **Real-Time Slippage Estimator** | Intelligently derives the best possible slippage to use at the time of execution, balancing between trade success and price protection. |
+| **Gasless Support** | Enables gasless transactions for users with certain tokens and trade sizes, you can identify this via the secondary signer in the transaction. |
 | **One-stop shop** | Retrieve the user's balances, get a quote, execute the trade, and get the results of the trade, all within Ultra API without touching a single RPC or any other external API. |
 | **World class support** | We handle the complexities of RPC connections, transaction landing, slippage protection and more. |
 

docs/102-trigger-api/2-execute-order.md

@@ -33,7 +33,7 @@ const transactionBase64 = orderResponse.tx
 const transaction = VersionedTransaction.deserialize(Buffer.from(transactionBase64, 'base64'));
 
 // Sign the transaction
-transaction.sign([wallet.payer]);
+transaction.sign([wallet]);
 
 // Serialize the transaction to base64 format
 const signedTransaction = Buffer.from(transaction.serialize()).toString('base64');
@@ -90,7 +90,7 @@ If you want to handle the transaction, you can sign and send the transaction to
 const transactionBase64 = createOrderResponse.transaction
 const transaction = VersionedTransaction.deserialize(Buffer.from(transactionBase64, 'base64'));
 
-transaction.sign([wallet.payer]);
+transaction.sign([wallet]);
 
 const transactionBinary = transaction.serialize();
 

docs/103-recurring-api/1-create-order.md

@@ -54,7 +54,7 @@ const createOrderResponse = await (
             'Content-Type': 'application/json',
         },
         body: JSON.stringify({
-            user: wallet.publicKey.toBase58(),
+            user: wallet.publicKey,
             inputMint: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
             outputMint: "So11111111111111111111111111111111111111112",
             params: {
@@ -94,7 +94,7 @@ const createOrderResponse = await (
             'Content-Type': 'application/json',
         },
         body: JSON.stringify({
-            user: wallet.publicKey.toBase58(),
+            user: wallet.publicKey,
             inputMint: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
             outputMint: "So11111111111111111111111111111111111111112",
             params: {

docs/103-recurring-api/2-execute-order.md

@@ -33,7 +33,7 @@ const transactionBase64 = createOrderResponse.transaction
 const transaction = VersionedTransaction.deserialize(Buffer.from(transactionBase64, 'base64'));
 
 // Sign the transaction
-transaction.sign([wallet.payer]);
+transaction.sign([wallet]);
 
 // Serialize the transaction to base64 format
 const signedTransaction = Buffer.from(transaction.serialize()).toString('base64');
@@ -98,7 +98,7 @@ If you want to handle the transaction, you can sign and send the transaction to
 const transactionBase64 = createOrderResponse.transaction
 const transaction = VersionedTransaction.deserialize(Buffer.from(transactionBase64, 'base64'));
 
-transaction.sign([wallet.payer]);
+transaction.sign([wallet]);
 
 const transactionBinary = transaction.serialize();
 

docs/103-recurring-api/3-cancel-order.md

@@ -42,7 +42,7 @@ const cancelOrderResponse = await (
         },
         body: JSON.stringify({
             order: "4DWzP4TdTsuwvYMaMWrRqzya4UTFKFoVjfUWNWh8zhzd",
-            user: wallet.publicKey.toBase58(),
+            user: wallet.publicKey,
             recurringType: "time",
         }),
     })

docs/103-recurring-api/4-deposit-price-order.md

@@ -42,7 +42,7 @@ const priceDepositResponse = await (
         },
         body: JSON.stringify({
             order: "EpTsCUnKComCd8FDNZn3kVrQBQo2uEn5rRzYk9ocqFPH",
-            user: wallet.publicKey.toBase58(),
+            user: wallet.publicKey,
             amount: 1000000
         }),
     })

docs/103-recurring-api/5-withdraw-price-order.md

@@ -46,7 +46,7 @@ const priceWithdrawResponse = await (
         },
         body: JSON.stringify({
             order: "EpTsCUnKComCd8FDNZn3kVrQBQo2uEn5rRzYk9ocqFPH",
-            user: wallet.publicKey.toBase58(),
+            user: wallet.publicKey,
             inputOrOutput: "In", // either "In" or "Out" mint, note that price-based orders auto withdraws the output tokens to the user's wallet every time the order is executed
             amount: 1000000
         }),

docs/600-routing/dex-integration.md

@@ -25,16 +25,7 @@ As Solana grows and more DEXes are built, we have to be more cautious in the DEX
 - **Traction**: We look at the traction of the DEX to ensure it has market demand and is well-used.
 - **Team and backers**: This is a good indicator of the quality of the DEX if they are backed by or built by reputable or verifiable entities.
 
-## Integration Guidelines
-
-### Markets API
-- This API should track all markets/pools that is listed or delisted, this will allow us to automatically track new markets as you add them to your DEX.
-
-### Rust SDK
-- [Your SDK should implement the following interface](#).
-- We are soon migrating to a Rust SDK and so are asking all integrated DEXes to create a Rust SDK version or give access to the code for us to include.
-
-## AMM Interface
+### AMM Interface
 
 To facilitate integration of your DEX into the Jupiter Core Engine:
 - Provide a DEX SDK that works with the [Jupiter AMM Interface](https://docs.rs/crate/jupiter-amm-interface).