@kehtus/proportion-sdk 0.1.0 → 0.1.2

package/dist/abi/fundedAccount.js

@@ -75,13 +75,13 @@ export const fundedAccountAbi = [
         "anonymous": false,
         "inputs": [
             {
-                "indexed": true,
-                "internalType": "address",
-                "name": "wallet",
-                "type": "address"
+                "indexed": false,
+                "internalType": "uint64",
+                "name": "amount",
+                "type": "uint64"
             }
         ],
-        "name": "BuilderRiskEngineWalletSet",
+        "name": "BridgedToEvm",
         "type": "event"
     },
     {
@@ -210,31 +210,6 @@ export const fundedAccountAbi = [
         "name": "Initialized",
         "type": "event"
     },
-    {
-        "anonymous": false,
-        "inputs": [
-            {
-                "indexed": true,
-                "internalType": "address",
-                "name": "owner",
-                "type": "address"
-            },
-            {
-                "indexed": false,
-                "internalType": "uint64",
-                "name": "ntlPos",
-                "type": "uint64"
-            },
-            {
-                "indexed": false,
-                "internalType": "int64",
-                "name": "accountValue",
-                "type": "int64"
-            }
-        ],
-        "name": "LeverageBreached",
-        "type": "event"
-    },
     {
         "anonymous": false,
         "inputs": [
@@ -260,19 +235,6 @@ export const fundedAccountAbi = [
         "name": "PositionLeverageBreached",
         "type": "event"
     },
-    {
-        "anonymous": false,
-        "inputs": [
-            {
-                "indexed": true,
-                "internalType": "address",
-                "name": "wallet",
-                "type": "address"
-            }
-        ],
-        "name": "RiskEngineWalletSet",
-        "type": "event"
-    },
     {
         "anonymous": false,
         "inputs": [
@@ -426,25 +388,6 @@ export const fundedAccountAbi = [
         "name": "VaultReturnInitiated",
         "type": "event"
     },
-    {
-        "anonymous": false,
-        "inputs": [
-            {
-                "indexed": true,
-                "internalType": "address",
-                "name": "owner",
-                "type": "address"
-            },
-            {
-                "indexed": false,
-                "internalType": "uint256",
-                "name": "profit",
-                "type": "uint256"
-            }
-        ],
-        "name": "WithdrawalCancelled",
-        "type": "event"
-    },
     {
         "anonymous": false,
         "inputs": [
@@ -639,7 +582,7 @@ export const fundedAccountAbi = [
     },
     {
         "inputs": [],
-        "name": "PERP_DEX_INDEX",
+        "name": "PERP_DEX_COUNT",
         "outputs": [
             {
                 "internalType": "uint32",
@@ -715,19 +658,6 @@ export const fundedAccountAbi = [
         "stateMutability": "view",
         "type": "function"
     },
-    {
-        "inputs": [],
-        "name": "WITHDRAWAL_TIMEOUT",
-        "outputs": [
-            {
-                "internalType": "uint256",
-                "name": "",
-                "type": "uint256"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
     {
         "inputs": [],
         "name": "accountSize",
@@ -769,20 +699,14 @@ export const fundedAccountAbi = [
     },
     {
         "inputs": [],
-        "name": "builder",
-        "outputs": [
-            {
-                "internalType": "address",
-                "name": "",
-                "type": "address"
-            }
-        ],
-        "stateMutability": "view",
+        "name": "bridgeToEvm",
+        "outputs": [],
+        "stateMutability": "nonpayable",
         "type": "function"
     },
     {
         "inputs": [],
-        "name": "builderRiskEngineWallet",
+        "name": "builder",
         "outputs": [
             {
                 "internalType": "address",
@@ -806,13 +730,6 @@ export const fundedAccountAbi = [
         "stateMutability": "view",
         "type": "function"
     },
-    {
-        "inputs": [],
-        "name": "cancelStuckWithdrawal",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
     {
         "inputs": [],
         "name": "cancelSubscription",
@@ -962,6 +879,19 @@ export const fundedAccountAbi = [
         "stateMutability": "nonpayable",
         "type": "function"
     },
+    {
+        "inputs": [],
+        "name": "forwarder",
+        "outputs": [
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
     {
         "inputs": [],
         "name": "getAllCheckpoints",
@@ -1066,6 +996,11 @@ export const fundedAccountAbi = [
                 "name": "_builder",
                 "type": "address"
             },
+            {
+                "internalType": "address",
+                "name": "_forwarder",
+                "type": "address"
+            },
             {
                 "internalType": "uint96",
                 "name": "_accountSize",
@@ -1139,6 +1074,25 @@ export const fundedAccountAbi = [
         "stateMutability": "view",
         "type": "function"
     },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "_forwarder",
+                "type": "address"
+            }
+        ],
+        "name": "isTrustedForwarder",
+        "outputs": [
+            {
+                "internalType": "bool",
+                "name": "",
+                "type": "bool"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
     {
         "inputs": [],
         "name": "lastCheckpointDay",
@@ -1186,11 +1140,6 @@ export const fundedAccountAbi = [
                 "internalType": "uint256",
                 "name": "profit",
                 "type": "uint256"
-            },
-            {
-                "internalType": "uint48",
-                "name": "requestedAt",
-                "type": "uint48"
             }
         ],
         "stateMutability": "view",
@@ -1236,19 +1185,6 @@ export const fundedAccountAbi = [
         "stateMutability": "view",
         "type": "function"
     },
-    {
-        "inputs": [],
-        "name": "riskEngineWallet",
-        "outputs": [
-            {
-                "internalType": "address",
-                "name": "",
-                "type": "address"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
     {
         "inputs": [
             {
@@ -1262,19 +1198,6 @@ export const fundedAccountAbi = [
         "stateMutability": "nonpayable",
         "type": "function"
     },
-    {
-        "inputs": [
-            {
-                "internalType": "address",
-                "name": "_wallet",
-                "type": "address"
-            }
-        ],
-        "name": "setRiskEngineWallet",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
     {
         "inputs": [],
         "name": "state",

package/dist/abi/mainVault.d.ts

@@ -642,16 +642,6 @@ export declare const mainVaultAbi: readonly [{
     }];
     readonly stateMutability: "view";
     readonly type: "function";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "HYPERCORE_NEW_ACCOUNT_FEE";
-    readonly outputs: readonly [{
-        readonly internalType: "uint256";
-        readonly name: "";
-        readonly type: "uint256";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
 }, {
     readonly inputs: readonly [];
     readonly name: "MAX_ACCOUNT_SIZE";

package/dist/abi/mainVault.js

@@ -812,19 +812,6 @@ export const mainVaultAbi = [
         "stateMutability": "view",
         "type": "function"
     },
-    {
-        "inputs": [],
-        "name": "HYPERCORE_NEW_ACCOUNT_FEE",
-        "outputs": [
-            {
-                "internalType": "uint256",
-                "name": "",
-                "type": "uint256"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
     {
         "inputs": [],
         "name": "MAX_ACCOUNT_SIZE",

package/dist/account.d.ts

@@ -28,7 +28,6 @@ export declare class AccountModule {
     }>>;
     getPendingWithdrawal(account: Address): Promise<{
         profit: bigint;
-        requestedAt: number;
     }>;
     getAccountConfig(account: Address): Promise<{
         usdc: Address;
@@ -40,16 +39,15 @@ export declare class AccountModule {
     setApiWallet(account: Address, wallet: Address): Promise<Hash>;
     requestWithdrawProfit(account: Address): Promise<Hash>;
     cancelSubscription(account: Address): Promise<Hash>;
-    cancelStuckWithdrawal(account: Address): Promise<Hash>;
     checkpoint(account: Address): Promise<Hash>;
     initiateClose(account: Address): Promise<Hash>;
     initiateCloseForPerp(account: Address, perpIndex: number): Promise<Hash>;
     initiateCloseAdmin(account: Address): Promise<Hash>;
     closeAndReturn(account: Address): Promise<Hash>;
+    bridgeToEvm(account: Address): Promise<Hash>;
     finalizeReturn(account: Address): Promise<Hash>;
     claimWithdrawal(account: Address): Promise<Hash>;
     claimSubscriptionFee(account: Address): Promise<Hash>;
     rescueStuckFunds(account: Address): Promise<Hash>;
-    setRiskEngineWallet(account: Address, wallet: Address): Promise<Hash>;
 }
 export {};

package/dist/account.js

@@ -38,8 +38,6 @@ export class AccountModule {
                 { ...contract, functionName: "subscriptionCancelled" },
                 { ...contract, functionName: "pendingSubscriptionFee" },
                 { ...contract, functionName: "apiWallet" },
-                { ...contract, functionName: "riskEngineWallet" },
-                { ...contract, functionName: "builderRiskEngineWallet" },
                 { ...contract, functionName: "checkpointIndex" },
                 { ...contract, functionName: "profitableDaysCount" },
                 { ...contract, functionName: "totalCheckpoints" },
@@ -55,10 +53,10 @@ export class AccountModule {
                 { ...contract, functionName: "getAllCheckpoints" },
             ],
         });
-        const checkpointIndex = results[16].result;
-        const totalCp = results[18].result;
-        const [profit, requestedAt] = results[22].result;
-        const rawCheckpoints = results[28].result;
+        const checkpointIndex = results[14].result;
+        const totalCp = results[16].result;
+        const profit = results[20].result;
+        const rawCheckpoints = results[26].result;
         const checkpoints = normalizeCheckpoints(rawCheckpoints, totalCp, checkpointIndex);
         return {
             address: account,
@@ -76,20 +74,18 @@ export class AccountModule {
             subscriptionCancelled: results[11].result,
             pendingSubscriptionFee: results[12].result,
             apiWallet: results[13].result,
-            riskEngineWallet: results[14].result,
-            builderRiskEngineWallet: results[15].result,
             checkpointIndex,
-            profitableDaysCount: results[17].result,
+            profitableDaysCount: results[15].result,
             totalCheckpoints: totalCp,
-            lastCheckpointDay: results[19].result,
-            closingInitiatedAt: Number(results[20].result),
-            returnInitiatedAt: Number(results[21].result),
-            pendingWithdrawal: { profit, requestedAt: Number(requestedAt) },
-            trailingFloor: results[23].result,
-            dailyFloor: results[24].result,
-            subscriptionFee: results[25].result,
-            isSubscriptionActive: results[26].result,
-            canWithdrawProfit: results[27].result,
+            lastCheckpointDay: results[17].result,
+            closingInitiatedAt: Number(results[18].result),
+            returnInitiatedAt: Number(results[19].result),
+            pendingWithdrawal: { profit },
+            trailingFloor: results[21].result,
+            dailyFloor: results[22].result,
+            subscriptionFee: results[23].result,
+            isSubscriptionActive: results[24].result,
+            canWithdrawProfit: results[25].result,
             checkpoints,
         };
     }
@@ -150,12 +146,12 @@ export class AccountModule {
         return normalizeCheckpoints(all, Number(total), Number(checkpointIndex));
     }
     async getPendingWithdrawal(account) {
-        const result = await this.publicClient.readContract({
+        const profit = await this.publicClient.readContract({
             address: account,
             abi: fundedAccountAbi,
             functionName: "pendingWithdrawal",
         });
-        return { profit: result[0], requestedAt: Number(result[1]) };
+        return { profit };
     }
     async getAccountConfig(account) {
         const contract = { address: account, abi: fundedAccountAbi };
@@ -206,13 +202,6 @@ export class AccountModule {
             functionName: "cancelSubscription",
         });
     }
-    async cancelStuckWithdrawal(account) {
-        return this.write({
-            address: account,
-            abi: fundedAccountAbi,
-            functionName: "cancelStuckWithdrawal",
-        });
-    }
     // ── PERMISSIONLESS WRITES ───────────────────────────
     async checkpoint(account) {
         return this.write({
@@ -250,6 +239,13 @@ export class AccountModule {
             functionName: "closeAndReturn",
         });
     }
+    async bridgeToEvm(account) {
+        return this.write({
+            address: account,
+            abi: fundedAccountAbi,
+            functionName: "bridgeToEvm",
+        });
+    }
     async finalizeReturn(account) {
         return this.write({
             address: account,
@@ -278,13 +274,4 @@ export class AccountModule {
             functionName: "rescueStuckFunds",
         });
     }
-    // ── RISK ENGINE WRITES ──────────────────────────────
-    async setRiskEngineWallet(account, wallet) {
-        return this.write({
-            address: account,
-            abi: fundedAccountAbi,
-            functionName: "setRiskEngineWallet",
-            args: [wallet],
-        });
-    }
 }

package/dist/constants.d.ts

@@ -19,8 +19,9 @@ export declare const hyperEvm: {
     };
 };
 export declare const ADDRESSES: {
-    readonly MAIN_VAULT: "0x4478888dA8d22E275344C1A24BDEbcf2bfE2dc45";
-    readonly FACTORY: "0xb7cE604a000CCFCe7c7DAfFBaefD26c33C86CE7A";
+    readonly MAIN_VAULT: "0x3A8cD3feb02959B2AB622Fcebe40A477c73f9488";
+    readonly FACTORY: "0x04B71DC7414Bfa940D1c11f839011B6a11031D2E";
+    readonly FORWARDER: "0x5961880B2C461F9733EC71720528461840881f4E";
     readonly USDC: "0xb88339CB7199b77E23DB6E890353E22632Ba630f";
 };
 export declare const BPS = 10000n;
@@ -38,7 +39,6 @@ export declare const USDC_DECIMALS = 6;
 export declare const ACCOUNT_VALUE_DECIMALS = 8;
 export declare const DECIMALS_MULTIPLIER = 100n;
 export declare const SUBSCRIPTION_PERIOD: number;
-export declare const WITHDRAWAL_TIMEOUT: number;
 export declare const BRIDGE_DELAY = 30;
 export declare const CLOSING_TIMEOUT: number;
 export declare const CHECKPOINT_INTERVAL = 86400;

package/dist/constants.js

@@ -9,8 +9,9 @@ export const hyperEvm = {
     },
 };
 export const ADDRESSES = {
-    MAIN_VAULT: "0x4478888dA8d22E275344C1A24BDEbcf2bfE2dc45",
-    FACTORY: "0xb7cE604a000CCFCe7c7DAfFBaefD26c33C86CE7A",
+    MAIN_VAULT: "0x3A8cD3feb02959B2AB622Fcebe40A477c73f9488",
+    FACTORY: "0x04B71DC7414Bfa940D1c11f839011B6a11031D2E",
+    FORWARDER: "0x5961880B2C461F9733EC71720528461840881f4E",
     USDC: "0xb88339CB7199b77E23DB6E890353E22632Ba630f",
 };
 // BPS
@@ -27,11 +28,11 @@ export const MAX_SINGLE_ACCOUNT_BPS = 1000n;
 export const HYPE_FOR_GAS = 1000000000000000n; // 0.001 ether
 // Decimals
 export const USDC_DECIMALS = 6;
-export const ACCOUNT_VALUE_DECIMALS = 8;
-export const DECIMALS_MULTIPLIER = 100n; // 6→8 dec
+export const ACCOUNT_VALUE_DECIMALS = 8; // spotBalance, spotSend
+export const DECIMALS_MULTIPLIER = 100n; // 6dec→8dec (used for spotSend conversion)
+// Note: accountValue, HWM, dayStartValue, floors are all 6dec (accountMarginSummary returns 6dec)
 // Time (seconds)
 export const SUBSCRIPTION_PERIOD = 30 * 86400;
-export const WITHDRAWAL_TIMEOUT = 7 * 86400;
 export const BRIDGE_DELAY = 30;
 export const CLOSING_TIMEOUT = 3 * 86400;
 export const CHECKPOINT_INTERVAL = 86400;

package/dist/indexer.js

@@ -14,7 +14,7 @@ export class IndexerModule {
     }
     static PAGE_SIZE = 1000;
     static VAULT_FIELDS = `id address totalDeposits totalWithdrawals totalActivationFees cumulativeActivationFeesToVault totalAllocated totalShares cumulativeProfitShares cumulativeCancelledProfit cumulativeSubscriptionFees cumulativeProtocolFeesRouted cumulativeHypercoreFees cumulativeAccountGains cumulativeAccountLosses cumulativeRescuedFunds totalAccountsActivated totalAccountsActive totalAccountsClosed paused subscriptionFeeMultiplier protocolFeeBps protocolFeeReceiver updatedAt`;
-    static ACCOUNT_FIELDS = `id owner builder { id address vaultAddress } vaultAddress factoryAddress state accountSize drawdownBps dailyDrawdownEnabled activationFee highWaterMark profitableDaysCount lastCheckpointDay totalCheckpoints subscriptionPaidUntil subscriptionCancelled pendingSubscriptionFee subscriptionFeeMultiplier dayStartValue apiWallet riskEngineWallet builderRiskEngineWallet createdAt activatedAt closingInitiatedAt returnInitiatedAt closedAt returnedAmount breachType breachValue breachFloor closePendingSubFee closePendingProfit lastWithdrawalId updatedAt`;
+    static ACCOUNT_FIELDS = `id owner builder { id address vaultAddress } vaultAddress factoryAddress state accountSize drawdownBps dailyDrawdownEnabled activationFee highWaterMark profitableDaysCount lastCheckpointDay totalCheckpoints subscriptionPaidUntil subscriptionCancelled pendingSubscriptionFee subscriptionFeeMultiplier dayStartValue apiWallet createdAt activatedAt closingInitiatedAt returnInitiatedAt closedAt returnedAmount breachType breachValue breachFloor closePendingSubFee closePendingProfit lastWithdrawalId updatedAt`;
     static MAIN_VAULT_CONFIG_FIELDS = `id vaultAddress factoryAddress owner pendingOwner relayer paused protocolFeeReceiver feeMultiplier subscriptionFeeMultiplier dailyDdDiscountBps minBuilderShares builderLeverage protocolFeeBps minAccountSize maxAccountSize minDrawdownBps maxDrawdownBps maxUtilizationBps maxSingleAccountBps hypeForSpot maxCap createdAt updatedAt`;
     static FACTORY_CONFIG_FIELDS = `id factoryAddress vaultAddress owner pendingOwner createdAt updatedAt`;
     static CONFIG_CHANGE_FIELDS = `id contractAddress contractType field oldValue newValue blockNumber timestamp txHash`;

package/dist/types.d.ts

@@ -35,7 +35,7 @@ export declare enum AccountState {
 }
 export type AccountStateLabel = "UNINITIALIZED" | "INITIALIZED" | "ACTIVE" | "WITHDRAWAL_PENDING" | "CLOSING" | "RETURNING" | "CLOSED";
 export type IndexerAccountStateLabel = "INITIALIZED" | "ACTIVE" | "WITHDRAWAL_PENDING" | "CLOSING" | "RETURNING" | "CLOSED";
-export type BreachType = "TRAILING_DRAWDOWN" | "DAILY_DRAWDOWN" | "LEVERAGE" | "POSITION_LEVERAGE" | "UNAUTHORIZED_ASSET" | "SUBSCRIPTION_EXPIRED";
+export type BreachType = "TRAILING_DRAWDOWN" | "DAILY_DRAWDOWN" | "POSITION_LEVERAGE" | "UNAUTHORIZED_ASSET" | "SUBSCRIPTION_EXPIRED";
 export interface VaultStats {
     totalAssets: bigint;
     sharePrice: bigint;
@@ -92,8 +92,6 @@ export interface AccountDetails {
     subscriptionCancelled: boolean;
     pendingSubscriptionFee: bigint;
     apiWallet: Address;
-    riskEngineWallet: Address;
-    builderRiskEngineWallet: Address;
     checkpointIndex: number;
     totalCheckpoints: number;
     profitableDaysCount: number;
@@ -102,7 +100,6 @@ export interface AccountDetails {
     returnInitiatedAt: number;
     pendingWithdrawal: {
         profit: bigint;
-        requestedAt: number;
     };
     trailingFloor: bigint;
     dailyFloor: bigint;
@@ -185,8 +182,6 @@ export interface GqlAccount {
     subscriptionFeeMultiplier: number;
     dayStartValue: string;
     apiWallet: string | null;
-    riskEngineWallet: string | null;
-    builderRiskEngineWallet: string | null;
     createdAt: string;
     activatedAt: string | null;
     closingInitiatedAt: string | null;

package/dist/utils.js

@@ -20,7 +20,7 @@ export function formatUsd(amount, dec = USDC_DECIMALS) {
     const num = Number(amount) / 10 ** dec;
     return "$" + num.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 });
 }
-// ── Drawdown ────────────────────────────────────────
+// ── Drawdown (all values in 6dec — matching on-chain HWM/dayStartValue) ──
 export function trailingFloor(hwm, drawdownBps) {
     return hwm - (hwm * BigInt(drawdownBps)) / BPS;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kehtus/proportion-sdk",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/__tests__/reads.test.ts

@@ -204,6 +204,5 @@ describe("account reads", () => {
     if (!existingAccount) return;
     const pw = await account.getPendingWithdrawal(existingAccount);
     expect(pw.profit).toBeTypeOf("bigint");
-    expect(typeof pw.requestedAt).toBe("number");
   });
 });

package/src/abi/factory.ts

@@ -10,6 +10,11 @@ export const factoryAbi = [
         "internalType": "address",
         "name": "_implementation",
         "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "_forwarder",
+        "type": "address"
       }
     ],
     "stateMutability": "nonpayable",
@@ -244,6 +249,19 @@ export const factoryAbi = [
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "forwarder",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "implementation",