@evaafi/sdk 0.3.2 → 0.4.0

package/src/contracts/UserContract.ts

@@ -1,125 +1,160 @@
-import { Address, Contract, ContractProvider, Dictionary } from '@ton/core';
-import { UserData, UserLiteData } from '../types/User';
-import { parseUserData, parseUserLiteData } from '../api/parser';
-import { AssetConfig, ExtendedAssetData } from '../types/Master';
-import { LiquidationBaseData } from './MasterContract';
-import { ASSET_ID } from '../constants';
-
-/**
- * User contract wrapper
- */
-export class EvaaUser implements Contract {
-    readonly address: Address;
-    private lastSync = 0;
-    private _liteData?: UserLiteData;
-    private _data?: UserData;
-
-    /**
-     * Create user contract wrapper from address
-     * @param address user contract address
-     */
-    static createFromAddress(address: Address) {
-        return new EvaaUser(address);
-    }
-
-    private constructor(address: Address) {
-        this.address = address;
-    }
-
-    async getSyncLite(
-        provider: ContractProvider,
-        assetsData: Dictionary<bigint, ExtendedAssetData>,
-        assetsConfig: Dictionary<bigint, AssetConfig>,
-    ) {
-        const state = (await provider.getState()).state;
-        if (state.type === 'active') {
-            this._liteData = parseUserLiteData(state.data!.toString('base64url'), assetsData, assetsConfig);
-            this.lastSync = Math.floor(Date.now() / 1000);
-        } else {
-            this._liteData = undefined;
-            this._data = { type: 'inactive' };
-        }
-    }
-
-    /**
-     * Calculate full user data from lite data and prices
-     * @param assetsData assets data
-     * @param assetsConfig assets config
-     * @param prices prices
-     * @returns true if user data was calculated
-     */
-    calculateUserData(
-        assetsData: Dictionary<bigint, ExtendedAssetData>,
-        assetsConfig: Dictionary<bigint, AssetConfig>,
-        prices: Dictionary<bigint, bigint>,
-    ): boolean {
-        if (this._liteData) {
-            this._data = parseUserData(this._liteData, assetsData, assetsConfig, prices);
-            return true;
-        }
-        return false;
-    }
-
-    async getSync(
-        provider: ContractProvider,
-        assetsData: Dictionary<bigint, ExtendedAssetData>,
-        assetsConfig: Dictionary<bigint, AssetConfig>,
-        prices: Dictionary<bigint, bigint>,
-    ) {
-        const state = (await provider.getState()).state;
-        if (state.type === 'active') {
-            this._liteData = parseUserLiteData(state.data!.toString('base64url'), assetsData, assetsConfig);
-            this._data = parseUserData(this._liteData, assetsData, assetsConfig, prices);
-            this.lastSync = Math.floor(Date.now() / 1000);
-        } else {
-            this._data = { type: 'inactive' };
-        }
-    }
-
-    /**
-     * Get user contract lite data
-     * @returns user lite data if available, otherwise undefined
-     */
-    get liteData(): UserLiteData | undefined {
-        return this._liteData;
-    }
-
-    /**
-     * Get user contract full data
-     * @returns user data if available  , otherwise undefined
-     */
-    get data(): UserData | undefined {
-        return this._data;
-    }
-
-    /**
-     * Get if user is liquidable
-     * @returns true if user is liquidable
-     */
-    get isLiquidable(): boolean {
-        if (!this._data || this._data.type === 'inactive') {
-            return false;
-        }
-
-        return this._data.liquidationData.liquidable;
-    }
-
-    /**
-     * Get liquidation parameters for passing to liquidation message
-     * @returns liquidation parameters if user is liquidable, otherwise undefined
-     */
-    get liquidationParameters(): LiquidationBaseData | undefined {
-        if (!this._data || this._data.type === 'inactive' || !this._data.liquidationData.liquidable) {
-            return undefined;
-        }
-
-        return {
-            borrowerAddress: this._data.ownerAddress,
-            loanAsset: this._data.liquidationData.greatestLoanAsset,
-            collateralAsset: this._data.liquidationData.greatestCollateralAsset,
-            minCollateralAmount: this._data.liquidationData.minCollateralAmount,
-            liquidationAmount: this._data.liquidationData.liquidationAmount,
-            tonLiquidation: this._data.liquidationData.greatestLoanAsset === ASSET_ID.TON,
-        };
-    }
-}
+import { Address, beginCell, Cell, Contract, ContractProvider, Dictionary, Sender, SendMode } from '@ton/core';
+import { UserData, UserLiteData } from '../types/User';
+import { parseUserData, parseUserLiteData } from '../api/parser';
+import { AssetConfig, ExtendedAssetData } from '../types/Master';
+import { LiquidationBaseData } from './MasterContract';
+import { MAINNET_ASSETS_ID, OPCODES } from '../constants';
+
+/**
+ * User contract wrapper
+ */
+export class EvaaUser implements Contract {
+    readonly address: Address;
+    readonly testnet: boolean = false;
+    private lastSync = 0;
+    private _liteData?: UserLiteData;
+    private _data?: UserData;
+
+    /**
+     * Create user contract wrapper from address
+     * @param address user contract address
+     * @param testnet testnet flag
+     */
+    static createFromAddress(address: Address, testnet: boolean = false) {
+        return new EvaaUser(address, testnet);
+    }
+
+    private constructor(address: Address, testnet: boolean = false) {
+        this.address = address;
+        this.testnet = testnet;
+    }
+
+    async getSyncLite(
+        provider: ContractProvider,
+        assetsData: Dictionary<bigint, ExtendedAssetData>,
+        assetsConfig: Dictionary<bigint, AssetConfig>,
+    ) {
+        const state = (await provider.getState()).state;
+        if (state.type === 'active') {
+            this._liteData = parseUserLiteData(
+                state.data!.toString('base64url'),
+                assetsData,
+                assetsConfig,
+                this.testnet,
+            );
+            this.lastSync = Math.floor(Date.now() / 1000);
+        } else {
+            this._liteData = undefined;
+            this._data = { type: 'inactive' };
+        }
+    }
+
+    /**
+     * Calculate full user data from lite data and prices
+     * @param assetsData assets data
+     * @param assetsConfig assets config
+     * @param prices prices
+     * @returns true if user data was calculated
+     */
+    calculateUserData(
+        assetsData: Dictionary<bigint, ExtendedAssetData>,
+        assetsConfig: Dictionary<bigint, AssetConfig>,
+        prices: Dictionary<bigint, bigint>,
+    ): boolean {
+        if (this._liteData) {
+            this._data = parseUserData(this._liteData, assetsData, assetsConfig, prices, this.testnet);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Open user contract wrapper
+     * @param forwardPayload - payload that will be forwarded to the address which requested the data
+     */
+    async sendOnchainGetter(
+        provider: ContractProvider,
+        via: Sender,
+        value: bigint,
+        queryID: bigint,
+        forwardPayload: Cell,
+    ) {
+        await provider.internal(via, {
+            value,
+            sendMode: SendMode.PAY_GAS_SEPARATELY + SendMode.IGNORE_ERRORS,
+            body: beginCell()
+                .storeCoins(BigInt(OPCODES.ONCHAIN_GETTER))
+                .storeUint(queryID, 64)
+                .storeRef(forwardPayload)
+                .endCell(),
+        });
+    }
+
+    async getSync(
+        provider: ContractProvider,
+        assetsData: Dictionary<bigint, ExtendedAssetData>,
+        assetsConfig: Dictionary<bigint, AssetConfig>,
+        prices: Dictionary<bigint, bigint>,
+    ) {
+        const state = (await provider.getState()).state;
+        if (state.type === 'active') {
+            this._liteData = parseUserLiteData(
+                state.data!.toString('base64url'),
+                assetsData,
+                assetsConfig,
+                this.testnet,
+            );
+            this._data = parseUserData(this._liteData, assetsData, assetsConfig, prices, this.testnet);
+            this.lastSync = Math.floor(Date.now() / 1000);
+        } else {
+            this._data = { type: 'inactive' };
+        }
+    }
+
+    /**
+     * Get user contract lite data
+     * @returns user lite data if available, otherwise undefined
+     */
+    get liteData(): UserLiteData | undefined {
+        return this._liteData;
+    }
+
+    /**
+     * Get user contract full data
+     * @returns user data if available  , otherwise undefined
+     */
+    get data(): UserData | undefined {
+        return this._data;
+    }
+
+    /**
+     * Get if user is liquidable
+     * @returns true if user is liquidable
+     */
+    get isLiquidable(): boolean {
+        if (!this._data || this._data.type === 'inactive') {
+            return false;
+        }
+
+        return this._data.liquidationData.liquidable;
+    }
+
+    /**
+     * Get liquidation parameters for passing to liquidation message
+     * @returns liquidation parameters if user is liquidable, otherwise undefined
+     */
+    get liquidationParameters(): LiquidationBaseData | undefined {
+        if (!this._data || this._data.type === 'inactive' || !this._data.liquidationData.liquidable) {
+            return undefined;
+        }
+
+        return {
+            borrowerAddress: this._data.ownerAddress,
+            loanAsset: this._data.liquidationData.greatestLoanAsset,
+            collateralAsset: this._data.liquidationData.greatestCollateralAsset,
+            minCollateralAmount: this._data.liquidationData.minCollateralAmount,
+            liquidationAmount: this._data.liquidationData.liquidationAmount,
+            tonLiquidation: this._data.liquidationData.greatestLoanAsset === MAINNET_ASSETS_ID.TON,
+        };
+    }
+}

package/src/index.ts

@@ -1,78 +1,76 @@
-// Math
-export {
-    mulFactor,
-    mulDiv,
-    bigIntMin,
-    bigIntMax,
-    calculatePresentValue,
-    calculateCurrentRates,
-    calculateAssetData,
-    calculateAssetInterest,
-    getAvailableToBorrow,
-    presentValue,
-    calculateLiquidationData,
-} from './api/math';
-
-// Parser
-export { createAssetData, createAssetConfig, parseMasterData, parseUserData } from './api/parser';
-
-// Prices
-export { getPrices } from './api/prices';
-
-// Contracts' wrappers
-export { JettonWallet } from './contracts/JettonWallet';
-export {
-    EvaaParameters,
-    JettonMessageParameters,
-    TonSupplyParameters,
-    JettonSupplyParameters,
-    WithdrawParameters,
-    LiquidationBaseData,
-    TonLiquidationParameters,
-    JettonLiquidationParameters,
-    Evaa,
-} from './contracts/MasterContract';
-export { EvaaUser } from './contracts/UserContract';
-
-// Types
-export { PriceData } from './types/Common';
-export {
-    UpgradeConfig,
-    AssetConfig,
-    MasterConfig,
-    AssetData,
-    AssetInterest,
-    AssetApy,
-    ExtendedAssetData,
-    MasterData,
-} from './types/Master';
-export {
-    BalanceType,
-    UserBalance,
-    UserLiqudationData,
-    LiquidableData,
-    NonLiquidableData,
-    LiquidationData,
-    UserDataInactive,
-    UserDataActive,
-    UserData,
-} from './types/User';
-
-// Constants
-export {
-    EVAA_MASTER_MAINNET,
-    MAINNET_VERSION,
-    EVAA_MASTER_TESTNET,
-    TESTNET_VERSION,
-    ASSET_ID,
-    JETTON_MASTER_ADDRESSES,
-    MASTER_CONSTANTS,
-    LENDING_CODE,
-    JETTON_WALLET_CODE,
-    OPCODES,
-    FEES,
-} from './constants';
-
-// Utils
-export { getLastSentBoc, getTonConnectSender } from './utils/tonConnectSender';
-export { getUserJettonWallet } from './utils/userJettonWallet';
+// Math
+export {
+    mulFactor,
+    mulDiv,
+    bigIntMin,
+    bigIntMax,
+    calculatePresentValue,
+    calculateCurrentRates,
+    calculateAssetData,
+    calculateAssetInterest,
+    getAvailableToBorrow,
+    presentValue,
+    calculateLiquidationData,
+} from './api/math';
+
+// Parser
+export { createAssetData, createAssetConfig, parseMasterData, parseUserData, parseUserLiteData } from './api/parser';
+
+// Prices
+export { getPrices } from './api/prices';
+
+// Contracts' wrappers
+export { JettonWallet } from './contracts/JettonWallet';
+export {
+    EvaaParameters,
+    JettonMessageParameters,
+    TonSupplyParameters,
+    JettonSupplyParameters,
+    WithdrawParameters,
+    LiquidationBaseData,
+    TonLiquidationParameters,
+    JettonLiquidationParameters,
+    Evaa,
+} from './contracts/MasterContract';
+export { EvaaUser } from './contracts/UserContract';
+
+// Types
+export { PriceData } from './types/Common';
+export {
+    UpgradeConfig,
+    AssetConfig,
+    MasterConfig,
+    AssetData,
+    AssetInterest,
+    AssetApy,
+    ExtendedAssetData,
+    MasterData,
+} from './types/Master';
+export {
+    BalanceType,
+    UserBalance,
+    UserLiqudationData,
+    LiquidableData,
+    NonLiquidableData,
+    LiquidationData,
+    UserDataInactive,
+    UserDataActive,
+    UserData,
+} from './types/User';
+
+// Constants
+export {
+    EVAA_MASTER_MAINNET,
+    MAINNET_VERSION,
+    EVAA_MASTER_TESTNET,
+    TESTNET_VERSION,
+    JETTON_MASTER_ADDRESSES,
+    MASTER_CONSTANTS,
+    LENDING_CODE,
+    OPCODES,
+    FEES,
+} from './constants';
+
+// Utils
+export { getLastSentBoc, getTonConnectSender } from './utils/tonConnectSender';
+export { getUserJettonWallet } from './utils/userJettonWallet';

package/src/types/Master.ts

@@ -1,71 +1,72 @@
-import { Address, Cell, Dictionary } from '@ton/core';
-
-export type UpgradeConfig = {
-    masterCodeVersion: number;
-    userCodeVersion: number;
-    timeout: number;
-    updateTime: number;
-    freezeTime: number;
-    userCode: Cell;
-    blankCode: Cell;
-    newMasterCode: Cell | null;
-    newUserCode: Cell | null;
-};
-
-export type AssetConfig = {
-    oracle: bigint;
-    decimals: bigint;
-    collateralFactor: bigint;
-    liquidationThreshold: bigint;
-    liquidationBonus: bigint;
-    baseBorrowRate: bigint;
-    borrowRateSlopeLow: bigint;
-    borrowRateSlopeHigh: bigint;
-    supplyRateSlopeLow: bigint;
-    supplyRateSlopeHigh: bigint;
-    targetUtilization: bigint;
-    originationFee: bigint;
-    dust: bigint;
-};
-
-export type MasterConfig = {
-    ifActive: number;
-    admin: Address;
-    adminPK: bigint;
-    tokenKeys: Cell | null;
-    walletToMaster: Cell | null;
-};
-
-export type AssetData = {
-    sRate: bigint;
-    bRate: bigint;
-    totalSupply: bigint;
-    totalBorrow: bigint;
-    lastAccural: bigint;
-    balance: bigint;
-};
-
-export type AssetInterest = {
-    supplyInterest: bigint;
-    borrowInterest: bigint;
-};
-
-export type AssetApy = {
-    supplyApy: number;
-    borrowApy: number;
-};
-
-export type ExtendedAssetData = AssetData & AssetInterest & AssetApy;
-
-export type MasterData = {
-    meta: string;
-    upgradeConfig: UpgradeConfig;
-    masterConfig: MasterConfig;
-    assetsConfig: Dictionary<bigint, AssetConfig>;
-    assetsData: Dictionary<bigint, ExtendedAssetData>;
-    assetsReserves: Dictionary<bigint, bigint>;
-    apy: {
-        supply: Dictionary<bigint, number>;
-        borrow: Dictionary<bigint, number>;
-    };
-};
+import { Address, Cell, Dictionary } from '@ton/core';
+
+export type UpgradeConfig = {
+    masterCodeVersion: number;
+    userCodeVersion: number;
+    timeout: number;
+    updateTime: number;
+    freezeTime: number;
+    userCode: Cell;
+    blankCode: Cell;
+    newMasterCode: Cell | null;
+    newUserCode: Cell | null;
+};
+
+export type AssetConfig = {
+    oracle: bigint;
+    decimals: bigint;
+    collateralFactor: bigint;
+    liquidationThreshold: bigint;
+    liquidationBonus: bigint;
+    baseBorrowRate: bigint;
+    borrowRateSlopeLow: bigint;
+    borrowRateSlopeHigh: bigint;
+    supplyRateSlopeLow: bigint;
+    supplyRateSlopeHigh: bigint;
+    targetUtilization: bigint;
+    originationFee: bigint;
+    dust: bigint;
+    maxTotalSupply: bigint;
+};
+
+export type MasterConfig = {
+    ifActive: number;
+    admin: Address;
+    adminPK: bigint;
+    tokenKeys: Cell | null;
+    walletToMaster: Cell | null;
+};
+
+export type AssetData = {
+    sRate: bigint;
+    bRate: bigint;
+    totalSupply: bigint;
+    totalBorrow: bigint;
+    lastAccural: bigint;
+    balance: bigint;
+};
+
+export type AssetInterest = {
+    supplyInterest: bigint;
+    borrowInterest: bigint;
+};
+
+export type AssetApy = {
+    supplyApy: number;
+    borrowApy: number;
+};
+
+export type ExtendedAssetData = AssetData & AssetInterest & AssetApy;
+
+export type MasterData = {
+    meta: string;
+    upgradeConfig: UpgradeConfig;
+    masterConfig: MasterConfig;
+    assetsConfig: Dictionary<bigint, AssetConfig>;
+    assetsData: Dictionary<bigint, ExtendedAssetData>;
+    assetsReserves: Dictionary<bigint, bigint>;
+    apy: {
+        supply: Dictionary<bigint, number>;
+        borrow: Dictionary<bigint, number>;
+    };
+};

package/src/utils/userJettonWallet.ts

@@ -1,52 +1,65 @@
-import { Address, beginCell, storeStateInit } from '@ton/core';
-import { ASSET_ID, JETTON_MASTER_ADDRESSES, JETTON_WALLET_CODE } from '../constants';
+import { Address, beginCell, Cell, storeStateInit } from '@ton/core';
+import { JETTON_MASTER_ADDRESSES, JETTON_WALLETS_CODE, MAINNET_ASSETS_ID } from '../constants';
 
 export function getUserJettonWallet(ownerAddress: Address, assetID: bigint, network: 'mainnet' | 'testnet'): Address {
     const builder = beginCell().storeCoins(0).storeAddress(ownerAddress);
+    let jettonWalletCode: Cell;
     switch (assetID) {
-        case ASSET_ID.jUSDT:
+        case MAINNET_ASSETS_ID.jUSDT:
             if (network === 'mainnet') {
                 builder.storeAddress(JETTON_MASTER_ADDRESSES.jUSDT_MAINNET);
+                jettonWalletCode = JETTON_WALLETS_CODE.jUSDT_MAINNET;
             } else {
                 builder.storeAddress(JETTON_MASTER_ADDRESSES.jUSDT_TESTNET);
+                jettonWalletCode = JETTON_WALLETS_CODE.jUSDT_TESTNET;
             }
             break;
-        case ASSET_ID.jUSDC:
+        case MAINNET_ASSETS_ID.jUSDC:
             if (network === 'mainnet') {
                 builder.storeAddress(JETTON_MASTER_ADDRESSES.jUSDC_MAINNET);
+                jettonWalletCode = JETTON_WALLETS_CODE.jUSDC_MAINNET;
             } else {
                 builder.storeAddress(JETTON_MASTER_ADDRESSES.jUSDC_TESTNET);
+                jettonWalletCode = JETTON_WALLETS_CODE.jUSDC_TESTNET;
             }
             break;
-        case ASSET_ID.stTON:
+        case MAINNET_ASSETS_ID.stTON:
             if (network === 'mainnet') {
                 builder.storeAddress(JETTON_MASTER_ADDRESSES.stTON_MAINNET);
+                jettonWalletCode = JETTON_WALLETS_CODE.stTON_MAINNET;
             } else {
                 builder.storeAddress(JETTON_MASTER_ADDRESSES.stTON_TESTNET);
+                jettonWalletCode = JETTON_WALLETS_CODE.stTON_TESTNET;
             }
             break;
-        case ASSET_ID.tsTON:
+        case MAINNET_ASSETS_ID.tsTON:
             if (network === 'mainnet') {
                 builder.storeAddress(JETTON_MASTER_ADDRESSES.tsTON_MAINNET);
+                jettonWalletCode = JETTON_WALLETS_CODE.tsTON_MAINNET;
             } else {
-                builder.storeAddress(JETTON_MASTER_ADDRESSES.tsTON_TESTNET);
+                // builder.storeAddress(JETTON_MASTER_ADDRESSES.tsTON_TESTNET);
+                // jettonWalletCode = JETTON_WALLETS_CODE.tsTON_TESTNET;
+                throw new Error('tsTON is not supported on testnet');
             }
             break;
-        case ASSET_ID.USDT:
+        case MAINNET_ASSETS_ID.USDT:
             if (network === 'mainnet') {
                 builder.storeAddress(JETTON_MASTER_ADDRESSES.USDT_MAINNET);
+                jettonWalletCode = JETTON_WALLETS_CODE.USDT_MAINNET;
             } else {
-                builder.storeAddress(JETTON_MASTER_ADDRESSES.USDT_TESTNET);
+                // builder.storeAddress(JETTON_MASTER_ADDRESSES.USDT_TESTNET);
+                // jettonWalletCode = JETTON_WALLETS_CODE.USDT_TESTNET;
+                throw new Error('USDT is not supported on testnet');
             }
             break;
         default:
             throw new Error('Unsupported asset');
     }
-    const data = builder.storeRef(JETTON_WALLET_CODE).endCell();
+    const data = builder.storeRef(jettonWalletCode).endCell();
     const stateInit = beginCell()
         .store(
             storeStateInit({
-                code: JETTON_WALLET_CODE,
+                code: jettonWalletCode,
                 data: data,
             }),
         )