@affluent-org/sdk 0.0.7 → 0.0.9

package/dist/common/trace-action.d.ts

@@ -3,9 +3,9 @@ import { MessageHash } from "../utils/external-message-hash";
 import { ToncenterTraceRaw } from "../utils/toncenter/type";
 import { ToncenterV3Client } from "../utils/pending-tracker/v3-client";
 export type Step = {
-    from: Address;
-    to: Address;
     op?: number;
+    from?: Address;
+    to: Address;
     description?: string;
 };
 export declare function findStepTx(trace: ToncenterTraceRaw, step: Step): import("../utils/toncenter/type").ToncenterTransactionRaw | undefined;

package/dist/common/trace-action.js

@@ -12,12 +12,12 @@ const jetton_wallet_1 = require("../contracts/jetton/jetton-wallet");
 const jetton_wallet_2 = require("../contracts/wton/jetton-wallet");
 function findStepTx(trace, step) {
     return Object.values(trace.transactions).find(tx => {
-        if (tx.in_msg) {
-            return (step.op ? Number(tx.in_msg.opcode) === step.op : true)
-                && step.from.equals(core_1.Address.parse(tx.in_msg.source))
-                && step.to.equals(core_1.Address.parse(tx.in_msg.destination));
-        }
-        return false;
+        if (!tx.in_msg)
+            return false;
+        const opMatch = step.op === undefined || Number(tx.in_msg.opcode) === step.op;
+        const fromMatch = step.from === undefined || (tx.in_msg.source && step.from.equals(core_1.Address.parse(tx.in_msg.source)));
+        const toMatch = step.to.equals(core_1.Address.parse(tx.in_msg.destination));
+        return opMatch && fromMatch && toMatch;
     });
 }
 function getOpAndQueryId(body) {

package/dist/common/transform.js

@@ -77,8 +77,8 @@ class PoolContext {
     }
     static fromPoolState(poolState) {
         const assets = {};
-        Object.entries(poolState.assets)
-            .forEach(([asset, assetState]) => {
+        const accrueInterestAssets = pool_1.Pool.applyAccrueInterest(poolState.assets, poolState.protocolFeeRate);
+        Object.entries(accrueInterestAssets).forEach(([asset, assetState]) => {
             assets[asset] = {
                 amount: new AmountPosition(assetState.totalSupplyAmount, assetState.totalBorrowAmount),
                 share: new SharePosition(assetState.totalSupplyShare, assetState.totalBorrowShare),

package/dist/contracts/core/pool/index.d.ts

@@ -118,6 +118,7 @@ export declare class Pool implements Contract {
     }) => Cell;
     static calculateGasFee(actionOp: number, baseFee: bigint, forwardFee: bigint, forwardTonAmount: bigint, useInternalOracle: boolean, useOracle: boolean, gas: PoolGasFee): bigint;
     getState(provider: ContractProvider): Promise<import("@ton/core").ContractState>;
+    static applyAccrueInterest(assets: Record<string, AssetState>, protocolFeeRate: bigint, time?: number): Record<string, AssetState>;
     static simulateAccrueInterest(poolState: PoolState, time?: number): PoolState;
     getPoolData(provider: ContractProvider): Promise<PoolState>;
     static parsePoolData(data: Slice): {

package/dist/contracts/core/pool/index.js

@@ -245,17 +245,17 @@ class Pool {
     async getState(provider) {
         return await provider.getState();
     }
-    static simulateAccrueInterest(poolState, time) {
+    static applyAccrueInterest(assets, protocolFeeRate, time) {
         const currentTime = BigInt(time ?? BigInt(Math.floor(Date.now() / 1000)));
         const newAssets = {};
-        Object.entries(poolState.assets).forEach(([assetAddress, assetInfo]) => {
+        Object.entries(assets).forEach(([assetAddress, assetInfo]) => {
             if (assetInfo.totalBorrowShare === 0n) {
                 newAssets[assetAddress] = assetInfo;
             }
             else {
                 const timeDelta = currentTime - assetInfo.lastUpdatedTime;
                 const interest = (timeDelta * assetInfo.totalBorrowAmount * assetInfo.storedInterestRate) / 10n ** 36n;
-                const protocolFee = (interest * poolState.protocolFeeRate) / 10000n;
+                const protocolFee = (interest * protocolFeeRate) / 10000n;
                 newAssets[assetAddress] = {
                     ...assetInfo,
                     totalBorrowAmount: assetInfo.totalBorrowAmount + interest,
@@ -265,6 +265,10 @@ class Pool {
                 };
             }
         });
+        return newAssets;
+    }
+    static simulateAccrueInterest(poolState, time) {
+        const newAssets = Pool.applyAccrueInterest(poolState.assets, poolState.protocolFeeRate, time);
         return {
             ...poolState,
             assets: newAssets,

package/dist/lib/send-msg.d.ts

@@ -10,15 +10,12 @@ export type InternalMessageInput = {
 export declare function sendMsg<T>(sender: AddressSender, msg: {
     opts: T;
     input: InternalMessageInput;
-}): Promise<T & {
-    seqno: number;
-}>;
+}): Promise<T>;
 export declare function sendMsgAndWaitTx<T>(ctx: AffluentContext, sender: AddressSender, msg: {
     opts: T;
     input: InternalMessageInput;
-}): Promise<T & {
+}): Promise<Awaited<T> & {
     getExternalHash: () => Promise<import("../utils/external-message-hash").MessageHash>;
-    seqno: number;
 }>;
 export declare function sendMsgAndWaitTxSimple(ctx: AffluentContext, sender: AddressSender, msg: {
     input: InternalMessageInput;

package/dist/lib/send-msg.js

@@ -7,14 +7,15 @@ const core_1 = require("@ton/core");
 const trackable_sender_1 = require("../utils/pending-tracker/trackable-sender");
 const trace_action_1 = require("../common/trace-action");
 async function sendMsg(sender, msg) {
-    const seqno = await sender.getSeqno();
     const { opts, input } = msg;
     await sender.send({ ...input, sendMode: core_1.SendMode.PAY_GAS_SEPARATELY });
-    return { ...opts, seqno };
+    return { ...opts };
 }
 async function sendMsgAndWaitTx(ctx, sender, msg) {
+    const seqnoRes = await ctx.client.provider(sender.address).get("seqno", []);
+    const seqno = seqnoRes.stack.readNumber();
     const result = await sendMsg(sender, msg);
-    const getExternalHash = () => (0, trackable_sender_1.pollExternalTransfer)(ctx.client, sender.address, result.seqno);
+    const getExternalHash = () => (0, trackable_sender_1.pollExternalTransfer)(ctx.client, sender.address, seqno);
     return { ...result, getExternalHash };
 }
 async function sendMsgAndWaitTxSimple(ctx, sender, msg) {

package/dist/services/share-vault/user/index.js

@@ -55,7 +55,7 @@ async function createSupplyMsg(ctx, sender, params, value) {
             opts,
             input: {
                 to: vaultWTONWallet.address,
-                value: value ?? jetton_wallet_2.WTONWallet.Gas.ExternalTransfer,
+                value: value ?? jetton_wallet_2.WTONWallet.Gas.ExternalTransfer + opts.amount + opts.forwardTonAmount,
                 body: vaultWTONWallet.createExternalTransferBody(opts),
             },
         };

package/dist/services/share-vault/user/trace.js

@@ -70,15 +70,16 @@ class ShareVaultWithdrawTracer extends trace_action_1.TracerBase {
                 minter: addresses.vault,
                 description: "Burning Vault Tokens",
             }),
-            ...(0, trace_action_1.createJettonReceiveSteps)({
-                isWTON,
-                sourceWallet: addresses.vaultAssetWallet,
-                actorWallet: addresses.actorAssetWallet,
-                actor: addresses.actor,
-                description: "Receiving Asset",
-            }),
+            // from omitted: could come from vault or pool
+            { to: addresses.actorAssetWallet, description: "Receiving Asset" },
         ];
-        super(toncenterClient, extHash, type, queryId, steps);
+        const failStep = {
+            op: jetton_wallet_1.JettonWallet.Op.InternalTransfer,
+            from: addresses.vault,
+            to: addresses.actorVaultWallet,
+            description: "Refunding Vault Tokens",
+        };
+        super(toncenterClient, extHash, type, queryId, steps, failStep);
     }
 }
 exports.ShareVaultWithdrawTracer = ShareVaultWithdrawTracer;

package/dist/services/strategy-vault/index.d.ts

@@ -212,8 +212,8 @@ export declare class StrategyVaultServiceV1 {
         vaultStateContext: import("../../common/transform").VaultStateContext;
         amountContext: import("../../common/transform").VaultAmountContext;
         valueContext: import("../../common/transform").VaultValueContext;
-        nativeValueDecomposedContext: import("../../common/transform").VaultNativeValueDecomposedContext;
         nativeAmountDecomposedContext: import("../../common/transform").VaultNativeAmountDecomposedContext;
+        nativeValueDecomposedContext: import("../../common/transform").VaultNativeValueDecomposedContext;
         priceInfo: import("../composite-oracle").CompositeOracleResult & {
             targetVaultAddress: string;
             price: bigint;

package/dist/services/strategy-vault/query.d.ts

@@ -144,8 +144,8 @@ export declare function getValuationContext(ctx: AffluentContext, vaultAddress:
     vaultStateContext: VaultStateContext;
     amountContext: import("../../common/transform").VaultAmountContext;
     valueContext: import("../../common/transform").VaultValueContext;
-    nativeValueDecomposedContext: VaultNativeValueDecomposedContext;
     nativeAmountDecomposedContext: VaultNativeAmountDecomposedContext;
+    nativeValueDecomposedContext: VaultNativeValueDecomposedContext;
     priceInfo: import("../composite-oracle").CompositeOracleResult & {
         targetVaultAddress: string;
         price: bigint;

package/dist/services/strategy-vault/query.js

@@ -87,14 +87,14 @@ async function getValuationContext(ctx, vaultAddress) {
     const vaultStateContext = transform_1.VaultStateContext.fromStrategyVaultState(vaultData);
     const amountContext = vaultStateContext.toAmountContext(poolContexts);
     const valueContext = amountContext.toValueContext(priceInfo.allPrices);
-    const nativeValueDecomposedContext = transform_1.VaultNativeValueDecomposedContext.fromValueContext(valueContext, priceInfo.allPrices);
     const nativeAmountDecomposedContext = transform_1.VaultNativeAmountDecomposedContext.fromAmountContext(amountContext, priceInfo.allPrices);
+    const nativeValueDecomposedContext = transform_1.VaultNativeValueDecomposedContext.fromValueContext(valueContext, priceInfo.allPrices);
     return {
         vaultStateContext,
         amountContext,
         valueContext,
-        nativeValueDecomposedContext,
         nativeAmountDecomposedContext,
+        nativeValueDecomposedContext,
         priceInfo,
     };
 }

package/dist/services/strategy-vault/user/trace.js

@@ -95,8 +95,8 @@ class StrategyVaultWithdrawTracer extends trace_action_1.TracerBase {
         ];
         const failStep = {
             op: jetton_wallet_1.JettonWallet.Op.InternalTransfer,
-            from: addresses.vaultWithdrawAssetWallet,
-            to: addresses.actorWithdrawAssetWallet,
+            from: addresses.vault,
+            to: addresses.actorVaultWallet,
             description: "Refunding Withdraw Asset",
         };
         super(toncenterClient, extHash, type, queryId, steps, failStep);

package/dist/types/sender.d.ts

@@ -1,7 +1,6 @@
 import { Address, Sender, SenderArguments } from "@ton/core";
 export interface AddressSender extends Sender {
     readonly address: Address;
-    getSeqno(): Promise<number>;
 }
 export interface MultiSender extends AddressSender {
     multiSend(args: SenderArguments[]): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@affluent-org/sdk",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "affluent-sdk",
   "main": "dist/index.js",
   "scripts": {