@dropsy/airdrop 0.2.5 → 0.2.7

package/dist/index.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -37,6 +47,8 @@ __export(index_exports, {
   CLAIM_MAP_DISCRIMINATOR: () => CLAIM_MAP_DISCRIMINATOR,
   CREATE_AIRDROP_DISCRIMINATOR: () => CREATE_AIRDROP_DISCRIMINATOR,
   CREATE_CLAIM_MAP_DISCRIMINATOR: () => CREATE_CLAIM_MAP_DISCRIMINATOR,
+  DEFAULT_MASTER_PDA: () => DEFAULT_MASTER_PDA,
+  DEFAULT_MASTER_PDA_AUTHORITY: () => DEFAULT_MASTER_PDA_AUTHORITY,
   DEPOSIT_TOKENS_DISCRIMINATOR: () => DEPOSIT_TOKENS_DISCRIMINATOR,
   DROPSY_ERROR__ACTIVE_BITMAPS_EXIST: () => DROPSY_ERROR__ACTIVE_BITMAPS_EXIST,
   DROPSY_ERROR__AIRDROP_ENDED: () => DROPSY_ERROR__AIRDROP_ENDED,
@@ -115,6 +127,7 @@ __export(index_exports, {
   DROPSY_ERROR__VESTING_ACCOUNT_REQUIRED: () => DROPSY_ERROR__VESTING_ACCOUNT_REQUIRED,
   DROPSY_MASTER_SEED: () => DROPSY_MASTER_SEED,
   DROPSY_PROGRAM_ADDRESS: () => DROPSY_PROGRAM_ADDRESS,
+  DROPSY_TREASURY: () => DROPSY_TREASURY,
   DropsyAccount: () => DropsyAccount,
   DropsyInstruction: () => DropsyInstruction,
   INITIALIZE_AIRDROP_MASTER_DISCRIMINATOR: () => INITIALIZE_AIRDROP_MASTER_DISCRIMINATOR,
@@ -131,6 +144,10 @@ __export(index_exports, {
   VERSION_BASIC: () => VERSION_BASIC,
   VERSION_VESTED: () => VERSION_VESTED,
   VESTING_SEED: () => VESTING_SEED,
+  createDefaultSolanaClient: () => createDefaultSolanaClient,
+  createMerkleTree: () => createMerkleTree,
+  createTransactionMessageFromInstructions: () => createTransactionMessageFromInstructions,
+  createWLMerkleTree: () => createWLMerkleTree,
   decodeAffiliate: () => decodeAffiliate,
   decodeAffiliateMaster: () => decodeAffiliateMaster,
   decodeAirdrop: () => decodeAirdrop,
@@ -166,6 +183,7 @@ __export(index_exports, {
   fetchMaybeAirdropMaster: () => fetchMaybeAirdropMaster,
   fetchMaybeClaimMap: () => fetchMaybeClaimMap,
   fetchMaybeMaster: () => fetchMaybeMaster,
+  generateKeyPairSignerWithSol: () => generateKeyPairSignerWithSol,
   getAdvancedFeeConfigCodec: () => getAdvancedFeeConfigCodec,
   getAdvancedFeeConfigDecoder: () => getAdvancedFeeConfigDecoder,
   getAdvancedFeeConfigEncoder: () => getAdvancedFeeConfigEncoder,
@@ -253,6 +271,7 @@ __export(index_exports, {
   getCreateClaimMapInstructionDataCodec: () => getCreateClaimMapInstructionDataCodec,
   getCreateClaimMapInstructionDataDecoder: () => getCreateClaimMapInstructionDataDecoder,
   getCreateClaimMapInstructionDataEncoder: () => getCreateClaimMapInstructionDataEncoder,
+  getCreateClaimMapV0Instruction: () => getCreateClaimMapV0Instruction,
   getDepositTokensDiscriminatorBytes: () => getDepositTokensDiscriminatorBytes,
   getDepositTokensInstruction: () => getDepositTokensInstruction,
   getDepositTokensInstructionAsync: () => getDepositTokensInstructionAsync,
@@ -285,12 +304,14 @@ __export(index_exports, {
   getMasterInitializedDecoder: () => getMasterInitializedDecoder,
   getMasterInitializedEncoder: () => getMasterInitializedEncoder,
   getMasterSize: () => getMasterSize,
+  getMerkleRootArray: () => getMerkleRootArray,
   getRedeemAirdropTokensDiscriminatorBytes: () => getRedeemAirdropTokensDiscriminatorBytes,
   getRedeemAirdropTokensInstruction: () => getRedeemAirdropTokensInstruction,
   getRedeemAirdropTokensInstructionAsync: () => getRedeemAirdropTokensInstructionAsync,
   getRedeemAirdropTokensInstructionDataCodec: () => getRedeemAirdropTokensInstructionDataCodec,
   getRedeemAirdropTokensInstructionDataDecoder: () => getRedeemAirdropTokensInstructionDataDecoder,
   getRedeemAirdropTokensInstructionDataEncoder: () => getRedeemAirdropTokensInstructionDataEncoder,
+  getSimpleMerkleProof: () => getSimpleMerkleProof,
   getTokensDepositedCodec: () => getTokensDepositedCodec,
   getTokensDepositedDecoder: () => getTokensDepositedDecoder,
   getTokensDepositedEncoder: () => getTokensDepositedEncoder,
@@ -306,7 +327,8 @@ __export(index_exports, {
   parseDepositTokensInstruction: () => parseDepositTokensInstruction,
   parseInitializeAirdropMasterInstruction: () => parseInitializeAirdropMasterInstruction,
   parseInitializeMasterInstruction: () => parseInitializeMasterInstruction,
-  parseRedeemAirdropTokensInstruction: () => parseRedeemAirdropTokensInstruction
+  parseRedeemAirdropTokensInstruction: () => parseRedeemAirdropTokensInstruction,
+  toUnixTimestamp: () => toUnixTimestamp
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -677,13 +699,11 @@ function getAirdropMasterEncoder() {
       ["bitmapCreated", (0, import_kit5.getU64Encoder)()],
       ["maxBitmapAllowed", (0, import_kit5.getU64Encoder)()],
       ["airdropCreationFee", (0, import_kit5.getU64Encoder)()],
+      ["bitmapCreationFee", (0, import_kit5.getU64Encoder)()],
       ["airdropUpdateFee", (0, import_kit5.getU64Encoder)()],
-      ["airdropCloseFee", (0, import_kit5.getU64Encoder)()],
       ["airdropClaimFee", (0, import_kit5.getU64Encoder)()],
       ["airdropDelegateFee", (0, import_kit5.getU64Encoder)()],
       ["airdropDepositFee", (0, import_kit5.getU64Encoder)()],
-      ["bitmapCreationFee", (0, import_kit5.getU64Encoder)()],
-      ["bitmapCloseFee", (0, import_kit5.getU64Encoder)()],
       ["bump", (0, import_kit5.getU8Encoder)()],
       ["padding", (0, import_kit5.fixEncoderSize)((0, import_kit5.getBytesEncoder)(), 7)]
     ]),
@@ -701,13 +721,11 @@ function getAirdropMasterDecoder() {
     ["bitmapCreated", (0, import_kit5.getU64Decoder)()],
     ["maxBitmapAllowed", (0, import_kit5.getU64Decoder)()],
     ["airdropCreationFee", (0, import_kit5.getU64Decoder)()],
+    ["bitmapCreationFee", (0, import_kit5.getU64Decoder)()],
     ["airdropUpdateFee", (0, import_kit5.getU64Decoder)()],
-    ["airdropCloseFee", (0, import_kit5.getU64Decoder)()],
     ["airdropClaimFee", (0, import_kit5.getU64Decoder)()],
     ["airdropDelegateFee", (0, import_kit5.getU64Decoder)()],
     ["airdropDepositFee", (0, import_kit5.getU64Decoder)()],
-    ["bitmapCreationFee", (0, import_kit5.getU64Decoder)()],
-    ["bitmapCloseFee", (0, import_kit5.getU64Decoder)()],
     ["bump", (0, import_kit5.getU8Decoder)()],
     ["padding", (0, import_kit5.fixDecoderSize)((0, import_kit5.getBytesDecoder)(), 7)]
   ]);
@@ -744,7 +762,7 @@ async function fetchAllMaybeAirdropMaster(rpc, addresses, config) {
   return maybeAccounts.map((maybeAccount) => decodeAirdropMaster(maybeAccount));
 }
 function getAirdropMasterSize() {
-  return 208;
+  return 192;
 }
 
 // src/accounts/claimMap.ts
@@ -1318,11 +1336,7 @@ async function getClaimAirdropInstructionAsync(input, config) {
     master: { value: input.master ?? null, isWritable: false },
     config: { value: input.config ?? null, isWritable: false },
     treasury: { value: input.treasury ?? null, isWritable: true },
-    airdropMaster: { value: input.airdropMaster ?? null, isWritable: false },
-    airdropMasterAuthority: {
-      value: input.airdropMasterAuthority ?? null,
-      isWritable: false
-    },
+    airdropMaster: { value: input.airdropMaster ?? null, isWritable: true },
     affiliate: { value: input.affiliate ?? null, isWritable: true },
     sourceTokenAccount: {
       value: input.sourceTokenAccount ?? null,
@@ -1379,34 +1393,6 @@ async function getClaimAirdropInstructionAsync(input, config) {
       ]
     });
   }
-  if (!accounts.airdropMaster.value) {
-    accounts.airdropMaster.value = await (0, import_kit11.getProgramDerivedAddress)({
-      programAddress,
-      seeds: [
-        (0, import_kit11.getBytesEncoder)().encode(
-          new Uint8Array([
-            97,
-            105,
-            114,
-            100,
-            114,
-            111,
-            112,
-            95,
-            109,
-            97,
-            115,
-            116,
-            101,
-            114
-          ])
-        ),
-        (0, import_kit11.getAddressEncoder)().encode(
-          expectAddress(accounts.airdropMasterAuthority.value)
-        )
-      ]
-    });
-  }
   if (!accounts.tokenProgram.value) {
     accounts.tokenProgram.value = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
   }
@@ -1445,7 +1431,6 @@ async function getClaimAirdropInstructionAsync(input, config) {
       getAccountMeta(accounts.config),
       getAccountMeta(accounts.treasury),
       getAccountMeta(accounts.airdropMaster),
-      getAccountMeta(accounts.airdropMasterAuthority),
       getAccountMeta(accounts.affiliate),
       getAccountMeta(accounts.sourceTokenAccount),
       getAccountMeta(accounts.destinationTokenAccount),
@@ -1470,11 +1455,7 @@ function getClaimAirdropInstruction(input, config) {
     master: { value: input.master ?? null, isWritable: false },
     config: { value: input.config ?? null, isWritable: false },
     treasury: { value: input.treasury ?? null, isWritable: true },
-    airdropMaster: { value: input.airdropMaster ?? null, isWritable: false },
-    airdropMasterAuthority: {
-      value: input.airdropMasterAuthority ?? null,
-      isWritable: false
-    },
+    airdropMaster: { value: input.airdropMaster ?? null, isWritable: true },
     affiliate: { value: input.affiliate ?? null, isWritable: true },
     sourceTokenAccount: {
       value: input.sourceTokenAccount ?? null,
@@ -1514,7 +1495,6 @@ function getClaimAirdropInstruction(input, config) {
       getAccountMeta(accounts.config),
       getAccountMeta(accounts.treasury),
       getAccountMeta(accounts.airdropMaster),
-      getAccountMeta(accounts.airdropMasterAuthority),
       getAccountMeta(accounts.affiliate),
       getAccountMeta(accounts.sourceTokenAccount),
       getAccountMeta(accounts.destinationTokenAccount),
@@ -1534,7 +1514,7 @@ function getClaimAirdropInstruction(input, config) {
   });
 }
 function parseClaimAirdropInstruction(instruction) {
-  if (instruction.accounts.length < 16) {
+  if (instruction.accounts.length < 15) {
     throw new Error("Not enough accounts");
   }
   let accountIndex = 0;
@@ -1554,7 +1534,6 @@ function parseClaimAirdropInstruction(instruction) {
       config: getNextAccount(),
       treasury: getNextAccount(),
       airdropMaster: getNextAccount(),
-      airdropMasterAuthority: getNextAccount(),
       affiliate: getNextOptionalAccount(),
       sourceTokenAccount: getNextAccount(),
       destinationTokenAccount: getNextAccount(),
@@ -1572,7 +1551,157 @@ function parseClaimAirdropInstruction(instruction) {
 }
 
 // src/instructions/createAirdrop.ts
+var import_kit15 = require("@solana/kit");
+
+// src/constants/index.ts
 var import_kit12 = require("@solana/kit");
+var DROPSY_MASTER_SEED = "master";
+var AIRDROP_CONFIG_SEED = "airdrop_config";
+var AFFILIATE_MASTER_SEED = "affiliate_master";
+var AIRDROP_MASTER_SEED = "airdrop_master";
+var AIRDROP_SEED = "airdrop";
+var AFFILIATE_SEED = "affiliate";
+var BITMAP_SEED = "bitmap";
+var VESTING_SEED = "vesting";
+var PRESALE_SEED = "presale";
+var VAULT_SEED = "vault";
+var ADMIN = (0, import_kit12.address)("8mtUD2XrkNnTxnjCehZ4DEtTXeGR1yrepSEGhCaSj2kT");
+var DROPSY_TREASURY = (0, import_kit12.address)("8mtUD2XrkNnTxnjCehZ4DEtTXeGR1yrepSEGhCaSj2kT");
+var DEFAULT_MASTER_PDA = (0, import_kit12.address)("8mtUD2XrkNnTxnjCehZ4DEtTXeGR1yrepSEGhCaSj2kT");
+var DEFAULT_MASTER_PDA_AUTHORITY = (0, import_kit12.address)("8mtUD2XrkNnTxnjCehZ4DEtTXeGR1yrepSEGhCaSj2kT");
+var BITMAP_SIZE = 8e3;
+var MAX_BITMAP_CLAIM = BITMAP_SIZE * 8;
+var VERSION_BASIC = 0;
+var VERSION_VESTED = 1;
+var STATE_INITIALIZED = 0;
+var STATE_DELEGATED = 1;
+var STATE_REDEEMED = 2;
+var MUTABLE_NONE = 0;
+
+// src/utils/client.ts
+var import_kit13 = require("@solana/kit");
+var generateKeyPairSignerWithSol = async (rpcClient, putativeLamports = 1000000000n) => {
+  const signer = await (0, import_kit13.generateKeyPairSigner)();
+  await (0, import_kit13.airdropFactory)(rpcClient)({
+    recipientAddress: signer.address,
+    lamports: (0, import_kit13.lamports)(putativeLamports),
+    commitment: "confirmed"
+  });
+  return signer;
+};
+var createDefaultSolanaClient = () => {
+  const rpc = (0, import_kit13.createSolanaRpc)("https://api.devnet.solana.com");
+  const rpcSubscriptions = (0, import_kit13.createSolanaRpcSubscriptions)(
+    "wss://api.devnet.solana.com"
+  );
+  return { rpc, rpcSubscriptions };
+};
+var createTransactionMessageFromInstructions = async (rpc, signer, instruction) => {
+  const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
+  return (0, import_kit13.pipe)(
+    (0, import_kit13.createTransactionMessage)({ version: 0 }),
+    (tx) => (0, import_kit13.setTransactionMessageLifetimeUsingBlockhash)(latestBlockhash, tx),
+    (tx) => (0, import_kit13.setTransactionMessageFeePayerSigner)(signer, tx),
+    (tx) => (0, import_kit13.appendTransactionMessageInstructions)(instruction, tx)
+  );
+};
+
+// src/utils/derive.ts
+var import_kit14 = require("@solana/kit");
+async function getDropsyDerivedAddress(seeds) {
+  return await (0, import_kit14.getProgramDerivedAddress)({
+    seeds,
+    programAddress: DROPSY_PROGRAM_ADDRESS
+  });
+}
+async function getMasterDerivedAddress() {
+  return await getDropsyDerivedAddress([DROPSY_MASTER_SEED]);
+}
+async function getAirdropConfigDerivedAddress() {
+  return await getDropsyDerivedAddress([AIRDROP_CONFIG_SEED]);
+}
+async function getAirdropMasterDerivedAddress(authority) {
+  const seeds = [
+    AIRDROP_MASTER_SEED,
+    (0, import_kit14.getAddressEncoder)().encode(authority)
+  ];
+  return await getDropsyDerivedAddress(seeds);
+}
+async function getAffiliateDerivedAddress(authority) {
+  const seeds = [
+    AFFILIATE_SEED,
+    (0, import_kit14.getAddressEncoder)().encode(authority)
+  ];
+  return await getDropsyDerivedAddress(seeds);
+}
+async function getAirdropDerivedAddress(authority, mint) {
+  const seeds = [
+    AIRDROP_SEED,
+    (0, import_kit14.getAddressEncoder)().encode(mint),
+    (0, import_kit14.getAddressEncoder)().encode(authority)
+  ];
+  return await getDropsyDerivedAddress(seeds);
+}
+async function getClaimMapDerivedAddress(airdrop, id) {
+  const idBuffer = Buffer.alloc(2);
+  idBuffer.writeUInt16LE(id);
+  const seeds = [
+    BITMAP_SEED,
+    (0, import_kit14.getAddressEncoder)().encode(airdrop),
+    idBuffer
+  ];
+  return await getDropsyDerivedAddress(seeds);
+}
+
+// src/utils/helper.ts
+function toUnixTimestamp(date) {
+  if (!date) return null;
+  return Math.floor(date.getTime() / 1e3);
+}
+
+// src/utils/merkle.ts
+var import_crypto = require("crypto");
+var import_merkletreejs = __toESM(require("merkletreejs"));
+function hashLeaf(index, address2, amount) {
+  const data = `${index}:${address2}:${amount.toString()}`;
+  return (0, import_crypto.createHash)("sha256").update(data).digest();
+}
+function hashAddress(address2) {
+  return (0, import_crypto.createHash)("sha256").update(address2).digest();
+}
+var createWLMerkleTree = (wallets) => {
+  const leaves = wallets.map((address2) => hashAddress(address2));
+  return new import_merkletreejs.default(
+    leaves,
+    (data) => (0, import_crypto.createHash)("sha256").update(data).digest(),
+    { sortPairs: true }
+  );
+};
+var getSimpleMerkleProof = (merkleTree, address2) => {
+  const leaf = hashAddress(address2);
+  return merkleTree.getProof(leaf).map((p) => p.data);
+};
+var getMerkleRootArray = (merkleTree) => {
+  const root = merkleTree.getRoot();
+  if (root.length !== 32) {
+    throw new Error("Merkle root must be 32 bytes");
+  }
+  const uint8Root = new Uint8Array(root);
+  return uint8Root;
+};
+var createMerkleTree = (claimList) => {
+  const leaves = claimList.map(
+    ({ index, address: address2, amount }) => hashLeaf(index, address2, amount)
+  );
+  const merkleTree = new import_merkletreejs.default(
+    leaves,
+    (data) => (0, import_crypto.createHash)("sha256").update(data).digest(),
+    { sortPairs: true }
+  );
+  return merkleTree;
+};
+
+// src/instructions/createAirdrop.ts
 var CREATE_AIRDROP_DISCRIMINATOR = new Uint8Array([
   227,
   135,
@@ -1584,39 +1713,39 @@ var CREATE_AIRDROP_DISCRIMINATOR = new Uint8Array([
   94
 ]);
 function getCreateAirdropDiscriminatorBytes() {
-  return (0, import_kit12.fixEncoderSize)((0, import_kit12.getBytesEncoder)(), 8).encode(
+  return (0, import_kit15.fixEncoderSize)((0, import_kit15.getBytesEncoder)(), 8).encode(
     CREATE_AIRDROP_DISCRIMINATOR
   );
 }
 function getCreateAirdropInstructionDataEncoder() {
-  return (0, import_kit12.transformEncoder)(
-    (0, import_kit12.getStructEncoder)([
-      ["discriminator", (0, import_kit12.fixEncoderSize)((0, import_kit12.getBytesEncoder)(), 8)],
-      ["merkleRoot", (0, import_kit12.getOptionEncoder)((0, import_kit12.fixEncoderSize)((0, import_kit12.getBytesEncoder)(), 32))],
-      ["startsAt", (0, import_kit12.getOptionEncoder)((0, import_kit12.getI64Encoder)())],
-      ["endsAt", (0, import_kit12.getOptionEncoder)((0, import_kit12.getI64Encoder)())],
-      ["version", (0, import_kit12.getOptionEncoder)((0, import_kit12.getU8Encoder)())],
-      ["mutable", (0, import_kit12.getOptionEncoder)((0, import_kit12.getU8Encoder)())],
-      ["delegateAuthority", (0, import_kit12.getOptionEncoder)((0, import_kit12.getAddressEncoder)())],
-      ["delegatePermissions", (0, import_kit12.getOptionEncoder)((0, import_kit12.getU8Encoder)())]
+  return (0, import_kit15.transformEncoder)(
+    (0, import_kit15.getStructEncoder)([
+      ["discriminator", (0, import_kit15.fixEncoderSize)((0, import_kit15.getBytesEncoder)(), 8)],
+      ["merkleRoot", (0, import_kit15.getOptionEncoder)((0, import_kit15.fixEncoderSize)((0, import_kit15.getBytesEncoder)(), 32))],
+      ["startsAt", (0, import_kit15.getOptionEncoder)((0, import_kit15.getI64Encoder)())],
+      ["endsAt", (0, import_kit15.getOptionEncoder)((0, import_kit15.getI64Encoder)())],
+      ["version", (0, import_kit15.getOptionEncoder)((0, import_kit15.getU8Encoder)())],
+      ["mutable", (0, import_kit15.getOptionEncoder)((0, import_kit15.getU8Encoder)())],
+      ["delegateAuthority", (0, import_kit15.getOptionEncoder)((0, import_kit15.getAddressEncoder)())],
+      ["delegatePermissions", (0, import_kit15.getOptionEncoder)((0, import_kit15.getU8Encoder)())]
     ]),
     (value) => ({ ...value, discriminator: CREATE_AIRDROP_DISCRIMINATOR })
   );
 }
 function getCreateAirdropInstructionDataDecoder() {
-  return (0, import_kit12.getStructDecoder)([
-    ["discriminator", (0, import_kit12.fixDecoderSize)((0, import_kit12.getBytesDecoder)(), 8)],
-    ["merkleRoot", (0, import_kit12.getOptionDecoder)((0, import_kit12.fixDecoderSize)((0, import_kit12.getBytesDecoder)(), 32))],
-    ["startsAt", (0, import_kit12.getOptionDecoder)((0, import_kit12.getI64Decoder)())],
-    ["endsAt", (0, import_kit12.getOptionDecoder)((0, import_kit12.getI64Decoder)())],
-    ["version", (0, import_kit12.getOptionDecoder)((0, import_kit12.getU8Decoder)())],
-    ["mutable", (0, import_kit12.getOptionDecoder)((0, import_kit12.getU8Decoder)())],
-    ["delegateAuthority", (0, import_kit12.getOptionDecoder)((0, import_kit12.getAddressDecoder)())],
-    ["delegatePermissions", (0, import_kit12.getOptionDecoder)((0, import_kit12.getU8Decoder)())]
+  return (0, import_kit15.getStructDecoder)([
+    ["discriminator", (0, import_kit15.fixDecoderSize)((0, import_kit15.getBytesDecoder)(), 8)],
+    ["merkleRoot", (0, import_kit15.getOptionDecoder)((0, import_kit15.fixDecoderSize)((0, import_kit15.getBytesDecoder)(), 32))],
+    ["startsAt", (0, import_kit15.getOptionDecoder)((0, import_kit15.getI64Decoder)())],
+    ["endsAt", (0, import_kit15.getOptionDecoder)((0, import_kit15.getI64Decoder)())],
+    ["version", (0, import_kit15.getOptionDecoder)((0, import_kit15.getU8Decoder)())],
+    ["mutable", (0, import_kit15.getOptionDecoder)((0, import_kit15.getU8Decoder)())],
+    ["delegateAuthority", (0, import_kit15.getOptionDecoder)((0, import_kit15.getAddressDecoder)())],
+    ["delegatePermissions", (0, import_kit15.getOptionDecoder)((0, import_kit15.getU8Decoder)())]
   ]);
 }
 function getCreateAirdropInstructionDataCodec() {
-  return (0, import_kit12.combineCodec)(
+  return (0, import_kit15.combineCodec)(
     getCreateAirdropInstructionDataEncoder(),
     getCreateAirdropInstructionDataDecoder()
   );
@@ -1628,10 +1757,6 @@ async function getCreateAirdropInstructionAsync(input, config) {
     config: { value: input.config ?? null, isWritable: false },
     treasury: { value: input.treasury ?? null, isWritable: true },
     airdropMaster: { value: input.airdropMaster ?? null, isWritable: true },
-    airdropMasterAuthority: {
-      value: input.airdropMasterAuthority ?? null,
-      isWritable: false
-    },
     affiliate: { value: input.affiliate ?? null, isWritable: true },
     airdrop: { value: input.airdrop ?? null, isWritable: true },
     mint: { value: input.mint ?? null, isWritable: false },
@@ -1641,18 +1766,18 @@ async function getCreateAirdropInstructionAsync(input, config) {
   const accounts = originalAccounts;
   const args = { ...input };
   if (!accounts.master.value) {
-    accounts.master.value = await (0, import_kit12.getProgramDerivedAddress)({
+    accounts.master.value = await (0, import_kit15.getProgramDerivedAddress)({
       programAddress,
       seeds: [
-        (0, import_kit12.getBytesEncoder)().encode(new Uint8Array([109, 97, 115, 116, 101, 114]))
+        (0, import_kit15.getBytesEncoder)().encode(new Uint8Array([109, 97, 115, 116, 101, 114]))
       ]
     });
   }
   if (!accounts.config.value) {
-    accounts.config.value = await (0, import_kit12.getProgramDerivedAddress)({
+    accounts.config.value = await (0, import_kit15.getProgramDerivedAddress)({
       programAddress,
       seeds: [
-        (0, import_kit12.getBytesEncoder)().encode(
+        (0, import_kit15.getBytesEncoder)().encode(
           new Uint8Array([
             97,
             105,
@@ -1673,43 +1798,15 @@ async function getCreateAirdropInstructionAsync(input, config) {
       ]
     });
   }
-  if (!accounts.airdropMaster.value) {
-    accounts.airdropMaster.value = await (0, import_kit12.getProgramDerivedAddress)({
-      programAddress,
-      seeds: [
-        (0, import_kit12.getBytesEncoder)().encode(
-          new Uint8Array([
-            97,
-            105,
-            114,
-            100,
-            114,
-            111,
-            112,
-            95,
-            109,
-            97,
-            115,
-            116,
-            101,
-            114
-          ])
-        ),
-        (0, import_kit12.getAddressEncoder)().encode(
-          expectAddress(accounts.airdropMasterAuthority.value)
-        )
-      ]
-    });
-  }
   if (!accounts.airdrop.value) {
-    accounts.airdrop.value = await (0, import_kit12.getProgramDerivedAddress)({
+    accounts.airdrop.value = await (0, import_kit15.getProgramDerivedAddress)({
       programAddress,
       seeds: [
-        (0, import_kit12.getBytesEncoder)().encode(
+        (0, import_kit15.getBytesEncoder)().encode(
           new Uint8Array([97, 105, 114, 100, 114, 111, 112])
         ),
-        (0, import_kit12.getAddressEncoder)().encode(expectAddress(accounts.mint.value)),
-        (0, import_kit12.getAddressEncoder)().encode(expectAddress(accounts.authority.value))
+        (0, import_kit15.getAddressEncoder)().encode(expectAddress(accounts.mint.value)),
+        (0, import_kit15.getAddressEncoder)().encode(expectAddress(accounts.authority.value))
       ]
     });
   }
@@ -1723,7 +1820,6 @@ async function getCreateAirdropInstructionAsync(input, config) {
       getAccountMeta(accounts.config),
       getAccountMeta(accounts.treasury),
       getAccountMeta(accounts.airdropMaster),
-      getAccountMeta(accounts.airdropMasterAuthority),
       getAccountMeta(accounts.affiliate),
       getAccountMeta(accounts.airdrop),
       getAccountMeta(accounts.mint),
@@ -1742,11 +1838,7 @@ function getCreateAirdropInstruction(input, config) {
     master: { value: input.master ?? null, isWritable: false },
     config: { value: input.config ?? null, isWritable: false },
     treasury: { value: input.treasury ?? null, isWritable: true },
-    airdropMaster: { value: input.airdropMaster ?? null, isWritable: false },
-    airdropMasterAuthority: {
-      value: input.airdropMasterAuthority ?? null,
-      isWritable: false
-    },
+    airdropMaster: { value: input.airdropMaster ?? null, isWritable: true },
     affiliate: { value: input.affiliate ?? null, isWritable: true },
     airdrop: { value: input.airdrop ?? null, isWritable: true },
     mint: { value: input.mint ?? null, isWritable: false },
@@ -1765,7 +1857,6 @@ function getCreateAirdropInstruction(input, config) {
       getAccountMeta(accounts.config),
       getAccountMeta(accounts.treasury),
       getAccountMeta(accounts.airdropMaster),
-      getAccountMeta(accounts.airdropMasterAuthority),
       getAccountMeta(accounts.affiliate),
       getAccountMeta(accounts.airdrop),
       getAccountMeta(accounts.mint),
@@ -1779,7 +1870,7 @@ function getCreateAirdropInstruction(input, config) {
   });
 }
 function parseCreateAirdropInstruction(instruction) {
-  if (instruction.accounts.length < 10) {
+  if (instruction.accounts.length < 9) {
     throw new Error("Not enough accounts");
   }
   let accountIndex = 0;
@@ -1799,7 +1890,6 @@ function parseCreateAirdropInstruction(instruction) {
       config: getNextAccount(),
       treasury: getNextAccount(),
       airdropMaster: getNextAccount(),
-      airdropMasterAuthority: getNextAccount(),
       affiliate: getNextOptionalAccount(),
       airdrop: getNextAccount(),
       mint: getNextAccount(),
@@ -1811,14 +1901,14 @@ function parseCreateAirdropInstruction(instruction) {
 }
 async function getCreateAirdropV0Instruction(input) {
   return await getCreateAirdropInstructionAsync({
-    airdropMasterAuthority: input.airdropMasterAuthority,
-    treasury: input.treasury,
+    airdropMaster: input.airdropMaster ?? DEFAULT_MASTER_PDA,
+    treasury: DROPSY_TREASURY,
     airdrop: input.airdrop,
     mint: input.mint,
     authority: input.authority,
     merkleRoot: input.merkleRoot ?? null,
-    startsAt: input.startsAt ?? null,
-    endsAt: input.endsAt ?? null,
+    startsAt: toUnixTimestamp(input.startsAt),
+    endsAt: toUnixTimestamp(input.endsAt),
     version: 0,
     mutable: null,
     delegateAuthority: null,
@@ -1827,7 +1917,7 @@ async function getCreateAirdropV0Instruction(input) {
 }
 
 // src/instructions/createClaimMap.ts
-var import_kit13 = require("@solana/kit");
+var import_kit16 = require("@solana/kit");
 var CREATE_CLAIM_MAP_DISCRIMINATOR = new Uint8Array([
   22,
   150,
@@ -1839,29 +1929,29 @@ var CREATE_CLAIM_MAP_DISCRIMINATOR = new Uint8Array([
   122
 ]);
 function getCreateClaimMapDiscriminatorBytes() {
-  return (0, import_kit13.fixEncoderSize)((0, import_kit13.getBytesEncoder)(), 8).encode(
+  return (0, import_kit16.fixEncoderSize)((0, import_kit16.getBytesEncoder)(), 8).encode(
     CREATE_CLAIM_MAP_DISCRIMINATOR
   );
 }
 function getCreateClaimMapInstructionDataEncoder() {
-  return (0, import_kit13.transformEncoder)(
-    (0, import_kit13.getStructEncoder)([
-      ["discriminator", (0, import_kit13.fixEncoderSize)((0, import_kit13.getBytesEncoder)(), 8)],
-      ["id", (0, import_kit13.getU16Encoder)()],
-      ["total", (0, import_kit13.getU32Encoder)()]
+  return (0, import_kit16.transformEncoder)(
+    (0, import_kit16.getStructEncoder)([
+      ["discriminator", (0, import_kit16.fixEncoderSize)((0, import_kit16.getBytesEncoder)(), 8)],
+      ["id", (0, import_kit16.getU16Encoder)()],
+      ["total", (0, import_kit16.getU32Encoder)()]
     ]),
     (value) => ({ ...value, discriminator: CREATE_CLAIM_MAP_DISCRIMINATOR })
   );
 }
 function getCreateClaimMapInstructionDataDecoder() {
-  return (0, import_kit13.getStructDecoder)([
-    ["discriminator", (0, import_kit13.fixDecoderSize)((0, import_kit13.getBytesDecoder)(), 8)],
-    ["id", (0, import_kit13.getU16Decoder)()],
-    ["total", (0, import_kit13.getU32Decoder)()]
+  return (0, import_kit16.getStructDecoder)([
+    ["discriminator", (0, import_kit16.fixDecoderSize)((0, import_kit16.getBytesDecoder)(), 8)],
+    ["id", (0, import_kit16.getU16Decoder)()],
+    ["total", (0, import_kit16.getU32Decoder)()]
   ]);
 }
 function getCreateClaimMapInstructionDataCodec() {
-  return (0, import_kit13.combineCodec)(
+  return (0, import_kit16.combineCodec)(
     getCreateClaimMapInstructionDataEncoder(),
     getCreateClaimMapInstructionDataDecoder()
   );
@@ -1873,10 +1963,6 @@ async function getCreateClaimMapInstructionAsync(input, config) {
     config: { value: input.config ?? null, isWritable: false },
     treasury: { value: input.treasury ?? null, isWritable: true },
     airdropMaster: { value: input.airdropMaster ?? null, isWritable: true },
-    airdropMasterAuthority: {
-      value: input.airdropMasterAuthority ?? null,
-      isWritable: false
-    },
     affiliate: { value: input.affiliate ?? null, isWritable: true },
     airdrop: { value: input.airdrop ?? null, isWritable: true },
     mint: { value: input.mint ?? null, isWritable: false },
@@ -1887,18 +1973,18 @@ async function getCreateClaimMapInstructionAsync(input, config) {
   const accounts = originalAccounts;
   const args = { ...input };
   if (!accounts.master.value) {
-    accounts.master.value = await (0, import_kit13.getProgramDerivedAddress)({
+    accounts.master.value = await (0, import_kit16.getProgramDerivedAddress)({
       programAddress,
       seeds: [
-        (0, import_kit13.getBytesEncoder)().encode(new Uint8Array([109, 97, 115, 116, 101, 114]))
+        (0, import_kit16.getBytesEncoder)().encode(new Uint8Array([109, 97, 115, 116, 101, 114]))
       ]
     });
   }
   if (!accounts.config.value) {
-    accounts.config.value = await (0, import_kit13.getProgramDerivedAddress)({
+    accounts.config.value = await (0, import_kit16.getProgramDerivedAddress)({
       programAddress,
       seeds: [
-        (0, import_kit13.getBytesEncoder)().encode(
+        (0, import_kit16.getBytesEncoder)().encode(
           new Uint8Array([
             97,
             105,
@@ -1919,53 +2005,25 @@ async function getCreateClaimMapInstructionAsync(input, config) {
       ]
     });
   }
-  if (!accounts.airdropMaster.value) {
-    accounts.airdropMaster.value = await (0, import_kit13.getProgramDerivedAddress)({
-      programAddress,
-      seeds: [
-        (0, import_kit13.getBytesEncoder)().encode(
-          new Uint8Array([
-            97,
-            105,
-            114,
-            100,
-            114,
-            111,
-            112,
-            95,
-            109,
-            97,
-            115,
-            116,
-            101,
-            114
-          ])
-        ),
-        (0, import_kit13.getAddressEncoder)().encode(
-          expectAddress(accounts.airdropMasterAuthority.value)
-        )
-      ]
-    });
-  }
   if (!accounts.airdrop.value) {
-    accounts.airdrop.value = await (0, import_kit13.getProgramDerivedAddress)({
+    accounts.airdrop.value = await (0, import_kit16.getProgramDerivedAddress)({
       programAddress,
       seeds: [
-        (0, import_kit13.getBytesEncoder)().encode(
+        (0, import_kit16.getBytesEncoder)().encode(
           new Uint8Array([97, 105, 114, 100, 114, 111, 112])
         ),
-        (0, import_kit13.getAddressEncoder)().encode(expectAddress(accounts.mint.value)),
-        (0, import_kit13.getAddressEncoder)().encode(expectAddress(accounts.authority.value))
+        (0, import_kit16.getAddressEncoder)().encode(expectAddress(accounts.mint.value)),
+        (0, import_kit16.getAddressEncoder)().encode(expectAddress(accounts.authority.value))
       ]
     });
   }
   if (!accounts.bitmap.value) {
-    accounts.bitmap.value = await (0, import_kit13.getProgramDerivedAddress)({
+    accounts.bitmap.value = await (0, import_kit16.getProgramDerivedAddress)({
       programAddress,
       seeds: [
-        (0, import_kit13.getBytesEncoder)().encode(new Uint8Array([98, 105, 116, 109, 97, 112])),
-        (0, import_kit13.getAddressEncoder)().encode(expectAddress(accounts.airdrop.value)),
-        (0, import_kit13.getU16Encoder)().encode(expectSome(args.id))
+        (0, import_kit16.getBytesEncoder)().encode(new Uint8Array([98, 105, 116, 109, 97, 112])),
+        (0, import_kit16.getAddressEncoder)().encode(expectAddress(accounts.airdrop.value)),
+        (0, import_kit16.getU16Encoder)().encode(expectSome(args.id))
       ]
     });
   }
@@ -1979,7 +2037,6 @@ async function getCreateClaimMapInstructionAsync(input, config) {
       getAccountMeta(accounts.config),
       getAccountMeta(accounts.treasury),
       getAccountMeta(accounts.airdropMaster),
-      getAccountMeta(accounts.airdropMasterAuthority),
       getAccountMeta(accounts.affiliate),
       getAccountMeta(accounts.airdrop),
       getAccountMeta(accounts.mint),
@@ -2000,10 +2057,6 @@ function getCreateClaimMapInstruction(input, config) {
     config: { value: input.config ?? null, isWritable: false },
     treasury: { value: input.treasury ?? null, isWritable: true },
     airdropMaster: { value: input.airdropMaster ?? null, isWritable: true },
-    airdropMasterAuthority: {
-      value: input.airdropMasterAuthority ?? null,
-      isWritable: false
-    },
     affiliate: { value: input.affiliate ?? null, isWritable: true },
     airdrop: { value: input.airdrop ?? null, isWritable: true },
     mint: { value: input.mint ?? null, isWritable: false },
@@ -2023,7 +2076,6 @@ function getCreateClaimMapInstruction(input, config) {
       getAccountMeta(accounts.config),
       getAccountMeta(accounts.treasury),
       getAccountMeta(accounts.airdropMaster),
-      getAccountMeta(accounts.airdropMasterAuthority),
       getAccountMeta(accounts.affiliate),
       getAccountMeta(accounts.airdrop),
       getAccountMeta(accounts.mint),
@@ -2038,7 +2090,7 @@ function getCreateClaimMapInstruction(input, config) {
   });
 }
 function parseCreateClaimMapInstruction(instruction) {
-  if (instruction.accounts.length < 11) {
+  if (instruction.accounts.length < 10) {
     throw new Error("Not enough accounts");
   }
   let accountIndex = 0;
@@ -2058,7 +2110,6 @@ function parseCreateClaimMapInstruction(instruction) {
       config: getNextAccount(),
       treasury: getNextAccount(),
       airdropMaster: getNextAccount(),
-      airdropMasterAuthority: getNextAccount(),
       affiliate: getNextOptionalAccount(),
       airdrop: getNextAccount(),
       mint: getNextAccount(),
@@ -2069,9 +2120,21 @@ function parseCreateClaimMapInstruction(instruction) {
     data: getCreateClaimMapInstructionDataDecoder().decode(instruction.data)
   };
 }
+async function getCreateClaimMapV0Instruction(input) {
+  return await getCreateClaimMapInstructionAsync({
+    airdropMaster: input.airdropMaster ?? DEFAULT_MASTER_PDA,
+    treasury: DROPSY_TREASURY,
+    airdrop: input.airdrop,
+    bitmap: input.claimMap,
+    mint: input.mint,
+    authority: input.authority,
+    id: input.id ?? 0,
+    total: input.total ?? MAX_BITMAP_CLAIM
+  });
+}
 
 // src/instructions/depositTokens.ts
-var import_kit14 = require("@solana/kit");
+var import_kit17 = require("@solana/kit");
 var DEPOSIT_TOKENS_DISCRIMINATOR = new Uint8Array([
   176,
   83,
@@ -2083,27 +2146,27 @@ var DEPOSIT_TOKENS_DISCRIMINATOR = new Uint8Array([
   150
 ]);
 function getDepositTokensDiscriminatorBytes() {
-  return (0, import_kit14.fixEncoderSize)((0, import_kit14.getBytesEncoder)(), 8).encode(
+  return (0, import_kit17.fixEncoderSize)((0, import_kit17.getBytesEncoder)(), 8).encode(
     DEPOSIT_TOKENS_DISCRIMINATOR
   );
 }
 function getDepositTokensInstructionDataEncoder() {
-  return (0, import_kit14.transformEncoder)(
-    (0, import_kit14.getStructEncoder)([
-      ["discriminator", (0, import_kit14.fixEncoderSize)((0, import_kit14.getBytesEncoder)(), 8)],
-      ["amount", (0, import_kit14.getU64Encoder)()]
+  return (0, import_kit17.transformEncoder)(
+    (0, import_kit17.getStructEncoder)([
+      ["discriminator", (0, import_kit17.fixEncoderSize)((0, import_kit17.getBytesEncoder)(), 8)],
+      ["amount", (0, import_kit17.getU64Encoder)()]
     ]),
     (value) => ({ ...value, discriminator: DEPOSIT_TOKENS_DISCRIMINATOR })
   );
 }
 function getDepositTokensInstructionDataDecoder() {
-  return (0, import_kit14.getStructDecoder)([
-    ["discriminator", (0, import_kit14.fixDecoderSize)((0, import_kit14.getBytesDecoder)(), 8)],
-    ["amount", (0, import_kit14.getU64Decoder)()]
+  return (0, import_kit17.getStructDecoder)([
+    ["discriminator", (0, import_kit17.fixDecoderSize)((0, import_kit17.getBytesDecoder)(), 8)],
+    ["amount", (0, import_kit17.getU64Decoder)()]
   ]);
 }
 function getDepositTokensInstructionDataCodec() {
-  return (0, import_kit14.combineCodec)(
+  return (0, import_kit17.combineCodec)(
     getDepositTokensInstructionDataEncoder(),
     getDepositTokensInstructionDataDecoder()
   );
@@ -2114,11 +2177,7 @@ async function getDepositTokensInstructionAsync(input, config) {
     master: { value: input.master ?? null, isWritable: false },
     config: { value: input.config ?? null, isWritable: false },
     treasury: { value: input.treasury ?? null, isWritable: true },
-    airdropMaster: { value: input.airdropMaster ?? null, isWritable: false },
-    airdropMasterAuthority: {
-      value: input.airdropMasterAuthority ?? null,
-      isWritable: false
-    },
+    airdropMaster: { value: input.airdropMaster ?? null, isWritable: true },
     affiliate: { value: input.affiliate ?? null, isWritable: true },
     sourceTokenAccount: {
       value: input.sourceTokenAccount ?? null,
@@ -2141,18 +2200,18 @@ async function getDepositTokensInstructionAsync(input, config) {
   const accounts = originalAccounts;
   const args = { ...input };
   if (!accounts.master.value) {
-    accounts.master.value = await (0, import_kit14.getProgramDerivedAddress)({
+    accounts.master.value = await (0, import_kit17.getProgramDerivedAddress)({
       programAddress,
       seeds: [
-        (0, import_kit14.getBytesEncoder)().encode(new Uint8Array([109, 97, 115, 116, 101, 114]))
+        (0, import_kit17.getBytesEncoder)().encode(new Uint8Array([109, 97, 115, 116, 101, 114]))
       ]
     });
   }
   if (!accounts.config.value) {
-    accounts.config.value = await (0, import_kit14.getProgramDerivedAddress)({
+    accounts.config.value = await (0, import_kit17.getProgramDerivedAddress)({
       programAddress,
       seeds: [
-        (0, import_kit14.getBytesEncoder)().encode(
+        (0, import_kit17.getBytesEncoder)().encode(
           new Uint8Array([
             97,
             105,
@@ -2174,42 +2233,20 @@ async function getDepositTokensInstructionAsync(input, config) {
     });
   }
   if (!accounts.airdropMaster.value) {
-    accounts.airdropMaster.value = await (0, import_kit14.getProgramDerivedAddress)({
-      programAddress,
-      seeds: [
-        (0, import_kit14.getBytesEncoder)().encode(
-          new Uint8Array([
-            97,
-            105,
-            114,
-            100,
-            114,
-            111,
-            112,
-            95,
-            109,
-            97,
-            115,
-            116,
-            101,
-            114
-          ])
-        ),
-        (0, import_kit14.getAddressEncoder)().encode(
-          expectAddress(accounts.airdropMasterAuthority.value)
-        )
-      ]
-    });
+    accounts.airdropMaster.value = DEFAULT_MASTER_PDA;
+  }
+  if (!accounts.treasury.value) {
+    accounts.treasury.value = DROPSY_TREASURY;
   }
   if (!accounts.airdrop.value) {
-    accounts.airdrop.value = await (0, import_kit14.getProgramDerivedAddress)({
+    accounts.airdrop.value = await (0, import_kit17.getProgramDerivedAddress)({
       programAddress,
       seeds: [
-        (0, import_kit14.getBytesEncoder)().encode(
+        (0, import_kit17.getBytesEncoder)().encode(
           new Uint8Array([97, 105, 114, 100, 114, 111, 112])
         ),
-        (0, import_kit14.getAddressEncoder)().encode(expectAddress(accounts.mint.value)),
-        (0, import_kit14.getAddressEncoder)().encode(expectAddress(accounts.authority.value))
+        (0, import_kit17.getAddressEncoder)().encode(expectAddress(accounts.mint.value)),
+        (0, import_kit17.getAddressEncoder)().encode(expectAddress(accounts.authority.value))
       ]
     });
   }
@@ -2217,12 +2254,12 @@ async function getDepositTokensInstructionAsync(input, config) {
     accounts.tokenProgram.value = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
   }
   if (!accounts.destinationTokenAccount.value) {
-    accounts.destinationTokenAccount.value = await (0, import_kit14.getProgramDerivedAddress)({
+    accounts.destinationTokenAccount.value = await (0, import_kit17.getProgramDerivedAddress)({
       programAddress: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL",
       seeds: [
-        (0, import_kit14.getAddressEncoder)().encode(expectAddress(accounts.airdrop.value)),
-        (0, import_kit14.getAddressEncoder)().encode(expectAddress(accounts.tokenProgram.value)),
-        (0, import_kit14.getAddressEncoder)().encode(expectAddress(accounts.mint.value))
+        (0, import_kit17.getAddressEncoder)().encode(expectAddress(accounts.airdrop.value)),
+        (0, import_kit17.getAddressEncoder)().encode(expectAddress(accounts.tokenProgram.value)),
+        (0, import_kit17.getAddressEncoder)().encode(expectAddress(accounts.mint.value))
       ]
     });
   }
@@ -2239,7 +2276,6 @@ async function getDepositTokensInstructionAsync(input, config) {
       getAccountMeta(accounts.config),
       getAccountMeta(accounts.treasury),
       getAccountMeta(accounts.airdropMaster),
-      getAccountMeta(accounts.airdropMasterAuthority),
       getAccountMeta(accounts.affiliate),
       getAccountMeta(accounts.sourceTokenAccount),
       getAccountMeta(accounts.destinationTokenAccount),
@@ -2262,11 +2298,7 @@ function getDepositTokensInstruction(input, config) {
     master: { value: input.master ?? null, isWritable: false },
     config: { value: input.config ?? null, isWritable: false },
     treasury: { value: input.treasury ?? null, isWritable: true },
-    airdropMaster: { value: input.airdropMaster ?? null, isWritable: false },
-    airdropMasterAuthority: {
-      value: input.airdropMasterAuthority ?? null,
-      isWritable: false
-    },
+    airdropMaster: { value: input.airdropMaster ?? null, isWritable: true },
     affiliate: { value: input.affiliate ?? null, isWritable: true },
     sourceTokenAccount: {
       value: input.sourceTokenAccount ?? null,
@@ -2304,7 +2336,6 @@ function getDepositTokensInstruction(input, config) {
       getAccountMeta(accounts.config),
       getAccountMeta(accounts.treasury),
       getAccountMeta(accounts.airdropMaster),
-      getAccountMeta(accounts.airdropMasterAuthority),
       getAccountMeta(accounts.affiliate),
       getAccountMeta(accounts.sourceTokenAccount),
       getAccountMeta(accounts.destinationTokenAccount),
@@ -2322,7 +2353,7 @@ function getDepositTokensInstruction(input, config) {
   });
 }
 function parseDepositTokensInstruction(instruction) {
-  if (instruction.accounts.length < 14) {
+  if (instruction.accounts.length < 13) {
     throw new Error("Not enough accounts");
   }
   let accountIndex = 0;
@@ -2342,7 +2373,6 @@ function parseDepositTokensInstruction(instruction) {
       config: getNextAccount(),
       treasury: getNextAccount(),
       airdropMaster: getNextAccount(),
-      airdropMasterAuthority: getNextAccount(),
       affiliate: getNextOptionalAccount(),
       sourceTokenAccount: getNextAccount(),
       destinationTokenAccount: getNextAccount(),
@@ -2358,354 +2388,354 @@ function parseDepositTokensInstruction(instruction) {
 }
 
 // src/instructions/initializeAirdropMaster.ts
-var import_kit30 = require("@solana/kit");
+var import_kit33 = require("@solana/kit");
 
 // src/types/advancedFeeConfig.ts
-var import_kit15 = require("@solana/kit");
+var import_kit18 = require("@solana/kit");
 function getAdvancedFeeConfigEncoder() {
-  return (0, import_kit15.getStructEncoder)([
-    ["claimFee", (0, import_kit15.getU64Encoder)()],
-    ["depositFee", (0, import_kit15.getU64Encoder)()],
-    ["delegateFee", (0, import_kit15.getU64Encoder)()]
+  return (0, import_kit18.getStructEncoder)([
+    ["claimFee", (0, import_kit18.getU64Encoder)()],
+    ["depositFee", (0, import_kit18.getU64Encoder)()],
+    ["delegateFee", (0, import_kit18.getU64Encoder)()]
   ]);
 }
 function getAdvancedFeeConfigDecoder() {
-  return (0, import_kit15.getStructDecoder)([
-    ["claimFee", (0, import_kit15.getU64Decoder)()],
-    ["depositFee", (0, import_kit15.getU64Decoder)()],
-    ["delegateFee", (0, import_kit15.getU64Decoder)()]
+  return (0, import_kit18.getStructDecoder)([
+    ["claimFee", (0, import_kit18.getU64Decoder)()],
+    ["depositFee", (0, import_kit18.getU64Decoder)()],
+    ["delegateFee", (0, import_kit18.getU64Decoder)()]
   ]);
 }
 function getAdvancedFeeConfigCodec() {
-  return (0, import_kit15.combineCodec)(
+  return (0, import_kit18.combineCodec)(
     getAdvancedFeeConfigEncoder(),
     getAdvancedFeeConfigDecoder()
   );
 }
 
 // src/types/airdropBoosted.ts
-var import_kit16 = require("@solana/kit");
+var import_kit19 = require("@solana/kit");
 function getAirdropBoostedEncoder() {
-  return (0, import_kit16.getStructEncoder)([
-    ["airdrop", (0, import_kit16.getAddressEncoder)()],
-    ["boostedBy", (0, import_kit16.getAddressEncoder)()],
-    ["boostAmount", (0, import_kit16.getU64Encoder)()],
-    ["timestamp", (0, import_kit16.getI64Encoder)()]
+  return (0, import_kit19.getStructEncoder)([
+    ["airdrop", (0, import_kit19.getAddressEncoder)()],
+    ["boostedBy", (0, import_kit19.getAddressEncoder)()],
+    ["boostAmount", (0, import_kit19.getU64Encoder)()],
+    ["timestamp", (0, import_kit19.getI64Encoder)()]
   ]);
 }
 function getAirdropBoostedDecoder() {
-  return (0, import_kit16.getStructDecoder)([
-    ["airdrop", (0, import_kit16.getAddressDecoder)()],
-    ["boostedBy", (0, import_kit16.getAddressDecoder)()],
-    ["boostAmount", (0, import_kit16.getU64Decoder)()],
-    ["timestamp", (0, import_kit16.getI64Decoder)()]
+  return (0, import_kit19.getStructDecoder)([
+    ["airdrop", (0, import_kit19.getAddressDecoder)()],
+    ["boostedBy", (0, import_kit19.getAddressDecoder)()],
+    ["boostAmount", (0, import_kit19.getU64Decoder)()],
+    ["timestamp", (0, import_kit19.getI64Decoder)()]
   ]);
 }
 function getAirdropBoostedCodec() {
-  return (0, import_kit16.combineCodec)(getAirdropBoostedEncoder(), getAirdropBoostedDecoder());
+  return (0, import_kit19.combineCodec)(getAirdropBoostedEncoder(), getAirdropBoostedDecoder());
 }
 
 // src/types/airdropClosed.ts
-var import_kit17 = require("@solana/kit");
+var import_kit20 = require("@solana/kit");
 function getAirdropClosedEncoder() {
-  return (0, import_kit17.getStructEncoder)([
-    ["airdrop", (0, import_kit17.getAddressEncoder)()],
-    ["authority", (0, import_kit17.getAddressEncoder)()],
-    ["timestamp", (0, import_kit17.getI64Encoder)()]
+  return (0, import_kit20.getStructEncoder)([
+    ["airdrop", (0, import_kit20.getAddressEncoder)()],
+    ["authority", (0, import_kit20.getAddressEncoder)()],
+    ["timestamp", (0, import_kit20.getI64Encoder)()]
   ]);
 }
 function getAirdropClosedDecoder() {
-  return (0, import_kit17.getStructDecoder)([
-    ["airdrop", (0, import_kit17.getAddressDecoder)()],
-    ["authority", (0, import_kit17.getAddressDecoder)()],
-    ["timestamp", (0, import_kit17.getI64Decoder)()]
+  return (0, import_kit20.getStructDecoder)([
+    ["airdrop", (0, import_kit20.getAddressDecoder)()],
+    ["authority", (0, import_kit20.getAddressDecoder)()],
+    ["timestamp", (0, import_kit20.getI64Decoder)()]
   ]);
 }
 function getAirdropClosedCodec() {
-  return (0, import_kit17.combineCodec)(getAirdropClosedEncoder(), getAirdropClosedDecoder());
+  return (0, import_kit20.combineCodec)(getAirdropClosedEncoder(), getAirdropClosedDecoder());
 }
 
 // src/types/airdropDelegated.ts
-var import_kit18 = require("@solana/kit");
+var import_kit21 = require("@solana/kit");
 function getAirdropDelegatedEncoder() {
-  return (0, import_kit18.getStructEncoder)([
-    ["airdrop", (0, import_kit18.getAddressEncoder)()],
-    ["authority", (0, import_kit18.getAddressEncoder)()],
-    ["delegate", (0, import_kit18.getAddressEncoder)()],
-    ["permissions", (0, import_kit18.getU8Encoder)()]
+  return (0, import_kit21.getStructEncoder)([
+    ["airdrop", (0, import_kit21.getAddressEncoder)()],
+    ["authority", (0, import_kit21.getAddressEncoder)()],
+    ["delegate", (0, import_kit21.getAddressEncoder)()],
+    ["permissions", (0, import_kit21.getU8Encoder)()]
   ]);
 }
 function getAirdropDelegatedDecoder() {
-  return (0, import_kit18.getStructDecoder)([
-    ["airdrop", (0, import_kit18.getAddressDecoder)()],
-    ["authority", (0, import_kit18.getAddressDecoder)()],
-    ["delegate", (0, import_kit18.getAddressDecoder)()],
-    ["permissions", (0, import_kit18.getU8Decoder)()]
+  return (0, import_kit21.getStructDecoder)([
+    ["airdrop", (0, import_kit21.getAddressDecoder)()],
+    ["authority", (0, import_kit21.getAddressDecoder)()],
+    ["delegate", (0, import_kit21.getAddressDecoder)()],
+    ["permissions", (0, import_kit21.getU8Decoder)()]
   ]);
 }
 function getAirdropDelegatedCodec() {
-  return (0, import_kit18.combineCodec)(
+  return (0, import_kit21.combineCodec)(
     getAirdropDelegatedEncoder(),
     getAirdropDelegatedDecoder()
   );
 }
 
 // src/types/airdropInitialized.ts
-var import_kit19 = require("@solana/kit");
+var import_kit22 = require("@solana/kit");
 function getAirdropInitializedEncoder() {
-  return (0, import_kit19.getStructEncoder)([
-    ["airdrop", (0, import_kit19.getAddressEncoder)()],
-    ["mint", (0, import_kit19.getAddressEncoder)()],
-    ["authority", (0, import_kit19.getAddressEncoder)()],
-    ["controller", (0, import_kit19.getAddressEncoder)()],
-    ["merkleRoot", (0, import_kit19.fixEncoderSize)((0, import_kit19.getBytesEncoder)(), 32)],
-    ["startTime", (0, import_kit19.getI64Encoder)()],
-    ["endTime", (0, import_kit19.getI64Encoder)()],
-    ["timestamp", (0, import_kit19.getI64Encoder)()]
+  return (0, import_kit22.getStructEncoder)([
+    ["airdrop", (0, import_kit22.getAddressEncoder)()],
+    ["mint", (0, import_kit22.getAddressEncoder)()],
+    ["authority", (0, import_kit22.getAddressEncoder)()],
+    ["controller", (0, import_kit22.getAddressEncoder)()],
+    ["merkleRoot", (0, import_kit22.fixEncoderSize)((0, import_kit22.getBytesEncoder)(), 32)],
+    ["startTime", (0, import_kit22.getI64Encoder)()],
+    ["endTime", (0, import_kit22.getI64Encoder)()],
+    ["timestamp", (0, import_kit22.getI64Encoder)()]
   ]);
 }
 function getAirdropInitializedDecoder() {
-  return (0, import_kit19.getStructDecoder)([
-    ["airdrop", (0, import_kit19.getAddressDecoder)()],
-    ["mint", (0, import_kit19.getAddressDecoder)()],
-    ["authority", (0, import_kit19.getAddressDecoder)()],
-    ["controller", (0, import_kit19.getAddressDecoder)()],
-    ["merkleRoot", (0, import_kit19.fixDecoderSize)((0, import_kit19.getBytesDecoder)(), 32)],
-    ["startTime", (0, import_kit19.getI64Decoder)()],
-    ["endTime", (0, import_kit19.getI64Decoder)()],
-    ["timestamp", (0, import_kit19.getI64Decoder)()]
+  return (0, import_kit22.getStructDecoder)([
+    ["airdrop", (0, import_kit22.getAddressDecoder)()],
+    ["mint", (0, import_kit22.getAddressDecoder)()],
+    ["authority", (0, import_kit22.getAddressDecoder)()],
+    ["controller", (0, import_kit22.getAddressDecoder)()],
+    ["merkleRoot", (0, import_kit22.fixDecoderSize)((0, import_kit22.getBytesDecoder)(), 32)],
+    ["startTime", (0, import_kit22.getI64Decoder)()],
+    ["endTime", (0, import_kit22.getI64Decoder)()],
+    ["timestamp", (0, import_kit22.getI64Decoder)()]
   ]);
 }
 function getAirdropInitializedCodec() {
-  return (0, import_kit19.combineCodec)(
+  return (0, import_kit22.combineCodec)(
     getAirdropInitializedEncoder(),
     getAirdropInitializedDecoder()
   );
 }
 
 // src/types/airdropUpdated.ts
-var import_kit20 = require("@solana/kit");
+var import_kit23 = require("@solana/kit");
 function getAirdropUpdatedEncoder() {
-  return (0, import_kit20.getStructEncoder)([
-    ["airdrop", (0, import_kit20.getAddressEncoder)()],
-    ["updatedBy", (0, import_kit20.getAddressEncoder)()]
+  return (0, import_kit23.getStructEncoder)([
+    ["airdrop", (0, import_kit23.getAddressEncoder)()],
+    ["updatedBy", (0, import_kit23.getAddressEncoder)()]
   ]);
 }
 function getAirdropUpdatedDecoder() {
-  return (0, import_kit20.getStructDecoder)([
-    ["airdrop", (0, import_kit20.getAddressDecoder)()],
-    ["updatedBy", (0, import_kit20.getAddressDecoder)()]
+  return (0, import_kit23.getStructDecoder)([
+    ["airdrop", (0, import_kit23.getAddressDecoder)()],
+    ["updatedBy", (0, import_kit23.getAddressDecoder)()]
   ]);
 }
 function getAirdropUpdatedCodec() {
-  return (0, import_kit20.combineCodec)(getAirdropUpdatedEncoder(), getAirdropUpdatedDecoder());
+  return (0, import_kit23.combineCodec)(getAirdropUpdatedEncoder(), getAirdropUpdatedDecoder());
 }
 
 // src/types/baseDurationConfig.ts
-var import_kit21 = require("@solana/kit");
+var import_kit24 = require("@solana/kit");
 function getBaseDurationConfigEncoder() {
-  return (0, import_kit21.getStructEncoder)([
-    ["minimum", (0, import_kit21.getI64Encoder)()],
-    ["maximum", (0, import_kit21.getI64Encoder)()],
-    ["updateGrace", (0, import_kit21.getI64Encoder)()]
+  return (0, import_kit24.getStructEncoder)([
+    ["minimum", (0, import_kit24.getI64Encoder)()],
+    ["maximum", (0, import_kit24.getI64Encoder)()],
+    ["updateGrace", (0, import_kit24.getI64Encoder)()]
   ]);
 }
 function getBaseDurationConfigDecoder() {
-  return (0, import_kit21.getStructDecoder)([
-    ["minimum", (0, import_kit21.getI64Decoder)()],
-    ["maximum", (0, import_kit21.getI64Decoder)()],
-    ["updateGrace", (0, import_kit21.getI64Decoder)()]
+  return (0, import_kit24.getStructDecoder)([
+    ["minimum", (0, import_kit24.getI64Decoder)()],
+    ["maximum", (0, import_kit24.getI64Decoder)()],
+    ["updateGrace", (0, import_kit24.getI64Decoder)()]
   ]);
 }
 function getBaseDurationConfigCodec() {
-  return (0, import_kit21.combineCodec)(
+  return (0, import_kit24.combineCodec)(
     getBaseDurationConfigEncoder(),
     getBaseDurationConfigDecoder()
   );
 }
 
 // src/types/baseFeatureFeeConfig.ts
-var import_kit22 = require("@solana/kit");
+var import_kit25 = require("@solana/kit");
 function getBaseFeatureFeeConfigEncoder() {
-  return (0, import_kit22.getStructEncoder)([
-    ["creationFee", (0, import_kit22.getU64Encoder)()],
-    ["upgradeFee", (0, import_kit22.getU64Encoder)()],
-    ["withdrawFeeBasis", (0, import_kit22.getU64Encoder)()]
+  return (0, import_kit25.getStructEncoder)([
+    ["creationFee", (0, import_kit25.getU64Encoder)()],
+    ["upgradeFee", (0, import_kit25.getU64Encoder)()],
+    ["withdrawFeeBasis", (0, import_kit25.getU64Encoder)()]
   ]);
 }
 function getBaseFeatureFeeConfigDecoder() {
-  return (0, import_kit22.getStructDecoder)([
-    ["creationFee", (0, import_kit22.getU64Decoder)()],
-    ["upgradeFee", (0, import_kit22.getU64Decoder)()],
-    ["withdrawFeeBasis", (0, import_kit22.getU64Decoder)()]
+  return (0, import_kit25.getStructDecoder)([
+    ["creationFee", (0, import_kit25.getU64Decoder)()],
+    ["upgradeFee", (0, import_kit25.getU64Decoder)()],
+    ["withdrawFeeBasis", (0, import_kit25.getU64Decoder)()]
   ]);
 }
 function getBaseFeatureFeeConfigCodec() {
-  return (0, import_kit22.combineCodec)(
+  return (0, import_kit25.combineCodec)(
     getBaseFeatureFeeConfigEncoder(),
     getBaseFeatureFeeConfigDecoder()
   );
 }
 
 // src/types/baseFeeConfig.ts
-var import_kit23 = require("@solana/kit");
+var import_kit26 = require("@solana/kit");
 function getBaseFeeConfigEncoder() {
-  return (0, import_kit23.getStructEncoder)([
-    ["creationFee", (0, import_kit23.getU64Encoder)()],
-    ["updateFee", (0, import_kit23.getOptionEncoder)((0, import_kit23.getU64Encoder)())],
-    ["closeFee", (0, import_kit23.getU64Encoder)()]
+  return (0, import_kit26.getStructEncoder)([
+    ["creationFee", (0, import_kit26.getU64Encoder)()],
+    ["updateFee", (0, import_kit26.getOptionEncoder)((0, import_kit26.getU64Encoder)())],
+    ["closeFee", (0, import_kit26.getU64Encoder)()]
   ]);
 }
 function getBaseFeeConfigDecoder() {
-  return (0, import_kit23.getStructDecoder)([
-    ["creationFee", (0, import_kit23.getU64Decoder)()],
-    ["updateFee", (0, import_kit23.getOptionDecoder)((0, import_kit23.getU64Decoder)())],
-    ["closeFee", (0, import_kit23.getU64Decoder)()]
+  return (0, import_kit26.getStructDecoder)([
+    ["creationFee", (0, import_kit26.getU64Decoder)()],
+    ["updateFee", (0, import_kit26.getOptionDecoder)((0, import_kit26.getU64Decoder)())],
+    ["closeFee", (0, import_kit26.getU64Decoder)()]
   ]);
 }
 function getBaseFeeConfigCodec() {
-  return (0, import_kit23.combineCodec)(getBaseFeeConfigEncoder(), getBaseFeeConfigDecoder());
+  return (0, import_kit26.combineCodec)(getBaseFeeConfigEncoder(), getBaseFeeConfigDecoder());
 }
 
 // src/types/claimMapClosed.ts
-var import_kit24 = require("@solana/kit");
+var import_kit27 = require("@solana/kit");
 function getClaimMapClosedEncoder() {
-  return (0, import_kit24.getStructEncoder)([
-    ["airdrop", (0, import_kit24.getAddressEncoder)()],
-    ["bitmap", (0, import_kit24.getAddressEncoder)()],
-    ["authority", (0, import_kit24.getAddressEncoder)()]
+  return (0, import_kit27.getStructEncoder)([
+    ["airdrop", (0, import_kit27.getAddressEncoder)()],
+    ["bitmap", (0, import_kit27.getAddressEncoder)()],
+    ["authority", (0, import_kit27.getAddressEncoder)()]
   ]);
 }
 function getClaimMapClosedDecoder() {
-  return (0, import_kit24.getStructDecoder)([
-    ["airdrop", (0, import_kit24.getAddressDecoder)()],
-    ["bitmap", (0, import_kit24.getAddressDecoder)()],
-    ["authority", (0, import_kit24.getAddressDecoder)()]
+  return (0, import_kit27.getStructDecoder)([
+    ["airdrop", (0, import_kit27.getAddressDecoder)()],
+    ["bitmap", (0, import_kit27.getAddressDecoder)()],
+    ["authority", (0, import_kit27.getAddressDecoder)()]
   ]);
 }
 function getClaimMapClosedCodec() {
-  return (0, import_kit24.combineCodec)(getClaimMapClosedEncoder(), getClaimMapClosedDecoder());
+  return (0, import_kit27.combineCodec)(getClaimMapClosedEncoder(), getClaimMapClosedDecoder());
 }
 
 // src/types/claimMapInitialized.ts
-var import_kit25 = require("@solana/kit");
+var import_kit28 = require("@solana/kit");
 function getClaimMapInitializedEncoder() {
-  return (0, import_kit25.getStructEncoder)([
-    ["airdrop", (0, import_kit25.getAddressEncoder)()],
-    ["bitmap", (0, import_kit25.getAddressEncoder)()],
-    ["bitmapId", (0, import_kit25.getU16Encoder)()],
-    ["timestamp", (0, import_kit25.getI64Encoder)()]
+  return (0, import_kit28.getStructEncoder)([
+    ["airdrop", (0, import_kit28.getAddressEncoder)()],
+    ["bitmap", (0, import_kit28.getAddressEncoder)()],
+    ["bitmapId", (0, import_kit28.getU16Encoder)()],
+    ["timestamp", (0, import_kit28.getI64Encoder)()]
   ]);
 }
 function getClaimMapInitializedDecoder() {
-  return (0, import_kit25.getStructDecoder)([
-    ["airdrop", (0, import_kit25.getAddressDecoder)()],
-    ["bitmap", (0, import_kit25.getAddressDecoder)()],
-    ["bitmapId", (0, import_kit25.getU16Decoder)()],
-    ["timestamp", (0, import_kit25.getI64Decoder)()]
+  return (0, import_kit28.getStructDecoder)([
+    ["airdrop", (0, import_kit28.getAddressDecoder)()],
+    ["bitmap", (0, import_kit28.getAddressDecoder)()],
+    ["bitmapId", (0, import_kit28.getU16Decoder)()],
+    ["timestamp", (0, import_kit28.getI64Decoder)()]
   ]);
 }
 function getClaimMapInitializedCodec() {
-  return (0, import_kit25.combineCodec)(
+  return (0, import_kit28.combineCodec)(
     getClaimMapInitializedEncoder(),
     getClaimMapInitializedDecoder()
   );
 }
 
 // src/types/initAirdropConfigArgs.ts
-var import_kit26 = require("@solana/kit");
+var import_kit29 = require("@solana/kit");
 function getInitAirdropConfigArgsEncoder() {
-  return (0, import_kit26.getStructEncoder)([
-    ["merkleRoot", (0, import_kit26.getOptionEncoder)((0, import_kit26.fixEncoderSize)((0, import_kit26.getBytesEncoder)(), 32))],
+  return (0, import_kit29.getStructEncoder)([
+    ["merkleRoot", (0, import_kit29.getOptionEncoder)((0, import_kit29.fixEncoderSize)((0, import_kit29.getBytesEncoder)(), 32))],
     ["durationConfig", getBaseDurationConfigEncoder()],
     ["masterConfig", getBaseFeatureFeeConfigEncoder()],
-    ["bitmapActionFee", (0, import_kit26.getU64Encoder)()],
-    ["perBoostAmount", (0, import_kit26.getU64Encoder)()]
+    ["bitmapActionFee", (0, import_kit29.getU64Encoder)()],
+    ["perBoostAmount", (0, import_kit29.getU64Encoder)()]
   ]);
 }
 function getInitAirdropConfigArgsDecoder() {
-  return (0, import_kit26.getStructDecoder)([
-    ["merkleRoot", (0, import_kit26.getOptionDecoder)((0, import_kit26.fixDecoderSize)((0, import_kit26.getBytesDecoder)(), 32))],
+  return (0, import_kit29.getStructDecoder)([
+    ["merkleRoot", (0, import_kit29.getOptionDecoder)((0, import_kit29.fixDecoderSize)((0, import_kit29.getBytesDecoder)(), 32))],
     ["durationConfig", getBaseDurationConfigDecoder()],
     ["masterConfig", getBaseFeatureFeeConfigDecoder()],
-    ["bitmapActionFee", (0, import_kit26.getU64Decoder)()],
-    ["perBoostAmount", (0, import_kit26.getU64Decoder)()]
+    ["bitmapActionFee", (0, import_kit29.getU64Decoder)()],
+    ["perBoostAmount", (0, import_kit29.getU64Decoder)()]
   ]);
 }
 function getInitAirdropConfigArgsCodec() {
-  return (0, import_kit26.combineCodec)(
+  return (0, import_kit29.combineCodec)(
     getInitAirdropConfigArgsEncoder(),
     getInitAirdropConfigArgsDecoder()
   );
 }
 
 // src/types/masterInitialized.ts
-var import_kit27 = require("@solana/kit");
+var import_kit30 = require("@solana/kit");
 function getMasterInitializedEncoder() {
-  return (0, import_kit27.getStructEncoder)([
-    ["address", (0, import_kit27.getAddressEncoder)()],
-    ["authority", (0, import_kit27.getAddressEncoder)()],
-    ["treasury", (0, import_kit27.getAddressEncoder)()],
-    ["timestamp", (0, import_kit27.getI64Encoder)()]
+  return (0, import_kit30.getStructEncoder)([
+    ["address", (0, import_kit30.getAddressEncoder)()],
+    ["authority", (0, import_kit30.getAddressEncoder)()],
+    ["treasury", (0, import_kit30.getAddressEncoder)()],
+    ["timestamp", (0, import_kit30.getI64Encoder)()]
   ]);
 }
 function getMasterInitializedDecoder() {
-  return (0, import_kit27.getStructDecoder)([
-    ["address", (0, import_kit27.getAddressDecoder)()],
-    ["authority", (0, import_kit27.getAddressDecoder)()],
-    ["treasury", (0, import_kit27.getAddressDecoder)()],
-    ["timestamp", (0, import_kit27.getI64Decoder)()]
+  return (0, import_kit30.getStructDecoder)([
+    ["address", (0, import_kit30.getAddressDecoder)()],
+    ["authority", (0, import_kit30.getAddressDecoder)()],
+    ["treasury", (0, import_kit30.getAddressDecoder)()],
+    ["timestamp", (0, import_kit30.getI64Decoder)()]
   ]);
 }
 function getMasterInitializedCodec() {
-  return (0, import_kit27.combineCodec)(
+  return (0, import_kit30.combineCodec)(
     getMasterInitializedEncoder(),
     getMasterInitializedDecoder()
   );
 }
 
 // src/types/tokensDeposited.ts
-var import_kit28 = require("@solana/kit");
+var import_kit31 = require("@solana/kit");
 function getTokensDepositedEncoder() {
-  return (0, import_kit28.getStructEncoder)([
-    ["airdrop", (0, import_kit28.getAddressEncoder)()],
-    ["amount", (0, import_kit28.getU64Encoder)()],
-    ["newSupply", (0, import_kit28.getU64Encoder)()],
-    ["depositor", (0, import_kit28.getAddressEncoder)()],
-    ["timestamp", (0, import_kit28.getI64Encoder)()]
+  return (0, import_kit31.getStructEncoder)([
+    ["airdrop", (0, import_kit31.getAddressEncoder)()],
+    ["amount", (0, import_kit31.getU64Encoder)()],
+    ["newSupply", (0, import_kit31.getU64Encoder)()],
+    ["depositor", (0, import_kit31.getAddressEncoder)()],
+    ["timestamp", (0, import_kit31.getI64Encoder)()]
   ]);
 }
 function getTokensDepositedDecoder() {
-  return (0, import_kit28.getStructDecoder)([
-    ["airdrop", (0, import_kit28.getAddressDecoder)()],
-    ["amount", (0, import_kit28.getU64Decoder)()],
-    ["newSupply", (0, import_kit28.getU64Decoder)()],
-    ["depositor", (0, import_kit28.getAddressDecoder)()],
-    ["timestamp", (0, import_kit28.getI64Decoder)()]
+  return (0, import_kit31.getStructDecoder)([
+    ["airdrop", (0, import_kit31.getAddressDecoder)()],
+    ["amount", (0, import_kit31.getU64Decoder)()],
+    ["newSupply", (0, import_kit31.getU64Decoder)()],
+    ["depositor", (0, import_kit31.getAddressDecoder)()],
+    ["timestamp", (0, import_kit31.getI64Decoder)()]
   ]);
 }
 function getTokensDepositedCodec() {
-  return (0, import_kit28.combineCodec)(getTokensDepositedEncoder(), getTokensDepositedDecoder());
+  return (0, import_kit31.combineCodec)(getTokensDepositedEncoder(), getTokensDepositedDecoder());
 }
 
 // src/types/tokensRedeemed.ts
-var import_kit29 = require("@solana/kit");
+var import_kit32 = require("@solana/kit");
 function getTokensRedeemedEncoder() {
-  return (0, import_kit29.getStructEncoder)([
-    ["airdrop", (0, import_kit29.getAddressEncoder)()],
-    ["authority", (0, import_kit29.getAddressEncoder)()],
-    ["timestamp", (0, import_kit29.getI64Encoder)()]
+  return (0, import_kit32.getStructEncoder)([
+    ["airdrop", (0, import_kit32.getAddressEncoder)()],
+    ["authority", (0, import_kit32.getAddressEncoder)()],
+    ["timestamp", (0, import_kit32.getI64Encoder)()]
   ]);
 }
 function getTokensRedeemedDecoder() {
-  return (0, import_kit29.getStructDecoder)([
-    ["airdrop", (0, import_kit29.getAddressDecoder)()],
-    ["authority", (0, import_kit29.getAddressDecoder)()],
-    ["timestamp", (0, import_kit29.getI64Decoder)()]
+  return (0, import_kit32.getStructDecoder)([
+    ["airdrop", (0, import_kit32.getAddressDecoder)()],
+    ["authority", (0, import_kit32.getAddressDecoder)()],
+    ["timestamp", (0, import_kit32.getI64Decoder)()]
   ]);
 }
 function getTokensRedeemedCodec() {
-  return (0, import_kit29.combineCodec)(getTokensRedeemedEncoder(), getTokensRedeemedDecoder());
+  return (0, import_kit32.combineCodec)(getTokensRedeemedEncoder(), getTokensRedeemedDecoder());
 }
 
 // src/instructions/initializeAirdropMaster.ts
@@ -2720,18 +2750,25 @@ var INITIALIZE_AIRDROP_MASTER_DISCRIMINATOR = new Uint8Array([
   65
 ]);
 function getInitializeAirdropMasterDiscriminatorBytes() {
-  return (0, import_kit30.fixEncoderSize)((0, import_kit30.getBytesEncoder)(), 8).encode(
+  return (0, import_kit33.fixEncoderSize)((0, import_kit33.getBytesEncoder)(), 8).encode(
     INITIALIZE_AIRDROP_MASTER_DISCRIMINATOR
   );
 }
 function getInitializeAirdropMasterInstructionDataEncoder() {
-  return (0, import_kit30.transformEncoder)(
-    (0, import_kit30.getStructEncoder)([
-      ["discriminator", (0, import_kit30.fixEncoderSize)((0, import_kit30.getBytesEncoder)(), 8)],
-      ["merkleRoot", (0, import_kit30.fixEncoderSize)((0, import_kit30.getBytesEncoder)(), 32)],
-      ["baseConfig", getBaseFeeConfigEncoder()],
-      ["airdropConfig", getAdvancedFeeConfigEncoder()],
-      ["bitmapConfig", getBaseFeeConfigEncoder()]
+  return (0, import_kit33.transformEncoder)(
+    (0, import_kit33.getStructEncoder)([
+      ["discriminator", (0, import_kit33.fixEncoderSize)((0, import_kit33.getBytesEncoder)(), 8)],
+      ["merkleRoot", (0, import_kit33.getOptionEncoder)((0, import_kit33.fixEncoderSize)((0, import_kit33.getBytesEncoder)(), 32))],
+      ["airdropCreateFee", (0, import_kit33.getOptionEncoder)((0, import_kit33.getU64Encoder)())],
+      ["airdropUpdateFee", (0, import_kit33.getOptionEncoder)((0, import_kit33.getU64Encoder)())],
+      ["bitmapCreateFee", (0, import_kit33.getOptionEncoder)((0, import_kit33.getU64Encoder)())],
+      ["advancedConfig", (0, import_kit33.getOptionEncoder)(getAdvancedFeeConfigEncoder())],
+      [
+        "wlProof",
+        (0, import_kit33.getOptionEncoder)(
+          (0, import_kit33.getArrayEncoder)((0, import_kit33.fixEncoderSize)((0, import_kit33.getBytesEncoder)(), 32))
+        )
+      ]
     ]),
     (value) => ({
       ...value,
@@ -2740,16 +2777,21 @@ function getInitializeAirdropMasterInstructionDataEncoder() {
   );
 }
 function getInitializeAirdropMasterInstructionDataDecoder() {
-  return (0, import_kit30.getStructDecoder)([
-    ["discriminator", (0, import_kit30.fixDecoderSize)((0, import_kit30.getBytesDecoder)(), 8)],
-    ["merkleRoot", (0, import_kit30.fixDecoderSize)((0, import_kit30.getBytesDecoder)(), 32)],
-    ["baseConfig", getBaseFeeConfigDecoder()],
-    ["airdropConfig", getAdvancedFeeConfigDecoder()],
-    ["bitmapConfig", getBaseFeeConfigDecoder()]
+  return (0, import_kit33.getStructDecoder)([
+    ["discriminator", (0, import_kit33.fixDecoderSize)((0, import_kit33.getBytesDecoder)(), 8)],
+    ["merkleRoot", (0, import_kit33.getOptionDecoder)((0, import_kit33.fixDecoderSize)((0, import_kit33.getBytesDecoder)(), 32))],
+    ["airdropCreateFee", (0, import_kit33.getOptionDecoder)((0, import_kit33.getU64Decoder)())],
+    ["airdropUpdateFee", (0, import_kit33.getOptionDecoder)((0, import_kit33.getU64Decoder)())],
+    ["bitmapCreateFee", (0, import_kit33.getOptionDecoder)((0, import_kit33.getU64Decoder)())],
+    ["advancedConfig", (0, import_kit33.getOptionDecoder)(getAdvancedFeeConfigDecoder())],
+    [
+      "wlProof",
+      (0, import_kit33.getOptionDecoder)((0, import_kit33.getArrayDecoder)((0, import_kit33.fixDecoderSize)((0, import_kit33.getBytesDecoder)(), 32)))
+    ]
   ]);
 }
 function getInitializeAirdropMasterInstructionDataCodec() {
-  return (0, import_kit30.combineCodec)(
+  return (0, import_kit33.combineCodec)(
     getInitializeAirdropMasterInstructionDataEncoder(),
     getInitializeAirdropMasterInstructionDataDecoder()
   );
@@ -2771,18 +2813,18 @@ async function getInitializeAirdropMasterInstructionAsync(input, config) {
   const accounts = originalAccounts;
   const args = { ...input };
   if (!accounts.master.value) {
-    accounts.master.value = await (0, import_kit30.getProgramDerivedAddress)({
+    accounts.master.value = await (0, import_kit33.getProgramDerivedAddress)({
       programAddress,
       seeds: [
-        (0, import_kit30.getBytesEncoder)().encode(new Uint8Array([109, 97, 115, 116, 101, 114]))
+        (0, import_kit33.getBytesEncoder)().encode(new Uint8Array([109, 97, 115, 116, 101, 114]))
       ]
     });
   }
   if (!accounts.config.value) {
-    accounts.config.value = await (0, import_kit30.getProgramDerivedAddress)({
+    accounts.config.value = await (0, import_kit33.getProgramDerivedAddress)({
       programAddress,
       seeds: [
-        (0, import_kit30.getBytesEncoder)().encode(
+        (0, import_kit33.getBytesEncoder)().encode(
           new Uint8Array([
             97,
             105,
@@ -2804,10 +2846,10 @@ async function getInitializeAirdropMasterInstructionAsync(input, config) {
     });
   }
   if (!accounts.airdropMaster.value) {
-    accounts.airdropMaster.value = await (0, import_kit30.getProgramDerivedAddress)({
+    accounts.airdropMaster.value = await (0, import_kit33.getProgramDerivedAddress)({
       programAddress,
       seeds: [
-        (0, import_kit30.getBytesEncoder)().encode(
+        (0, import_kit33.getBytesEncoder)().encode(
           new Uint8Array([
             97,
             105,
@@ -2825,7 +2867,7 @@ async function getInitializeAirdropMasterInstructionAsync(input, config) {
             114
           ])
         ),
-        (0, import_kit30.getAddressEncoder)().encode(expectAddress(accounts.authority.value))
+        (0, import_kit33.getAddressEncoder)().encode(expectAddress(accounts.authority.value))
       ]
     });
   }
@@ -2917,7 +2959,7 @@ function parseInitializeAirdropMasterInstruction(instruction) {
 }
 
 // src/instructions/initializeMaster.ts
-var import_kit31 = require("@solana/kit");
+var import_kit34 = require("@solana/kit");
 var INITIALIZE_MASTER_DISCRIMINATOR = new Uint8Array([
   206,
   91,
@@ -2929,29 +2971,29 @@ var INITIALIZE_MASTER_DISCRIMINATOR = new Uint8Array([
   166
 ]);
 function getInitializeMasterDiscriminatorBytes() {
-  return (0, import_kit31.fixEncoderSize)((0, import_kit31.getBytesEncoder)(), 8).encode(
+  return (0, import_kit34.fixEncoderSize)((0, import_kit34.getBytesEncoder)(), 8).encode(
     INITIALIZE_MASTER_DISCRIMINATOR
   );
 }
 function getInitializeMasterInstructionDataEncoder() {
-  return (0, import_kit31.transformEncoder)(
-    (0, import_kit31.getStructEncoder)([
-      ["discriminator", (0, import_kit31.fixEncoderSize)((0, import_kit31.getBytesEncoder)(), 8)],
+  return (0, import_kit34.transformEncoder)(
+    (0, import_kit34.getStructEncoder)([
+      ["discriminator", (0, import_kit34.fixEncoderSize)((0, import_kit34.getBytesEncoder)(), 8)],
       ["airdropConfig", getInitAirdropConfigArgsEncoder()],
-      ["protocolFee", (0, import_kit31.getU64Encoder)()]
+      ["protocolFee", (0, import_kit34.getU64Encoder)()]
     ]),
     (value) => ({ ...value, discriminator: INITIALIZE_MASTER_DISCRIMINATOR })
   );
 }
 function getInitializeMasterInstructionDataDecoder() {
-  return (0, import_kit31.getStructDecoder)([
-    ["discriminator", (0, import_kit31.fixDecoderSize)((0, import_kit31.getBytesDecoder)(), 8)],
+  return (0, import_kit34.getStructDecoder)([
+    ["discriminator", (0, import_kit34.fixDecoderSize)((0, import_kit34.getBytesDecoder)(), 8)],
     ["airdropConfig", getInitAirdropConfigArgsDecoder()],
-    ["protocolFee", (0, import_kit31.getU64Decoder)()]
+    ["protocolFee", (0, import_kit34.getU64Decoder)()]
   ]);
 }
 function getInitializeMasterInstructionDataCodec() {
-  return (0, import_kit31.combineCodec)(
+  return (0, import_kit34.combineCodec)(
     getInitializeMasterInstructionDataEncoder(),
     getInitializeMasterInstructionDataDecoder()
   );
@@ -2969,18 +3011,18 @@ async function getInitializeMasterInstructionAsync(input, config) {
   const accounts = originalAccounts;
   const args = { ...input };
   if (!accounts.master.value) {
-    accounts.master.value = await (0, import_kit31.getProgramDerivedAddress)({
+    accounts.master.value = await (0, import_kit34.getProgramDerivedAddress)({
       programAddress,
       seeds: [
-        (0, import_kit31.getBytesEncoder)().encode(new Uint8Array([109, 97, 115, 116, 101, 114]))
+        (0, import_kit34.getBytesEncoder)().encode(new Uint8Array([109, 97, 115, 116, 101, 114]))
       ]
     });
   }
   if (!accounts.config.value) {
-    accounts.config.value = await (0, import_kit31.getProgramDerivedAddress)({
+    accounts.config.value = await (0, import_kit34.getProgramDerivedAddress)({
       programAddress,
       seeds: [
-        (0, import_kit31.getBytesEncoder)().encode(
+        (0, import_kit34.getBytesEncoder)().encode(
           new Uint8Array([
             97,
             105,
@@ -3086,7 +3128,7 @@ function parseInitializeMasterInstruction(instruction) {
 }
 
 // src/instructions/redeemAirdropTokens.ts
-var import_kit32 = require("@solana/kit");
+var import_kit35 = require("@solana/kit");
 var REDEEM_AIRDROP_TOKENS_DISCRIMINATOR = new Uint8Array([
   102,
   70,
@@ -3098,13 +3140,13 @@ var REDEEM_AIRDROP_TOKENS_DISCRIMINATOR = new Uint8Array([
   103
 ]);
 function getRedeemAirdropTokensDiscriminatorBytes() {
-  return (0, import_kit32.fixEncoderSize)((0, import_kit32.getBytesEncoder)(), 8).encode(
+  return (0, import_kit35.fixEncoderSize)((0, import_kit35.getBytesEncoder)(), 8).encode(
     REDEEM_AIRDROP_TOKENS_DISCRIMINATOR
   );
 }
 function getRedeemAirdropTokensInstructionDataEncoder() {
-  return (0, import_kit32.transformEncoder)(
-    (0, import_kit32.getStructEncoder)([["discriminator", (0, import_kit32.fixEncoderSize)((0, import_kit32.getBytesEncoder)(), 8)]]),
+  return (0, import_kit35.transformEncoder)(
+    (0, import_kit35.getStructEncoder)([["discriminator", (0, import_kit35.fixEncoderSize)((0, import_kit35.getBytesEncoder)(), 8)]]),
     (value) => ({
       ...value,
       discriminator: REDEEM_AIRDROP_TOKENS_DISCRIMINATOR
@@ -3112,12 +3154,12 @@ function getRedeemAirdropTokensInstructionDataEncoder() {
   );
 }
 function getRedeemAirdropTokensInstructionDataDecoder() {
-  return (0, import_kit32.getStructDecoder)([
-    ["discriminator", (0, import_kit32.fixDecoderSize)((0, import_kit32.getBytesDecoder)(), 8)]
+  return (0, import_kit35.getStructDecoder)([
+    ["discriminator", (0, import_kit35.fixDecoderSize)((0, import_kit35.getBytesDecoder)(), 8)]
   ]);
 }
 function getRedeemAirdropTokensInstructionDataCodec() {
-  return (0, import_kit32.combineCodec)(
+  return (0, import_kit35.combineCodec)(
     getRedeemAirdropTokensInstructionDataEncoder(),
     getRedeemAirdropTokensInstructionDataDecoder()
   );
@@ -3128,11 +3170,7 @@ async function getRedeemAirdropTokensInstructionAsync(input, config) {
     master: { value: input.master ?? null, isWritable: false },
     config: { value: input.config ?? null, isWritable: false },
     treasury: { value: input.treasury ?? null, isWritable: true },
-    airdropMaster: { value: input.airdropMaster ?? null, isWritable: false },
-    airdropMasterAuthority: {
-      value: input.airdropMasterAuthority ?? null,
-      isWritable: false
-    },
+    airdropMaster: { value: input.airdropMaster ?? null, isWritable: true },
     affiliate: { value: input.affiliate ?? null, isWritable: true },
     sourceTokenAccount: {
       value: input.sourceTokenAccount ?? null,
@@ -3154,18 +3192,18 @@ async function getRedeemAirdropTokensInstructionAsync(input, config) {
   };
   const accounts = originalAccounts;
   if (!accounts.master.value) {
-    accounts.master.value = await (0, import_kit32.getProgramDerivedAddress)({
+    accounts.master.value = await (0, import_kit35.getProgramDerivedAddress)({
       programAddress,
       seeds: [
-        (0, import_kit32.getBytesEncoder)().encode(new Uint8Array([109, 97, 115, 116, 101, 114]))
+        (0, import_kit35.getBytesEncoder)().encode(new Uint8Array([109, 97, 115, 116, 101, 114]))
       ]
     });
   }
   if (!accounts.config.value) {
-    accounts.config.value = await (0, import_kit32.getProgramDerivedAddress)({
+    accounts.config.value = await (0, import_kit35.getProgramDerivedAddress)({
       programAddress,
       seeds: [
-        (0, import_kit32.getBytesEncoder)().encode(
+        (0, import_kit35.getBytesEncoder)().encode(
           new Uint8Array([
             97,
             105,
@@ -3186,43 +3224,15 @@ async function getRedeemAirdropTokensInstructionAsync(input, config) {
       ]
     });
   }
-  if (!accounts.airdropMaster.value) {
-    accounts.airdropMaster.value = await (0, import_kit32.getProgramDerivedAddress)({
-      programAddress,
-      seeds: [
-        (0, import_kit32.getBytesEncoder)().encode(
-          new Uint8Array([
-            97,
-            105,
-            114,
-            100,
-            114,
-            111,
-            112,
-            95,
-            109,
-            97,
-            115,
-            116,
-            101,
-            114
-          ])
-        ),
-        (0, import_kit32.getAddressEncoder)().encode(
-          expectAddress(accounts.airdropMasterAuthority.value)
-        )
-      ]
-    });
-  }
   if (!accounts.airdrop.value) {
-    accounts.airdrop.value = await (0, import_kit32.getProgramDerivedAddress)({
+    accounts.airdrop.value = await (0, import_kit35.getProgramDerivedAddress)({
       programAddress,
       seeds: [
-        (0, import_kit32.getBytesEncoder)().encode(
+        (0, import_kit35.getBytesEncoder)().encode(
           new Uint8Array([97, 105, 114, 100, 114, 111, 112])
         ),
-        (0, import_kit32.getAddressEncoder)().encode(expectAddress(accounts.mint.value)),
-        (0, import_kit32.getAddressEncoder)().encode(expectAddress(accounts.authority.value))
+        (0, import_kit35.getAddressEncoder)().encode(expectAddress(accounts.mint.value)),
+        (0, import_kit35.getAddressEncoder)().encode(expectAddress(accounts.authority.value))
       ]
     });
   }
@@ -3230,12 +3240,12 @@ async function getRedeemAirdropTokensInstructionAsync(input, config) {
     accounts.tokenProgram.value = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
   }
   if (!accounts.destinationTokenAccount.value) {
-    accounts.destinationTokenAccount.value = await (0, import_kit32.getProgramDerivedAddress)({
+    accounts.destinationTokenAccount.value = await (0, import_kit35.getProgramDerivedAddress)({
       programAddress: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL",
       seeds: [
-        (0, import_kit32.getAddressEncoder)().encode(expectAddress(accounts.airdrop.value)),
-        (0, import_kit32.getAddressEncoder)().encode(expectAddress(accounts.tokenProgram.value)),
-        (0, import_kit32.getAddressEncoder)().encode(expectAddress(accounts.mint.value))
+        (0, import_kit35.getAddressEncoder)().encode(expectAddress(accounts.airdrop.value)),
+        (0, import_kit35.getAddressEncoder)().encode(expectAddress(accounts.tokenProgram.value)),
+        (0, import_kit35.getAddressEncoder)().encode(expectAddress(accounts.mint.value))
       ]
     });
   }
@@ -3252,7 +3262,6 @@ async function getRedeemAirdropTokensInstructionAsync(input, config) {
       getAccountMeta(accounts.config),
       getAccountMeta(accounts.treasury),
       getAccountMeta(accounts.airdropMaster),
-      getAccountMeta(accounts.airdropMasterAuthority),
       getAccountMeta(accounts.affiliate),
       getAccountMeta(accounts.sourceTokenAccount),
       getAccountMeta(accounts.destinationTokenAccount),
@@ -3273,11 +3282,7 @@ function getRedeemAirdropTokensInstruction(input, config) {
     master: { value: input.master ?? null, isWritable: false },
     config: { value: input.config ?? null, isWritable: false },
     treasury: { value: input.treasury ?? null, isWritable: true },
-    airdropMaster: { value: input.airdropMaster ?? null, isWritable: false },
-    airdropMasterAuthority: {
-      value: input.airdropMasterAuthority ?? null,
-      isWritable: false
-    },
+    airdropMaster: { value: input.airdropMaster ?? null, isWritable: true },
     affiliate: { value: input.affiliate ?? null, isWritable: true },
     sourceTokenAccount: {
       value: input.sourceTokenAccount ?? null,
@@ -3314,7 +3319,6 @@ function getRedeemAirdropTokensInstruction(input, config) {
       getAccountMeta(accounts.config),
       getAccountMeta(accounts.treasury),
       getAccountMeta(accounts.airdropMaster),
-      getAccountMeta(accounts.airdropMasterAuthority),
       getAccountMeta(accounts.affiliate),
       getAccountMeta(accounts.sourceTokenAccount),
       getAccountMeta(accounts.destinationTokenAccount),
@@ -3330,7 +3334,7 @@ function getRedeemAirdropTokensInstruction(input, config) {
   });
 }
 function parseRedeemAirdropTokensInstruction(instruction) {
-  if (instruction.accounts.length < 14) {
+  if (instruction.accounts.length < 13) {
     throw new Error("Not enough accounts");
   }
   let accountIndex = 0;
@@ -3350,7 +3354,6 @@ function parseRedeemAirdropTokensInstruction(instruction) {
       config: getNextAccount(),
       treasury: getNextAccount(),
       airdropMaster: getNextAccount(),
-      airdropMasterAuthority: getNextAccount(),
       affiliate: getNextOptionalAccount(),
       sourceTokenAccount: getNextAccount(),
       destinationTokenAccount: getNextAccount(),
@@ -3366,77 +3369,6 @@ function parseRedeemAirdropTokensInstruction(instruction) {
     )
   };
 }
-
-// src/utils/derive.ts
-var import_kit34 = require("@solana/kit");
-
-// src/constants/index.ts
-var import_kit33 = require("@solana/kit");
-var DROPSY_MASTER_SEED = "master";
-var AIRDROP_CONFIG_SEED = "airdrop_config";
-var AFFILIATE_MASTER_SEED = "affiliate_master";
-var AIRDROP_MASTER_SEED = "airdrop_master";
-var AIRDROP_SEED = "airdrop";
-var AFFILIATE_SEED = "affiliate";
-var BITMAP_SEED = "bitmap";
-var VESTING_SEED = "vesting";
-var PRESALE_SEED = "presale";
-var VAULT_SEED = "vault";
-var ADMIN = (0, import_kit33.address)("8mtUD2XrkNnTxnjCehZ4DEtTXeGR1yrepSEGhCaSj2kT");
-var BITMAP_SIZE = 8e3;
-var MAX_BITMAP_CLAIM = BITMAP_SIZE * 8;
-var VERSION_BASIC = 0;
-var VERSION_VESTED = 1;
-var STATE_INITIALIZED = 0;
-var STATE_DELEGATED = 1;
-var STATE_REDEEMED = 2;
-var MUTABLE_NONE = 0;
-
-// src/utils/derive.ts
-async function getDropsyDerivedAddress(seeds) {
-  return await (0, import_kit34.getProgramDerivedAddress)({
-    seeds,
-    programAddress: DROPSY_PROGRAM_ADDRESS
-  });
-}
-async function getMasterDerivedAddress() {
-  return await getDropsyDerivedAddress([DROPSY_MASTER_SEED]);
-}
-async function getAirdropConfigDerivedAddress() {
-  return await getDropsyDerivedAddress([AIRDROP_CONFIG_SEED]);
-}
-async function getAirdropMasterDerivedAddress(authority) {
-  const seeds = [
-    AIRDROP_MASTER_SEED,
-    (0, import_kit34.getAddressEncoder)().encode(authority)
-  ];
-  return await getDropsyDerivedAddress(seeds);
-}
-async function getAffiliateDerivedAddress(authority) {
-  const seeds = [
-    AFFILIATE_SEED,
-    (0, import_kit34.getAddressEncoder)().encode(authority)
-  ];
-  return await getDropsyDerivedAddress(seeds);
-}
-async function getAirdropDerivedAddress(authority, mint) {
-  const seeds = [
-    AIRDROP_SEED,
-    (0, import_kit34.getAddressEncoder)().encode(mint),
-    (0, import_kit34.getAddressEncoder)().encode(authority)
-  ];
-  return await getDropsyDerivedAddress(seeds);
-}
-async function getClaimMapDerivedAddress(airdrop, id) {
-  const idBuffer = Buffer.alloc(2);
-  idBuffer.writeUInt16LE(id);
-  const seeds = [
-    BITMAP_SEED,
-    (0, import_kit34.getAddressEncoder)().encode(airdrop),
-    idBuffer
-  ];
-  return await getDropsyDerivedAddress(seeds);
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ADMIN,
@@ -3456,6 +3388,8 @@ async function getClaimMapDerivedAddress(airdrop, id) {
   CLAIM_MAP_DISCRIMINATOR,
   CREATE_AIRDROP_DISCRIMINATOR,
   CREATE_CLAIM_MAP_DISCRIMINATOR,
+  DEFAULT_MASTER_PDA,
+  DEFAULT_MASTER_PDA_AUTHORITY,
   DEPOSIT_TOKENS_DISCRIMINATOR,
   DROPSY_ERROR__ACTIVE_BITMAPS_EXIST,
   DROPSY_ERROR__AIRDROP_ENDED,
@@ -3534,6 +3468,7 @@ async function getClaimMapDerivedAddress(airdrop, id) {
   DROPSY_ERROR__VESTING_ACCOUNT_REQUIRED,
   DROPSY_MASTER_SEED,
   DROPSY_PROGRAM_ADDRESS,
+  DROPSY_TREASURY,
   DropsyAccount,
   DropsyInstruction,
   INITIALIZE_AIRDROP_MASTER_DISCRIMINATOR,
@@ -3550,6 +3485,10 @@ async function getClaimMapDerivedAddress(airdrop, id) {
   VERSION_BASIC,
   VERSION_VESTED,
   VESTING_SEED,
+  createDefaultSolanaClient,
+  createMerkleTree,
+  createTransactionMessageFromInstructions,
+  createWLMerkleTree,
   decodeAffiliate,
   decodeAffiliateMaster,
   decodeAirdrop,
@@ -3585,6 +3524,7 @@ async function getClaimMapDerivedAddress(airdrop, id) {
   fetchMaybeAirdropMaster,
   fetchMaybeClaimMap,
   fetchMaybeMaster,
+  generateKeyPairSignerWithSol,
   getAdvancedFeeConfigCodec,
   getAdvancedFeeConfigDecoder,
   getAdvancedFeeConfigEncoder,
@@ -3672,6 +3612,7 @@ async function getClaimMapDerivedAddress(airdrop, id) {
   getCreateClaimMapInstructionDataCodec,
   getCreateClaimMapInstructionDataDecoder,
   getCreateClaimMapInstructionDataEncoder,
+  getCreateClaimMapV0Instruction,
   getDepositTokensDiscriminatorBytes,
   getDepositTokensInstruction,
   getDepositTokensInstructionAsync,
@@ -3704,12 +3645,14 @@ async function getClaimMapDerivedAddress(airdrop, id) {
   getMasterInitializedDecoder,
   getMasterInitializedEncoder,
   getMasterSize,
+  getMerkleRootArray,
   getRedeemAirdropTokensDiscriminatorBytes,
   getRedeemAirdropTokensInstruction,
   getRedeemAirdropTokensInstructionAsync,
   getRedeemAirdropTokensInstructionDataCodec,
   getRedeemAirdropTokensInstructionDataDecoder,
   getRedeemAirdropTokensInstructionDataEncoder,
+  getSimpleMerkleProof,
   getTokensDepositedCodec,
   getTokensDepositedDecoder,
   getTokensDepositedEncoder,
@@ -3725,6 +3668,7 @@ async function getClaimMapDerivedAddress(airdrop, id) {
   parseDepositTokensInstruction,
   parseInitializeAirdropMasterInstruction,
   parseInitializeMasterInstruction,
-  parseRedeemAirdropTokensInstruction
+  parseRedeemAirdropTokensInstruction,
+  toUnixTimestamp
 });
 //# sourceMappingURL=index.js.map