@dropsy/airdrop 0.2.5 → 0.2.7

package/dist/index.mjs

@@ -473,13 +473,11 @@ function getAirdropMasterEncoder() {
       ["bitmapCreated", getU64Encoder5()],
       ["maxBitmapAllowed", getU64Encoder5()],
       ["airdropCreationFee", getU64Encoder5()],
+      ["bitmapCreationFee", getU64Encoder5()],
       ["airdropUpdateFee", getU64Encoder5()],
-      ["airdropCloseFee", getU64Encoder5()],
       ["airdropClaimFee", getU64Encoder5()],
       ["airdropDelegateFee", getU64Encoder5()],
       ["airdropDepositFee", getU64Encoder5()],
-      ["bitmapCreationFee", getU64Encoder5()],
-      ["bitmapCloseFee", getU64Encoder5()],
       ["bump", getU8Encoder5()],
       ["padding", fixEncoderSize5(getBytesEncoder5(), 7)]
     ]),
@@ -497,13 +495,11 @@ function getAirdropMasterDecoder() {
     ["bitmapCreated", getU64Decoder5()],
     ["maxBitmapAllowed", getU64Decoder5()],
     ["airdropCreationFee", getU64Decoder5()],
+    ["bitmapCreationFee", getU64Decoder5()],
     ["airdropUpdateFee", getU64Decoder5()],
-    ["airdropCloseFee", getU64Decoder5()],
     ["airdropClaimFee", getU64Decoder5()],
     ["airdropDelegateFee", getU64Decoder5()],
     ["airdropDepositFee", getU64Decoder5()],
-    ["bitmapCreationFee", getU64Decoder5()],
-    ["bitmapCloseFee", getU64Decoder5()],
     ["bump", getU8Decoder5()],
     ["padding", fixDecoderSize5(getBytesDecoder5(), 7)]
   ]);
@@ -540,7 +536,7 @@ async function fetchAllMaybeAirdropMaster(rpc, addresses, config) {
   return maybeAccounts.map((maybeAccount) => decodeAirdropMaster(maybeAccount));
 }
 function getAirdropMasterSize() {
-  return 208;
+  return 192;
 }
 
 // src/accounts/claimMap.ts
@@ -1184,11 +1180,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,
@@ -1245,34 +1237,6 @@ async function getClaimAirdropInstructionAsync(input, config) {
       ]
     });
   }
-  if (!accounts.airdropMaster.value) {
-    accounts.airdropMaster.value = await getProgramDerivedAddress({
-      programAddress,
-      seeds: [
-        getBytesEncoder9().encode(
-          new Uint8Array([
-            97,
-            105,
-            114,
-            100,
-            114,
-            111,
-            112,
-            95,
-            109,
-            97,
-            115,
-            116,
-            101,
-            114
-          ])
-        ),
-        getAddressEncoder7().encode(
-          expectAddress(accounts.airdropMasterAuthority.value)
-        )
-      ]
-    });
-  }
   if (!accounts.tokenProgram.value) {
     accounts.tokenProgram.value = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
   }
