@whetstone-research/doppler-sdk 1.0.38 → 1.0.39

package/dist/solana/index.js

@@ -9288,7 +9288,7 @@ function getRehypeStateEncoder() {
       ["beneficiaryCount", getU8Encoder()],
       ["inflightKind", getU8Encoder()],
       ["inflightDirection", getU8Encoder()],
-      ["settlementAuthority", getAddressEncoder()],
+      ["reservedSettlementAuthority", fixEncoderSize(getBytesEncoder(), 32)],
       ["cumulativeRoutedBaseFees", getU64Encoder()],
       ["cumulativeRoutedQuoteFees", getU64Encoder()],
       ["settledInitializerBaseFees", getU64Encoder()],
@@ -9335,7 +9335,7 @@ function getRehypeStateDecoder() {
     ["beneficiaryCount", getU8Decoder()],
     ["inflightKind", getU8Decoder()],
     ["inflightDirection", getU8Decoder()],
-    ["settlementAuthority", getAddressDecoder()],
+    ["reservedSettlementAuthority", fixDecoderSize(getBytesDecoder(), 32)],
     ["cumulativeRoutedBaseFees", getU64Decoder()],
     ["cumulativeRoutedQuoteFees", getU64Decoder()],
     ["settledInitializerBaseFees", getU64Decoder()],
@@ -9792,10 +9792,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 +9918,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 +9937,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 +9967,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 +9983,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 +10002,6 @@ function parseInitializeRehypeInstruction(instruction) {
     programAddress: instruction.programAddress,
     accounts: {
       payer: getNextAccount(),
-      settlementAuthority: getNextAccount(),
       baseMint: getNextAccount(),
       quoteMint: getNextAccount(),
       hookProgram: getNextAccount(),
@@ -10207,10 +10196,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 +10414,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 +10451,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 +10523,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 +10580,7 @@ function parseSettleFeesInstruction(instruction) {
   return {
     programAddress: instruction.programAddress,
     accounts: {
-      settlementAuthority: getNextAccount(),
+      payer: getNextAccount(),
       initializerProgram: getNextAccount(),
       initializerConfig: getNextAccount(),
       launch: getNextAccount(),
@@ -10676,10 +10659,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 +10852,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 +10892,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 +10973,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 +11033,7 @@ function parseSettleMigratedFeesInstruction(instruction) {
   return {
     programAddress: instruction.programAddress,
     accounts: {
-      settlementAuthority: getNextAccount(),
+      payer: getNextAccount(),
       initializerProgram: getNextAccount(),
       initializerConfig: getNextAccount(),
       launch: getNextAccount(),
@@ -11321,11 +11298,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
+            })
           )
         }
       }
@@ -13572,7 +13555,6 @@ async function prepareLaunch(input) {
       namespace,
       launchId,
       buybackDestination: input.buybackDestination,
-      settlementAuthority: input.settlementAuthority,
       routingMode: input.strategy.routingMode,
       feeRouting: input.strategy.feeRouting,
       beneficiaries
@@ -13723,7 +13705,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 +13812,7 @@ async function prepareSettlement(input) {
   });
   const instruction = await getSettleFeesInstructionAsync(
     {
-      settlementAuthority: input.settlementAuthority,
+      payer: input.payer,
       initializerProgram: deployment.initializerProgram,
       initializerConfig: deployment.initializerConfig,
       launch: input.launch,