@haven-fi/solauto-sdk 1.0.134 → 1.0.136

package/dist/clients/solautoClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoClient.ts"],"names":[],"mappings":"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"}

package/dist/clients/solautoClient.js

@@ -190,10 +190,13 @@ class SolautoClient extends txHandler_1.TxHandler {
             this.solautoPositionData?.position.dca);
     }
     openPosition(settingParams, dca) {
-        if (dca && dca.debtToAddBaseUnit > 0) {
+        if (dca && dca.dcaInBaseUnit > 0) {
             this.livePositionUpdates.new({
-                type: "debtDcaIn",
-                value: BigInt(dca.debtToAddBaseUnit),
+                type: "dcaInBalance",
+                value: {
+                    amount: BigInt(dca.dcaInBaseUnit),
+                    tokenType: dca.tokenType
+                },
             });
         }
         if (settingParams) {
@@ -211,31 +214,33 @@ class SolautoClient extends txHandler_1.TxHandler {
         return (0, umi_1.transactionBuilder)();
     }
     updatePositionIx(args) {
-        let debtMint = undefined;
-        let positionDebtTa = undefined;
-        let signerDebtTa = undefined;
+        let dcaMint = undefined;
+        let positionDcaTa = undefined;
+        let signerDcaTa = undefined;
         if ((0, umi_1.isOption)(args.dca) && (0, umi_1.isSome)(args.dca)) {
-            debtMint = (0, umi_1.publicKey)(this.debtMint);
-            positionDebtTa = (0, umi_1.publicKey)(this.positionDebtTa);
-            signerDebtTa = (0, umi_1.publicKey)(this.signerDebtTa);
+            if (args.dca.value.tokenType === generated_1.TokenType.Supply) {
+                dcaMint = (0, umi_1.publicKey)(this.supplyMint);
+                positionDcaTa = (0, umi_1.publicKey)(this.positionSupplyTa);
+                signerDcaTa = (0, umi_1.publicKey)(this.signerSupplyTa);
+            }
+            else {
+                dcaMint = (0, umi_1.publicKey)(this.debtMint);
+                positionDcaTa = (0, umi_1.publicKey)(this.positionDebtTa);
+                signerDcaTa = (0, umi_1.publicKey)(this.signerDebtTa);
+            }
             let addingToPos = false;
             if ((0, umi_1.isOption)(args.dca) &&
                 (0, umi_1.isSome)(args.dca) &&
-                args.dca.value.debtToAddBaseUnit > 0) {
+                args.dca.value.dcaInBaseUnit > 0) {
                 this.livePositionUpdates.new({
-                    type: "debtDcaIn",
-                    value: BigInt(args.dca.value.debtToAddBaseUnit),
+                    type: "dcaInBalance",
+                    value: {
+                        amount: BigInt(args.dca.value.dcaInBaseUnit),
+                        tokenType: args.dca.value.tokenType
+                    },
                 });
                 addingToPos = true;
             }
-            if (this.solautoPositionData?.position.dca.debtToAddBaseUnit &&
-                !addingToPos) {
-                this.livePositionUpdates.new({
-                    type: "debtDcaIn",
-                    value: this.solautoPositionData.position.dca.debtToAddBaseUnit *
-                        BigInt(-1),
-                });
-            }
         }
         if ((0, umi_1.isOption)(args.settingParams) && (0, umi_1.isSome)(args.settingParams)) {
             this.livePositionUpdates.new({
@@ -252,9 +257,9 @@ class SolautoClient extends txHandler_1.TxHandler {
         return (0, generated_1.updatePosition)(this.umi, {
             signer: this.signer,
             solautoPosition: (0, umi_1.publicKey)(this.solautoPosition),
-            debtMint,
-            positionDebtTa,
-            signerDebtTa,
+            dcaMint,
+            positionDcaTa,
+            signerDcaTa,
             updatePositionData: args,
         });
     }
@@ -270,27 +275,32 @@ class SolautoClient extends txHandler_1.TxHandler {
         });
     }
     cancelDCAIx() {
-        let debtMint = undefined;
-        let positionDebtTa = undefined;
-        let signerDebtTa = undefined;
-        if (this.solautoPositionData !== null && !this.selfManaged) {
-            const positionData = this.solautoPositionData.position;
-            if (positionData.dca.debtToAddBaseUnit) {
-                debtMint = (0, umi_1.publicKey)(this.debtMint);
-                positionDebtTa = (0, umi_1.publicKey)(this.positionDebtTa);
-                signerDebtTa = (0, umi_1.publicKey)(this.signerDebtTa);
-                this.livePositionUpdates.new({
-                    type: "debtDcaIn",
-                    value: positionData.dca.debtToAddBaseUnit * BigInt(-1),
-                });
+        let dcaMint = undefined;
+        let positionDcaTa = undefined;
+        let signerDcaTa = undefined;
+        const currDca = this.solautoPositionActiveDca();
+        if (currDca.dcaInBaseUnit > 0) {
+            if (currDca.tokenType === generated_1.TokenType.Supply) {
+                dcaMint = (0, umi_1.publicKey)(this.supplyMint);
+                positionDcaTa = (0, umi_1.publicKey)(this.positionSupplyTa);
+                signerDcaTa = (0, umi_1.publicKey)(this.signerSupplyTa);
+            }
+            else {
+                dcaMint = (0, umi_1.publicKey)(this.debtMint);
+                positionDcaTa = (0, umi_1.publicKey)(this.positionDebtTa);
+                signerDcaTa = (0, umi_1.publicKey)(this.signerDebtTa);
             }
+            this.livePositionUpdates.new({
+                type: "cancellingDca",
+                value: this.solautoPositionData.position.dca.tokenType,
+            });
         }
         return (0, generated_1.cancelDCA)(this.umi, {
             signer: this.signer,
             solautoPosition: (0, umi_1.publicKey)(this.solautoPosition),
-            debtMint,
-            positionDebtTa,
-            signerDebtTa,
+            dcaMint,
+            positionDcaTa,
+            signerDcaTa,
         });
     }
     protocolInteraction(args) {

package/dist/clients/solautoMarginfiClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EACb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAWnE,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,WAAW,CAAkB;IAE9B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAG5B,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAkE1C,8BAA8B;IA0CpC,eAAe,IAAI,SAAS;IAI5B,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAU/B,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA6C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,WAAW,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA4DrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IAoFlE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CA4BlE"}
+{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EACb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAWnE,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,WAAW,CAAkB;IAE9B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAG5B,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAkE1C,8BAA8B;IA0CpC,eAAe,IAAI,SAAS;IAI5B,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAU/B,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA6C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,WAAW,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA0DrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IAoFlE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CA4BlE"}

package/dist/clients/solautoMarginfiClient.js

@@ -293,9 +293,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
             supplyPriceOracle: (0, umi_1.publicKey)(this.supplyPriceOracle),
             positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyTa),
-            signerSupplyTa: this.selfManaged
-                ? (0, umi_1.publicKey)(this.signerSupplyTa)
-                : undefined,
+            authoritySupplyTa: (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)(this.authority, this.supplyMint)),
             vaultSupplyTa: needSupplyAccounts
                 ? (0, umi_1.publicKey)(this.marginfiSupplyAccounts.liquidityVault)
                 : undefined,
@@ -305,7 +303,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             debtBank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
             debtPriceOracle: (0, umi_1.publicKey)(this.debtPriceOracle),
             positionDebtTa: (0, umi_1.publicKey)(this.positionDebtTa),
-            signerDebtTa: this.selfManaged ? (0, umi_1.publicKey)(this.signerDebtTa) : undefined,
+            authorityDebtTa: (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)(this.authority, this.debtMint)),
             vaultDebtTa: needDebtAccounts
                 ? (0, umi_1.publicKey)(this.marginfiDebtAccounts.liquidityVault)
                 : undefined,

package/dist/generated/accounts/solautoPosition.d.ts

@@ -7,7 +7,7 @@
  */
 import { Account, Context, Pda, PublicKey, RpcAccount, RpcGetAccountOptions, RpcGetAccountsOptions } from '@metaplex-foundation/umi';
 import { Serializer } from '@metaplex-foundation/umi/serializers';
-import { FeeType, FeeTypeArgs, PodBool, PodBoolArgs, PositionData, PositionDataArgs, PositionState, PositionStateArgs, RebalanceData, RebalanceDataArgs } from '../types';
+import { PodBool, PodBoolArgs, PositionData, PositionDataArgs, PositionState, PositionStateArgs, RebalanceData, RebalanceDataArgs } from '../types';
 export type SolautoPosition = Account<SolautoPositionAccountData>;
 export type SolautoPositionAccountData = {
     bump: Array<number>;
@@ -18,8 +18,6 @@ export type SolautoPositionAccountData = {
     position: PositionData;
     state: PositionState;
     rebalance: RebalanceData;
-    feeType: FeeType;
-    padding2: Array<number>;
     padding: Array<number>;
 };
 export type SolautoPositionAccountDataArgs = {
@@ -31,8 +29,6 @@ export type SolautoPositionAccountDataArgs = {
     position: PositionDataArgs;
     state: PositionStateArgs;
     rebalance: RebalanceDataArgs;
-    feeType: FeeTypeArgs;
-    padding2: Array<number>;
     padding: Array<number>;
 };
 export declare function getSolautoPositionAccountDataSerializer(): Serializer<SolautoPositionAccountDataArgs, SolautoPositionAccountData>;
@@ -50,8 +46,6 @@ export declare function getSolautoPositionGpaBuilder(context: Pick<Context, 'rpc
     position: PositionDataArgs;
     state: PositionStateArgs;
     rebalance: RebalanceDataArgs;
-    feeType: FeeTypeArgs;
-    padding2: Array<number>;
     padding: Array<number>;
 }>;
 export declare function getSolautoPositionSize(): number;

package/dist/generated/accounts/solautoPosition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoPosition.d.ts","sourceRoot":"","sources":["../../../src/generated/accounts/solautoPosition.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"solautoPosition.d.ts","sourceRoot":"","sources":["../../../src/generated/accounts/solautoPosition.ts"],"names":[],"mappings":"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"}

package/dist/generated/accounts/solautoPosition.js

@@ -28,9 +28,7 @@ function getSolautoPositionAccountDataSerializer() {
         ['position', (0, types_1.getPositionDataSerializer)()],
         ['state', (0, types_1.getPositionStateSerializer)()],
         ['rebalance', (0, types_1.getRebalanceDataSerializer)()],
-        ['feeType', (0, types_1.getFeeTypeSerializer)()],
-        ['padding2', (0, serializers_1.array)((0, serializers_1.u8)(), { size: 7 })],
-        ['padding', (0, serializers_1.array)((0, serializers_1.u32)(), { size: 30 })],
+        ['padding', (0, serializers_1.array)((0, serializers_1.u32)(), { size: 32 })],
     ], { description: 'SolautoPositionAccountData' });
 }
 function deserializeSolautoPosition(rawAccount) {
@@ -70,9 +68,7 @@ function getSolautoPositionGpaBuilder(context) {
         position: [40, (0, types_1.getPositionDataSerializer)()],
         state: [360, (0, types_1.getPositionStateSerializer)()],
         rebalance: [648, (0, types_1.getRebalanceDataSerializer)()],
-        feeType: [704, (0, types_1.getFeeTypeSerializer)()],
-        padding2: [705, (0, serializers_1.array)((0, serializers_1.u8)(), { size: 7 })],
-        padding: [712, (0, serializers_1.array)((0, serializers_1.u32)(), { size: 30 })],
+        padding: [704, (0, serializers_1.array)((0, serializers_1.u32)(), { size: 32 })],
     })
         .deserializeUsing((account) => deserializeSolautoPosition(account));
 }

package/dist/generated/instructions/cancelDCA.d.ts

@@ -13,9 +13,9 @@ export type CancelDCAInstructionAccounts = {
     tokenProgram?: PublicKey | Pda;
     ataProgram?: PublicKey | Pda;
     solautoPosition: PublicKey | Pda;
-    debtMint?: PublicKey | Pda;
-    positionDebtTa?: PublicKey | Pda;
-    signerDebtTa?: PublicKey | Pda;
+    dcaMint?: PublicKey | Pda;
+    positionDcaTa?: PublicKey | Pda;
+    signerDcaTa?: PublicKey | Pda;
 };
 export type CancelDCAInstructionData = {
     discriminator: number;

package/dist/generated/instructions/cancelDCA.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cancelDCA.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/cancelDCA.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAIX,MAAM,sCAAsC,CAAC;AAQ9C,MAAM,MAAM,4BAA4B,GAAG;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,UAAU,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC7B,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,QAAQ,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC3B,cAAc,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;CAChC,CAAC;AAGF,MAAM,MAAM,wBAAwB,GAAG;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjE,MAAM,MAAM,4BAA4B,GAAG,EAAE,CAAC;AAE9C,wBAAgB,qCAAqC,IAAI,UAAU,CACjE,4BAA4B,EAC5B,wBAAwB,CACzB,CAWA;AAGD,wBAAgB,SAAS,CACvB,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,4BAA4B,GAClC,kBAAkB,CA+FpB"}
+{"version":3,"file":"cancelDCA.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/cancelDCA.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAIX,MAAM,sCAAsC,CAAC;AAQ9C,MAAM,MAAM,4BAA4B,GAAG;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,UAAU,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC7B,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,OAAO,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC1B,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,WAAW,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;CAC/B,CAAC;AAGF,MAAM,MAAM,wBAAwB,GAAG;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjE,MAAM,MAAM,4BAA4B,GAAG,EAAE,CAAC;AAE9C,wBAAgB,qCAAqC,IAAI,UAAU,CACjE,4BAA4B,EAC5B,wBAAwB,CACzB,CAWA;AAGD,wBAAgB,SAAS,CACvB,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,4BAA4B,GAClC,kBAAkB,CA+FpB"}

package/dist/generated/instructions/cancelDCA.js

@@ -48,20 +48,20 @@ function cancelDCA(context, input) {
             isWritable: true,
             value: input.solautoPosition ?? null,
         },
-        debtMint: {
+        dcaMint: {
             index: 5,
             isWritable: false,
-            value: input.debtMint ?? null,
+            value: input.dcaMint ?? null,
         },
-        positionDebtTa: {
+        positionDcaTa: {
             index: 6,
             isWritable: true,
-            value: input.positionDebtTa ?? null,
+            value: input.positionDcaTa ?? null,
         },
-        signerDebtTa: {
+        signerDcaTa: {
             index: 7,
             isWritable: true,
-            value: input.signerDebtTa ?? null,
+            value: input.signerDcaTa ?? null,
         },
     };
     // Default values.

package/dist/generated/instructions/closePosition.d.ts

@@ -14,9 +14,8 @@ export type ClosePositionInstructionAccounts = {
     ataProgram?: PublicKey | Pda;
     solautoPosition: PublicKey | Pda;
     protocolAccount: PublicKey | Pda;
-    signerSupplyTa: PublicKey | Pda;
     positionSupplyTa: PublicKey | Pda;
-    positionSupplyCollateralTa?: PublicKey | Pda;
+    signerSupplyTa: PublicKey | Pda;
     positionDebtTa: PublicKey | Pda;
     signerDebtTa: PublicKey | Pda;
 };

package/dist/generated/instructions/closePosition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"closePosition.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/closePosition.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAIX,MAAM,sCAAsC,CAAC;AAQ9C,MAAM,MAAM,gCAAgC,GAAG;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,UAAU,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC7B,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,cAAc,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,gBAAgB,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,0BAA0B,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC7C,cAAc,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,EAAE,SAAS,GAAG,GAAG,CAAC;CAC/B,CAAC;AAGF,MAAM,MAAM,4BAA4B,GAAG;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC;AAErE,MAAM,MAAM,gCAAgC,GAAG,EAAE,CAAC;AAElD,wBAAgB,yCAAyC,IAAI,UAAU,CACrE,gCAAgC,EAChC,4BAA4B,CAC7B,CAcA;AAGD,wBAAgB,aAAa,CAC3B,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,gCAAgC,GACtC,kBAAkB,CA8GpB"}
+{"version":3,"file":"closePosition.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/closePosition.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAIX,MAAM,sCAAsC,CAAC;AAQ9C,MAAM,MAAM,gCAAgC,GAAG;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,UAAU,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC7B,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,gBAAgB,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,cAAc,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,cAAc,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,EAAE,SAAS,GAAG,GAAG,CAAC;CAC/B,CAAC;AAGF,MAAM,MAAM,4BAA4B,GAAG;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC;AAErE,MAAM,MAAM,gCAAgC,GAAG,EAAE,CAAC;AAElD,wBAAgB,yCAAyC,IAAI,UAAU,CACrE,gCAAgC,EAChC,4BAA4B,CAC7B,CAcA;AAGD,wBAAgB,aAAa,CAC3B,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,gCAAgC,GACtC,kBAAkB,CAyGpB"}

package/dist/generated/instructions/closePosition.js

@@ -53,28 +53,23 @@ function closePosition(context, input) {
             isWritable: true,
             value: input.protocolAccount ?? null,
         },
-        signerSupplyTa: {
-            index: 6,
-            isWritable: true,
-            value: input.signerSupplyTa ?? null,
-        },
         positionSupplyTa: {
-            index: 7,
+            index: 6,
             isWritable: true,
             value: input.positionSupplyTa ?? null,
         },
-        positionSupplyCollateralTa: {
-            index: 8,
+        signerSupplyTa: {
+            index: 7,
             isWritable: true,
-            value: input.positionSupplyCollateralTa ?? null,
+            value: input.signerSupplyTa ?? null,
         },
         positionDebtTa: {
-            index: 9,
+            index: 8,
             isWritable: true,
             value: input.positionDebtTa ?? null,
         },
         signerDebtTa: {
-            index: 10,
+            index: 9,
             isWritable: true,
             value: input.signerDebtTa ?? null,
         },

package/dist/generated/instructions/marginfiRebalance.d.ts

@@ -24,13 +24,13 @@ export type MarginfiRebalanceInstructionAccounts = {
     supplyBank: PublicKey | Pda;
     supplyPriceOracle?: PublicKey | Pda;
     positionSupplyTa: PublicKey | Pda;
-    signerSupplyTa?: PublicKey | Pda;
+    authoritySupplyTa?: PublicKey | Pda;
     vaultSupplyTa?: PublicKey | Pda;
     supplyVaultAuthority?: PublicKey | Pda;
     debtBank: PublicKey | Pda;
     debtPriceOracle?: PublicKey | Pda;
     positionDebtTa: PublicKey | Pda;
-    signerDebtTa?: PublicKey | Pda;
+    authorityDebtTa?: PublicKey | Pda;
     vaultDebtTa?: PublicKey | Pda;
     debtVaultAuthority?: PublicKey | Pda;
 };

package/dist/generated/instructions/marginfiRebalance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marginfiRebalance.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/marginfiRebalance.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,MAAM,EACN,gBAAgB,EAChB,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAMX,MAAM,sCAAsC,CAAC;AAM9C,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EAEzB,MAAM,UAAU,CAAC;AAGlB,MAAM,MAAM,oCAAoC,GAAG;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,SAAS,EAAE,SAAS,GAAG,GAAG,CAAC;IAC3B,mBAAmB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACtC,sBAAsB,EAAE,SAAS,GAAG,GAAG,CAAC;IACxC,kBAAkB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACrC,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,cAAc,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,UAAU,EAAE,SAAS,GAAG,GAAG,CAAC;IAC5B,iBAAiB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACpC,gBAAgB,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,cAAc,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,oBAAoB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACvC,QAAQ,EAAE,SAAS,GAAG,GAAG,CAAC;IAC1B,eAAe,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,cAAc,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,WAAW,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC9B,kBAAkB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;CACtC,CAAC;AAGF,MAAM,MAAM,gCAAgC,GAAG;IAC7C,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,oBAAoB,CAAC;IACpC,2BAA2B,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG;IACjD,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,wBAAwB,CAAC;IACxC,2BAA2B,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACtD,WAAW,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;CACvC,CAAC;AAEF,wBAAgB,6CAA6C,IAAI,UAAU,CACzE,oCAAoC,EACpC,gCAAgC,CACjC,CAqBA;AAGD,MAAM,MAAM,gCAAgC,GAC1C,oCAAoC,CAAC;AAGvC,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,oCAAoC,GAAG,gCAAgC,GAC7E,kBAAkB,CA6KpB"}
+{"version":3,"file":"marginfiRebalance.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/marginfiRebalance.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,MAAM,EACN,gBAAgB,EAChB,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAMX,MAAM,sCAAsC,CAAC;AAM9C,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EAEzB,MAAM,UAAU,CAAC;AAGlB,MAAM,MAAM,oCAAoC,GAAG;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,SAAS,EAAE,SAAS,GAAG,GAAG,CAAC;IAC3B,mBAAmB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACtC,sBAAsB,EAAE,SAAS,GAAG,GAAG,CAAC;IACxC,kBAAkB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACrC,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,cAAc,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,UAAU,EAAE,SAAS,GAAG,GAAG,CAAC;IAC5B,iBAAiB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACpC,gBAAgB,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,iBAAiB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACpC,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,oBAAoB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACvC,QAAQ,EAAE,SAAS,GAAG,GAAG,CAAC;IAC1B,eAAe,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,cAAc,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,eAAe,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,WAAW,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC9B,kBAAkB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;CACtC,CAAC;AAGF,MAAM,MAAM,gCAAgC,GAAG;IAC7C,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,oBAAoB,CAAC;IACpC,2BAA2B,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG;IACjD,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,wBAAwB,CAAC;IACxC,2BAA2B,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACtD,WAAW,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;CACvC,CAAC;AAEF,wBAAgB,6CAA6C,IAAI,UAAU,CACzE,oCAAoC,EACpC,gCAAgC,CACjC,CAqBA;AAGD,MAAM,MAAM,gCAAgC,GAC1C,oCAAoC,CAAC;AAGvC,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,oCAAoC,GAAG,gCAAgC,GAC7E,kBAAkB,CA6KpB"}

package/dist/generated/instructions/marginfiRebalance.js

@@ -103,10 +103,10 @@ function marginfiRebalance(context, input) {
             isWritable: true,
             value: input.positionSupplyTa ?? null,
         },
-        signerSupplyTa: {
+        authoritySupplyTa: {
             index: 15,
             isWritable: true,
-            value: input.signerSupplyTa ?? null,
+            value: input.authoritySupplyTa ?? null,
         },
         vaultSupplyTa: {
             index: 16,
@@ -133,10 +133,10 @@ function marginfiRebalance(context, input) {
             isWritable: true,
             value: input.positionDebtTa ?? null,
         },
-        signerDebtTa: {
+        authorityDebtTa: {
             index: 21,
             isWritable: true,
-            value: input.signerDebtTa ?? null,
+            value: input.authorityDebtTa ?? null,
         },
         vaultDebtTa: {
             index: 22,

package/dist/generated/instructions/updatePosition.d.ts

@@ -13,9 +13,9 @@ export type UpdatePositionInstructionAccounts = {
     systemProgram?: PublicKey | Pda;
     tokenProgram?: PublicKey | Pda;
     solautoPosition: PublicKey | Pda;
-    debtMint?: PublicKey | Pda;
-    positionDebtTa?: PublicKey | Pda;
-    signerDebtTa?: PublicKey | Pda;
+    dcaMint?: PublicKey | Pda;
+    positionDcaTa?: PublicKey | Pda;
+    signerDcaTa?: PublicKey | Pda;
 };
 export type UpdatePositionInstructionData = {
     discriminator: number;

package/dist/generated/instructions/updatePosition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updatePosition.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/updatePosition.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAIX,MAAM,sCAAsC,CAAC;AAM9C,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EAEvB,MAAM,UAAU,CAAC;AAGlB,MAAM,MAAM,iCAAiC,GAAG;IAC9C,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,QAAQ,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC3B,cAAc,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;CAChC,CAAC;AAGF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,kBAAkB,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,kBAAkB,EAAE,sBAAsB,CAAC;CAC5C,CAAC;AAEF,wBAAgB,0CAA0C,IAAI,UAAU,CACtE,iCAAiC,EACjC,6BAA6B,CAC9B,CAkBA;AAGD,MAAM,MAAM,6BAA6B,GAAG,iCAAiC,CAAC;AAG9E,wBAAgB,cAAc,CAC5B,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,iCAAiC,GAAG,6BAA6B,GACvE,kBAAkB,CAwFpB"}
+{"version":3,"file":"updatePosition.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/updatePosition.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAIX,MAAM,sCAAsC,CAAC;AAM9C,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EAEvB,MAAM,UAAU,CAAC;AAGlB,MAAM,MAAM,iCAAiC,GAAG;IAC9C,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,OAAO,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC1B,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,WAAW,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;CAC/B,CAAC;AAGF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,kBAAkB,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,kBAAkB,EAAE,sBAAsB,CAAC;CAC5C,CAAC;AAEF,wBAAgB,0CAA0C,IAAI,UAAU,CACtE,iCAAiC,EACjC,6BAA6B,CAC9B,CAkBA;AAGD,MAAM,MAAM,6BAA6B,GAAG,iCAAiC,CAAC;AAG9E,wBAAgB,cAAc,CAC5B,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,iCAAiC,GAAG,6BAA6B,GACvE,kBAAkB,CAwFpB"}

package/dist/generated/instructions/updatePosition.js

@@ -45,20 +45,20 @@ function updatePosition(context, input) {
             isWritable: true,
             value: input.solautoPosition ?? null,
         },
-        debtMint: {
+        dcaMint: {
             index: 4,
             isWritable: false,
-            value: input.debtMint ?? null,
+            value: input.dcaMint ?? null,
         },
-        positionDebtTa: {
+        positionDcaTa: {
             index: 5,
             isWritable: true,
-            value: input.positionDebtTa ?? null,
+            value: input.positionDcaTa ?? null,
         },
-        signerDebtTa: {
+        signerDcaTa: {
             index: 6,
             isWritable: true,
-            value: input.signerDebtTa ?? null,
+            value: input.signerDcaTa ?? null,
         },
     };
     // Arguments.

package/dist/generated/types/dCASettings.d.ts

@@ -6,16 +6,18 @@
  * @see https://github.com/metaplex-foundation/kinobi
  */
 import { Serializer } from '@metaplex-foundation/umi/serializers';
-import { AutomationSettings, AutomationSettingsArgs } from '.';
+import { AutomationSettings, AutomationSettingsArgs, TokenType, TokenTypeArgs } from '.';
 export type DCASettings = {
     automation: AutomationSettings;
-    debtToAddBaseUnit: bigint;
-    padding: Uint8Array;
+    dcaInBaseUnit: bigint;
+    tokenType: TokenType;
+    padding: Array<number>;
 };
 export type DCASettingsArgs = {
     automation: AutomationSettingsArgs;
-    debtToAddBaseUnit: number | bigint;
-    padding: Uint8Array;
+    dcaInBaseUnit: number | bigint;
+    tokenType: TokenTypeArgs;
+    padding: Array<number>;
 };
 export declare function getDCASettingsSerializer(): Serializer<DCASettingsArgs, DCASettings>;
 //# sourceMappingURL=dCASettings.d.ts.map

package/dist/generated/types/dCASettings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dCASettings.d.ts","sourceRoot":"","sources":["../../../src/generated/types/dCASettings.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,UAAU,EAIX,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EAEvB,MAAM,GAAG,CAAC;AAEX,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,kBAAkB,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,EAAE,UAAU,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,EAAE,sBAAsB,CAAC;IACnC,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAAC;IACnC,OAAO,EAAE,UAAU,CAAC;CACrB,CAAC;AAEF,wBAAgB,wBAAwB,IAAI,UAAU,CACpD,eAAe,EACf,WAAW,CACZ,CASA"}
+{"version":3,"file":"dCASettings.d.ts","sourceRoot":"","sources":["../../../src/generated/types/dCASettings.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,UAAU,EAKX,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EACtB,SAAS,EACT,aAAa,EAGd,MAAM,GAAG,CAAC;AAEX,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,kBAAkB,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,EAAE,sBAAsB,CAAC;IACnC,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,SAAS,EAAE,aAAa,CAAC;IACzB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACxB,CAAC;AAEF,wBAAgB,wBAAwB,IAAI,UAAU,CACpD,eAAe,EACf,WAAW,CACZ,CAUA"}

package/dist/generated/types/dCASettings.js

@@ -13,7 +13,8 @@ const _1 = require(".");
 function getDCASettingsSerializer() {
     return (0, serializers_1.struct)([
         ['automation', (0, _1.getAutomationSettingsSerializer)()],
-        ['debtToAddBaseUnit', (0, serializers_1.u64)()],
-        ['padding', (0, serializers_1.bytes)({ size: 32 })],
+        ['dcaInBaseUnit', (0, serializers_1.u64)()],
+        ['tokenType', (0, _1.getTokenTypeSerializer)()],
+        ['padding', (0, serializers_1.array)((0, serializers_1.u8)(), { size: 31 })],
     ], { description: 'DCASettings' });
 }

package/dist/generated/types/dCASettingsInp.d.ts

@@ -6,14 +6,16 @@
  * @see https://github.com/metaplex-foundation/kinobi
  */
 import { Serializer } from '@metaplex-foundation/umi/serializers';
-import { AutomationSettingsInp, AutomationSettingsInpArgs } from '.';
+import { AutomationSettingsInp, AutomationSettingsInpArgs, TokenType, TokenTypeArgs } from '.';
 export type DCASettingsInp = {
     automation: AutomationSettingsInp;
-    debtToAddBaseUnit: bigint;
+    dcaInBaseUnit: bigint;
+    tokenType: TokenType;
 };
 export type DCASettingsInpArgs = {
     automation: AutomationSettingsInpArgs;
-    debtToAddBaseUnit: number | bigint;
+    dcaInBaseUnit: number | bigint;
+    tokenType: TokenTypeArgs;
 };
 export declare function getDCASettingsInpSerializer(): Serializer<DCASettingsInpArgs, DCASettingsInp>;
 //# sourceMappingURL=dCASettingsInp.d.ts.map

package/dist/generated/types/dCASettingsInp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dCASettingsInp.d.ts","sourceRoot":"","sources":["../../../src/generated/types/dCASettingsInp.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAe,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EACL,qBAAqB,EACrB,yBAAyB,EAE1B,MAAM,GAAG,CAAC;AAEX,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,EAAE,qBAAqB,CAAC;IAClC,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,EAAE,yBAAyB,CAAC;IACtC,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAAC;CACpC,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,UAAU,CACvD,kBAAkB,EAClB,cAAc,CACf,CAQA"}
+{"version":3,"file":"dCASettingsInp.d.ts","sourceRoot":"","sources":["../../../src/generated/types/dCASettingsInp.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAe,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EACL,qBAAqB,EACrB,yBAAyB,EACzB,SAAS,EACT,aAAa,EAGd,MAAM,GAAG,CAAC;AAEX,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,EAAE,qBAAqB,CAAC;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,EAAE,yBAAyB,CAAC;IACtC,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,SAAS,EAAE,aAAa,CAAC;CAC1B,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,UAAU,CACvD,kBAAkB,EAClB,cAAc,CACf,CASA"}

package/dist/generated/types/dCASettingsInp.js

@@ -13,6 +13,7 @@ const _1 = require(".");
 function getDCASettingsInpSerializer() {
     return (0, serializers_1.struct)([
         ['automation', (0, _1.getAutomationSettingsInpSerializer)()],
-        ['debtToAddBaseUnit', (0, serializers_1.u64)()],
+        ['dcaInBaseUnit', (0, serializers_1.u64)()],
+        ['tokenType', (0, _1.getTokenTypeSerializer)()],
     ], { description: 'DCASettingsInp' });
 }

package/dist/generated/types/index.d.ts

@@ -9,7 +9,6 @@ export * from './automationSettings';
 export * from './automationSettingsInp';
 export * from './dCASettings';
 export * from './dCASettingsInp';
-export * from './feeType';
 export * from './lendingPlatform';
 export * from './podBool';
 export * from './positionData';
@@ -22,5 +21,6 @@ export * from './solautoSettingsParameters';
 export * from './solautoSettingsParametersInp';
 export * from './tokenAmount';
 export * from './tokenBalanceAmount';
+export * from './tokenType';
 export * from './updatePositionData';
 //# sourceMappingURL=index.d.ts.map

package/dist/generated/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generated/types/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generated/types/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC"}

package/dist/generated/types/index.js

@@ -25,7 +25,6 @@ __exportStar(require("./automationSettings"), exports);
 __exportStar(require("./automationSettingsInp"), exports);
 __exportStar(require("./dCASettings"), exports);
 __exportStar(require("./dCASettingsInp"), exports);
-__exportStar(require("./feeType"), exports);
 __exportStar(require("./lendingPlatform"), exports);
 __exportStar(require("./podBool"), exports);
 __exportStar(require("./positionData"), exports);
@@ -38,4 +37,5 @@ __exportStar(require("./solautoSettingsParameters"), exports);
 __exportStar(require("./solautoSettingsParametersInp"), exports);
 __exportStar(require("./tokenAmount"), exports);
 __exportStar(require("./tokenBalanceAmount"), exports);
+__exportStar(require("./tokenType"), exports);
 __exportStar(require("./updatePositionData"), exports);

package/dist/generated/types/{feeType.d.ts → tokenType.d.ts}

@@ -6,10 +6,10 @@
  * @see https://github.com/metaplex-foundation/kinobi
  */
 import { Serializer } from '@metaplex-foundation/umi/serializers';
-export declare enum FeeType {
-    Small = 0,
-    Default = 1
+export declare enum TokenType {
+    Supply = 0,
+    Debt = 1
 }
-export type FeeTypeArgs = FeeType;
-export declare function getFeeTypeSerializer(): Serializer<FeeTypeArgs, FeeType>;
-//# sourceMappingURL=feeType.d.ts.map
+export type TokenTypeArgs = TokenType;
+export declare function getTokenTypeSerializer(): Serializer<TokenTypeArgs, TokenType>;
+//# sourceMappingURL=tokenType.d.ts.map

package/dist/generated/types/tokenType.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tokenType.d.ts","sourceRoot":"","sources":["../../../src/generated/types/tokenType.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAc,MAAM,sCAAsC,CAAC;AAE9E,oBAAY,SAAS;IACnB,MAAM,IAAA;IACN,IAAI,IAAA;CACL;AAED,MAAM,MAAM,aAAa,GAAG,SAAS,CAAC;AAEtC,wBAAgB,sBAAsB,IAAI,UAAU,CAAC,aAAa,EAAE,SAAS,CAAC,CAI7E"}