@@ -1311,7 +1275,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),
@@ -1336,11 +1299,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,
@@ -1380,7 +1339,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),
@@ -1400,7 +1358,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;
@@ -1420,7 +1378,6 @@ function parseClaimAirdropInstruction(instruction) {
       config: getNextAccount(),
       treasury: getNextAccount(),
       airdropMaster: getNextAccount(),
-      airdropMasterAuthority: getNextAccount(),
       affiliate: getNextOptionalAccount(),
       sourceTokenAccount: getNextAccount(),
       destinationTokenAccount: getNextAccount(),
@@ -1443,20 +1400,184 @@ import {
   fixDecoderSize as fixDecoderSize9,
   fixEncoderSize as fixEncoderSize10,
   getAddressDecoder as getAddressDecoder7,
-  getAddressEncoder as getAddressEncoder8,
+  getAddressEncoder as getAddressEncoder9,
   getBytesDecoder as getBytesDecoder9,
   getBytesEncoder as getBytesEncoder10,
   getI64Decoder as getI64Decoder3,
   getI64Encoder as getI64Encoder3,
   getOptionDecoder,
   getOptionEncoder,
-  getProgramDerivedAddress as getProgramDerivedAddress2,
+  getProgramDerivedAddress as getProgramDerivedAddress3,
   getStructDecoder as getStructDecoder9,
   getStructEncoder as getStructEncoder9,
   getU8Decoder as getU8Decoder8,
   getU8Encoder as getU8Encoder8,
   transformEncoder as transformEncoder9
 } from "@solana/kit";
+
+// src/constants/index.ts
+import { address } from "@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 = address("8mtUD2XrkNnTxnjCehZ4DEtTXeGR1yrepSEGhCaSj2kT");
+var DROPSY_TREASURY = address("8mtUD2XrkNnTxnjCehZ4DEtTXeGR1yrepSEGhCaSj2kT");
+var DEFAULT_MASTER_PDA = address("8mtUD2XrkNnTxnjCehZ4DEtTXeGR1yrepSEGhCaSj2kT");
+var DEFAULT_MASTER_PDA_AUTHORITY = 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
+import {
+  airdropFactory,
+  appendTransactionMessageInstructions,
+  createSolanaRpc,
+  createSolanaRpcSubscriptions,
+  createTransactionMessage,
+  generateKeyPairSigner,
+  lamports,
+  pipe,
+  setTransactionMessageFeePayerSigner,
+  setTransactionMessageLifetimeUsingBlockhash
+} from "@solana/kit";
+var generateKeyPairSignerWithSol = async (rpcClient, putativeLamports = 1000000000n) => {
+  const signer = await generateKeyPairSigner();
+  await airdropFactory(rpcClient)({
+    recipientAddress: signer.address,
+    lamports: lamports(putativeLamports),
+    commitment: "confirmed"
+  });
+  return signer;
+};
+var createDefaultSolanaClient = () => {
+  const rpc = createSolanaRpc("https://api.devnet.solana.com");
+  const rpcSubscriptions = createSolanaRpcSubscriptions(
+    "wss://api.devnet.solana.com"
+  );
+  return { rpc, rpcSubscriptions };
+};
+var createTransactionMessageFromInstructions = async (rpc, signer, instruction) => {
+  const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
+  return pipe(
+    createTransactionMessage({ version: 0 }),
+    (tx) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, tx),
+    (tx) => setTransactionMessageFeePayerSigner(signer, tx),
+    (tx) => appendTransactionMessageInstructions(instruction, tx)
+  );
+};
+
+// src/utils/derive.ts
+import {
+  getAddressEncoder as getAddressEncoder8,
+  getProgramDerivedAddress as getProgramDerivedAddress2
+} from "@solana/kit";
+async function getDropsyDerivedAddress(seeds) {
+  return await getProgramDerivedAddress2({
+    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,
+    getAddressEncoder8().encode(authority)
+  ];
+  return await getDropsyDerivedAddress(seeds);
+}
+async function getAffiliateDerivedAddress(authority) {
+  const seeds = [
+    AFFILIATE_SEED,
+    getAddressEncoder8().encode(authority)
+  ];
+  return await getDropsyDerivedAddress(seeds);
+}
+async function getAirdropDerivedAddress(authority, mint) {
+  const seeds = [
+    AIRDROP_SEED,
+    getAddressEncoder8().encode(mint),
+    getAddressEncoder8().encode(authority)
+  ];
+  return await getDropsyDerivedAddress(seeds);
+}
+async function getClaimMapDerivedAddress(airdrop, id) {
+  const idBuffer = Buffer.alloc(2);
+  idBuffer.writeUInt16LE(id);
+  const seeds = [
+    BITMAP_SEED,
+    getAddressEncoder8().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
+import { createHash } from "crypto";
+import MerkleTree from "merkletreejs";
+function hashLeaf(index, address2, amount) {
+  const data = `${index}:${address2}:${amount.toString()}`;
+  return createHash("sha256").update(data).digest();
+}
+function hashAddress(address2) {
+  return createHash("sha256").update(address2).digest();
+}
+var createWLMerkleTree = (wallets) => {
+  const leaves = wallets.map((address2) => hashAddress(address2));
+  return new MerkleTree(
+    leaves,
+    (data) => 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 MerkleTree(
+    leaves,
+    (data) => createHash("sha256").update(data).digest(),
+    { sortPairs: true }
+  );
+  return merkleTree;
+};
+
+// src/instructions/createAirdrop.ts
 var CREATE_AIRDROP_DISCRIMINATOR = new Uint8Array([
   227,
   135,
@@ -1481,7 +1602,7 @@ function getCreateAirdropInstructionDataEncoder() {
       ["endsAt", getOptionEncoder(getI64Encoder3())],
       ["version", getOptionEncoder(getU8Encoder8())],
       ["mutable", getOptionEncoder(getU8Encoder8())],
-      ["delegateAuthority", getOptionEncoder(getAddressEncoder8())],
+      ["delegateAuthority", getOptionEncoder(getAddressEncoder9())],
       ["delegatePermissions", getOptionEncoder(getU8Encoder8())]
     ]),
     (value) => ({ ...value, discriminator: CREATE_AIRDROP_DISCRIMINATOR })
@@ -1512,10 +1633,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 },
@@ -1525,7 +1642,7 @@ async function getCreateAirdropInstructionAsync(input, config) {
   const accounts = originalAccounts;
   const args = { ...input };
   if (!accounts.master.value) {
-    accounts.master.value = await getProgramDerivedAddress2({
+    accounts.master.value = await getProgramDerivedAddress3({
       programAddress,
       seeds: [
         getBytesEncoder10().encode(new Uint8Array([109, 97, 115, 116, 101, 114]))
@@ -1533,7 +1650,7 @@ async function getCreateAirdropInstructionAsync(input, config) {
     });
   }
   if (!accounts.config.value) {
-    accounts.config.value = await getProgramDerivedAddress2({
+    accounts.config.value = await getProgramDerivedAddress3({
       programAddress,
       seeds: [
         getBytesEncoder10().encode(
@@ -1557,43 +1674,15 @@ async function getCreateAirdropInstructionAsync(input, config) {
       ]
     });
   }
-  if (!accounts.airdropMaster.value) {
-    accounts.airdropMaster.value = await getProgramDerivedAddress2({
-      programAddress,
-      seeds: [
-        getBytesEncoder10().encode(
-          new Uint8Array([
-            97,
-            105,
-            114,
-            100,
-            114,
-            111,
-            112,
-            95,
-            109,
-            97,
-            115,
-            116,
-            101,
-            114
-          ])
-        ),
-        getAddressEncoder8().encode(
-          expectAddress(accounts.airdropMasterAuthority.value)
-        )
-      ]
-    });
-  }
   if (!accounts.airdrop.value) {
-    accounts.airdrop.value = await getProgramDerivedAddress2({
+    accounts.airdrop.value = await getProgramDerivedAddress3({
       programAddress,
       seeds: [
         getBytesEncoder10().encode(
           new Uint8Array([97, 105, 114, 100, 114, 111, 112])
         ),
-        getAddressEncoder8().encode(expectAddress(accounts.mint.value)),
-        getAddressEncoder8().encode(expectAddress(accounts.authority.value))
+        getAddressEncoder9().encode(expectAddress(accounts.mint.value)),
+        getAddressEncoder9().encode(expectAddress(accounts.authority.value))
       ]
     });
   }
@@ -1607,7 +1696,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),
@@ -1626,11 +1714,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 },
@@ -1649,7 +1733,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),
@@ -1663,7 +1746,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;
@@ -1683,7 +1766,6 @@ function parseCreateAirdropInstruction(instruction) {
       config: getNextAccount(),
       treasury: getNextAccount(),
       airdropMaster: getNextAccount(),
-      airdropMasterAuthority: getNextAccount(),
       affiliate: getNextOptionalAccount(),
       airdrop: getNextAccount(),
       mint: getNextAccount(),
@@ -1695,14 +1777,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,
@@ -1715,10 +1797,10 @@ import {
   combineCodec as combineCodec10,
   fixDecoderSize as fixDecoderSize10,
   fixEncoderSize as fixEncoderSize11,
-  getAddressEncoder as getAddressEncoder9,
+  getAddressEncoder as getAddressEncoder10,
   getBytesDecoder as getBytesDecoder10,
   getBytesEncoder as getBytesEncoder11,
-  getProgramDerivedAddress as getProgramDerivedAddress3,
+  getProgramDerivedAddress as getProgramDerivedAddress4,
   getStructDecoder as getStructDecoder10,
   getStructEncoder as getStructEncoder10,
   getU16Decoder as getU16Decoder5,
@@ -1772,10 +1854,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 },
@@ -1786,7 +1864,7 @@ async function getCreateClaimMapInstructionAsync(input, config) {
   const accounts = originalAccounts;
   const args = { ...input };
   if (!accounts.master.value) {
-    accounts.master.value = await getProgramDerivedAddress3({
+    accounts.master.value = await getProgramDerivedAddress4({
       programAddress,
       seeds: [
         getBytesEncoder11().encode(new Uint8Array([109, 97, 115, 116, 101, 114]))
@@ -1794,7 +1872,7 @@ async function getCreateClaimMapInstructionAsync(input, config) {
     });
   }
   if (!accounts.config.value) {
-    accounts.config.value = await getProgramDerivedAddress3({
+    accounts.config.value = await getProgramDerivedAddress4({
       programAddress,
       seeds: [
         getBytesEncoder11().encode(
@@ -1818,52 +1896,24 @@ async function getCreateClaimMapInstructionAsync(input, config) {
       ]
     });
   }
-  if (!accounts.airdropMaster.value) {
-    accounts.airdropMaster.value = await getProgramDerivedAddress3({
-      programAddress,
-      seeds: [
-        getBytesEncoder11().encode(
-          new Uint8Array([
-            97,
-            105,
-            114,
-            100,
-            114,
-            111,
-            112,
-            95,
-            109,
-            97,
-            115,
-            116,
-            101,
-            114
-          ])
-        ),
-        getAddressEncoder9().encode(
-          expectAddress(accounts.airdropMasterAuthority.value)
-        )
-      ]
-    });
-  }
   if (!accounts.airdrop.value) {
-    accounts.airdrop.value = await getProgramDerivedAddress3({
+    accounts.airdrop.value = await getProgramDerivedAddress4({
       programAddress,
       seeds: [
         getBytesEncoder11().encode(
           new Uint8Array([97, 105, 114, 100, 114, 111, 112])
         ),
-        getAddressEncoder9().encode(expectAddress(accounts.mint.value)),
-        getAddressEncoder9().encode(expectAddress(accounts.authority.value))
+        getAddressEncoder10().encode(expectAddress(accounts.mint.value)),
+        getAddressEncoder10().encode(expectAddress(accounts.authority.value))
       ]
     });
   }
   if (!accounts.bitmap.value) {
-    accounts.bitmap.value = await getProgramDerivedAddress3({
+    accounts.bitmap.value = await getProgramDerivedAddress4({
       programAddress,
       seeds: [
         getBytesEncoder11().encode(new Uint8Array([98, 105, 116, 109, 97, 112])),
-        getAddressEncoder9().encode(expectAddress(accounts.airdrop.value)),
+        getAddressEncoder10().encode(expectAddress(accounts.airdrop.value)),
         getU16Encoder5().encode(expectSome(args.id))
       ]
     });
@@ -1878,7 +1928,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),
@@ -1899,10 +1948,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 },
@@ -1922,7 +1967,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),
@@ -1937,7 +1981,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;
@@ -1957,7 +2001,6 @@ function parseCreateClaimMapInstruction(instruction) {
       config: getNextAccount(),
       treasury: getNextAccount(),
       airdropMaster: getNextAccount(),
-      airdropMasterAuthority: getNextAccount(),
       affiliate: getNextOptionalAccount(),
       airdrop: getNextAccount(),
       mint: getNextAccount(),
@@ -1968,16 +2011,28 @@ 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
 import {
   combineCodec as combineCodec11,
   fixDecoderSize as fixDecoderSize11,
   fixEncoderSize as fixEncoderSize12,
-  getAddressEncoder as getAddressEncoder10,
+  getAddressEncoder as getAddressEncoder11,
   getBytesDecoder as getBytesDecoder11,
   getBytesEncoder as getBytesEncoder12,
-  getProgramDerivedAddress as getProgramDerivedAddress4,
+  getProgramDerivedAddress as getProgramDerivedAddress5,
   getStructDecoder as getStructDecoder11,
   getStructEncoder as getStructEncoder11,
   getU64Decoder as getU64Decoder8,
@@ -2026,11 +2081,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,
@@ -2053,7 +2104,7 @@ async function getDepositTokensInstructionAsync(input, config) {
   const accounts = originalAccounts;
   const args = { ...input };
   if (!accounts.master.value) {
-    accounts.master.value = await getProgramDerivedAddress4({
+    accounts.master.value = await getProgramDerivedAddress5({
       programAddress,
       seeds: [
         getBytesEncoder12().encode(new Uint8Array([109, 97, 115, 116, 101, 114]))
@@ -2061,7 +2112,7 @@ async function getDepositTokensInstructionAsync(input, config) {
     });
   }
   if (!accounts.config.value) {
-    accounts.config.value = await getProgramDerivedAddress4({
+    accounts.config.value = await getProgramDerivedAddress5({
       programAddress,
       seeds: [
         getBytesEncoder12().encode(
@@ -2086,42 +2137,20 @@ async function getDepositTokensInstructionAsync(input, config) {
     });
   }
   if (!accounts.airdropMaster.value) {
-    accounts.airdropMaster.value = await getProgramDerivedAddress4({
-      programAddress,
-      seeds: [
-        getBytesEncoder12().encode(
-          new Uint8Array([
-            97,
-            105,
-            114,
-            100,
-            114,
-            111,
-            112,
-            95,
-            109,
-            97,
-            115,
-            116,
-            101,
-            114
-          ])
-        ),
-        getAddressEncoder10().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 getProgramDerivedAddress4({
+    accounts.airdrop.value = await getProgramDerivedAddress5({
       programAddress,
       seeds: [
         getBytesEncoder12().encode(
           new Uint8Array([97, 105, 114, 100, 114, 111, 112])
         ),
-        getAddressEncoder10().encode(expectAddress(accounts.mint.value)),
-        getAddressEncoder10().encode(expectAddress(accounts.authority.value))
+        getAddressEncoder11().encode(expectAddress(accounts.mint.value)),
+        getAddressEncoder11().encode(expectAddress(accounts.authority.value))
       ]
     });
   }
@@ -2129,12 +2158,12 @@ async function getDepositTokensInstructionAsync(input, config) {
     accounts.tokenProgram.value = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
   }
   if (!accounts.destinationTokenAccount.value) {
-    accounts.destinationTokenAccount.value = await getProgramDerivedAddress4({
+    accounts.destinationTokenAccount.value = await getProgramDerivedAddress5({
       programAddress: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL",
       seeds: [
-        getAddressEncoder10().encode(expectAddress(accounts.airdrop.value)),
-        getAddressEncoder10().encode(expectAddress(accounts.tokenProgram.value)),
-        getAddressEncoder10().encode(expectAddress(accounts.mint.value))
+        getAddressEncoder11().encode(expectAddress(accounts.airdrop.value)),
+        getAddressEncoder11().encode(expectAddress(accounts.tokenProgram.value)),
+        getAddressEncoder11().encode(expectAddress(accounts.mint.value))
       ]
     });
   }
@@ -2151,7 +2180,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),
@@ -2174,11 +2202,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,
@@ -2216,7 +2240,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),
@@ -2234,7 +2257,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;
@@ -2254,7 +2277,6 @@ function parseDepositTokensInstruction(instruction) {
       config: getNextAccount(),
       treasury: getNextAccount(),
       airdropMaster: getNextAccount(),
-      airdropMasterAuthority: getNextAccount(),
       affiliate: getNextOptionalAccount(),
       sourceTokenAccount: getNextAccount(),
       destinationTokenAccount: getNextAccount(),
@@ -2274,12 +2296,18 @@ import {
   combineCodec as combineCodec27,
   fixDecoderSize as fixDecoderSize14,
   fixEncoderSize as fixEncoderSize15,
-  getAddressEncoder as getAddressEncoder21,
+  getAddressEncoder as getAddressEncoder22,
+  getArrayDecoder as getArrayDecoder2,
+  getArrayEncoder as getArrayEncoder2,
   getBytesDecoder as getBytesDecoder14,
   getBytesEncoder as getBytesEncoder15,
-  getProgramDerivedAddress as getProgramDerivedAddress5,
+  getOptionDecoder as getOptionDecoder4,
+  getOptionEncoder as getOptionEncoder4,
+  getProgramDerivedAddress as getProgramDerivedAddress6,
   getStructDecoder as getStructDecoder27,
   getStructEncoder as getStructEncoder27,
+  getU64Decoder as getU64Decoder15,
+  getU64Encoder as getU64Encoder15,
   transformEncoder as transformEncoder12
 } from "@solana/kit";
 
@@ -2316,7 +2344,7 @@ function getAdvancedFeeConfigCodec() {
 import {
   combineCodec as combineCodec13,
   getAddressDecoder as getAddressDecoder8,
-  getAddressEncoder as getAddressEncoder11,
+  getAddressEncoder as getAddressEncoder12,
   getI64Decoder as getI64Decoder4,
   getI64Encoder as getI64Encoder4,
   getStructDecoder as getStructDecoder13,
@@ -2326,8 +2354,8 @@ import {
 } from "@solana/kit";
 function getAirdropBoostedEncoder() {
   return getStructEncoder13([
-    ["airdrop", getAddressEncoder11()],
-    ["boostedBy", getAddressEncoder11()],
+    ["airdrop", getAddressEncoder12()],
+    ["boostedBy", getAddressEncoder12()],
     ["boostAmount", getU64Encoder10()],
     ["timestamp", getI64Encoder4()]
   ]);
@@ -2348,7 +2376,7 @@ function getAirdropBoostedCodec() {
 import {
   combineCodec as combineCodec14,
   getAddressDecoder as getAddressDecoder9,
-  getAddressEncoder as getAddressEncoder12,
+  getAddressEncoder as getAddressEncoder13,
   getI64Decoder as getI64Decoder5,
   getI64Encoder as getI64Encoder5,
   getStructDecoder as getStructDecoder14,
@@ -2356,8 +2384,8 @@ import {
 } from "@solana/kit";
 function getAirdropClosedEncoder() {
   return getStructEncoder14([
-    ["airdrop", getAddressEncoder12()],
-    ["authority", getAddressEncoder12()],
+    ["airdrop", getAddressEncoder13()],
+    ["authority", getAddressEncoder13()],
     ["timestamp", getI64Encoder5()]
   ]);
 }
@@ -2376,7 +2404,7 @@ function getAirdropClosedCodec() {
 import {
   combineCodec as combineCodec15,
   getAddressDecoder as getAddressDecoder10,
-  getAddressEncoder as getAddressEncoder13,
+  getAddressEncoder as getAddressEncoder14,
   getStructDecoder as getStructDecoder15,
   getStructEncoder as getStructEncoder15,
   getU8Decoder as getU8Decoder9,
@@ -2384,9 +2412,9 @@ import {
 } from "@solana/kit";
 function getAirdropDelegatedEncoder() {
   return getStructEncoder15([
-    ["airdrop", getAddressEncoder13()],
-    ["authority", getAddressEncoder13()],
-    ["delegate", getAddressEncoder13()],
+    ["airdrop", getAddressEncoder14()],
+    ["authority", getAddressEncoder14()],
+    ["delegate", getAddressEncoder14()],
     ["permissions", getU8Encoder9()]
   ]);
 }
@@ -2411,7 +2439,7 @@ import {
   fixDecoderSize as fixDecoderSize12,
   fixEncoderSize as fixEncoderSize13,
   getAddressDecoder as getAddressDecoder11,
-  getAddressEncoder as getAddressEncoder14,
+  getAddressEncoder as getAddressEncoder15,
   getBytesDecoder as getBytesDecoder12,
   getBytesEncoder as getBytesEncoder13,
   getI64Decoder as getI64Decoder6,
@@ -2421,10 +2449,10 @@ import {
 } from "@solana/kit";
 function getAirdropInitializedEncoder() {
   return getStructEncoder16([
-    ["airdrop", getAddressEncoder14()],
-    ["mint", getAddressEncoder14()],
-    ["authority", getAddressEncoder14()],
-    ["controller", getAddressEncoder14()],
+    ["airdrop", getAddressEncoder15()],
+    ["mint", getAddressEncoder15()],
+    ["authority", getAddressEncoder15()],
+    ["controller", getAddressEncoder15()],
     ["merkleRoot", fixEncoderSize13(getBytesEncoder13(), 32)],
     ["startTime", getI64Encoder6()],
     ["endTime", getI64Encoder6()],
@@ -2454,14 +2482,14 @@ function getAirdropInitializedCodec() {
 import {
   combineCodec as combineCodec17,
   getAddressDecoder as getAddressDecoder12,
-  getAddressEncoder as getAddressEncoder15,
+  getAddressEncoder as getAddressEncoder16,
   getStructDecoder as getStructDecoder17,
   getStructEncoder as getStructEncoder17
 } from "@solana/kit";
 function getAirdropUpdatedEncoder() {
   return getStructEncoder17([
-    ["airdrop", getAddressEncoder15()],
-    ["updatedBy", getAddressEncoder15()]
+    ["airdrop", getAddressEncoder16()],
+    ["updatedBy", getAddressEncoder16()]
   ]);
 }
 function getAirdropUpdatedDecoder() {
@@ -2564,15 +2592,15 @@ function getBaseFeeConfigCodec() {
 import {
   combineCodec as combineCodec21,
   getAddressDecoder as getAddressDecoder13,
-  getAddressEncoder as getAddressEncoder16,
+  getAddressEncoder as getAddressEncoder17,
   getStructDecoder as getStructDecoder21,
   getStructEncoder as getStructEncoder21
 } from "@solana/kit";
 function getClaimMapClosedEncoder() {
   return getStructEncoder21([
-    ["airdrop", getAddressEncoder16()],
-    ["bitmap", getAddressEncoder16()],
-    ["authority", getAddressEncoder16()]
+    ["airdrop", getAddressEncoder17()],
+    ["bitmap", getAddressEncoder17()],
+    ["authority", getAddressEncoder17()]
   ]);
 }
 function getClaimMapClosedDecoder() {
@@ -2590,7 +2618,7 @@ function getClaimMapClosedCodec() {
 import {
   combineCodec as combineCodec22,
   getAddressDecoder as getAddressDecoder14,
-  getAddressEncoder as getAddressEncoder17,
+  getAddressEncoder as getAddressEncoder18,
   getI64Decoder as getI64Decoder8,
   getI64Encoder as getI64Encoder8,
   getStructDecoder as getStructDecoder22,
@@ -2600,8 +2628,8 @@ import {
 } from "@solana/kit";
 function getClaimMapInitializedEncoder() {
   return getStructEncoder22([
-    ["airdrop", getAddressEncoder17()],
-    ["bitmap", getAddressEncoder17()],
+    ["airdrop", getAddressEncoder18()],
+    ["bitmap", getAddressEncoder18()],
     ["bitmapId", getU16Encoder6()],
     ["timestamp", getI64Encoder8()]
   ]);
@@ -2664,7 +2692,7 @@ function getInitAirdropConfigArgsCodec() {
 import {
   combineCodec as combineCodec24,
   getAddressDecoder as getAddressDecoder15,
-  getAddressEncoder as getAddressEncoder18,
+  getAddressEncoder as getAddressEncoder19,
   getI64Decoder as getI64Decoder9,
   getI64Encoder as getI64Encoder9,
   getStructDecoder as getStructDecoder24,
@@ -2672,9 +2700,9 @@ import {
 } from "@solana/kit";
 function getMasterInitializedEncoder() {
   return getStructEncoder24([
-    ["address", getAddressEncoder18()],
-    ["authority", getAddressEncoder18()],
-    ["treasury", getAddressEncoder18()],
+    ["address", getAddressEncoder19()],
+    ["authority", getAddressEncoder19()],
+    ["treasury", getAddressEncoder19()],
     ["timestamp", getI64Encoder9()]
   ]);
 }
@@ -2697,7 +2725,7 @@ function getMasterInitializedCodec() {
 import {
   combineCodec as combineCodec25,
   getAddressDecoder as getAddressDecoder16,
-  getAddressEncoder as getAddressEncoder19,
+  getAddressEncoder as getAddressEncoder20,
   getI64Decoder as getI64Decoder10,
   getI64Encoder as getI64Encoder10,
   getStructDecoder as getStructDecoder25,
@@ -2707,10 +2735,10 @@ import {
 } from "@solana/kit";
 function getTokensDepositedEncoder() {
   return getStructEncoder25([
-    ["airdrop", getAddressEncoder19()],
+    ["airdrop", getAddressEncoder20()],
     ["amount", getU64Encoder14()],
     ["newSupply", getU64Encoder14()],
-    ["depositor", getAddressEncoder19()],
+    ["depositor", getAddressEncoder20()],
     ["timestamp", getI64Encoder10()]
   ]);
 }
@@ -2731,7 +2759,7 @@ function getTokensDepositedCodec() {
 import {
   combineCodec as combineCodec26,
   getAddressDecoder as getAddressDecoder17,
-  getAddressEncoder as getAddressEncoder20,
+  getAddressEncoder as getAddressEncoder21,
   getI64Decoder as getI64Decoder11,
   getI64Encoder as getI64Encoder11,
   getStructDecoder as getStructDecoder26,
@@ -2739,8 +2767,8 @@ import {
 } from "@solana/kit";
 function getTokensRedeemedEncoder() {
   return getStructEncoder26([
-    ["airdrop", getAddressEncoder20()],
-    ["authority", getAddressEncoder20()],
+    ["airdrop", getAddressEncoder21()],
+    ["authority", getAddressEncoder21()],
     ["timestamp", getI64Encoder11()]
   ]);
 }
@@ -2775,10 +2803,17 @@ function getInitializeAirdropMasterInstructionDataEncoder() {
   return transformEncoder12(
     getStructEncoder27([
       ["discriminator", fixEncoderSize15(getBytesEncoder15(), 8)],
-      ["merkleRoot", fixEncoderSize15(getBytesEncoder15(), 32)],
-      ["baseConfig", getBaseFeeConfigEncoder()],
-      ["airdropConfig", getAdvancedFeeConfigEncoder()],
-      ["bitmapConfig", getBaseFeeConfigEncoder()]
+      ["merkleRoot", getOptionEncoder4(fixEncoderSize15(getBytesEncoder15(), 32))],
+      ["airdropCreateFee", getOptionEncoder4(getU64Encoder15())],
+      ["airdropUpdateFee", getOptionEncoder4(getU64Encoder15())],
+      ["bitmapCreateFee", getOptionEncoder4(getU64Encoder15())],
+      ["advancedConfig", getOptionEncoder4(getAdvancedFeeConfigEncoder())],
+      [
+        "wlProof",
+        getOptionEncoder4(
+          getArrayEncoder2(fixEncoderSize15(getBytesEncoder15(), 32))
+        )
+      ]
     ]),
     (value) => ({
       ...value,
@@ -2789,10 +2824,15 @@ function getInitializeAirdropMasterInstructionDataEncoder() {
 function getInitializeAirdropMasterInstructionDataDecoder() {
   return getStructDecoder27([
     ["discriminator", fixDecoderSize14(getBytesDecoder14(), 8)],
-    ["merkleRoot", fixDecoderSize14(getBytesDecoder14(), 32)],
-    ["baseConfig", getBaseFeeConfigDecoder()],
-    ["airdropConfig", getAdvancedFeeConfigDecoder()],
-    ["bitmapConfig", getBaseFeeConfigDecoder()]
+    ["merkleRoot", getOptionDecoder4(fixDecoderSize14(getBytesDecoder14(), 32))],
+    ["airdropCreateFee", getOptionDecoder4(getU64Decoder15())],
+    ["airdropUpdateFee", getOptionDecoder4(getU64Decoder15())],
+    ["bitmapCreateFee", getOptionDecoder4(getU64Decoder15())],
+    ["advancedConfig", getOptionDecoder4(getAdvancedFeeConfigDecoder())],
+    [
+      "wlProof",
+      getOptionDecoder4(getArrayDecoder2(fixDecoderSize14(getBytesDecoder14(), 32)))
+    ]
   ]);
 }
 function getInitializeAirdropMasterInstructionDataCodec() {
@@ -2818,7 +2858,7 @@ async function getInitializeAirdropMasterInstructionAsync(input, config) {
   const accounts = originalAccounts;
   const args = { ...input };
   if (!accounts.master.value) {
-    accounts.master.value = await getProgramDerivedAddress5({
+    accounts.master.value = await getProgramDerivedAddress6({
       programAddress,
       seeds: [
         getBytesEncoder15().encode(new Uint8Array([109, 97, 115, 116, 101, 114]))
@@ -2826,7 +2866,7 @@ async function getInitializeAirdropMasterInstructionAsync(input, config) {
     });
   }
   if (!accounts.config.value) {
-    accounts.config.value = await getProgramDerivedAddress5({
+    accounts.config.value = await getProgramDerivedAddress6({
       programAddress,
       seeds: [
         getBytesEncoder15().encode(
@@ -2851,7 +2891,7 @@ async function getInitializeAirdropMasterInstructionAsync(input, config) {
     });
   }
   if (!accounts.airdropMaster.value) {
-    accounts.airdropMaster.value = await getProgramDerivedAddress5({
+    accounts.airdropMaster.value = await getProgramDerivedAddress6({
       programAddress,
       seeds: [
         getBytesEncoder15().encode(
@@ -2872,7 +2912,7 @@ async function getInitializeAirdropMasterInstructionAsync(input, config) {
             114
           ])
         ),
-        getAddressEncoder21().encode(expectAddress(accounts.authority.value))
+        getAddressEncoder22().encode(expectAddress(accounts.authority.value))
       ]
     });
   }
@@ -2970,11 +3010,11 @@ import {
   fixEncoderSize as fixEncoderSize16,
   getBytesDecoder as getBytesDecoder15,
   getBytesEncoder as getBytesEncoder16,
-  getProgramDerivedAddress as getProgramDerivedAddress6,
+  getProgramDerivedAddress as getProgramDerivedAddress7,
   getStructDecoder as getStructDecoder28,
   getStructEncoder as getStructEncoder28,
-  getU64Decoder as getU64Decoder15,
-  getU64Encoder as getU64Encoder15,
+  getU64Decoder as getU64Decoder16,
+  getU64Encoder as getU64Encoder16,
   transformEncoder as transformEncoder13
 } from "@solana/kit";
 var INITIALIZE_MASTER_DISCRIMINATOR = new Uint8Array([
@@ -2997,7 +3037,7 @@ function getInitializeMasterInstructionDataEncoder() {
     getStructEncoder28([
       ["discriminator", fixEncoderSize16(getBytesEncoder16(), 8)],
       ["airdropConfig", getInitAirdropConfigArgsEncoder()],
-      ["protocolFee", getU64Encoder15()]
+      ["protocolFee", getU64Encoder16()]
     ]),
     (value) => ({ ...value, discriminator: INITIALIZE_MASTER_DISCRIMINATOR })
   );
@@ -3006,7 +3046,7 @@ function getInitializeMasterInstructionDataDecoder() {
   return getStructDecoder28([
     ["discriminator", fixDecoderSize15(getBytesDecoder15(), 8)],
     ["airdropConfig", getInitAirdropConfigArgsDecoder()],
-    ["protocolFee", getU64Decoder15()]
+    ["protocolFee", getU64Decoder16()]
   ]);
 }
 function getInitializeMasterInstructionDataCodec() {
@@ -3028,7 +3068,7 @@ async function getInitializeMasterInstructionAsync(input, config) {
   const accounts = originalAccounts;
   const args = { ...input };
   if (!accounts.master.value) {
-    accounts.master.value = await getProgramDerivedAddress6({
+    accounts.master.value = await getProgramDerivedAddress7({
       programAddress,
       seeds: [
         getBytesEncoder16().encode(new Uint8Array([109, 97, 115, 116, 101, 114]))
@@ -3036,7 +3076,7 @@ async function getInitializeMasterInstructionAsync(input, config) {
     });
   }
   if (!accounts.config.value) {
-    accounts.config.value = await getProgramDerivedAddress6({
+    accounts.config.value = await getProgramDerivedAddress7({
       programAddress,
       seeds: [
         getBytesEncoder16().encode(
@@ -3149,10 +3189,10 @@ import {
   combineCodec as combineCodec29,
   fixDecoderSize as fixDecoderSize16,
   fixEncoderSize as fixEncoderSize17,
-  getAddressEncoder as getAddressEncoder22,
+  getAddressEncoder as getAddressEncoder23,
   getBytesDecoder as getBytesDecoder16,
   getBytesEncoder as getBytesEncoder17,
-  getProgramDerivedAddress as getProgramDerivedAddress7,
+  getProgramDerivedAddress as getProgramDerivedAddress8,
   getStructDecoder as getStructDecoder29,
   getStructEncoder as getStructEncoder29,
   transformEncoder as transformEncoder14
@@ -3198,11 +3238,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,
@@ -3224,7 +3260,7 @@ async function getRedeemAirdropTokensInstructionAsync(input, config) {
   };
   const accounts = originalAccounts;
   if (!accounts.master.value) {
-    accounts.master.value = await getProgramDerivedAddress7({
+    accounts.master.value = await getProgramDerivedAddress8({
       programAddress,
       seeds: [
         getBytesEncoder17().encode(new Uint8Array([109, 97, 115, 116, 101, 114]))
@@ -3232,7 +3268,7 @@ async function getRedeemAirdropTokensInstructionAsync(input, config) {
     });
   }
   if (!accounts.config.value) {
-    accounts.config.value = await getProgramDerivedAddress7({
+    accounts.config.value = await getProgramDerivedAddress8({
       programAddress,
       seeds: [
         getBytesEncoder17().encode(
@@ -3256,43 +3292,15 @@ async function getRedeemAirdropTokensInstructionAsync(input, config) {
       ]
     });
   }
-  if (!accounts.airdropMaster.value) {
-    accounts.airdropMaster.value = await getProgramDerivedAddress7({
-      programAddress,
-      seeds: [
-        getBytesEncoder17().encode(
-          new Uint8Array([
-            97,
-            105,
-            114,
-            100,
-            114,
-            111,
-            112,
-            95,
-            109,
-            97,
-            115,
-            116,
-            101,
-            114
-          ])
-        ),
-        getAddressEncoder22().encode(
-          expectAddress(accounts.airdropMasterAuthority.value)
-        )
-      ]
-    });
-  }
   if (!accounts.airdrop.value) {
-    accounts.airdrop.value = await getProgramDerivedAddress7({
+    accounts.airdrop.value = await getProgramDerivedAddress8({
       programAddress,
       seeds: [
         getBytesEncoder17().encode(
           new Uint8Array([97, 105, 114, 100, 114, 111, 112])
         ),
-        getAddressEncoder22().encode(expectAddress(accounts.mint.value)),
-        getAddressEncoder22().encode(expectAddress(accounts.authority.value))
+        getAddressEncoder23().encode(expectAddress(accounts.mint.value)),
+        getAddressEncoder23().encode(expectAddress(accounts.authority.value))
       ]
     });
   }
@@ -3300,12 +3308,12 @@ async function getRedeemAirdropTokensInstructionAsync(input, config) {
     accounts.tokenProgram.value = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
   }
   if (!accounts.destinationTokenAccount.value) {
-    accounts.destinationTokenAccount.value = await getProgramDerivedAddress7({
+    accounts.destinationTokenAccount.value = await getProgramDerivedAddress8({
       programAddress: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL",
       seeds: [
-        getAddressEncoder22().encode(expectAddress(accounts.airdrop.value)),
-        getAddressEncoder22().encode(expectAddress(accounts.tokenProgram.value)),
-        getAddressEncoder22().encode(expectAddress(accounts.mint.value))
+        getAddressEncoder23().encode(expectAddress(accounts.airdrop.value)),
+        getAddressEncoder23().encode(expectAddress(accounts.tokenProgram.value)),
+        getAddressEncoder23().encode(expectAddress(accounts.mint.value))
       ]
     });
   }
@@ -3322,7 +3330,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),
@@ -3343,11 +3350,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,
@@ -3384,7 +3387,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),
@@ -3400,7 +3402,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;
@@ -3420,7 +3422,6 @@ function parseRedeemAirdropTokensInstruction(instruction) {
       config: getNextAccount(),
       treasury: getNextAccount(),
       airdropMaster: getNextAccount(),
-      airdropMasterAuthority: getNextAccount(),
       affiliate: getNextOptionalAccount(),
       sourceTokenAccount: getNextAccount(),
       destinationTokenAccount: getNextAccount(),
@@ -3436,80 +3437,6 @@ function parseRedeemAirdropTokensInstruction(instruction) {
     )
   };
 }
-
-// src/utils/derive.ts
-import {
-  getAddressEncoder as getAddressEncoder23,
-  getProgramDerivedAddress as getProgramDerivedAddress8
-} from "@solana/kit";
-
-// src/constants/index.ts
-import { address } from "@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 = 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 getProgramDerivedAddress8({
-    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,
-    getAddressEncoder23().encode(authority)
-  ];
-  return await getDropsyDerivedAddress(seeds);
-}
-async function getAffiliateDerivedAddress(authority) {
-  const seeds = [
-    AFFILIATE_SEED,
-    getAddressEncoder23().encode(authority)
-  ];
-  return await getDropsyDerivedAddress(seeds);
-}
-async function getAirdropDerivedAddress(authority, mint) {
-  const seeds = [
-    AIRDROP_SEED,
-    getAddressEncoder23().encode(mint),
-    getAddressEncoder23().encode(authority)
-  ];
-  return await getDropsyDerivedAddress(seeds);
-}
-async function getClaimMapDerivedAddress(airdrop, id) {
-  const idBuffer = Buffer.alloc(2);
-  idBuffer.writeUInt16LE(id);
-  const seeds = [
-    BITMAP_SEED,
-    getAddressEncoder23().encode(airdrop),
-    idBuffer
-  ];
-  return await getDropsyDerivedAddress(seeds);
-}
 export {
   ADMIN,
   AFFILIATE_DISCRIMINATOR,
@@ -3528,6 +3455,8 @@ export {
   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,
@@ -3606,6 +3535,7 @@ export {
   DROPSY_ERROR__VESTING_ACCOUNT_REQUIRED,
   DROPSY_MASTER_SEED,
   DROPSY_PROGRAM_ADDRESS,
+  DROPSY_TREASURY,
   DropsyAccount,
   DropsyInstruction,
   INITIALIZE_AIRDROP_MASTER_DISCRIMINATOR,
@@ -3622,6 +3552,10 @@ export {
   VERSION_BASIC,
   VERSION_VESTED,
   VESTING_SEED,
+  createDefaultSolanaClient,
+  createMerkleTree,
+  createTransactionMessageFromInstructions,
+  createWLMerkleTree,
   decodeAffiliate,
   decodeAffiliateMaster,
   decodeAirdrop,
@@ -3657,6 +3591,7 @@ export {
   fetchMaybeAirdropMaster,
   fetchMaybeClaimMap,
   fetchMaybeMaster,
+  generateKeyPairSignerWithSol,
   getAdvancedFeeConfigCodec,
   getAdvancedFeeConfigDecoder,
   getAdvancedFeeConfigEncoder,
@@ -3744,6 +3679,7 @@ export {
   getCreateClaimMapInstructionDataCodec,
   getCreateClaimMapInstructionDataDecoder,
   getCreateClaimMapInstructionDataEncoder,
+  getCreateClaimMapV0Instruction,
   getDepositTokensDiscriminatorBytes,
   getDepositTokensInstruction,
   getDepositTokensInstructionAsync,
@@ -3776,12 +3712,14 @@ export {
   getMasterInitializedDecoder,
   getMasterInitializedEncoder,
   getMasterSize,
+  getMerkleRootArray,
   getRedeemAirdropTokensDiscriminatorBytes,
   getRedeemAirdropTokensInstruction,
   getRedeemAirdropTokensInstructionAsync,
   getRedeemAirdropTokensInstructionDataCodec,
   getRedeemAirdropTokensInstructionDataDecoder,
   getRedeemAirdropTokensInstructionDataEncoder,
+  getSimpleMerkleProof,
   getTokensDepositedCodec,
   getTokensDepositedDecoder,
   getTokensDepositedEncoder,
@@ -3797,6 +3735,7 @@ export {
   parseDepositTokensInstruction,
   parseInitializeAirdropMasterInstruction,
   parseInitializeMasterInstruction,
-  parseRedeemAirdropTokensInstruction
+  parseRedeemAirdropTokensInstruction,
+  toUnixTimestamp
 };
 //# sourceMappingURL=index.mjs.map