@whetstone-research/doppler-sdk 1.0.38 → 1.0.40

package/dist/solana/index.js

@@ -1901,6 +1901,9 @@ function isCosignerGateEnforced(hookPayload, clock = {}) {
 var INITIALIZER_PROGRAM_ID = address(
   "4h3Dqyo5qmteJoMxXt3tdtfXELDB6pdRTPU9mWruiKp1"
 );
+var MAINNET_INITIALIZER_PROGRAM_ID = address(
+  "4carc9eePfE7jKUXdCAYMhcPf4awEFpZPrz1sTykdss1"
+);
 var BPF_LOADER_UPGRADEABLE_PROGRAM_ID = address(
   "BPFLoaderUpgradeab1e11111111111111111111111"
 );
@@ -3427,6 +3430,7 @@ __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,
@@ -6899,7 +6903,7 @@ async function createInitializeLaunchInstruction(accounts, args, programId = INI
     keys.push({ address: programId, role: AccountRole.READONLY });
     keys.push({ address: programId, role: 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: AccountRole.READONLY } : { address: programId, role: AccountRole.READONLY }
     );
@@ -9288,7 +9292,7 @@ function getRehypeStateEncoder() {
       ["beneficiaryCount", getU8Encoder()],
       ["inflightKind", getU8Encoder()],
       ["inflightDirection", getU8Encoder()],
-      ["settlementAuthority", getAddressEncoder()],
+      ["reservedSettlementAuthority", fixEncoderSize(getBytesEncoder(), 32)],
       ["cumulativeRoutedBaseFees", getU64Encoder()],
       ["cumulativeRoutedQuoteFees", getU64Encoder()],
       ["settledInitializerBaseFees", getU64Encoder()],
@@ -9335,7 +9339,7 @@ function getRehypeStateDecoder() {
     ["beneficiaryCount", getU8Decoder()],
     ["inflightKind", getU8Decoder()],
     ["inflightDirection", getU8Decoder()],
-    ["settlementAuthority", getAddressDecoder()],
+    ["reservedSettlementAuthority", fixDecoderSize(getBytesDecoder(), 32)],
     ["cumulativeRoutedBaseFees", getU64Decoder()],
     ["cumulativeRoutedQuoteFees", getU64Decoder()],
     ["settledInitializerBaseFees", getU64Decoder()],
@@ -9792,10 +9796,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 },
@@ -9922,7 +9922,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),
@@ -9942,10 +9941,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 },
@@ -9976,7 +9971,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),
@@ -9993,12 +9987,12 @@ function getInitializeRehypeInstruction(input, config) {
   });
 }
 function parseInitializeRehypeInstruction(instruction) {
-  if (instruction.accounts.length < 10) {
+  if (instruction.accounts.length < 9) {
     throw new SolanaError(
       SOLANA_ERROR__PROGRAM_CLIENTS__INSUFFICIENT_ACCOUNT_METAS,
       {
         actualAccountMetas: instruction.accounts.length,
-        expectedAccountMetas: 10
+        expectedAccountMetas: 9
       }
     );
   }
@@ -10012,7 +10006,6 @@ function parseInitializeRehypeInstruction(instruction) {
     programAddress: instruction.programAddress,
     accounts: {
       payer: getNextAccount(),
-      settlementAuthority: getNextAccount(),
       baseMint: getNextAccount(),
       quoteMint: getNextAccount(),
       hookProgram: getNextAccount(),
@@ -10207,10 +10200,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
@@ -10428,7 +10418,7 @@ async function getSettleFeesInstructionAsync(input, config) {
   const getAccountMeta = 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),
@@ -10465,10 +10455,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
@@ -10540,7 +10527,7 @@ function getSettleFeesInstruction(input, config) {
   const getAccountMeta = 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),
@@ -10597,7 +10584,7 @@ function parseSettleFeesInstruction(instruction) {
   return {
     programAddress: instruction.programAddress,
     accounts: {
-      settlementAuthority: getNextAccount(),
+      payer: getNextAccount(),
       initializerProgram: getNextAccount(),
       initializerConfig: getNextAccount(),
       launch: getNextAccount(),
@@ -10676,10 +10663,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
@@ -10872,7 +10856,7 @@ async function getSettleMigratedFeesInstructionAsync(input, config) {
   const getAccountMeta = 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),
@@ -10912,10 +10896,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
@@ -10996,7 +10977,7 @@ function getSettleMigratedFeesInstruction(input, config) {
   const getAccountMeta = 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),
@@ -11056,7 +11037,7 @@ function parseSettleMigratedFeesInstruction(instruction) {
   return {
     programAddress: instruction.programAddress,
     accounts: {
-      settlementAuthority: getNextAccount(),
+      payer: getNextAccount(),
       initializerProgram: getNextAccount(),
       initializerConfig: getNextAccount(),
       launch: getNextAccount(),
@@ -11321,11 +11302,17 @@ function dopplerRehypeRouterV1Program() {
           ),
           settleFees: (input) => addSelfPlanAndSendFunctions(
             client,
-            getSettleFeesInstructionAsync(input)
+            getSettleFeesInstructionAsync({
+              ...input,
+              payer: input.payer ?? client.payer
+            })
           ),
           settleMigratedFees: (input) => addSelfPlanAndSendFunctions(
             client,
-            getSettleMigratedFeesInstructionAsync(input)
+            getSettleMigratedFeesInstructionAsync({
+              ...input,
+              payer: input.payer ?? client.payer
+            })
           )
         }
       }
@@ -11946,7 +11933,7 @@ var DOPPLER_SOLANA_DEVNET_PROGRAM_ADDRESSES = {
 };
 var DOPPLER_SOLANA_MAINNET_PROGRAM_ADDRESSES = {
   cpmmProgram: address("5pXzd9UiWrVxATCYWmgo5EbfxzXqHYhfSKGdCPXPz7vK"),
-  initializerProgram: address("4carc9eePfE7jKUXdCAYMhcPf4awEFpZPrz1sTykdss1"),
+  initializerProgram: MAINNET_INITIALIZER_PROGRAM_ID,
   cpmmMigratorProgram: address(
     "H71WD4tsiCCipro4urykWHySH1ryvLTmqEdNbHTGwb3o"
   ),
@@ -11959,6 +11946,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: address(
+    "7ZueM1Tef2QA5zrFtVJMDM8MFqkoeG8fog1mXPgmLGH1"
+  ),
+  dopplerRehypeRouterV1Program: address(
+    "BpHX6orJ73qCvsfKkSMARQtqJvSPfqXNUfoes5rMND1D"
+  )
+};
 async function deriveSolanaCpmmDeployment(programs = DOPPLER_SOLANA_DEVNET_PROGRAM_ADDRESSES) {
   const [cpmmConfig] = await getConfigAddress(programs.cpmmProgram);
   const [initializerConfig] = await getConfigAddress2(
@@ -13572,7 +13568,6 @@ async function prepareLaunch(input) {
       namespace,
       launchId,
       buybackDestination: input.buybackDestination,
-      settlementAuthority: input.settlementAuthority,
       routingMode: input.strategy.routingMode,
       feeRouting: input.strategy.feeRouting,
       beneficiaries
@@ -13723,7 +13718,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) {
@@ -13830,7 +13825,7 @@ async function prepareSettlement(input) {
   });
   const instruction = await getSettleFeesInstructionAsync(
     {
-      settlementAuthority: input.settlementAuthority,
+      payer: input.payer,
       initializerProgram: deployment.initializerProgram,
       initializerConfig: deployment.initializerConfig,
       launch: input.launch,
@@ -15249,6 +15244,6 @@ async function assertMigrationQuoteThreshold({
   return progress;
 }
 
-export { DOPPLER_SOLANA_DEVNET_FEE_REHYPOTHECATION_PROGRAM_ADDRESSES, DOPPLER_SOLANA_DEVNET_PROGRAM_ADDRESSES, DOPPLER_SOLANA_MAINNET_PROGRAM_ADDRESSES, assertMigrationQuoteThreshold, cpmm_exports as cpmm, cpmmMigrator_exports as cpmmMigrator, createLaunch, curveSwapExactIn, deriveSolanaCpmmDeployment, deriveSolanaFeeRehypothecationDeployment, dopplerLaunchHookV1_exports as dopplerLaunchHookV1, dopplerLaunchHookV2_exports as dopplerLaunchHookV2, dopplerRehypeRouterV1_exports as dopplerRehypeRouterV1, feeRehypothecation_exports as feeRehypothecation, getMigrationQuoteProgress, initializer_exports as initializer, migrateLaunch, predictionMigrator_exports as predictionMigrator, swapExactIn, trustedOracle_exports as trustedOracle, vesting_exports as vesting };
+export { DOPPLER_SOLANA_DEVNET_FEE_REHYPOTHECATION_PROGRAM_ADDRESSES, DOPPLER_SOLANA_DEVNET_PROGRAM_ADDRESSES, DOPPLER_SOLANA_MAINNET_FEE_REHYPOTHECATION_PROGRAM_ADDRESSES, DOPPLER_SOLANA_MAINNET_PROGRAM_ADDRESSES, assertMigrationQuoteThreshold, cpmm_exports as cpmm, cpmmMigrator_exports as cpmmMigrator, createLaunch, curveSwapExactIn, deriveSolanaCpmmDeployment, deriveSolanaFeeRehypothecationDeployment, dopplerLaunchHookV1_exports as dopplerLaunchHookV1, dopplerLaunchHookV2_exports as dopplerLaunchHookV2, dopplerRehypeRouterV1_exports as dopplerRehypeRouterV1, feeRehypothecation_exports as feeRehypothecation, getMigrationQuoteProgress, initializer_exports as initializer, migrateLaunch, predictionMigrator_exports as predictionMigrator, swapExactIn, trustedOracle_exports as trustedOracle, vesting_exports as vesting };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map