dipcoin-cli 1.2.2 → 1.3.0

package/dist/cli.cjs

@@ -16596,6 +16596,13 @@ function getPerpetualId(deployment, market) {
         throw new Error(`Deployment config missing Perpetual id for ${m}`);
     return id;
 }
+function getPriceFeedId(deployment) {
+    const id = deployment?.objects?.PriceFeed?.id;
+    if (!id) {
+        throw new Error("Deployment config missing PriceFeed id. Add objects.PriceFeed to the network's main_contract.json — required for v6+ on-chain margin/vault writes.");
+    }
+    return id;
+}
 function getPriceOracleObjectId(deployment, market) {
     const m = market?.toUpperCase() || "ETH-PERP";
     const id = deployment?.markets?.[m]?.Objects?.PriceInfoObject?.id;
@@ -16641,7 +16648,7 @@ function buildAddMarginTx(deployment, args, tx, gasBudget, sender) {
         t.setSender(sender);
     const packageId = getPackageId(deployment);
     t.moveCall({
-        target: `${packageId}::exchange::add_margin_v2`,
+        target: `${packageId}::exchange::add_margin_v3`,
         arguments: [
             t.object(getProtocolConfigId(deployment)),
             t.object(CLOCK_OBJECT_ID),
@@ -16649,7 +16656,7 @@ function buildAddMarginTx(deployment, args, tx, gasBudget, sender) {
             t.object(getBankId(deployment)),
             t.object(args.subAccountsMapID || getSubAccountsId(deployment)),
             t.object(getTxIndexerId(deployment)),
-            t.object(getPriceOracleObjectId(deployment, args.market)),
+            t.object(getPriceFeedId(deployment)),
             t.pure.address(args.account || sender || ""),
             t.pure.u128(args.amount.toString()),
         ],
@@ -16665,7 +16672,7 @@ function buildRemoveMarginTx(deployment, args, tx, gasBudget, sender) {
         t.setSender(sender);
     const packageId = getPackageId(deployment);
     t.moveCall({
-        target: `${packageId}::exchange::remove_margin_v2`,
+        target: `${packageId}::exchange::remove_margin_v3`,
         arguments: [
             t.object(getProtocolConfigId(deployment)),
             t.object(CLOCK_OBJECT_ID),
@@ -16673,7 +16680,7 @@ function buildRemoveMarginTx(deployment, args, tx, gasBudget, sender) {
             t.object(getBankId(deployment)),
             t.object(args.subAccountsMapID || getSubAccountsId(deployment)),
             t.object(getTxIndexerId(deployment)),
-            t.object(getPriceOracleObjectId(deployment, args.market)),
+            t.object(getPriceFeedId(deployment)),
             t.pure.address(args.account || sender || ""),
             t.pure.u128(args.amount.toString()),
         ],
@@ -16744,17 +16751,6 @@ function buildSetOraclePriceTx(deployment, args, tx, gasBudget, sender) {
     });
     return t;
 }
-function buildBatchSetOraclePriceTx(deployment, args, tx, gasBudget, sender) {
-    let t = tx || new transactions.Transaction();
-    for (const priceArgs of args.prices) {
-        t = buildSetOraclePriceTx(deployment, priceArgs, t, undefined, undefined);
-    }
-    if (gasBudget)
-        t.setGasBudget(gasBudget);
-    if (sender)
-        t.setSender(sender);
-    return t;
-}
 
 // Copyright (c) 2025 Dipcoin LLC
 async function executeTxBlock(suiClient, tx, signer) {
@@ -18624,10 +18620,9 @@ class DipCoinPerpSDK {
     }
     async buildMarginTransaction(params, action) {
         const payload = this.buildMarginCallArgs(params, action);
-        const updatePriceTx = payload.market
-            ? await this.buildUpdatePriceTransaction(payload.market)
-            : undefined;
-        const baseTx = updatePriceTx || new transactions.Transaction();
+        // v6+ uses add_margin_v3/remove_margin_v3 which read &PriceFeed (a shared object
+        // maintained off-band by an operator). No Pyth update is needed on the user-side tx.
+        const baseTx = new transactions.Transaction();
         if (action === "add") {
             return buildAddMarginTx(this.deploymentConfig, payload, baseTx, params.gasBudget);
         }
@@ -18913,45 +18908,40 @@ class DipCoinPerpSDK {
             throw new Error(`Deployment config missing PriceInfoObject id for ${symbol}`);
         return id;
     }
-    async buildVaultNavTransaction(vaultID, markets, tx) {
+    getPriceFeedId() {
+        const id = this.deploymentConfig?.objects?.PriceFeed?.id;
+        if (!id) {
+            throw new Error("Deployment config missing PriceFeed id. Add objects.PriceFeed to the network's main_contract.json — required for v6+ vault/margin writes.");
+        }
+        return id;
+    }
+    async getOnChainPerpetualIds() {
+        const pcId = this.getDeploymentProtocolConfigId();
+        const df = await this.suiClient.getDynamicFieldObject({
+            parentId: pcId,
+            name: {
+                type: "vector<u8>",
+                value: Array.from(Buffer.from("perpetual_registry", "utf8")),
+            },
+        });
+        const content = df.data?.content;
+        const contents = content?.fields?.value?.fields?.perpetuals?.fields?.contents;
+        if (!Array.isArray(contents)) {
+            throw new Error("Could not read perpetual_registry from on-chain ProtocolConfig. Vault NAV requires the full list of perpetuals registered in the protocol.");
+        }
+        return contents;
+    }
+    async buildVaultNavTransaction(vaultID, _markets, tx) {
         const t = tx || new transactions.Transaction();
         const vaultPkg = this.getVaultPackageId();
         const currencyType = this.getCurrencyType();
-        const symbols = markets && markets.length > 0 ? markets : this.getMarketSymbols();
-        if (this.options.network === "mainnet") {
-            // On mainnet, use Pyth to fetch fresh price VAAs and update on-chain oracles
-            this.ensurePythClients();
-            if (this.priceServiceConnection && this.pythClient) {
-                const priceIds = [];
-                for (const sym of symbols) {
-                    const feedId = await this.resolvePriceFeedId(sym);
-                    if (feedId)
-                        priceIds.push(feedId);
-                }
-                if (priceIds.length > 0) {
-                    const priceUpdateData = await this.priceServiceConnection.getPriceFeedsUpdateData(priceIds);
-                    await this.pythClient.updatePriceFeeds(t, priceUpdateData, priceIds);
-                }
-            }
-        }
-        else {
-            // On testnet, prepend price oracle updates so PriceInfoObjects are fresh
-            const prices = [];
-            for (const sym of symbols) {
-                try {
-                    const oraclePrice = await getOraclePrice(this.suiClient, this.deploymentConfig, sym);
-                    if (oraclePrice !== undefined && oraclePrice !== null) {
-                        prices.push({ price: Number(oraclePrice), market: sym });
-                    }
-                }
-                catch {
-                    // skip symbols where oracle price is unavailable
-                }
-            }
-            if (prices.length > 0) {
-                buildBatchSetOraclePriceTx(this.deploymentConfig, { prices }, t);
-            }
-        }
+        // v6+: PriceFeed is a single shared object maintained by an operator off-band.
+        // new_vault_nav populates `perpetuals` from ProtocolConfig.perpetual_registry, and
+        // is_nav_filled requires EVERY registered perpetual to have a position value entry.
+        // So we must compute against the on-chain registry, not the local deployment.markets
+        // list (which can drift behind chain additions).
+        const priceFeedId = this.getPriceFeedId();
+        const perpetualIds = await this.getOnChainPerpetualIds();
         const [nav] = t.moveCall({
             target: `${vaultPkg}::vault::new_vault_nav`,
             arguments: [
@@ -18962,12 +18952,10 @@ class DipCoinPerpSDK {
             ],
             typeArguments: [currencyType],
         });
-        for (const sym of symbols) {
-            const perpId = this.getVaultPerpetualId(sym);
-            const priceInfoId = this.getVaultPriceInfoObjectId(sym);
+        for (const perpId of perpetualIds) {
             t.moveCall({
-                target: `${vaultPkg}::vault::compute_perpetual_position_value`,
-                arguments: [nav, t.object("0x6"), t.object(perpId), t.object(priceInfoId)],
+                target: `${vaultPkg}::vault::compute_perpetual_position_value_v2`,
+                arguments: [nav, t.object("0x6"), t.object(perpId), t.object(priceFeedId)],
                 typeArguments: [],
             });
         }
@@ -19996,11 +19984,16 @@ function registerPositionCommands(program) {
         .description("Add margin to position")
         .argument("<symbol>", "Trading pair")
         .argument("<amount>", "Amount in USDC")
-        .action(async (symbol, amount) => {
+        .option("--vault <address>", "Target a vault's position (vault id) instead of personal account")
+        .action(async (symbol, amount, opts) => {
         try {
             const sdk = getSDK();
             symbol = normalizeSymbol(symbol);
-            const tx = await sdk.addMargin({ symbol, amount: parseAmount(amount) });
+            const tx = await sdk.addMargin({
+                symbol,
+                amount: parseAmount(amount),
+                accountAddress: opts.vault,
+            });
             if (isJson(program))
                 return printJson({ digest: tx?.digest, status: "ok" });
             console.log(`Added ${amount} margin to ${symbol}. Tx: ${tx?.digest || JSON.stringify(tx)}`);
@@ -20014,11 +20007,16 @@ function registerPositionCommands(program) {
         .description("Remove margin from position")
         .argument("<symbol>", "Trading pair")
         .argument("<amount>", "Amount in USDC")
-        .action(async (symbol, amount) => {
+        .option("--vault <address>", "Target a vault's position (vault id) instead of personal account")
+        .action(async (symbol, amount, opts) => {
         try {
             const sdk = getSDK();
             symbol = normalizeSymbol(symbol);
-            const tx = await sdk.removeMargin({ symbol, amount: parseAmount(amount) });
+            const tx = await sdk.removeMargin({
+                symbol,
+                amount: parseAmount(amount),
+                accountAddress: opts.vault,
+            });
             if (isJson(program))
                 return printJson({ digest: tx?.digest, status: "ok" });
             console.log(`Removed ${amount} margin from ${symbol}. Tx: ${tx?.digest || JSON.stringify(tx)}`);