@whetstone-research/doppler-sdk 1.0.38 → 1.0.40

package/dist/solana/index.cjs

@@ -1903,6 +1903,9 @@ function isCosignerGateEnforced(hookPayload, clock = {}) {
 var INITIALIZER_PROGRAM_ID = kit.address(
   "4h3Dqyo5qmteJoMxXt3tdtfXELDB6pdRTPU9mWruiKp1"
 );
+var MAINNET_INITIALIZER_PROGRAM_ID = kit.address(
+  "4carc9eePfE7jKUXdCAYMhcPf4awEFpZPrz1sTykdss1"
+);
 var BPF_LOADER_UPGRADEABLE_PROGRAM_ID = kit.address(
   "BPFLoaderUpgradeab1e11111111111111111111111"
 );
@@ -3429,6 +3432,7 @@ chunkQ7SFCCGT_cjs.__export(initializer_exports, {
   INITIALIZER_ACCOUNT_DISCRIMINATORS: () => INITIALIZER_ACCOUNT_DISCRIMINATORS,
   INITIALIZER_INSTRUCTION_DISCRIMINATORS: () => INITIALIZER_INSTRUCTION_DISCRIMINATORS,
   INITIALIZER_PROGRAM_ID: () => INITIALIZER_PROGRAM_ID,
+  MAINNET_INITIALIZER_PROGRAM_ID: () => MAINNET_INITIALIZER_PROGRAM_ID,
   MAX_HOOK_ALLOWLIST: () => MAX_HOOK_ALLOWLIST2,
   MAX_MIGRATOR_ALLOWLIST: () => MAX_MIGRATOR_ALLOWLIST,
   MAX_PAYLOAD: () => MAX_PAYLOAD,
@@ -6901,7 +6905,7 @@ async function createInitializeLaunchInstruction(accounts, args, programId = INI
     keys.push({ address: programId, role: kit.AccountRole.READONLY });
     keys.push({ address: programId, role: kit.AccountRole.READONLY });
   }
-  if (programId === INITIALIZER_PROGRAM_ID || vestingConfig) {
+  if (programId === INITIALIZER_PROGRAM_ID || programId === MAINNET_INITIALIZER_PROGRAM_ID || vestingConfig) {
     keys.push(
       vestingConfig ? { address: vestingConfig, role: kit.AccountRole.READONLY } : { address: programId, role: kit.AccountRole.READONLY }
     );
@@ -9290,7 +9294,7 @@ function getRehypeStateEncoder() {
       ["beneficiaryCount", kit.getU8Encoder()],
       ["inflightKind", kit.getU8Encoder()],
       ["inflightDirection", kit.getU8Encoder()],
-      ["settlementAuthority", kit.getAddressEncoder()],
+      ["reservedSettlementAuthority", kit.fixEncoderSize(kit.getBytesEncoder(), 32)],
       ["cumulativeRoutedBaseFees", kit.getU64Encoder()],
       ["cumulativeRoutedQuoteFees", kit.getU64Encoder()],
       ["settledInitializerBaseFees", kit.getU64Encoder()],
@@ -9337,7 +9341,7 @@ function getRehypeStateDecoder() {
     ["beneficiaryCount", kit.getU8Decoder()],
     ["inflightKind", kit.getU8Decoder()],
     ["inflightDirection", kit.getU8Decoder()],
-    ["settlementAuthority", kit.getAddressDecoder()],
+    ["reservedSettlementAuthority", kit.fixDecoderSize(kit.getBytesDecoder(), 32)],
     ["cumulativeRoutedBaseFees", kit.getU64Decoder()],
     ["cumulativeRoutedQuoteFees", kit.getU64Decoder()],
     ["settledInitializerBaseFees", kit.getU64Decoder()],
@@ -9794,10 +9798,6 @@ async function getInitializeRehypeInstructionAsync(input, config) {
   const programAddress = config?.programAddress ?? DOPPLER_REHYPE_ROUTER_V1_PROGRAM_ADDRESS;
   const originalAccounts = {
     payer: { value: input.payer ?? null, isWritable: true },
-    settlementAuthority: {
-      value: input.settlementAuthority ?? null,
-      isWritable: false
-    },
     baseMint: { value: input.baseMint ?? null, isWritable: false },
     quoteMint: { value: input.quoteMint ?? null, isWritable: false },
     hookProgram: { value: input.hookProgram ?? null, isWritable: false },
@@ -9924,7 +9924,6 @@ async function getInitializeRehypeInstructionAsync(input, config) {
   return Object.freeze({
     accounts: [
       getAccountMeta("payer", accounts.payer),
-      getAccountMeta("settlementAuthority", accounts.settlementAuthority),
       getAccountMeta("baseMint", accounts.baseMint),
       getAccountMeta("quoteMint", accounts.quoteMint),
       getAccountMeta("hookProgram", accounts.hookProgram),
@@ -9944,10 +9943,6 @@ function getInitializeRehypeInstruction(input, config) {
   const programAddress = config?.programAddress ?? DOPPLER_REHYPE_ROUTER_V1_PROGRAM_ADDRESS;
   const originalAccounts = {
     payer: { value: input.payer ?? null, isWritable: true },
-    settlementAuthority: {
-      value: input.settlementAuthority ?? null,
-      isWritable: false
-    },
     baseMint: { value: input.baseMint ?? null, isWritable: false },
     quoteMint: { value: input.quoteMint ?? null, isWritable: false },
     hookProgram: { value: input.hookProgram ?? null, isWritable: false },
@@ -9978,7 +9973,6 @@ function getInitializeRehypeInstruction(input, config) {
   return Object.freeze({
     accounts: [
       getAccountMeta("payer", accounts.payer),
-      getAccountMeta("settlementAuthority", accounts.settlementAuthority),
       getAccountMeta("baseMint", accounts.baseMint),
       getAccountMeta("quoteMint", accounts.quoteMint),
       getAccountMeta("hookProgram", accounts.hookProgram),
@@ -9995,12 +9989,12 @@ function getInitializeRehypeInstruction(input, config) {
   });
 }
 function parseInitializeRehypeInstruction(instruction) {
-  if (instruction.accounts.length < 10) {
+  if (instruction.accounts.length < 9) {
     throw new kit.SolanaError(
       kit.SOLANA_ERROR__PROGRAM_CLIENTS__INSUFFICIENT_ACCOUNT_METAS,
       {
         actualAccountMetas: instruction.accounts.length,
-        expectedAccountMetas: 10
+        expectedAccountMetas: 9
       }
     );
   }
@@ -10014,7 +10008,6 @@ function parseInitializeRehypeInstruction(instruction) {
     programAddress: instruction.programAddress,
     accounts: {
       payer: getNextAccount(),
-      settlementAuthority: getNextAccount(),
       baseMint: getNextAccount(),
       quoteMint: getNextAccount(),
       hookProgram: getNextAccount(),
@@ -10209,10 +10202,7 @@ function getSettleFeesInstructionDataCodec() {
 async function getSettleFeesInstructionAsync(input, config) {
   const programAddress = config?.programAddress ?? DOPPLER_REHYPE_ROUTER_V1_PROGRAM_ADDRESS;
   const originalAccounts = {
-    settlementAuthority: {
-      value: input.settlementAuthority ?? null,
-      isWritable: true
-    },
+    payer: { value: input.payer ?? null, isWritable: true },
     initializerProgram: {
       value: input.initializerProgram ?? null,
       isWritable: false
@@ -10430,7 +10420,7 @@ async function getSettleFeesInstructionAsync(input, config) {
   const getAccountMeta = programClientCore.getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
-      getAccountMeta("settlementAuthority", accounts.settlementAuthority),
+      getAccountMeta("payer", accounts.payer),
       getAccountMeta("initializerProgram", accounts.initializerProgram),
       getAccountMeta("initializerConfig", accounts.initializerConfig),
       getAccountMeta("launch", accounts.launch),
@@ -10467,10 +10457,7 @@ async function getSettleFeesInstructionAsync(input, config) {
 function getSettleFeesInstruction(input, config) {
   const programAddress = config?.programAddress ?? DOPPLER_REHYPE_ROUTER_V1_PROGRAM_ADDRESS;
   const originalAccounts = {
-    settlementAuthority: {
-      value: input.settlementAuthority ?? null,
-      isWritable: true
-    },
+    payer: { value: input.payer ?? null, isWritable: true },
     initializerProgram: {
       value: input.initializerProgram ?? null,
       isWritable: false
@@ -10542,7 +10529,7 @@ function getSettleFeesInstruction(input, config) {
   const getAccountMeta = programClientCore.getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
-      getAccountMeta("settlementAuthority", accounts.settlementAuthority),
+      getAccountMeta("payer", accounts.payer),
       getAccountMeta("initializerProgram", accounts.initializerProgram),
       getAccountMeta("initializerConfig", accounts.initializerConfig),
       getAccountMeta("launch", accounts.launch),
@@ -10599,7 +10586,7 @@ function parseSettleFeesInstruction(instruction) {
   return {
     programAddress: instruction.programAddress,
     accounts: {
-      settlementAuthority: getNextAccount(),
+      payer: getNextAccount(),
       initializerProgram: getNextAccount(),
       initializerConfig: getNextAccount(),
       launch: getNextAccount(),
@@ -10678,10 +10665,7 @@ function getSettleMigratedFeesInstructionDataCodec() {
 async function getSettleMigratedFeesInstructionAsync(input, config) {
   const programAddress = config?.programAddress ?? DOPPLER_REHYPE_ROUTER_V1_PROGRAM_ADDRESS;
   const originalAccounts = {
-    settlementAuthority: {
-      value: input.settlementAuthority ?? null,
-      isWritable: true
-    },
+    payer: { value: input.payer ?? null, isWritable: true },
     initializerProgram: {
       value: input.initializerProgram ?? null,
       isWritable: false
@@ -10874,7 +10858,7 @@ async function getSettleMigratedFeesInstructionAsync(input, config) {
   const getAccountMeta = programClientCore.getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
-      getAccountMeta("settlementAuthority", accounts.settlementAuthority),
+      getAccountMeta("payer", accounts.payer),
       getAccountMeta("initializerProgram", accounts.initializerProgram),
       getAccountMeta("initializerConfig", accounts.initializerConfig),
       getAccountMeta("launch", accounts.launch),
@@ -10914,10 +10898,7 @@ async function getSettleMigratedFeesInstructionAsync(input, config) {
 function getSettleMigratedFeesInstruction(input, config) {
   const programAddress = config?.programAddress ?? DOPPLER_REHYPE_ROUTER_V1_PROGRAM_ADDRESS;
   const originalAccounts = {
-    settlementAuthority: {
-      value: input.settlementAuthority ?? null,
-      isWritable: true
-    },
+    payer: { value: input.payer ?? null, isWritable: true },
     initializerProgram: {
       value: input.initializerProgram ?? null,
       isWritable: false
@@ -10998,7 +10979,7 @@ function getSettleMigratedFeesInstruction(input, config) {
   const getAccountMeta = programClientCore.getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
-      getAccountMeta("settlementAuthority", accounts.settlementAuthority),
+      getAccountMeta("payer", accounts.payer),
       getAccountMeta("initializerProgram", accounts.initializerProgram),
       getAccountMeta("initializerConfig", accounts.initializerConfig),
       getAccountMeta("launch", accounts.launch),
@@ -11058,7 +11039,7 @@ function parseSettleMigratedFeesInstruction(instruction) {
   return {
     programAddress: instruction.programAddress,
     accounts: {
-      settlementAuthority: getNextAccount(),
+      payer: getNextAccount(),
       initializerProgram: getNextAccount(),
       initializerConfig: getNextAccount(),
       launch: getNextAccount(),
@@ -11323,11 +11304,17 @@ function dopplerRehypeRouterV1Program() {
           ),
           settleFees: (input) => programClientCore.addSelfPlanAndSendFunctions(
             client,
-            getSettleFeesInstructionAsync(input)
+            getSettleFeesInstructionAsync({
+              ...input,
+              payer: input.payer ?? client.payer
+            })
           ),
           settleMigratedFees: (input) => programClientCore.addSelfPlanAndSendFunctions(
             client,
-            getSettleMigratedFeesInstructionAsync(input)
+            getSettleMigratedFeesInstructionAsync({
+              ...input,
+              payer: input.payer ?? client.payer
+            })
           )
         }
       }
@@ -11948,7 +11935,7 @@ var DOPPLER_SOLANA_DEVNET_PROGRAM_ADDRESSES = {
 };
 var DOPPLER_SOLANA_MAINNET_PROGRAM_ADDRESSES = {
   cpmmProgram: kit.address("5pXzd9UiWrVxATCYWmgo5EbfxzXqHYhfSKGdCPXPz7vK"),
-  initializerProgram: kit.address("4carc9eePfE7jKUXdCAYMhcPf4awEFpZPrz1sTykdss1"),
+  initializerProgram: MAINNET_INITIALIZER_PROGRAM_ID,
   cpmmMigratorProgram: kit.address(
     "H71WD4tsiCCipro4urykWHySH1ryvLTmqEdNbHTGwb3o"
   ),
@@ -11961,6 +11948,15 @@ var DOPPLER_SOLANA_DEVNET_FEE_REHYPOTHECATION_PROGRAM_ADDRESSES = {
   dopplerLaunchHookV2Program: DOPPLER_LAUNCH_HOOK_V2_PROGRAM_ID,
   dopplerRehypeRouterV1Program: DOPPLER_REHYPE_ROUTER_V1_PROGRAM_ADDRESS
 };
+var DOPPLER_SOLANA_MAINNET_FEE_REHYPOTHECATION_PROGRAM_ADDRESSES = {
+  initializerProgram: MAINNET_INITIALIZER_PROGRAM_ID,
+  dopplerLaunchHookV2Program: kit.address(
+    "7ZueM1Tef2QA5zrFtVJMDM8MFqkoeG8fog1mXPgmLGH1"
+  ),
+  dopplerRehypeRouterV1Program: kit.address(
+    "BpHX6orJ73qCvsfKkSMARQtqJvSPfqXNUfoes5rMND1D"
+  )
+};
 async function deriveSolanaCpmmDeployment(programs = DOPPLER_SOLANA_DEVNET_PROGRAM_ADDRESSES) {
   const [cpmmConfig] = await chunkO2Z5ORGF_cjs.getConfigAddress(programs.cpmmProgram);
   const [initializerConfig] = await getConfigAddress2(
@@ -13574,7 +13570,6 @@ async function prepareLaunch(input) {
       namespace,
       launchId,
       buybackDestination: input.buybackDestination,
-      settlementAuthority: input.settlementAuthority,
       routingMode: input.strategy.routingMode,
       feeRouting: input.strategy.feeRouting,
       beneficiaries
@@ -13725,7 +13720,7 @@ async function prepareSettlement(input) {
   ))[0] : void 0;
   const feeState = feeStateAccount.data;
   const routingState = routingStateAccount.data;
-  if (feeState.launch !== input.launch || feeState.beneficiaryLen !== 1 || feeState.beneficiaries[0]?.wallet !== routingAddresses.authority || feeState.beneficiaries[0]?.shareBps !== 1e4 || routingState.launch !== input.launch || routingState.baseMint !== launch.baseMint || routingState.quoteMint !== launch.quoteMint || routingState.hookProgram !== launch.hookProgram || routingState.settlementAuthority !== input.settlementAuthority.address || baseMintAccount.address !== launch.baseMint || quoteMintAccount.address !== launch.quoteMint || baseVaultAccount.address !== launch.baseVault || quoteVaultAccount.address !== launch.quoteVault || baseVaultAccount.programAddress !== baseTokenProgram || quoteVaultAccount.programAddress !== quoteTokenProgram || baseVaultAccount.data.mint !== launch.baseMint || quoteVaultAccount.data.mint !== launch.quoteMint || baseVaultAccount.data.owner !== launchAuthority || quoteVaultAccount.data.owner !== launchAuthority) {
+  if (feeState.launch !== input.launch || feeState.beneficiaryLen !== 1 || feeState.beneficiaries[0]?.wallet !== routingAddresses.authority || feeState.beneficiaries[0]?.shareBps !== 1e4 || routingState.launch !== input.launch || routingState.baseMint !== launch.baseMint || routingState.quoteMint !== launch.quoteMint || routingState.hookProgram !== launch.hookProgram || baseMintAccount.address !== launch.baseMint || quoteMintAccount.address !== launch.quoteMint || baseVaultAccount.address !== launch.baseVault || quoteVaultAccount.address !== launch.quoteVault || baseVaultAccount.programAddress !== baseTokenProgram || quoteVaultAccount.programAddress !== quoteTokenProgram || baseVaultAccount.data.mint !== launch.baseMint || quoteVaultAccount.data.mint !== launch.quoteMint || baseVaultAccount.data.owner !== launchAuthority || quoteVaultAccount.data.owner !== launchAuthority) {
     throw new Error("fee rehypothecation state does not match the launch");
   }
   if (routingState.pendingCrossBase !== 0n || routingState.pendingCrossQuote !== 0n || routingState.pendingLpBase !== 0n || routingState.pendingLpQuote !== 0n || routingState.inflightKind !== 0 || routingState.inflightAmountIn !== 0n || routingState.inflightExpectedAmountOut !== 0n) {
@@ -13832,7 +13827,7 @@ async function prepareSettlement(input) {
   });
   const instruction = await getSettleFeesInstructionAsync(
     {
-      settlementAuthority: input.settlementAuthority,
+      payer: input.payer,
       initializerProgram: deployment.initializerProgram,
       initializerConfig: deployment.initializerConfig,
       launch: input.launch,
@@ -15253,6 +15248,7 @@ async function assertMigrationQuoteThreshold({
 
 exports.DOPPLER_SOLANA_DEVNET_FEE_REHYPOTHECATION_PROGRAM_ADDRESSES = DOPPLER_SOLANA_DEVNET_FEE_REHYPOTHECATION_PROGRAM_ADDRESSES;
 exports.DOPPLER_SOLANA_DEVNET_PROGRAM_ADDRESSES = DOPPLER_SOLANA_DEVNET_PROGRAM_ADDRESSES;
+exports.DOPPLER_SOLANA_MAINNET_FEE_REHYPOTHECATION_PROGRAM_ADDRESSES = DOPPLER_SOLANA_MAINNET_FEE_REHYPOTHECATION_PROGRAM_ADDRESSES;
 exports.DOPPLER_SOLANA_MAINNET_PROGRAM_ADDRESSES = DOPPLER_SOLANA_MAINNET_PROGRAM_ADDRESSES;
 exports.assertMigrationQuoteThreshold = assertMigrationQuoteThreshold;
 exports.cpmm = cpmm_exports;