@solana/kora 0.2.0-beta.4 → 0.2.0

package/dist/test/plugin.test.js

@@ -1,5 +1,5 @@
 import { createEmptyClient } from '@solana/kit';
-import { koraPlugin } from '../src/plugin.js';
+import { koraPlugin } from '../src/kit/plugin.js';
 // Mock fetch globally
 const mockFetch = jest.fn();
 global.fetch = mockFetch;
@@ -12,8 +12,8 @@ describe('Kora Kit Plugin', () => {
     const mockSuccessfulResponse = (result) => {
         mockFetch.mockResolvedValueOnce({
             json: jest.fn().mockResolvedValueOnce({
-                id: 1,
                 jsonrpc: '2.0',
+                id: 1,
                 result,
             }),
         });
@@ -22,9 +22,9 @@ describe('Kora Kit Plugin', () => {
     const mockErrorResponse = (error) => {
         mockFetch.mockResolvedValueOnce({
             json: jest.fn().mockResolvedValueOnce({
-                error,
-                id: 1,
                 jsonrpc: '2.0',
+                id: 1,
+                error,
             }),
         });
     };
@@ -41,14 +41,11 @@ describe('Kora Kit Plugin', () => {
             expect(typeof enhanced.kora.getConfig).toBe('function');
             expect(typeof enhanced.kora.getPayerSigner).toBe('function');
             expect(typeof enhanced.kora.getBlockhash).toBe('function');
-            expect(typeof enhanced.kora.getVersion).toBe('function');
             expect(typeof enhanced.kora.getSupportedTokens).toBe('function');
             expect(typeof enhanced.kora.estimateTransactionFee).toBe('function');
-            expect(typeof enhanced.kora.estimateBundleFee).toBe('function');
             expect(typeof enhanced.kora.signTransaction).toBe('function');
             expect(typeof enhanced.kora.signAndSendTransaction).toBe('function');
-            expect(typeof enhanced.kora.signBundle).toBe('function');
-            expect(typeof enhanced.kora.signAndSendBundle).toBe('function');
+            expect(typeof enhanced.kora.transferTransaction).toBe('function');
             expect(typeof enhanced.kora.getPaymentInstruction).toBe('function');
         });
         it('should work with empty client object', () => {
@@ -58,8 +55,8 @@ describe('Kora Kit Plugin', () => {
         });
         it('should support authentication options', () => {
             const authConfig = {
-                apiKey: 'test-api-key',
                 endpoint: mockEndpoint,
+                apiKey: 'test-api-key',
                 hmacSecret: 'test-hmac-secret',
             };
             const plugin = koraPlugin(authConfig);
@@ -77,67 +74,67 @@ describe('Kora Kit Plugin', () => {
         describe('getConfig', () => {
             it('should return Kit-typed Address arrays', async () => {
                 const rawResponse = {
-                    enabled_methods: {
-                        estimate_transaction_fee: true,
-                        get_blockhash: true,
-                        get_config: true,
-                        get_supported_tokens: true,
-                        liveness: true,
-                        sign_and_send_transaction: true,
-                        sign_transaction: true,
-                        transfer_transaction: true,
-                    },
                     fee_payers: ['DemoKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7'],
                     validation_config: {
+                        max_allowed_lamports: 1000000,
+                        max_signatures: 10,
+                        price_source: 'Jupiter',
                         allowed_programs: ['11111111111111111111111111111111'],
-                        allowed_spl_paid_tokens: ['EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'],
                         allowed_tokens: ['EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'],
+                        allowed_spl_paid_tokens: ['EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'],
                         disallowed_accounts: [],
                         fee_payer_policy: {
-                            spl_token: {
-                                allow_approve: true,
-                                allow_burn: true,
-                                allow_close_account: true,
-                                allow_freeze_account: true,
-                                allow_mint_to: true,
-                                allow_revoke: true,
-                                allow_set_authority: true,
-                                allow_thaw_account: true,
-                                allow_transfer: true,
-                            },
                             system: {
-                                allow_allocate: true,
+                                allow_transfer: true,
                                 allow_assign: true,
                                 allow_create_account: true,
-                                allow_transfer: true,
+                                allow_allocate: true,
                                 nonce: {
+                                    allow_initialize: true,
                                     allow_advance: true,
                                     allow_authorize: true,
-                                    allow_initialize: true,
                                     allow_withdraw: true,
                                 },
                             },
-                            token_2022: {
-                                allow_approve: true,
+                            spl_token: {
+                                allow_transfer: true,
                                 allow_burn: true,
                                 allow_close_account: true,
-                                allow_freeze_account: true,
-                                allow_mint_to: true,
+                                allow_approve: true,
                                 allow_revoke: true,
                                 allow_set_authority: true,
+                                allow_mint_to: true,
+                                allow_freeze_account: true,
                                 allow_thaw_account: true,
+                            },
+                            token_2022: {
                                 allow_transfer: true,
+                                allow_burn: true,
+                                allow_close_account: true,
+                                allow_approve: true,
+                                allow_revoke: true,
+                                allow_set_authority: true,
+                                allow_mint_to: true,
+                                allow_freeze_account: true,
+                                allow_thaw_account: true,
                             },
                         },
-                        max_allowed_lamports: 1000000,
-                        max_signatures: 10,
-                        price: { margin: 0.1, type: 'margin' },
-                        price_source: 'Jupiter',
+                        price: { type: 'margin', margin: 0.1 },
                         token2022: {
-                            blocked_account_extensions: [],
                             blocked_mint_extensions: [],
+                            blocked_account_extensions: [],
                         },
                     },
+                    enabled_methods: {
+                        liveness: true,
+                        estimate_transaction_fee: true,
+                        get_supported_tokens: true,
+                        sign_transaction: true,
+                        sign_and_send_transaction: true,
+                        transfer_transaction: true,
+                        get_blockhash: true,
+                        get_config: true,
+                    },
                 };
                 mockSuccessfulResponse(rawResponse);
                 const result = await kora.getConfig();
@@ -153,8 +150,8 @@ describe('Kora Kit Plugin', () => {
         describe('getPayerSigner', () => {
             it('should return Kit-typed Address fields', async () => {
                 const rawResponse = {
-                    payment_address: 'PayKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7',
                     signer_address: 'DemoKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7',
+                    payment_address: 'PayKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7',
                 };
                 mockSuccessfulResponse(rawResponse);
                 const result = await kora.getPayerSigner();
@@ -177,16 +174,6 @@ describe('Kora Kit Plugin', () => {
                 expect(hash).toBe('4NxM2D4kQcipkzMWBWQME5YSVnj5kT8QKA7rvb3rKLvE');
             });
         });
-        describe('getVersion', () => {
-            it('should return version string', async () => {
-                const rawResponse = {
-                    version: '2.0.0',
-                };
-                mockSuccessfulResponse(rawResponse);
-                const result = await kora.getVersion();
-                expect(result.version).toBe('2.0.0');
-            });
-        });
         describe('getSupportedTokens', () => {
             it('should return Kit-typed Address array', async () => {
                 const rawResponse = {
@@ -210,13 +197,13 @@ describe('Kora Kit Plugin', () => {
                 const rawResponse = {
                     fee_in_lamports: 5000,
                     fee_in_token: 50,
-                    payment_address: 'PayKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7',
                     signer_pubkey: 'DemoKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7',
+                    payment_address: 'PayKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7',
                 };
                 mockSuccessfulResponse(rawResponse);
                 const result = await kora.estimateTransactionFee({
-                    fee_token: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
                     transaction: 'base64EncodedTransaction',
+                    fee_token: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
                 });
                 // Type assertions
                 const signerPubkey = result.signer_pubkey;
@@ -227,28 +214,6 @@ describe('Kora Kit Plugin', () => {
                 expect(paymentAddr).toBe('PayKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7');
             });
         });
-        describe('estimateBundleFee', () => {
-            it('should return Kit-typed Address fields for bundle', async () => {
-                const rawResponse = {
-                    fee_in_lamports: 15000,
-                    fee_in_token: 150,
-                    payment_address: 'PayKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7',
-                    signer_pubkey: 'DemoKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7',
-                };
-                mockSuccessfulResponse(rawResponse);
-                const result = await kora.estimateBundleFee({
-                    fee_token: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
-                    transactions: ['base64Tx1', 'base64Tx2', 'base64Tx3'],
-                });
-                // Type assertions
-                const signerPubkey = result.signer_pubkey;
-                const paymentAddr = result.payment_address;
-                expect(result.fee_in_lamports).toBe(15000);
-                expect(result.fee_in_token).toBe(150);
-                expect(signerPubkey).toBe('DemoKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7');
-                expect(paymentAddr).toBe('PayKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7');
-            });
-        });
         describe('signTransaction', () => {
             it('should return Kit-typed response with Base64EncodedWireTransaction', async () => {
                 const rawResponse = {
@@ -267,11 +232,9 @@ describe('Kora Kit Plugin', () => {
             });
         });
         describe('signAndSendTransaction', () => {
-            it('should return Kit-typed response with Signature and Base64EncodedWireTransaction', async () => {
-                // Use a valid base58 signature (88 characters, valid base58 alphabet)
-                const mockSignature = '5VERv8NMvzbJMEkV8xnrLkEaWRtSz9CosKDYjCJjBRnbJLgp8uirBgmQpjKhoR4tjF3ZpRzrFmBV6UjKdiSZkQUW';
+            it('should return Kit-typed response with Base64EncodedWireTransaction', async () => {
                 const rawResponse = {
-                    signature: mockSignature,
+                    signature: '5wBzExmp8yR5M6m4KjV8WT9T6B1NMQkaMbsFWqBoDPBMYWxDx6EuSGxNqKfXnBhDhAkEqMiGRjEwKnGhSN3pi3n',
                     signed_transaction: 'base64SignedTransaction',
                     signer_pubkey: 'DemoKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7',
                 };
@@ -280,52 +243,37 @@ describe('Kora Kit Plugin', () => {
                     transaction: 'base64EncodedTransaction',
                 });
                 // Type assertions - verify Kit types
-                const sig = result.signature;
                 const signedTx = result.signed_transaction;
                 const signerPubkey = result.signer_pubkey;
-                expect(sig).toBe(mockSignature);
                 expect(signedTx).toBe('base64SignedTransaction');
                 expect(signerPubkey).toBe('DemoKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7');
             });
         });
-        describe('signBundle', () => {
-            it('should return Kit-typed response with Base64EncodedWireTransaction array', async () => {
-                const rawResponse = {
-                    signed_transactions: ['base64SignedTx1', 'base64SignedTx2'],
-                    signer_pubkey: 'DemoKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7',
-                };
-                mockSuccessfulResponse(rawResponse);
-                const result = await kora.signBundle({
-                    transactions: ['base64Tx1', 'base64Tx2'],
-                });
-                // Type assertions - verify Kit types
-                const signedTxs = result.signed_transactions;
-                const signerPubkey = result.signer_pubkey;
-                expect(signedTxs).toHaveLength(2);
-                expect(signedTxs[0]).toBe('base64SignedTx1');
-                expect(signedTxs[1]).toBe('base64SignedTx2');
-                expect(signerPubkey).toBe('DemoKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7');
-            });
-        });
-        describe('signAndSendBundle', () => {
-            it('should return Kit-typed response with Base64EncodedWireTransaction array and bundle UUID', async () => {
+        describe('transferTransaction', () => {
+            it('should return Kit-typed response with Base64EncodedWireTransaction and Blockhash', async () => {
                 const rawResponse = {
-                    bundle_uuid: 'jito-bundle-uuid-12345',
-                    signed_transactions: ['base64SignedTx1', 'base64SignedTx2'],
+                    transaction: 'base64Transaction',
+                    message: 'base64Message',
+                    blockhash: '4NxM2D4kQcipkzMWBWQME5YSVnj5kT8QKA7rvb3rKLvE',
                     signer_pubkey: 'DemoKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7',
+                    instructions: [],
                 };
                 mockSuccessfulResponse(rawResponse);
-                const result = await kora.signAndSendBundle({
-                    transactions: ['base64Tx1', 'base64Tx2'],
+                const result = await kora.transferTransaction({
+                    amount: 1000000,
+                    token: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
+                    source: 'sourceWallet',
+                    destination: 'destWallet',
                 });
                 // Type assertions - verify Kit types
-                const signedTxs = result.signed_transactions;
+                const tx = result.transaction;
+                const hash = result.blockhash;
                 const signerPubkey = result.signer_pubkey;
-                expect(signedTxs).toHaveLength(2);
-                expect(signedTxs[0]).toBe('base64SignedTx1');
-                expect(signedTxs[1]).toBe('base64SignedTx2');
+                expect(tx).toBe('base64Transaction');
+                expect(result.message).toBe('base64Message');
+                expect(hash).toBe('4NxM2D4kQcipkzMWBWQME5YSVnj5kT8QKA7rvb3rKLvE');
                 expect(signerPubkey).toBe('DemoKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7');
-                expect(result.bundle_uuid).toBe('jito-bundle-uuid-12345');
+                expect(result.instructions).toEqual([]);
             });
         });
         describe('getPaymentInstruction', () => {
@@ -333,16 +281,16 @@ describe('Kora Kit Plugin', () => {
                 const mockFeeEstimate = {
                     fee_in_lamports: 5000,
                     fee_in_token: 50000,
-                    payment_address: 'PayKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7',
                     signer_pubkey: 'DemoKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7',
+                    payment_address: 'PayKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7',
                 };
                 const testTx = 'Aoq7ymA5OGP+gmDXiY5m3cYXlY2Rz/a/gFjOgt9ZuoCS7UzuiGGaEnW2OOtvHvMQHkkD7Z4LRF5B63ftu+1oZwIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgECB1urjQEjgFgzqYhJ8IXJeSg4cJP1j1g2CJstOQTDchOKUzqH3PxgGW3c4V3vZV05A5Y30/MggOBs0Kd00s1JEwg5TaEeaV4+KL2y7fXIAuf6cN0ZQitbhY+G9ExtBSChspOXPgNcy9pYpETe4bmB+fg4bfZx1tnicA/kIyyubczAmbcIKIuniNOOQYG2ggKCz8NjEsHVezrWMatndu1wk6J5miGP26J6Vwp31AljiAajAFuP0D9mWJwSeFuA7J5rPwbd9uHXZaGT2cvhRs7reawctIXtX1s3kTqM9YV+/wCpd/O36SW02zRtNtqk6GFeip2+yBQsVTeSbLL4rWJRkd4CBgQCBQQBCgxAQg8AAAAAAAYGBAIFAwEKDBAnAAAAAAAABg==';
                 mockSuccessfulResponse(mockFeeEstimate);
                 const result = await kora.getPaymentInstruction({
+                    transaction: testTx,
                     fee_token: '4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU',
                     source_wallet: '11111111111111111111111111111111',
                     token_program_id: 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA',
-                    transaction: testTx,
                 });
                 // Type assertions - verify Kit types
                 const originalTx = result.original_transaction;
@@ -373,12 +321,12 @@ describe('Kora Kit Plugin', () => {
             await expect(kora.getConfig()).rejects.toThrow('Network error');
         });
     });
-    describe('KoraApi Type Export', () => {
-        it('should export KoraApi type correctly', () => {
-            // This test verifies the KoraApi type is correctly exported
+    describe('KoraPlugin Type Export', () => {
+        it('should export KoraPlugin type correctly', () => {
+            // This test verifies the KoraPlugin type is correctly exported
             const plugin = koraPlugin(mockConfig);
             const client = plugin({});
-            // Type check - assign to KoraApi type
+            // Type check - assign to KoraPlugin type
             const api = client.kora;
             expect(api).toBeDefined();
         });
@@ -394,20 +342,17 @@ describe('Kora Kit Plugin', () => {
             expect(typeof client.kora.getConfig).toBe('function');
             expect(typeof client.kora.getPayerSigner).toBe('function');
             expect(typeof client.kora.getBlockhash).toBe('function');
-            expect(typeof client.kora.getVersion).toBe('function');
             expect(typeof client.kora.getSupportedTokens).toBe('function');
             expect(typeof client.kora.estimateTransactionFee).toBe('function');
-            expect(typeof client.kora.estimateBundleFee).toBe('function');
             expect(typeof client.kora.signTransaction).toBe('function');
             expect(typeof client.kora.signAndSendTransaction).toBe('function');
-            expect(typeof client.kora.signBundle).toBe('function');
-            expect(typeof client.kora.signAndSendBundle).toBe('function');
+            expect(typeof client.kora.transferTransaction).toBe('function');
             expect(typeof client.kora.getPaymentInstruction).toBe('function');
         });
         it('should work with authentication config', () => {
             const authConfig = {
-                apiKey: 'test-api-key',
                 endpoint: mockEndpoint,
+                apiKey: 'test-api-key',
                 hmacSecret: 'test-hmac-secret',
             };
             const client = createEmptyClient().use(koraPlugin(authConfig));
@@ -429,8 +374,8 @@ describe('Kora Kit Plugin', () => {
         });
         it('should call RPC methods correctly', async () => {
             const mockResponse = {
-                payment_address: 'PayKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7',
                 signer_address: 'DemoKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7',
+                payment_address: 'PayKMZWkk483QoFPLRPQ2XVKB7bWnuXwSjvDE1JsWk7',
             };
             mockSuccessfulResponse(mockResponse);
             const client = createEmptyClient().use(koraPlugin(mockConfig));

package/dist/test/setup.d.ts

@@ -1,26 +1,30 @@
-import { Address, Commitment, KeyPairSigner } from '@solana/kit';
+import { Commitment, KeyPairSigner, Address } from '@solana/kit';
 import { KoraClient } from '../src/index.js';
 interface TestSuite {
-    destinationAddress: Address<string>;
-    koraAddress: Address<string>;
     koraClient: KoraClient;
     koraRpcUrl: string;
     testWallet: KeyPairSigner<string>;
     usdcMint: Address<string>;
-}
-export declare function loadEnvironmentVariables(): {
-    commitment: Commitment;
     destinationAddress: Address<string>;
     koraAddress: Address<string>;
+    authConfig?: {
+        apiKey: string;
+        hmacSecret: string;
+    };
+}
+export declare function loadEnvironmentVariables(): {
     koraRpcUrl: string;
+    koraAddress: Address<string>;
     koraSignerType: string;
+    commitment: Commitment;
+    tokenDecimals: number;
+    tokenDropAmount: number;
     solDropAmount: bigint;
     solanaRpcUrl: string;
     solanaWsUrl: string;
-    testUsdcMintSecret: string;
     testWalletSecret: string;
-    tokenDecimals: number;
-    tokenDropAmount: number;
+    testUsdcMintSecret: string;
+    destinationAddress: Address<string>;
 };
 declare function setupTestSuite(): Promise<TestSuite>;
 export default setupTestSuite;

package/dist/test/setup.js

@@ -1,28 +1,25 @@
-import { airdropFactory, appendTransactionMessageInstructions, assertIsAddress, assertIsSendableTransaction, assertIsTransactionWithBlockhashLifetime, createKeyPairSignerFromBytes, createSolanaRpc, createSolanaRpcSubscriptions, createTransactionMessage, getBase58Encoder, getSignatureFromTransaction, lamports, pipe, sendAndConfirmTransactionFactory, setTransactionMessageFeePayerSigner, setTransactionMessageLifetimeUsingBlockhash, signTransactionMessageWithSigners, } from '@solana/kit';
-import { MAX_COMPUTE_UNIT_LIMIT, updateOrAppendSetComputeUnitLimitInstruction, updateOrAppendSetComputeUnitPriceInstruction, } from '@solana-program/compute-budget';
 import { getCreateAccountInstruction } from '@solana-program/system';
 import { findAssociatedTokenPda, getCreateAssociatedTokenIdempotentInstructionAsync, getInitializeMintInstruction, getMintSize, getMintToInstruction, TOKEN_PROGRAM_ADDRESS, } from '@solana-program/token';
+import { airdropFactory, createSolanaRpc, createSolanaRpcSubscriptions, lamports, sendAndConfirmTransactionFactory, pipe, createTransactionMessage, setTransactionMessageLifetimeUsingBlockhash, setTransactionMessageFeePayerSigner, appendTransactionMessageInstructions, signTransactionMessageWithSigners, getSignatureFromTransaction, assertIsAddress, createKeyPairSignerFromBytes, getBase58Encoder, assertIsSendableTransaction, assertIsTransactionWithBlockhashLifetime, } from '@solana/kit';
+import { updateOrAppendSetComputeUnitLimitInstruction, updateOrAppendSetComputeUnitPriceInstruction, MAX_COMPUTE_UNIT_LIMIT, } from '@solana-program/compute-budget';
 import { config } from 'dotenv';
 import path from 'path';
 import { KoraClient } from '../src/index.js';
 config({ path: path.resolve(process.cwd(), '.env') });
 const DEFAULTS = {
-    COMMITMENT: 'processed',
     DECIMALS: 6,
-    // Make sure this matches the USDC mint in kora.toml (9BgeTKqmFsPVnfYscfM6NvsgmZxei7XfdciShQ6D3bxJ)
-    DESTINATION_ADDRESS: 'AVmDft8deQEo78bRKcGN5ZMf3hyjeLBK4Rd4xGB46yQM',
-    // DO NOT USE THESE KEYPAIRS IN PRODUCTION, TESTING KEYPAIRS ONLY
-    KORA_ADDRESS: '7AqpcUvgJ7Kh1VmJZ44rWp2XDow33vswo9VK9VqpPU2d',
+    TOKEN_DROP_AMOUNT: 100_000,
     KORA_RPC_URL: 'http://localhost:8080/',
-    KORA_SIGNER_TYPE: 'memory',
-    // Make sure this matches the kora-rpc signer address on launch (root .env)
-    SENDER_SECRET: 'tzgfgSWTE3KUA6qfRoFYLaSfJm59uUeZRDy4ybMrLn1JV2drA1mftiaEcVFvq1Lok6h6EX2C4Y9kSKLvQWyMpS5',
     SOLANA_RPC_URL: 'http://127.0.0.1:8899',
     SOLANA_WS_URL: 'ws://127.0.0.1:8900',
+    COMMITMENT: 'processed',
     SOL_DROP_AMOUNT: 1_000_000_000,
-    // HhA5j2rRiPbMrpF2ZD36r69FyZf3zWmEHRNSZbbNdVjf
-    TEST_USDC_MINT_SECRET: '59kKmXphL5UJANqpFFjtH17emEq3oRNmYsx6a3P3vSGJRmhMgVdzH77bkNEi9bArRViT45e8L2TsuPxKNFoc3Qfg',
-    TOKEN_DROP_AMOUNT: 100_000, // Default signer type
+    // DO NOT USE THESE KEYPAIRS IN PRODUCTION, TESTING KEYPAIRS ONLY
+    KORA_ADDRESS: '7AqpcUvgJ7Kh1VmJZ44rWp2XDow33vswo9VK9VqpPU2d', // Make sure this matches the kora-rpc signer address on launch (root .env)
+    SENDER_SECRET: 'tzgfgSWTE3KUA6qfRoFYLaSfJm59uUeZRDy4ybMrLn1JV2drA1mftiaEcVFvq1Lok6h6EX2C4Y9kSKLvQWyMpS5', // HhA5j2rRiPbMrpF2ZD36r69FyZf3zWmEHRNSZbbNdVjf
+    TEST_USDC_MINT_SECRET: '59kKmXphL5UJANqpFFjtH17emEq3oRNmYsx6a3P3vSGJRmhMgVdzH77bkNEi9bArRViT45e8L2TsuPxKNFoc3Qfg', // Make sure this matches the USDC mint in kora.toml (9BgeTKqmFsPVnfYscfM6NvsgmZxei7XfdciShQ6D3bxJ)
+    DESTINATION_ADDRESS: 'AVmDft8deQEo78bRKcGN5ZMf3hyjeLBK4Rd4xGB46yQM',
+    KORA_SIGNER_TYPE: 'memory', // Default signer type
 };
 const createKeyPairSignerFromB58Secret = async (b58Secret) => {
     const base58Encoder = getBase58Encoder();
@@ -66,18 +63,18 @@ export function loadEnvironmentVariables() {
     assertIsAddress(destinationAddress);
     assertIsAddress(koraAddress);
     return {
-        commitment,
-        destinationAddress,
-        koraAddress,
         koraRpcUrl,
+        koraAddress,
         koraSignerType,
+        commitment,
+        tokenDecimals,
+        tokenDropAmount,
         solDropAmount,
         solanaRpcUrl,
         solanaWsUrl,
-        testUsdcMintSecret,
         testWalletSecret,
-        tokenDecimals,
-        tokenDropAmount,
+        testUsdcMintSecret,
+        destinationAddress,
     };
 }
 async function createKeyPairSigners() {
@@ -85,9 +82,9 @@ async function createKeyPairSigners() {
     const testWallet = await createKeyPairSignerFromB58Secret(testWalletSecret);
     const usdcMint = await createKeyPairSignerFromB58Secret(testUsdcMintSecret);
     return {
-        destinationAddress,
         testWallet,
         usdcMint,
+        destinationAddress,
     };
 }
 const createDefaultTransaction = async (client, feePayer, computeLimit = MAX_COMPUTE_UNIT_LIMIT, feeMicroLamports = 1n) => {
@@ -134,46 +131,46 @@ async function initializeToken({ client, mintAuthority, payer, owner, mint, drop
     const baseInstructions = [
         // Create the Mint Account
         getCreateAccountInstruction({
-            lamports: mintRent,
-            newAccount: mint,
             payer,
-            programAddress: TOKEN_PROGRAM_ADDRESS,
+            newAccount: mint,
+            lamports: mintRent,
             space: mintSpace,
+            programAddress: TOKEN_PROGRAM_ADDRESS,
         }),
         // Initialize the Mint
         getInitializeMintInstruction({
-            decimals,
             mint: mint.address,
+            decimals,
             mintAuthority: mintAuthority.address,
         }),
         // Create Associated Token Account
         await getCreateAssociatedTokenIdempotentInstructionAsync({
             mint: mint.address,
-            owner: owner.address,
             payer,
+            owner: owner.address,
         }),
         // Mint To the Destination Associated Token Account
         getMintToInstruction({
-            amount: BigInt(dropAmount * 10 ** decimals),
             mint: mint.address,
-            mintAuthority,
             token: ata,
+            amount: BigInt(dropAmount * 10 ** decimals),
+            mintAuthority,
         }),
     ];
     // Generate Create ATA instructions for other token accounts we wish to add
     const otherAtaInstructions = otherAtaWallets
         ? await Promise.all(otherAtaWallets.map(async (wallet) => await getCreateAssociatedTokenIdempotentInstructionAsync({
             mint: mint.address,
-            owner: wallet,
             payer,
+            owner: wallet,
         })))
         : [];
     const alreadyExists = await mintExists(client, mint.address);
-    const instructions = alreadyExists ? [...otherAtaInstructions] : [...baseInstructions, ...otherAtaInstructions];
+    let instructions = alreadyExists ? [...otherAtaInstructions] : [...baseInstructions, ...otherAtaInstructions];
     await sendAndConfirmInstructions(client, payer, instructions, 'Initialize token and ATAs', 'finalized');
 }
 async function setupTestSuite() {
-    const { koraAddress, koraRpcUrl, tokenDecimals, tokenDropAmount, solDropAmount, solanaRpcUrl, solanaWsUrl } = loadEnvironmentVariables();
+    const { koraAddress, koraRpcUrl, commitment, tokenDecimals, tokenDropAmount, solDropAmount, solanaRpcUrl, solanaWsUrl, } = await loadEnvironmentVariables();
     // Load auth config from environment if not provided
     const authConfig = process.env.ENABLE_AUTH === 'true'
         ? {
@@ -205,21 +202,22 @@ async function setupTestSuite() {
     // Initialize token and ATAs
     await initializeToken({
         client,
-        decimals: tokenDecimals,
-        dropAmount: tokenDropAmount,
-        mint: usdcMint,
         mintAuthority,
-        otherAtaWallets: [testWallet.address, koraAddress, destinationAddress],
-        owner: testWallet,
         payer: mintAuthority,
+        owner: testWallet,
+        mint: usdcMint,
+        dropAmount: tokenDropAmount,
+        decimals: tokenDecimals,
+        otherAtaWallets: [testWallet.address, koraAddress, destinationAddress],
     });
     return {
-        destinationAddress,
-        koraAddress,
         koraClient: new KoraClient({ rpcUrl: koraRpcUrl, ...authConfig }),
         koraRpcUrl,
         testWallet,
         usdcMint: usdcMint.address,
+        destinationAddress,
+        koraAddress,
+        authConfig,
     };
 }
 const mintExists = async (client, mint) => {
@@ -227,7 +225,7 @@ const mintExists = async (client, mint) => {
         const mintAccount = await client.rpc.getAccountInfo(mint).send();
         return mintAccount.value !== null;
     }
-    catch {
+    catch (error) {
         return false;
     }
 };