@magicblock-labs/ephemeral-rollups-sdk 0.10.0 → 0.10.2

package/lib/instructions/ephemeral-spl-token-program/ephemeralAta.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decodeEphemeralAta = decodeEphemeralAta;
 exports.encodeEphemeralAta = encodeEphemeralAta;
@@ -36,11 +69,15 @@ exports.delegateSplWithPrivateTransfer = delegateSplWithPrivateTransfer;
 exports.transferSpl = transferSpl;
 exports.withdrawSpl = withdrawSpl;
 const web3_js_1 = require("@solana/web3.js");
+const blake2b_1 = require("@noble/hashes/blake2b");
+const ed25519_1 = require("@noble/curves/ed25519");
+const nacl = __importStar(require("tweetnacl"));
 const constants_js_1 = require("../../constants.js");
 const pda_js_1 = require("../../pda.js");
 const transferQueue_js_1 = require("./transferQueue.js");
 const TOKEN_PROGRAM_ID = new web3_js_1.PublicKey("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
 const ASSOCIATED_TOKEN_PROGRAM_ID = new web3_js_1.PublicKey("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");
+const QUEUED_TRANSFER_FLAG_CREATE_IDEMPOTENT_ATA = 1 << 0;
 function getAssociatedTokenAddressSync(mint, owner, allowOwnerOffCurve = false, programId = TOKEN_PROGRAM_ID, associatedTokenProgramId = ASSOCIATED_TOKEN_PROGRAM_ID) {
     if (!allowOwnerOffCurve && !web3_js_1.PublicKey.isOnCurve(owner)) {
         throw new Error("Owner public key is off-curve");
@@ -86,6 +123,43 @@ function createTransferInstruction(source, destination, owner, amount, multiSign
         data,
     });
 }
+function encryptEd25519Recipient(plaintext, recipient) {
+    const recipientX25519 = (0, ed25519_1.edwardsToMontgomeryPub)(recipient.toBytes());
+    const ephemeral = nacl.box.keyPair();
+    const nonce = (0, blake2b_1.blake2b)(Buffer.concat([
+        Buffer.from(ephemeral.publicKey),
+        Buffer.from(recipientX25519),
+    ]), { dkLen: nacl.box.nonceLength });
+    const ciphertext = nacl.box(plaintext, nonce, recipientX25519, ephemeral.secretKey);
+    return Buffer.concat([
+        Buffer.from(ephemeral.publicKey),
+        Buffer.from(ciphertext),
+    ]);
+}
+function encodeLengthPrefixedBytes(bytes) {
+    if (bytes.length > 0xff) {
+        throw new Error("encrypted private transfer payload exceeds u8 length");
+    }
+    return Buffer.concat([Buffer.from([bytes.length]), Buffer.from(bytes)]);
+}
+function packPrivateTransferSuffix(minDelayMs, maxDelayMs, split, flags = 0) {
+    const suffix = Buffer.alloc(8 + 8 + 4 + 1);
+    suffix.writeBigUInt64LE(minDelayMs, 0);
+    suffix.writeBigUInt64LE(maxDelayMs, 8);
+    suffix.writeUInt32LE(split, 16);
+    suffix.writeUInt8(flags, 20);
+    return suffix;
+}
+function u32leBuffer(value) {
+    const out = Buffer.alloc(4);
+    out.writeUInt32LE(value, 0);
+    return out;
+}
+function u64leBuffer(value) {
+    const out = Buffer.alloc(8);
+    out.writeBigUInt64LE(value, 0);
+    return out;
+}
 function decodeEphemeralAta(info) {
     if (info.data.length < 72) {
         throw new Error("Invalid EphemeralAta account data length");
@@ -146,7 +220,7 @@ function deriveShuttleAta(shuttleEphemeralAta, mint) {
 function deriveShuttleWalletAta(mint, shuttleEphemeralAta) {
     return getAssociatedTokenAddressSync(mint, shuttleEphemeralAta, true);
 }
-function initEphemeralAtaIx(ephemeralAta, owner, mint, payer, bump) {
+function initEphemeralAtaIx(ephemeralAta, owner, mint, payer) {
     return new web3_js_1.TransactionInstruction({
         programId: constants_js_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
         keys: [
@@ -156,13 +230,13 @@ function initEphemeralAtaIx(ephemeralAta, owner, mint, payer, bump) {
             { pubkey: mint, isSigner: false, isWritable: false },
             { pubkey: web3_js_1.SystemProgram.programId, isSigner: false, isWritable: false },
         ],
-        data: Buffer.from([0, bump]),
+        data: Buffer.from([0]),
     });
 }
 function initVaultAtaIx(payer, vaultAta, vault, mint) {
     return createAssociatedTokenAccountIdempotentInstruction(payer, vaultAta, vault, mint);
 }
-function initVaultIx(vault, mint, payer, bump) {
+function initVaultIx(vault, mint, payer) {
     const [vaultEphemeralAta] = deriveEphemeralAta(vault, mint);
     const vaultAta = deriveVaultAta(mint, vault);
     return new web3_js_1.TransactionInstruction({
@@ -181,7 +255,7 @@ function initVaultIx(vault, mint, payer, bump) {
             },
             { pubkey: web3_js_1.SystemProgram.programId, isSigner: false, isWritable: false },
         ],
-        data: Buffer.from([1, bump]),
+        data: Buffer.from([1]),
     });
 }
 function initRentPdaIx(payer, rentPda) {
@@ -213,10 +287,10 @@ function transferToVaultIx(ephemeralAta, vault, mint, sourceAta, vaultAta, owner
 function depositSplTokensIx(ephemeralAta, vault, mint, sourceAta, vaultAta, owner, amount) {
     return transferToVaultIx(ephemeralAta, vault, mint, sourceAta, vaultAta, owner, amount);
 }
-function delegateEphemeralAtaIx(payer, ephemeralAta, bump, validator) {
+function delegateEphemeralAtaIx(payer, ephemeralAta, validator) {
     const data = validator
-        ? Buffer.concat([Buffer.from([4, bump]), validator.toBuffer()])
-        : Buffer.from([4, bump]);
+        ? Buffer.concat([Buffer.from([4]), validator.toBuffer()])
+        : Buffer.from([4]);
     return new web3_js_1.TransactionInstruction({
         programId: constants_js_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
         keys: [
@@ -248,16 +322,15 @@ function delegateEphemeralAtaIx(payer, ephemeralAta, bump, validator) {
         data,
     });
 }
-function initShuttleEphemeralAtaIx(payer, shuttleEphemeralAta, shuttleAta, shuttleWalletAta, owner, mint, shuttleId, bump) {
+function initShuttleEphemeralAtaIx(payer, shuttleEphemeralAta, shuttleAta, shuttleWalletAta, owner, mint, shuttleId) {
     if (!Number.isInteger(shuttleId) ||
         shuttleId < 0 ||
         shuttleId > 4294967295) {
         throw new Error("shuttleId must fit in u32");
     }
-    const data = Buffer.alloc(6);
+    const data = Buffer.alloc(5);
     data[0] = 11;
     data.writeUInt32LE(shuttleId, 1);
-    data[5] = bump;
     return new web3_js_1.TransactionInstruction({
         programId: constants_js_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
         keys: [
@@ -278,10 +351,10 @@ function initShuttleEphemeralAtaIx(payer, shuttleEphemeralAta, shuttleAta, shutt
         data,
     });
 }
-function delegateShuttleEphemeralAtaIx(payer, shuttleEphemeralAta, shuttleAta, bump, validator) {
+function delegateShuttleEphemeralAtaIx(payer, shuttleEphemeralAta, shuttleAta, validator) {
     const data = validator
-        ? Buffer.concat([Buffer.from([13, bump]), validator.toBuffer()])
-        : Buffer.from([13, bump]);
+        ? Buffer.concat([Buffer.from([13]), validator.toBuffer()])
+        : Buffer.from([13]);
     return new web3_js_1.TransactionInstruction({
         programId: constants_js_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
         keys: [
@@ -314,7 +387,7 @@ function delegateShuttleEphemeralAtaIx(payer, shuttleEphemeralAta, shuttleAta, b
         data,
     });
 }
-function setupAndDelegateShuttleEphemeralAtaWithMergeIx(payer, shuttleEphemeralAta, shuttleAta, owner, sourceAta, destinationAta, shuttleWalletAta, mint, shuttleId, bump, amount, validator) {
+function setupAndDelegateShuttleEphemeralAtaWithMergeIx(payer, shuttleEphemeralAta, shuttleAta, owner, sourceAta, destinationAta, shuttleWalletAta, mint, shuttleId, amount, validator) {
     if (!Number.isInteger(shuttleId) ||
         shuttleId < 0 ||
         shuttleId > 4294967295) {
@@ -323,13 +396,12 @@ function setupAndDelegateShuttleEphemeralAtaWithMergeIx(payer, shuttleEphemeralA
     const [rentPda] = deriveRentPda();
     const [vault] = deriveVault(mint);
     const vaultAta = deriveVaultAta(mint, vault);
-    const data = validator ? Buffer.alloc(46) : Buffer.alloc(14);
+    const data = validator ? Buffer.alloc(45) : Buffer.alloc(13);
     data[0] = 24;
     data.writeUInt32LE(shuttleId, 1);
-    data[5] = bump;
-    data.writeBigUInt64LE(amount, 6);
+    data.writeBigUInt64LE(amount, 5);
     if (validator) {
-        validator.toBuffer().copy(data, 14);
+        validator.toBuffer().copy(data, 13);
     }
     return new web3_js_1.TransactionInstruction({
         programId: constants_js_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
@@ -377,7 +449,7 @@ function setupAndDelegateShuttleEphemeralAtaWithMergeIx(payer, shuttleEphemeralA
         data,
     });
 }
-function depositAndDelegateShuttleEphemeralAtaWithMergeAndPrivateTransferIx(payer, shuttleEphemeralAta, shuttleAta, owner, sourceAta, destinationAta, shuttleWalletAta, mint, shuttleId, bump, amount, minDelayMs, maxDelayMs, split, validator) {
+function depositAndDelegateShuttleEphemeralAtaWithMergeAndPrivateTransferIx(payer, shuttleEphemeralAta, shuttleAta, owner, sourceAta, destinationOwner, shuttleWalletAta, mint, shuttleId, amount, minDelayMs, maxDelayMs, split, validator) {
     if (!Number.isInteger(shuttleId) ||
         shuttleId < 0 ||
         shuttleId > 4294967295) {
@@ -392,21 +464,23 @@ function depositAndDelegateShuttleEphemeralAtaWithMergeAndPrivateTransferIx(paye
     if (maxDelayMs < minDelayMs) {
         throw new Error("maxDelayMs must be greater than or equal to minDelayMs");
     }
+    if (validator == null) {
+        throw new Error("validator is required for encrypted private transfers");
+    }
     const [rentPda] = deriveRentPda();
     const [vault] = deriveVault(mint);
     const vaultAta = deriveVaultAta(mint, vault);
-    const [queue] = (0, transferQueue_js_1.deriveTransferQueue)(mint);
-    const data = validator ? Buffer.alloc(66) : Buffer.alloc(34);
-    data[0] = 25;
-    data.writeUInt32LE(shuttleId, 1);
-    data[5] = bump;
-    data.writeBigUInt64LE(amount, 6);
-    data.writeBigUInt64LE(minDelayMs, 14);
-    data.writeBigUInt64LE(maxDelayMs, 22);
-    data.writeUInt32LE(split, 30);
-    if (validator) {
-        validator.toBuffer().copy(data, 34);
-    }
+    const [queue] = (0, transferQueue_js_1.deriveTransferQueue)(mint, validator);
+    const encryptedDestination = encryptEd25519Recipient(destinationOwner.toBytes(), validator);
+    const encryptedSuffix = encryptEd25519Recipient(packPrivateTransferSuffix(minDelayMs, maxDelayMs, split, QUEUED_TRANSFER_FLAG_CREATE_IDEMPOTENT_ATA), validator);
+    const data = Buffer.concat([
+        Buffer.from([25]),
+        u32leBuffer(shuttleId),
+        u64leBuffer(amount),
+        encodeLengthPrefixedBytes(validator.toBytes()),
+        encodeLengthPrefixedBytes(encryptedDestination),
+        encodeLengthPrefixedBytes(encryptedSuffix),
+    ]);
     return new web3_js_1.TransactionInstruction({
         programId: constants_js_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
         keys: [
@@ -443,7 +517,6 @@ function depositAndDelegateShuttleEphemeralAtaWithMergeAndPrivateTransferIx(paye
                 isWritable: false,
             },
             { pubkey: web3_js_1.SystemProgram.programId, isSigner: false, isWritable: false },
-            { pubkey: destinationAta, isSigner: false, isWritable: true },
             { pubkey: mint, isSigner: false, isWritable: false },
             { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
             { pubkey: vault, isSigner: false, isWritable: false },
@@ -454,7 +527,7 @@ function depositAndDelegateShuttleEphemeralAtaWithMergeAndPrivateTransferIx(paye
         data,
     });
 }
-function withdrawThroughDelegatedShuttleWithMergeIx(payer, shuttleEphemeralAta, shuttleAta, owner, ownerAta, shuttleWalletAta, mint, shuttleId, bump, amount, validator) {
+function withdrawThroughDelegatedShuttleWithMergeIx(payer, shuttleEphemeralAta, shuttleAta, owner, ownerAta, shuttleWalletAta, mint, shuttleId, amount, validator) {
     if (!Number.isInteger(shuttleId) ||
         shuttleId < 0 ||
         shuttleId > 4294967295) {
@@ -464,13 +537,12 @@ function withdrawThroughDelegatedShuttleWithMergeIx(payer, shuttleEphemeralAta,
         throw new Error("amount must be non-negative");
     }
     const [rentPda] = deriveRentPda();
-    const data = validator ? Buffer.alloc(46) : Buffer.alloc(14);
+    const data = validator ? Buffer.alloc(45) : Buffer.alloc(13);
     data[0] = 26;
     data.writeUInt32LE(shuttleId, 1);
-    data[5] = bump;
-    data.writeBigUInt64LE(amount, 6);
+    data.writeBigUInt64LE(amount, 5);
     if (validator) {
-        validator.toBuffer().copy(data, 14);
+        validator.toBuffer().copy(data, 13);
     }
     return new web3_js_1.TransactionInstruction({
         programId: constants_js_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
@@ -529,7 +601,7 @@ function mergeShuttleIntoAtaIx(owner, destinationAta, shuttleEphemeralAta, shutt
         data: Buffer.from([15]),
     });
 }
-function undelegateAndCloseShuttleEphemeralAtaIx(payer, shuttleEphemeralAta, shuttleAta, shuttleWalletAta, escrowIndex) {
+function undelegateAndCloseShuttleEphemeralAtaIx(payer, rentReimbursement, shuttleEphemeralAta, shuttleAta, shuttleWalletAta, destinationAta, escrowIndex) {
     const data = escrowIndex === undefined
         ? Buffer.from([14])
         : Buffer.from([14, escrowIndex]);
@@ -537,9 +609,11 @@ function undelegateAndCloseShuttleEphemeralAtaIx(payer, shuttleEphemeralAta, shu
         programId: constants_js_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
         keys: [
             { pubkey: payer, isSigner: true, isWritable: true },
+            { pubkey: rentReimbursement, isSigner: false, isWritable: true },
             { pubkey: shuttleEphemeralAta, isSigner: false, isWritable: false },
             { pubkey: shuttleAta, isSigner: false, isWritable: false },
             { pubkey: shuttleWalletAta, isSigner: false, isWritable: true },
+            { pubkey: destinationAta, isSigner: false, isWritable: true },
             { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
             { pubkey: constants_js_1.MAGIC_CONTEXT_ID, isSigner: false, isWritable: true },
             { pubkey: constants_js_1.MAGIC_PROGRAM_ID, isSigner: false, isWritable: false },
@@ -549,7 +623,7 @@ function undelegateAndCloseShuttleEphemeralAtaIx(payer, shuttleEphemeralAta, shu
 }
 function withdrawSplIx(owner, mint, amount) {
     const [ephemeralAta] = deriveEphemeralAta(owner, mint);
-    const [vault, vaultBump] = deriveVault(mint);
+    const [vault] = deriveVault(mint);
     const vaultAta = deriveVaultAta(mint, vault);
     const userDestAta = getAssociatedTokenAddressSync(mint, owner);
     return new web3_js_1.TransactionInstruction({
@@ -563,7 +637,7 @@ function withdrawSplIx(owner, mint, amount) {
             { pubkey: userDestAta, isSigner: false, isWritable: true },
             { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
         ],
-        data: encodeAmountInstructionData(3, amount, vaultBump),
+        data: encodeAmountInstructionData(3, amount),
     });
 }
 function undelegateIx(owner, mint) {
@@ -601,7 +675,7 @@ function undelegateIx(owner, mint) {
         data: Buffer.from([5]),
     });
 }
-function createEataPermissionIx(ephemeralAta, payer, bump, flags = 0) {
+function createEataPermissionIx(ephemeralAta, payer, flags = 0) {
     const permission = (0, pda_js_1.permissionPdaFromAccount)(ephemeralAta);
     return new web3_js_1.TransactionInstruction({
         programId: constants_js_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
@@ -612,10 +686,10 @@ function createEataPermissionIx(ephemeralAta, payer, bump, flags = 0) {
             { pubkey: web3_js_1.SystemProgram.programId, isSigner: false, isWritable: false },
             { pubkey: constants_js_1.PERMISSION_PROGRAM_ID, isSigner: false, isWritable: false },
         ],
-        data: Buffer.from([6, bump, flags]),
+        data: Buffer.from([6, flags]),
     });
 }
-function resetEataPermissionIx(ephemeralAta, payer, bump, flags = 0) {
+function resetEataPermissionIx(ephemeralAta, payer, flags = 0) {
     const permission = (0, pda_js_1.permissionPdaFromAccount)(ephemeralAta);
     return new web3_js_1.TransactionInstruction({
         programId: constants_js_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
@@ -625,10 +699,10 @@ function resetEataPermissionIx(ephemeralAta, payer, bump, flags = 0) {
             { pubkey: payer, isSigner: true, isWritable: false },
             { pubkey: constants_js_1.PERMISSION_PROGRAM_ID, isSigner: false, isWritable: false },
         ],
-        data: Buffer.from([9, bump, flags]),
+        data: Buffer.from([9, flags]),
     });
 }
-function delegateEataPermissionIx(payer, ephemeralAta, bump, validator) {
+function delegateEataPermissionIx(payer, ephemeralAta, validator) {
     const permission = (0, pda_js_1.permissionPdaFromAccount)(ephemeralAta);
     return new web3_js_1.TransactionInstruction({
         programId: constants_js_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
@@ -656,7 +730,7 @@ function delegateEataPermissionIx(payer, ephemeralAta, bump, validator) {
             { pubkey: constants_js_1.DELEGATION_PROGRAM_ID, isSigner: false, isWritable: false },
             { pubkey: validator, isSigner: false, isWritable: false },
         ],
-        data: Buffer.from([7, bump]),
+        data: Buffer.from([7]),
     });
 }
 function undelegateEataPermissionIx(owner, ephemeralAta) {
@@ -690,22 +764,22 @@ async function buildDelegateSplInstructions(owner, mint, amount, opts) {
     const initVaultIfMissing = opts?.initVaultIfMissing ?? initIfMissing;
     const isPrivate = opts?.private ?? false;
     const instructions = [];
-    const [ephemeralAta, eataBump] = deriveEphemeralAta(owner, mint);
-    const [vault, vaultBump] = deriveVault(mint);
-    const [vaultEphemeralAta, vaultEataBump] = deriveEphemeralAta(vault, mint);
+    const [ephemeralAta] = deriveEphemeralAta(owner, mint);
+    const [vault] = deriveVault(mint);
+    const [vaultEphemeralAta] = deriveEphemeralAta(vault, mint);
     const vaultAta = deriveVaultAta(mint, vault);
     const ownerAta = getAssociatedTokenAddressSync(mint, owner);
     if (initIfMissing) {
-        instructions.push(initEphemeralAtaIx(ephemeralAta, owner, mint, payer, eataBump));
+        instructions.push(initEphemeralAtaIx(ephemeralAta, owner, mint, payer));
     }
     if (initVaultIfMissing) {
-        instructions.push(initVaultIx(vault, mint, payer, vaultBump), initVaultAtaIx(payer, vaultAta, vault, mint), delegateEphemeralAtaIx(payer, vaultEphemeralAta, vaultEataBump, validator));
+        instructions.push(initVaultIx(vault, mint, payer), initVaultAtaIx(payer, vaultAta, vault, mint), delegateEphemeralAtaIx(payer, vaultEphemeralAta, validator));
     }
     instructions.push(transferToVaultIx(ephemeralAta, vault, mint, ownerAta, vaultAta, owner, amount));
     if (isPrivate) {
-        instructions.push(createEataPermissionIx(ephemeralAta, payer, eataBump));
+        instructions.push(createEataPermissionIx(ephemeralAta, payer));
     }
-    instructions.push(delegateEphemeralAtaIx(payer, ephemeralAta, eataBump, validator));
+    instructions.push(delegateEphemeralAtaIx(payer, ephemeralAta, validator));
     return instructions;
 }
 async function buildIdempotentDelegateSplInstructions(owner, mint, amount, opts) {
@@ -717,32 +791,32 @@ async function buildIdempotentDelegateSplInstructions(owner, mint, amount, opts)
     const isPrivate = opts?.private ?? false;
     const shuttleId = opts?.shuttleId ?? randomShuttleId();
     const instructions = [];
-    const [ephemeralAta, eataBump] = deriveEphemeralAta(owner, mint);
-    const [vault, vaultBump] = deriveVault(mint);
-    const [vaultEphemeralAta, vaultEataBump] = deriveEphemeralAta(vault, mint);
+    const [ephemeralAta] = deriveEphemeralAta(owner, mint);
+    const [vault] = deriveVault(mint);
+    const [vaultEphemeralAta] = deriveEphemeralAta(vault, mint);
     const vaultAta = deriveVaultAta(mint, vault);
     const ownerAta = getAssociatedTokenAddressSync(mint, owner);
-    const [shuttleEphemeralAta, shuttleBump] = deriveShuttleEphemeralAta(owner, mint, shuttleId);
-    const [shuttleAta, shuttleAtaBump] = deriveShuttleAta(shuttleEphemeralAta, mint);
+    const [shuttleEphemeralAta] = deriveShuttleEphemeralAta(owner, mint, shuttleId);
+    const [shuttleAta] = deriveShuttleAta(shuttleEphemeralAta, mint);
     const shuttleWalletAta = deriveShuttleWalletAta(mint, shuttleEphemeralAta);
     if (initVaultIfMissing) {
-        instructions.push(initVaultIx(vault, mint, payer, vaultBump), initVaultAtaIx(payer, vaultAta, vault, mint), delegateEphemeralAtaIx(payer, vaultEphemeralAta, vaultEataBump, validator));
+        instructions.push(initVaultIx(vault, mint, payer), initVaultAtaIx(payer, vaultAta, vault, mint), delegateEphemeralAtaIx(payer, vaultEphemeralAta, validator));
     }
     if (initAtasIfMissing) {
         instructions.push(createAssociatedTokenAccountIdempotentInstruction(payer, ownerAta, owner, mint));
     }
     if (initIfMissing) {
-        instructions.push(initEphemeralAtaIx(ephemeralAta, owner, mint, payer, eataBump));
+        instructions.push(initEphemeralAtaIx(ephemeralAta, owner, mint, payer));
     }
     if (isPrivate) {
-        instructions.push(createEataPermissionIx(ephemeralAta, payer, eataBump));
+        instructions.push(createEataPermissionIx(ephemeralAta, payer));
     }
-    instructions.push(delegateEphemeralAtaIx(payer, ephemeralAta, eataBump, validator));
+    instructions.push(delegateEphemeralAtaIx(payer, ephemeralAta, validator));
     if (amount > 0n) {
-        instructions.push(setupAndDelegateShuttleEphemeralAtaWithMergeIx(payer, shuttleEphemeralAta, shuttleAta, owner, ownerAta, ownerAta, shuttleWalletAta, mint, shuttleId, shuttleBump, amount, validator));
+        instructions.push(setupAndDelegateShuttleEphemeralAtaWithMergeIx(payer, shuttleEphemeralAta, shuttleAta, owner, ownerAta, ownerAta, shuttleWalletAta, mint, shuttleId, amount, validator));
     }
     else {
-        instructions.push(initShuttleEphemeralAtaIx(payer, shuttleEphemeralAta, shuttleAta, shuttleWalletAta, owner, mint, shuttleId, shuttleBump), delegateShuttleEphemeralAtaIx(payer, shuttleEphemeralAta, shuttleAta, shuttleAtaBump, validator));
+        instructions.push(initShuttleEphemeralAtaIx(payer, shuttleEphemeralAta, shuttleAta, shuttleWalletAta, owner, mint, shuttleId), delegateShuttleEphemeralAtaIx(payer, shuttleEphemeralAta, shuttleAta, validator));
     }
     return instructions;
 }
@@ -763,29 +837,32 @@ async function delegateSplWithPrivateTransfer(owner, mint, amount, opts) {
     const minDelayMs = opts?.minDelayMs ?? 0n;
     const maxDelayMs = opts?.maxDelayMs ?? minDelayMs;
     const split = opts?.split ?? 1;
+    if (validator == null) {
+        throw new Error("validator is required for encrypted private transfers");
+    }
     const instructions = [];
-    const [ephemeralAta, eataBump] = deriveEphemeralAta(owner, mint);
-    const [vault, vaultBump] = deriveVault(mint);
-    const [vaultEphemeralAta, vaultEataBump] = deriveEphemeralAta(vault, mint);
+    const [ephemeralAta] = deriveEphemeralAta(owner, mint);
+    const [vault] = deriveVault(mint);
+    const [vaultEphemeralAta] = deriveEphemeralAta(vault, mint);
     const vaultAta = deriveVaultAta(mint, vault);
-    const [queue] = (0, transferQueue_js_1.deriveTransferQueue)(mint);
+    const [queue] = (0, transferQueue_js_1.deriveTransferQueue)(mint, validator);
     const ownerAta = getAssociatedTokenAddressSync(mint, owner);
-    const [shuttleEphemeralAta, shuttleBump] = deriveShuttleEphemeralAta(owner, mint, shuttleId);
+    const [shuttleEphemeralAta] = deriveShuttleEphemeralAta(owner, mint, shuttleId);
     const [shuttleAta] = deriveShuttleAta(shuttleEphemeralAta, mint);
     const shuttleWalletAta = deriveShuttleWalletAta(mint, shuttleEphemeralAta);
     if (initVaultIfMissing) {
-        instructions.push(initVaultIx(vault, mint, payer, vaultBump), initVaultAtaIx(payer, vaultAta, vault, mint), delegateEphemeralAtaIx(payer, vaultEphemeralAta, vaultEataBump, validator));
+        instructions.push(initVaultIx(vault, mint, payer), initVaultAtaIx(payer, vaultAta, vault, mint), delegateEphemeralAtaIx(payer, vaultEphemeralAta, validator));
     }
     if (initTransferQueueIfMissing) {
-        instructions.push((0, transferQueue_js_1.initTransferQueueIx)(payer, queue, mint));
+        instructions.push((0, transferQueue_js_1.toTransactionInstruction)((0, transferQueue_js_1.initTransferQueueIx)(payer, queue, mint, validator)));
     }
     if (initAtasIfMissing) {
         instructions.push(createAssociatedTokenAccountIdempotentInstruction(payer, ownerAta, owner, mint));
     }
     if (initIfMissing) {
-        instructions.push(initEphemeralAtaIx(ephemeralAta, owner, mint, payer, eataBump));
+        instructions.push(initEphemeralAtaIx(ephemeralAta, owner, mint, payer));
     }
-    instructions.push(delegateEphemeralAtaIx(payer, ephemeralAta, eataBump, validator), depositAndDelegateShuttleEphemeralAtaWithMergeAndPrivateTransferIx(payer, shuttleEphemeralAta, shuttleAta, owner, ownerAta, ownerAta, shuttleWalletAta, mint, shuttleId, shuttleBump, amount, minDelayMs, maxDelayMs, split, validator));
+    instructions.push(delegateEphemeralAtaIx(payer, ephemeralAta, validator), depositAndDelegateShuttleEphemeralAtaWithMergeAndPrivateTransferIx(payer, shuttleEphemeralAta, shuttleAta, owner, ownerAta, owner, shuttleWalletAta, mint, shuttleId, amount, minDelayMs, maxDelayMs, split, validator));
     return instructions;
 }
 async function transferSpl(from, to, mint, amount, opts) {
@@ -804,11 +881,14 @@ async function transferSpl(from, to, mint, amount, opts) {
         switch (opts.visibility) {
             case "private":
                 if (opts.toBalance === "base") {
-                    const [queue] = (0, transferQueue_js_1.deriveTransferQueue)(mint);
+                    if (validator == null) {
+                        throw new Error("validator is required for private ephemeral-to-base transfers");
+                    }
+                    const [queue] = (0, transferQueue_js_1.deriveTransferQueue)(mint, validator);
                     const [vault] = deriveVault(mint);
                     const vaultAta = deriveVaultAta(mint, vault);
                     return [
-                        (0, transferQueue_js_1.depositAndQueueTransferIx)(queue, vault, mint, fromAta, vaultAta, toAta, from, amount, minDelayMs, maxDelayMs, split),
+                        (0, transferQueue_js_1.toTransactionInstruction)((0, transferQueue_js_1.depositAndQueueTransferIx)(queue, vault, mint, fromAta, vaultAta, toAta, from, amount, minDelayMs, maxDelayMs, split)),
                     ];
                 }
                 if (opts.toBalance === "ephemeral") {
@@ -824,10 +904,10 @@ async function transferSpl(from, to, mint, amount, opts) {
     }
     const instructions = [];
     if (initVaultIfMissing) {
-        const [vault, vaultBump] = deriveVault(mint);
-        const [vaultEphemeralAta, vaultEataBump] = deriveEphemeralAta(vault, mint);
+        const [vault] = deriveVault(mint);
+        const [vaultEphemeralAta] = deriveEphemeralAta(vault, mint);
         const vaultAta = deriveVaultAta(mint, vault);
-        instructions.push(initVaultIx(vault, mint, payer, vaultBump), initVaultAtaIx(payer, vaultAta, vault, mint), delegateEphemeralAtaIx(payer, vaultEphemeralAta, vaultEataBump, validator));
+        instructions.push(initVaultIx(vault, mint, payer), initVaultAtaIx(payer, vaultAta, vault, mint), delegateEphemeralAtaIx(payer, vaultEphemeralAta, validator));
     }
     if (opts.fromBalance === "base" && initAtasIfMissing) {
         instructions.push(createAssociatedTokenAccountIdempotentInstruction(payer, fromAta, from, mint));
@@ -835,28 +915,25 @@ async function transferSpl(from, to, mint, amount, opts) {
     switch (opts.visibility) {
         case "private":
             if (opts.fromBalance === "base" && opts.toBalance === "base") {
-                if (initIfMissing) {
-                    instructions.push(createAssociatedTokenAccountIdempotentInstruction(payer, toAta, to, mint));
-                }
-                const [shuttleEphemeralAta, shuttleBump] = deriveShuttleEphemeralAta(from, mint, shuttleId);
+                const [shuttleEphemeralAta] = deriveShuttleEphemeralAta(from, mint, shuttleId);
                 const [shuttleAta] = deriveShuttleAta(shuttleEphemeralAta, mint);
                 const shuttleWalletAta = deriveShuttleWalletAta(mint, shuttleEphemeralAta);
                 return [
                     ...instructions,
-                    depositAndDelegateShuttleEphemeralAtaWithMergeAndPrivateTransferIx(payer, shuttleEphemeralAta, shuttleAta, from, fromAta, toAta, shuttleWalletAta, mint, shuttleId, shuttleBump, amount, minDelayMs, maxDelayMs, split, validator),
+                    depositAndDelegateShuttleEphemeralAtaWithMergeAndPrivateTransferIx(payer, shuttleEphemeralAta, shuttleAta, from, fromAta, to, shuttleWalletAta, mint, shuttleId, amount, minDelayMs, maxDelayMs, split, validator),
                 ];
             }
             if (opts.fromBalance === "base" && opts.toBalance === "ephemeral") {
                 if (initIfMissing) {
-                    const [toEphemeralAta, toEataBump] = deriveEphemeralAta(to, mint);
-                    instructions.push(createAssociatedTokenAccountIdempotentInstruction(payer, toAta, to, mint), initEphemeralAtaIx(toEphemeralAta, to, mint, payer, toEataBump), delegateEphemeralAtaIx(payer, toEphemeralAta, toEataBump, validator));
+                    const [toEphemeralAta] = deriveEphemeralAta(to, mint);
+                    instructions.push(createAssociatedTokenAccountIdempotentInstruction(payer, toAta, to, mint), initEphemeralAtaIx(toEphemeralAta, to, mint, payer), delegateEphemeralAtaIx(payer, toEphemeralAta, validator));
                 }
-                const [shuttleEphemeralAta, shuttleBump] = deriveShuttleEphemeralAta(from, mint, shuttleId);
+                const [shuttleEphemeralAta] = deriveShuttleEphemeralAta(from, mint, shuttleId);
                 const [shuttleAta] = deriveShuttleAta(shuttleEphemeralAta, mint);
                 const shuttleWalletAta = deriveShuttleWalletAta(mint, shuttleEphemeralAta);
                 return [
                     ...instructions,
-                    setupAndDelegateShuttleEphemeralAtaWithMergeIx(payer, shuttleEphemeralAta, shuttleAta, from, fromAta, toAta, shuttleWalletAta, mint, shuttleId, shuttleBump, amount, validator),
+                    setupAndDelegateShuttleEphemeralAtaWithMergeIx(payer, shuttleEphemeralAta, shuttleAta, from, fromAta, toAta, shuttleWalletAta, mint, shuttleId, amount, validator),
                 ];
             }
             break;
@@ -878,18 +955,18 @@ async function buildIdempotentWithdrawSplInstructions(owner, mint, amount, opts)
     const initAtasIfMissing = opts?.initAtasIfMissing ?? false;
     const shuttleId = opts?.shuttleId ?? randomShuttleId();
     const instructions = [];
-    const [ephemeralAta, eataBump] = deriveEphemeralAta(owner, mint);
+    const [ephemeralAta] = deriveEphemeralAta(owner, mint);
     const ownerAta = getAssociatedTokenAddressSync(mint, owner);
-    const [shuttleEphemeralAta, shuttleBump] = deriveShuttleEphemeralAta(owner, mint, shuttleId);
+    const [shuttleEphemeralAta] = deriveShuttleEphemeralAta(owner, mint, shuttleId);
     const [shuttleAta] = deriveShuttleAta(shuttleEphemeralAta, mint);
     const shuttleWalletAta = deriveShuttleWalletAta(mint, shuttleEphemeralAta);
     if (initAtasIfMissing) {
         instructions.push(createAssociatedTokenAccountIdempotentInstruction(payer, ownerAta, owner, mint));
     }
     if (initIfMissing) {
-        instructions.push(initEphemeralAtaIx(ephemeralAta, owner, mint, payer, eataBump));
+        instructions.push(initEphemeralAtaIx(ephemeralAta, owner, mint, payer));
     }
-    instructions.push(delegateEphemeralAtaIx(payer, ephemeralAta, eataBump, validator), withdrawThroughDelegatedShuttleWithMergeIx(payer, shuttleEphemeralAta, shuttleAta, owner, ownerAta, shuttleWalletAta, mint, shuttleId, shuttleBump, amount, validator));
+    instructions.push(delegateEphemeralAtaIx(payer, ephemeralAta, validator), withdrawThroughDelegatedShuttleWithMergeIx(payer, shuttleEphemeralAta, shuttleAta, owner, ownerAta, shuttleWalletAta, mint, shuttleId, amount, validator));
     return instructions;
 }
 async function withdrawSpl(owner, mint, amount, opts) {