@whetstone-research/doppler-sdk 1.0.38 → 1.0.39

package/dist/solana/index.cjs

@@ -9290,7 +9290,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 +9337,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 +9794,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 +9920,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 +9939,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 +9969,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 +9985,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 +10004,6 @@ function parseInitializeRehypeInstruction(instruction) {
     programAddress: instruction.programAddress,
     accounts: {
       payer: getNextAccount(),
-      settlementAuthority: getNextAccount(),
       baseMint: getNextAccount(),
       quoteMint: getNextAccount(),
       hookProgram: getNextAccount(),
@@ -10209,10 +10198,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 +10416,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 +10453,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 +10525,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 +10582,7 @@ function parseSettleFeesInstruction(instruction) {
   return {
     programAddress: instruction.programAddress,
     accounts: {
-      settlementAuthority: getNextAccount(),
+      payer: getNextAccount(),
       initializerProgram: getNextAccount(),
       initializerConfig: getNextAccount(),
       launch: getNextAccount(),
@@ -10678,10 +10661,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 +10854,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 +10894,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 +10975,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 +11035,7 @@ function parseSettleMigratedFeesInstruction(instruction) {
   return {
     programAddress: instruction.programAddress,
     accounts: {
-      settlementAuthority: getNextAccount(),
+      payer: getNextAccount(),
       initializerProgram: getNextAccount(),
       initializerConfig: getNextAccount(),
       launch: getNextAccount(),
@@ -11323,11 +11300,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
+            })
           )
         }
       }
@@ -13574,7 +13557,6 @@ async function prepareLaunch(input) {
       namespace,
       launchId,
       buybackDestination: input.buybackDestination,
-      settlementAuthority: input.settlementAuthority,
       routingMode: input.strategy.routingMode,
       feeRouting: input.strategy.feeRouting,
       beneficiaries
@@ -13725,7 +13707,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 +13814,7 @@ async function prepareSettlement(input) {
   });
   const instruction = await getSettleFeesInstructionAsync(
     {
-      settlementAuthority: input.settlementAuthority,
+      payer: input.payer,
       initializerProgram: deployment.initializerProgram,
       initializerConfig: deployment.initializerConfig,
       launch: input.launch,