@magicblock-labs/ephemeral-rollups-kit 0.10.0 → 0.10.1

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.getEphemeralAtaEncoder = getEphemeralAtaEncoder;
 exports.getEphemeralAtaDecoder = getEphemeralAtaDecoder;
@@ -40,12 +73,16 @@ exports.transferSpl = transferSpl;
 exports.withdrawSpl = withdrawSpl;
 const kit_1 = require("@solana/kit");
 const system_1 = require("@solana-program/system");
+const blake2b_1 = require("@noble/hashes/blake2b");
+const ed25519_1 = require("@noble/curves/ed25519");
+const nacl = __importStar(require("tweetnacl"));
 const constants_1 = require("../../constants");
 const pda_1 = require("../../pda");
 const transferQueue_1 = require("./transferQueue");
 const U64_ENCODER = (0, kit_1.getU64Encoder)();
 const TOKEN_PROGRAM_ADDRESS = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
 const ASSOCIATED_TOKEN_PROGRAM_ADDRESS = "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
+const QUEUED_TRANSFER_FLAG_CREATE_IDEMPOTENT_ATA = 1 << 0;
 async function getAssociatedTokenAddressSync(mint, owner, allowOwnerOffCurve = false) {
     const addressEncoder = (0, kit_1.getAddressEncoder)();
     const [ata] = await (0, kit_1.getProgramDerivedAddress)({
@@ -69,6 +106,44 @@ function createTransferInstruction(source, destination, owner, amount) {
         programAddress: TOKEN_PROGRAM_ADDRESS,
     };
 }
+function encryptEd25519Recipient(plaintext, recipient) {
+    const recipientBytes = (0, kit_1.getAddressEncoder)().encode(recipient);
+    const recipientX25519 = (0, ed25519_1.edwardsToMontgomeryPub)(new Uint8Array(recipientBytes));
+    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 getEphemeralAtaEncoder() {
     return (0, kit_1.getStructEncoder)([
         ["owner", (0, kit_1.getAddressEncoder)()],
@@ -162,7 +237,7 @@ async function deriveShuttleAta(shuttleEphemeralAta, mint) {
 async function deriveShuttleWalletAta(mint, shuttleEphemeralAta) {
     return getAssociatedTokenAddressSync(mint, shuttleEphemeralAta, true);
 }
-function initEphemeralAtaIx(ephemeralAta, owner, mint, payer, bump) {
+function initEphemeralAtaIx(ephemeralAta, owner, mint, payer) {
     return {
         accounts: [
             { address: ephemeralAta, role: kit_1.AccountRole.WRITABLE },
@@ -171,7 +246,7 @@ function initEphemeralAtaIx(ephemeralAta, owner, mint, payer, bump) {
             { address: mint, role: kit_1.AccountRole.READONLY },
             { address: system_1.SYSTEM_PROGRAM_ADDRESS, role: kit_1.AccountRole.READONLY },
         ],
-        data: new Uint8Array([0, bump]),
+        data: new Uint8Array([0]),
         programAddress: constants_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
     };
 }
@@ -189,7 +264,7 @@ function initVaultAtaIx(payer, vaultAta, vault, mint) {
         programAddress: ASSOCIATED_TOKEN_PROGRAM_ADDRESS,
     };
 }
-function initVaultIx(vault, mint, payer, bump, vaultEphemeralAta, vaultAta) {
+function initVaultIx(vault, mint, payer, vaultEphemeralAta, vaultAta) {
     return {
         accounts: [
             { address: vault, role: kit_1.AccountRole.WRITABLE },
@@ -204,7 +279,7 @@ function initVaultIx(vault, mint, payer, bump, vaultEphemeralAta, vaultAta) {
             },
             { address: system_1.SYSTEM_PROGRAM_ADDRESS, role: kit_1.AccountRole.READONLY },
         ],
-        data: new Uint8Array([1, bump]),
+        data: new Uint8Array([1]),
         programAddress: constants_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
     };
 }
@@ -234,23 +309,21 @@ function transferToVaultIx(ephemeralAta, vault, mint, sourceAta, vaultAta, owner
         programAddress: constants_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
     };
 }
-async function delegateIx(payer, ephemeralAta, bump, validator) {
+async function delegateIx(payer, ephemeralAta, validator) {
     const delegateBuffer = await (0, pda_1.delegateBufferPdaFromDelegatedAccountAndOwnerProgram)(ephemeralAta, constants_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID);
     const delegationRecord = await (0, pda_1.delegationRecordPdaFromDelegatedAccount)(ephemeralAta);
     const delegationMetadata = await (0, pda_1.delegationMetadataPdaFromDelegatedAccount)(ephemeralAta);
     const encoder = (0, kit_1.getAddressEncoder)();
     let data;
     if (validator) {
-        data = new Uint8Array(34);
+        data = new Uint8Array(33);
         data[0] = 4;
-        data[1] = bump;
         const validatorBytes = encoder.encode(validator);
-        data.set(validatorBytes, 2);
+        data.set(validatorBytes, 1);
     }
     else {
-        data = new Uint8Array(2);
+        data = new Uint8Array(1);
         data[0] = 4;
-        data[1] = bump;
     }
     return {
         accounts: [
@@ -267,16 +340,15 @@ async function delegateIx(payer, ephemeralAta, bump, validator) {
         programAddress: constants_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
     };
 }
-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 = new Uint8Array(6);
+    const data = new Uint8Array(5);
     data[0] = 11;
     new DataView(data.buffer).setUint32(1, shuttleId, true);
-    data[5] = bump;
     return {
         accounts: [
             { address: payer, role: kit_1.AccountRole.WRITABLE_SIGNER },
@@ -296,22 +368,20 @@ function initShuttleEphemeralAtaIx(payer, shuttleEphemeralAta, shuttleAta, shutt
         programAddress: constants_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
     };
 }
-async function delegateShuttleEphemeralAtaIx(payer, shuttleEphemeralAta, shuttleAta, bump, validator) {
+async function delegateShuttleEphemeralAtaIx(payer, shuttleEphemeralAta, shuttleAta, validator) {
     const delegateBuffer = await (0, pda_1.delegateBufferPdaFromDelegatedAccountAndOwnerProgram)(shuttleAta, constants_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID);
     const delegationRecord = await (0, pda_1.delegationRecordPdaFromDelegatedAccount)(shuttleAta);
     const delegationMetadata = await (0, pda_1.delegationMetadataPdaFromDelegatedAccount)(shuttleAta);
     const addressEncoder = (0, kit_1.getAddressEncoder)();
     let data;
     if (validator) {
-        data = new Uint8Array(34);
+        data = new Uint8Array(33);
         data[0] = 13;
-        data[1] = bump;
-        data.set(addressEncoder.encode(validator), 2);
+        data.set(addressEncoder.encode(validator), 1);
     }
     else {
-        data = new Uint8Array(2);
+        data = new Uint8Array(1);
         data[0] = 13;
-        data[1] = bump;
     }
     return {
         accounts: [
@@ -329,7 +399,7 @@ async function delegateShuttleEphemeralAtaIx(payer, shuttleEphemeralAta, shuttle
         programAddress: constants_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
     };
 }
-async function setupAndDelegateShuttleEphemeralAtaWithMergeIx(payer, shuttleEphemeralAta, shuttleAta, owner, sourceAta, destinationAta, shuttleWalletAta, mint, shuttleId, bump, amount, validator) {
+async function setupAndDelegateShuttleEphemeralAtaWithMergeIx(payer, shuttleEphemeralAta, shuttleAta, owner, sourceAta, destinationAta, shuttleWalletAta, mint, shuttleId, amount, validator) {
     if (!Number.isInteger(shuttleId) ||
         shuttleId < 0 ||
         shuttleId > 4294967295) {
@@ -342,14 +412,13 @@ async function setupAndDelegateShuttleEphemeralAtaWithMergeIx(payer, shuttleEphe
     const delegationRecord = await (0, pda_1.delegationRecordPdaFromDelegatedAccount)(shuttleAta);
     const delegationMetadata = await (0, pda_1.delegationMetadataPdaFromDelegatedAccount)(shuttleAta);
     const addressEncoder = (0, kit_1.getAddressEncoder)();
-    const data = new Uint8Array(validator ? 46 : 14);
+    const data = new Uint8Array(validator ? 45 : 13);
     const dataView = new DataView(data.buffer, data.byteOffset, data.byteLength);
     data[0] = 24;
     dataView.setUint32(1, shuttleId, true);
-    data[5] = bump;
-    dataView.setBigUint64(6, amount, true);
+    dataView.setBigUint64(5, amount, true);
     if (validator) {
-        data.set(addressEncoder.encode(validator), 14);
+        data.set(addressEncoder.encode(validator), 13);
     }
     return {
         accounts: [
@@ -380,7 +449,7 @@ async function setupAndDelegateShuttleEphemeralAtaWithMergeIx(payer, shuttleEphe
         programAddress: constants_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
     };
 }
-async function depositAndDelegateShuttleEphemeralAtaWithMergeAndPrivateTransferIx(payer, shuttleEphemeralAta, shuttleAta, owner, sourceAta, destinationAta, shuttleWalletAta, mint, shuttleId, bump, amount, minDelayMs, maxDelayMs, split, validator) {
+async function depositAndDelegateShuttleEphemeralAtaWithMergeAndPrivateTransferIx(payer, shuttleEphemeralAta, shuttleAta, owner, sourceAta, destinationOwner, shuttleWalletAta, mint, shuttleId, amount, minDelayMs, maxDelayMs, split, validator) {
     if (!Number.isInteger(shuttleId) ||
         shuttleId < 0 ||
         shuttleId > 4294967295) {
@@ -395,6 +464,9 @@ async function depositAndDelegateShuttleEphemeralAtaWithMergeAndPrivateTransferI
     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");
+    }
     if (!Number.isInteger(split) || split <= 0 || split > 4294967295) {
         throw new Error("split must fit in u32 and be positive");
     }
@@ -406,18 +478,16 @@ async function depositAndDelegateShuttleEphemeralAtaWithMergeAndPrivateTransferI
     const delegationRecord = await (0, pda_1.delegationRecordPdaFromDelegatedAccount)(shuttleAta);
     const delegationMetadata = await (0, pda_1.delegationMetadataPdaFromDelegatedAccount)(shuttleAta);
     const addressEncoder = (0, kit_1.getAddressEncoder)();
-    const data = new Uint8Array(validator ? 66 : 34);
-    const dataView = new DataView(data.buffer, data.byteOffset, data.byteLength);
-    data[0] = 25;
-    dataView.setUint32(1, shuttleId, true);
-    data[5] = bump;
-    dataView.setBigUint64(6, amount, true);
-    dataView.setBigUint64(14, minDelayMs, true);
-    dataView.setBigUint64(22, maxDelayMs, true);
-    dataView.setUint32(30, split, true);
-    if (validator) {
-        data.set(addressEncoder.encode(validator), 34);
-    }
+    const encryptedDestination = encryptEd25519Recipient(new Uint8Array(addressEncoder.encode(destinationOwner)), 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(new Uint8Array(addressEncoder.encode(validator))),
+        encodeLengthPrefixedBytes(encryptedDestination),
+        encodeLengthPrefixedBytes(encryptedSuffix),
+    ]);
     return {
         accounts: [
             { address: payer, role: kit_1.AccountRole.WRITABLE_SIGNER },
@@ -436,7 +506,6 @@ async function depositAndDelegateShuttleEphemeralAtaWithMergeAndPrivateTransferI
                 role: kit_1.AccountRole.READONLY,
             },
             { address: system_1.SYSTEM_PROGRAM_ADDRESS, role: kit_1.AccountRole.READONLY },
-            { address: destinationAta, role: kit_1.AccountRole.WRITABLE },
             { address: mint, role: kit_1.AccountRole.READONLY },
             { address: TOKEN_PROGRAM_ADDRESS, role: kit_1.AccountRole.READONLY },
             { address: vault, role: kit_1.AccountRole.READONLY },
@@ -448,7 +517,7 @@ async function depositAndDelegateShuttleEphemeralAtaWithMergeAndPrivateTransferI
         programAddress: constants_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
     };
 }
-async function withdrawThroughDelegatedShuttleWithMergeIx(payer, shuttleEphemeralAta, shuttleAta, owner, ownerAta, shuttleWalletAta, mint, shuttleId, bump, amount, validator) {
+async function withdrawThroughDelegatedShuttleWithMergeIx(payer, shuttleEphemeralAta, shuttleAta, owner, ownerAta, shuttleWalletAta, mint, shuttleId, amount, validator) {
     if (!Number.isInteger(shuttleId) ||
         shuttleId < 0 ||
         shuttleId > 4294967295) {
@@ -462,14 +531,13 @@ async function withdrawThroughDelegatedShuttleWithMergeIx(payer, shuttleEphemera
     const delegationRecord = await (0, pda_1.delegationRecordPdaFromDelegatedAccount)(shuttleAta);
     const delegationMetadata = await (0, pda_1.delegationMetadataPdaFromDelegatedAccount)(shuttleAta);
     const addressEncoder = (0, kit_1.getAddressEncoder)();
-    const data = new Uint8Array(validator ? 46 : 14);
+    const data = new Uint8Array(validator ? 45 : 13);
     const dataView = new DataView(data.buffer, data.byteOffset, data.byteLength);
     data[0] = 26;
     dataView.setUint32(1, shuttleId, true);
-    data[5] = bump;
-    dataView.setBigUint64(6, amount, true);
+    dataView.setBigUint64(5, amount, true);
     if (validator) {
-        data.set(addressEncoder.encode(validator), 14);
+        data.set(addressEncoder.encode(validator), 13);
     }
     return {
         accounts: [
@@ -535,7 +603,7 @@ function undelegateAndCloseShuttleEphemeralAtaIx(payer, shuttleEphemeralAta, shu
 }
 async function withdrawSplIx(owner, mint, amount) {
     const [ephemeralAta] = await deriveEphemeralAta(owner, mint);
-    const [vault, vaultBump] = await deriveVault(mint);
+    const [vault] = await deriveVault(mint);
     const vaultAta = await deriveVaultAta(mint, vault);
     const userDestAta = await getAssociatedTokenAddressSync(mint, owner);
     return {
@@ -548,7 +616,7 @@ async function withdrawSplIx(owner, mint, amount) {
             { address: userDestAta, role: kit_1.AccountRole.WRITABLE },
             { address: TOKEN_PROGRAM_ADDRESS, role: kit_1.AccountRole.READONLY },
         ],
-        data: encodeAmountInstructionData(3, amount, vaultBump),
+        data: encodeAmountInstructionData(3, amount),
         programAddress: constants_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
     };
 }
@@ -582,7 +650,7 @@ async function undelegateIx(owner, mint) {
         programAddress: constants_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
     };
 }
-async function createEataPermissionIx(ephemeralAta, payer, bump, flags = 0) {
+async function createEataPermissionIx(ephemeralAta, payer, flags = 0) {
     const permission = await (0, pda_1.permissionPdaFromAccount)(ephemeralAta);
     return {
         accounts: [
@@ -592,11 +660,11 @@ async function createEataPermissionIx(ephemeralAta, payer, bump, flags = 0) {
             { address: system_1.SYSTEM_PROGRAM_ADDRESS, role: kit_1.AccountRole.READONLY },
             { address: constants_1.PERMISSION_PROGRAM_ID, role: kit_1.AccountRole.READONLY },
         ],
-        data: new Uint8Array([6, bump, flags]),
+        data: new Uint8Array([6, flags]),
         programAddress: constants_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
     };
 }
-async function resetEataPermissionIx(ephemeralAta, payer, bump, flags = 0) {
+async function resetEataPermissionIx(ephemeralAta, payer, flags = 0) {
     const permission = await (0, pda_1.permissionPdaFromAccount)(ephemeralAta);
     return {
         accounts: [
@@ -605,11 +673,11 @@ async function resetEataPermissionIx(ephemeralAta, payer, bump, flags = 0) {
             { address: payer, role: kit_1.AccountRole.READONLY_SIGNER },
             { address: constants_1.PERMISSION_PROGRAM_ID, role: kit_1.AccountRole.READONLY },
         ],
-        data: new Uint8Array([9, bump, flags]),
+        data: new Uint8Array([9, flags]),
         programAddress: constants_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
     };
 }
-async function delegateEataPermissionIx(payer, ephemeralAta, bump, validator) {
+async function delegateEataPermissionIx(payer, ephemeralAta, validator) {
     const permission = await (0, pda_1.permissionPdaFromAccount)(ephemeralAta);
     return {
         accounts: [
@@ -633,7 +701,7 @@ async function delegateEataPermissionIx(payer, ephemeralAta, bump, validator) {
             { address: constants_1.DELEGATION_PROGRAM_ID, role: kit_1.AccountRole.READONLY },
             { address: validator, role: kit_1.AccountRole.READONLY },
         ],
-        data: new Uint8Array([7, bump]),
+        data: new Uint8Array([7]),
         programAddress: constants_1.EPHEMERAL_SPL_TOKEN_PROGRAM_ID,
     };
 }
@@ -668,22 +736,22 @@ async function buildDelegateSplInstructions(owner, mint, amount, opts) {
     const initVaultIfMissing = opts?.initVaultIfMissing ?? false;
     const isPrivate = opts?.private ?? false;
     const instructions = [];
-    const [ephemeralAta, eataBump] = await deriveEphemeralAta(owner, mint);
-    const [vault, vaultBump] = await deriveVault(mint);
-    const [vaultEphemeralAta, vaultEataBump] = await deriveEphemeralAta(vault, mint);
+    const [ephemeralAta] = await deriveEphemeralAta(owner, mint);
+    const [vault] = await deriveVault(mint);
+    const [vaultEphemeralAta] = await deriveEphemeralAta(vault, mint);
     const vaultAta = await deriveVaultAta(mint, vault);
     const ownerAta = await 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, vaultEphemeralAta, vaultAta), initVaultAtaIx(payer, vaultAta, vault, mint), await delegateIx(payer, vaultEphemeralAta, vaultEataBump, validator));
+        instructions.push(initVaultIx(vault, mint, payer, vaultEphemeralAta, vaultAta), initVaultAtaIx(payer, vaultAta, vault, mint), await delegateIx(payer, vaultEphemeralAta, validator));
     }
     instructions.push(transferToVaultIx(ephemeralAta, vault, mint, ownerAta, vaultAta, owner, amount));
     if (isPrivate) {
-        instructions.push(await createEataPermissionIx(ephemeralAta, payer, eataBump));
+        instructions.push(await createEataPermissionIx(ephemeralAta, payer));
     }
-    instructions.push(await delegateIx(payer, ephemeralAta, eataBump, validator));
+    instructions.push(await delegateIx(payer, ephemeralAta, validator));
     return instructions;
 }
 async function buildIdempotentDelegateSplInstructions(owner, mint, amount, opts) {
@@ -695,32 +763,32 @@ async function buildIdempotentDelegateSplInstructions(owner, mint, amount, opts)
     const isPrivate = opts?.private ?? false;
     const shuttleId = opts?.shuttleId ?? randomShuttleId();
     const instructions = [];
-    const [ephemeralAta, eataBump] = await deriveEphemeralAta(owner, mint);
-    const [vault, vaultBump] = await deriveVault(mint);
-    const [vaultEphemeralAta, vaultEataBump] = await deriveEphemeralAta(vault, mint);
+    const [ephemeralAta] = await deriveEphemeralAta(owner, mint);
+    const [vault] = await deriveVault(mint);
+    const [vaultEphemeralAta] = await deriveEphemeralAta(vault, mint);
     const vaultAta = await deriveVaultAta(mint, vault);
     const ownerAta = await getAssociatedTokenAddressSync(mint, owner);
-    const [shuttleEphemeralAta, shuttleBump] = await deriveShuttleEphemeralAta(owner, mint, shuttleId);
-    const [shuttleAta, shuttleAtaBump] = await deriveShuttleAta(shuttleEphemeralAta, mint);
+    const [shuttleEphemeralAta] = await deriveShuttleEphemeralAta(owner, mint, shuttleId);
+    const [shuttleAta] = await deriveShuttleAta(shuttleEphemeralAta, mint);
     const shuttleWalletAta = await deriveShuttleWalletAta(mint, shuttleEphemeralAta);
     if (initVaultIfMissing) {
-        instructions.push(initVaultIx(vault, mint, payer, vaultBump, vaultEphemeralAta, vaultAta), initVaultAtaIx(payer, vaultAta, vault, mint), await delegateIx(payer, vaultEphemeralAta, vaultEataBump, validator));
+        instructions.push(initVaultIx(vault, mint, payer, vaultEphemeralAta, vaultAta), initVaultAtaIx(payer, vaultAta, vault, mint), await delegateIx(payer, vaultEphemeralAta, validator));
     }
     if (initAtasIfMissing) {
         instructions.push(initVaultAtaIx(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(await createEataPermissionIx(ephemeralAta, payer, eataBump));
+        instructions.push(await createEataPermissionIx(ephemeralAta, payer));
     }
-    instructions.push(await delegateIx(payer, ephemeralAta, eataBump, validator));
+    instructions.push(await delegateIx(payer, ephemeralAta, validator));
     if (amount > 0n) {
-        instructions.push(await setupAndDelegateShuttleEphemeralAtaWithMergeIx(payer, shuttleEphemeralAta, shuttleAta, owner, ownerAta, ownerAta, shuttleWalletAta, mint, shuttleId, shuttleBump, amount, validator));
+        instructions.push(await setupAndDelegateShuttleEphemeralAtaWithMergeIx(payer, shuttleEphemeralAta, shuttleAta, owner, ownerAta, ownerAta, shuttleWalletAta, mint, shuttleId, amount, validator));
     }
     else {
-        instructions.push(initShuttleEphemeralAtaIx(payer, shuttleEphemeralAta, shuttleAta, shuttleWalletAta, owner, mint, shuttleId, shuttleBump), await delegateShuttleEphemeralAtaIx(payer, shuttleEphemeralAta, shuttleAta, shuttleAtaBump, validator));
+        instructions.push(initShuttleEphemeralAtaIx(payer, shuttleEphemeralAta, shuttleAta, shuttleWalletAta, owner, mint, shuttleId), await delegateShuttleEphemeralAtaIx(payer, shuttleEphemeralAta, shuttleAta, validator));
     }
     return instructions;
 }
@@ -742,17 +810,17 @@ async function delegateSplWithPrivateTransfer(owner, mint, amount, opts) {
     const maxDelayMs = opts?.maxDelayMs ?? minDelayMs;
     const split = opts?.split ?? 1;
     const instructions = [];
-    const [ephemeralAta, eataBump] = await deriveEphemeralAta(owner, mint);
-    const [vault, vaultBump] = await deriveVault(mint);
-    const [vaultEphemeralAta, vaultEataBump] = await deriveEphemeralAta(vault, mint);
+    const [ephemeralAta] = await deriveEphemeralAta(owner, mint);
+    const [vault] = await deriveVault(mint);
+    const [vaultEphemeralAta] = await deriveEphemeralAta(vault, mint);
     const vaultAta = await deriveVaultAta(mint, vault);
     const [queue] = await (0, transferQueue_1.deriveTransferQueue)(mint);
     const ownerAta = await getAssociatedTokenAddressSync(mint, owner);
-    const [shuttleEphemeralAta, shuttleBump] = await deriveShuttleEphemeralAta(owner, mint, shuttleId);
+    const [shuttleEphemeralAta] = await deriveShuttleEphemeralAta(owner, mint, shuttleId);
     const [shuttleAta] = await deriveShuttleAta(shuttleEphemeralAta, mint);
     const shuttleWalletAta = await deriveShuttleWalletAta(mint, shuttleEphemeralAta);
     if (initVaultIfMissing) {
-        instructions.push(initVaultIx(vault, mint, payer, vaultBump, vaultEphemeralAta, vaultAta), initVaultAtaIx(payer, vaultAta, vault, mint), await delegateIx(payer, vaultEphemeralAta, vaultEataBump, validator));
+        instructions.push(initVaultIx(vault, mint, payer, vaultEphemeralAta, vaultAta), initVaultAtaIx(payer, vaultAta, vault, mint), await delegateIx(payer, vaultEphemeralAta, validator));
     }
     if (initTransferQueueIfMissing) {
         instructions.push((0, transferQueue_1.initTransferQueueIx)(payer, queue, mint));
@@ -761,9 +829,9 @@ async function delegateSplWithPrivateTransfer(owner, mint, amount, opts) {
         instructions.push(initVaultAtaIx(payer, ownerAta, owner, mint));
     }
     if (initIfMissing) {
-        instructions.push(initEphemeralAtaIx(ephemeralAta, owner, mint, payer, eataBump));
+        instructions.push(initEphemeralAtaIx(ephemeralAta, owner, mint, payer));
     }
-    instructions.push(await delegateIx(payer, ephemeralAta, eataBump, validator), await depositAndDelegateShuttleEphemeralAtaWithMergeAndPrivateTransferIx(payer, shuttleEphemeralAta, shuttleAta, owner, ownerAta, ownerAta, shuttleWalletAta, mint, shuttleId, shuttleBump, amount, minDelayMs, maxDelayMs, split, validator));
+    instructions.push(await delegateIx(payer, ephemeralAta, validator), await 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) {
@@ -802,10 +870,10 @@ async function transferSpl(from, to, mint, amount, opts) {
     }
     const instructions = [];
     if (initVaultIfMissing) {
-        const [vault, vaultBump] = await deriveVault(mint);
-        const [vaultEphemeralAta, vaultEataBump] = await deriveEphemeralAta(vault, mint);
+        const [vault] = await deriveVault(mint);
+        const [vaultEphemeralAta] = await deriveEphemeralAta(vault, mint);
         const vaultAta = await deriveVaultAta(mint, vault);
-        instructions.push(initVaultIx(vault, mint, payer, vaultBump, vaultEphemeralAta, vaultAta), initVaultAtaIx(payer, vaultAta, vault, mint), await delegateIx(payer, vaultEphemeralAta, vaultEataBump, validator));
+        instructions.push(initVaultIx(vault, mint, payer, vaultEphemeralAta, vaultAta), initVaultAtaIx(payer, vaultAta, vault, mint), await delegateIx(payer, vaultEphemeralAta, validator));
     }
     if (opts.fromBalance === "base" && initAtasIfMissing) {
         instructions.push(initVaultAtaIx(payer, fromAta, from, mint));
@@ -813,28 +881,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(initVaultAtaIx(payer, toAta, to, mint));
-                }
-                const [shuttleEphemeralAta, shuttleBump] = await deriveShuttleEphemeralAta(from, mint, shuttleId);
+                const [shuttleEphemeralAta] = await deriveShuttleEphemeralAta(from, mint, shuttleId);
                 const [shuttleAta] = await deriveShuttleAta(shuttleEphemeralAta, mint);
                 const shuttleWalletAta = await deriveShuttleWalletAta(mint, shuttleEphemeralAta);
                 return [
                     ...instructions,
-                    await depositAndDelegateShuttleEphemeralAtaWithMergeAndPrivateTransferIx(payer, shuttleEphemeralAta, shuttleAta, from, fromAta, toAta, shuttleWalletAta, mint, shuttleId, shuttleBump, amount, minDelayMs, maxDelayMs, split, validator),
+                    await 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] = await deriveEphemeralAta(to, mint);
-                    instructions.push(initVaultAtaIx(payer, toAta, to, mint), initEphemeralAtaIx(toEphemeralAta, to, mint, payer, toEataBump), await delegateIx(payer, toEphemeralAta, toEataBump, validator));
+                    const [toEphemeralAta] = await deriveEphemeralAta(to, mint);
+                    instructions.push(initVaultAtaIx(payer, toAta, to, mint), initEphemeralAtaIx(toEphemeralAta, to, mint, payer), await delegateIx(payer, toEphemeralAta, validator));
                 }
-                const [shuttleEphemeralAta, shuttleBump] = await deriveShuttleEphemeralAta(from, mint, shuttleId);
+                const [shuttleEphemeralAta] = await deriveShuttleEphemeralAta(from, mint, shuttleId);
                 const [shuttleAta] = await deriveShuttleAta(shuttleEphemeralAta, mint);
                 const shuttleWalletAta = await deriveShuttleWalletAta(mint, shuttleEphemeralAta);
                 return [
                     ...instructions,
-                    await setupAndDelegateShuttleEphemeralAtaWithMergeIx(payer, shuttleEphemeralAta, shuttleAta, from, fromAta, toAta, shuttleWalletAta, mint, shuttleId, shuttleBump, amount, validator),
+                    await setupAndDelegateShuttleEphemeralAtaWithMergeIx(payer, shuttleEphemeralAta, shuttleAta, from, fromAta, toAta, shuttleWalletAta, mint, shuttleId, amount, validator),
                 ];
             }
             break;
@@ -856,18 +921,18 @@ async function buildIdempotentWithdrawSplInstructions(owner, mint, amount, opts)
     const initAtasIfMissing = opts?.initAtasIfMissing ?? false;
     const shuttleId = opts?.shuttleId ?? randomShuttleId();
     const instructions = [];
-    const [ephemeralAta, eataBump] = await deriveEphemeralAta(owner, mint);
+    const [ephemeralAta] = await deriveEphemeralAta(owner, mint);
     const ownerAta = await getAssociatedTokenAddressSync(mint, owner);
-    const [shuttleEphemeralAta, shuttleBump] = await deriveShuttleEphemeralAta(owner, mint, shuttleId);
+    const [shuttleEphemeralAta] = await deriveShuttleEphemeralAta(owner, mint, shuttleId);
     const [shuttleAta] = await deriveShuttleAta(shuttleEphemeralAta, mint);
     const shuttleWalletAta = await deriveShuttleWalletAta(mint, shuttleEphemeralAta);
     if (initAtasIfMissing) {
         instructions.push(initVaultAtaIx(payer, ownerAta, owner, mint));
     }
     if (initIfMissing) {
-        instructions.push(initEphemeralAtaIx(ephemeralAta, owner, mint, payer, eataBump));
+        instructions.push(initEphemeralAtaIx(ephemeralAta, owner, mint, payer));
     }
-    instructions.push(await delegateIx(payer, ephemeralAta, eataBump, validator), await withdrawThroughDelegatedShuttleWithMergeIx(payer, shuttleEphemeralAta, shuttleAta, owner, ownerAta, shuttleWalletAta, mint, shuttleId, shuttleBump, amount, validator));
+    instructions.push(await delegateIx(payer, ephemeralAta, validator), await withdrawThroughDelegatedShuttleWithMergeIx(payer, shuttleEphemeralAta, shuttleAta, owner, ownerAta, shuttleWalletAta, mint, shuttleId, amount, validator));
     return instructions;
 }
 async function withdrawSpl(owner, mint, amount, opts) {