@typus/typus-sdk 1.0.44 → 1.0.45

package/lib/utils/sponsorTransaction.d.ts

@@ -15,9 +15,8 @@ export interface SponsorRpc {
     gas_getSponsoredTransactionBlockStatus(txDigest: string): SponsoredTransactionStatus;
 }
 export declare const sponsorTransactionBlock: (gaslessTxb: any, sponsor: any, provider: any, gasBudget: any, signerAddress: any) => Promise<[SponsoredTransaction, Uint8Array]>;
-export declare const executeSponsorTransactionBlock: (provider: any, sponsoredResponse: any, senderSig: any) => Promise<void>;
+export declare const executeSponsorTransactionBlock: (provider: any, sponsoredResponse: any, senderSig: any) => Promise<any>;
 export declare const sponsorTransactionE2E: (gaslessTxb: any, sponsor: any, provider: any, signer: any, gasBudget: any) => Promise<void>;
-export declare function getSponsoredDeposit(packageId: string, typeArguments: string[], registry: string, index: string, coins: string[], amount: string, signerAddress: string): Promise<[SponsoredTransaction, Uint8Array]>;
-export declare function getSponsoredCompound(packageId: string, typeArguments: string[], registry: string, index: string, signerAddress: string): Promise<[SponsoredTransaction, Uint8Array]>;
-export declare function getSponsoredNewBid(packageId: string, typeArguments: string[], registry: string, index: string, priceOracle: string, coins: string[], size: string, premium_required: string, // fe float * b_token_decimal
-signerAddress: string): Promise<[SponsoredTransaction, Uint8Array]>;
+export declare function getSponsoredDeposit(sponsorApi: string, packageId: string, typeArguments: string[], registry: string, index: string, coins: string[], amount: string, signerAddress: string): Promise<[SponsoredTransaction, Uint8Array]>;
+export declare function getSponsoredCompound(sponsorApi: string, packageId: string, typeArguments: string[], registry: string, index: string, signerAddress: string): Promise<[SponsoredTransaction, Uint8Array]>;
+export declare function getSponsoredNewBid(sponsorApi: string, packageId: string, typeArguments: string[], registry: string, index: string, priceOracle: string, coins: string[], size: string, signerAddress: string): Promise<[SponsoredTransaction, Uint8Array]>;

package/lib/utils/sponsorTransaction.js

@@ -65,9 +65,9 @@ exports.sponsorTransactionBlock = sponsorTransactionBlock;
 // const senderSig = await signer.signTransactionBlock({ transactionBlock });
 var executeSponsorTransactionBlock = function (provider, sponsoredResponse, senderSig) { return __awaiter(void 0, void 0, void 0, function () {
     var executeResponse;
-    var _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0: return [4 /*yield*/, provider.executeTransactionBlock({
                     transactionBlock: sponsoredResponse.txBytes,
                     signature: [senderSig.signature, sponsoredResponse.signature],
@@ -75,10 +75,9 @@ var executeSponsorTransactionBlock = function (provider, sponsoredResponse, send
                     requestType: "WaitForLocalExecution",
                 })];
             case 1:
-                executeResponse = _b.sent();
-                console.log(executeResponse, "executeResponse");
+                executeResponse = _c.sent();
                 console.log("Execution Status:", (_a = executeResponse.effects) === null || _a === void 0 ? void 0 : _a.status.status);
-                return [2 /*return*/];
+                return [2 /*return*/, (_b = executeResponse.effects) === null || _b === void 0 ? void 0 : _b.status.status];
         }
     });
 }); };
@@ -120,7 +119,7 @@ var sponsorTransactionE2E = function (gaslessTxb, sponsor, provider, signer, gas
     });
 }); };
 exports.sponsorTransactionE2E = sponsorTransactionE2E;
-function getSponsoredDeposit(packageId, typeArguments, registry, index, coins, amount, signerAddress) {
+function getSponsoredDeposit(sponsorApi, packageId, typeArguments, registry, index, coins, amount, signerAddress) {
     return __awaiter(this, void 0, void 0, function () {
         var jsonData, response, data, sponsoredResponse, transactionBlock;
         return __generator(this, function (_a) {
@@ -136,7 +135,7 @@ function getSponsoredDeposit(packageId, typeArguments, registry, index, coins, a
                         amount: amount,
                         signerAddress: signerAddress,
                     });
-                    return [4 /*yield*/, fetch("https://function-1-jbw5emju3a-uc.a.run.app", {
+                    return [4 /*yield*/, fetch(sponsorApi, {
                             method: "POST",
                             headers: { "Content-Type": "application/json" },
                             body: jsonData,
@@ -155,7 +154,7 @@ function getSponsoredDeposit(packageId, typeArguments, registry, index, coins, a
     });
 }
 exports.getSponsoredDeposit = getSponsoredDeposit;
-function getSponsoredCompound(packageId, typeArguments, registry, index, signerAddress) {
+function getSponsoredCompound(sponsorApi, packageId, typeArguments, registry, index, signerAddress) {
     return __awaiter(this, void 0, void 0, function () {
         var jsonData, response, data, sponsoredResponse, transactionBlock;
         return __generator(this, function (_a) {
@@ -169,7 +168,7 @@ function getSponsoredCompound(packageId, typeArguments, registry, index, signerA
                         index: index,
                         signerAddress: signerAddress,
                     });
-                    return [4 /*yield*/, fetch("https://function-1-jbw5emju3a-uc.a.run.app", {
+                    return [4 /*yield*/, fetch(sponsorApi, {
                             method: "POST",
                             headers: { "Content-Type": "application/json" },
                             body: jsonData,
@@ -188,8 +187,7 @@ function getSponsoredCompound(packageId, typeArguments, registry, index, signerA
     });
 }
 exports.getSponsoredCompound = getSponsoredCompound;
-function getSponsoredNewBid(packageId, typeArguments, registry, index, priceOracle, coins, size, premium_required, // fe float * b_token_decimal
-signerAddress) {
+function getSponsoredNewBid(sponsorApi, packageId, typeArguments, registry, index, priceOracle, coins, size, signerAddress) {
     return __awaiter(this, void 0, void 0, function () {
         var jsonData, response, data, sponsoredResponse, transactionBlock;
         return __generator(this, function (_a) {
@@ -204,10 +202,9 @@ signerAddress) {
                         priceOracle: priceOracle,
                         coins: coins,
                         size: size,
-                        premium_required: premium_required,
                         signerAddress: signerAddress,
                     });
-                    return [4 /*yield*/, fetch("https://function-1-jbw5emju3a-uc.a.run.app", {
+                    return [4 /*yield*/, fetch(sponsorApi, {
                             method: "POST",
                             headers: { "Content-Type": "application/json" },
                             body: jsonData,

package/lib/utils/typus-dov-double/portfolio-vault.js

@@ -37,6 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPortfolioVaults = void 0;
+var sui_js_1 = require("@mysten/sui.js");
 var vault_1 = require("../typus-framework/vault");
 var dutch_1 = require("../typus-framework/dutch");
 function getPortfolioVaults(provider, registry, token_deposit_vault_registry, usd_deposit_vault_registry, bid_vault_registry, index) {
@@ -62,7 +63,21 @@ function getPortfolioVaults(provider, registry, token_deposit_vault_registry, us
                         var vaultId = portfolioVault.data.content.fields.id.id;
                         // @ts-ignore
                         var typeArgs = new RegExp(".*<(.*), (.*), (.*)>").exec(portfolioVault.data.content.type).slice(1, 4);
-                        var assets = typeArgs.map(function (x) { return x.split("::")[2]; });
+                        var assets = typeArgs.map(function (x) {
+                            var typeArgs = x.split("::");
+                            switch ((0, sui_js_1.normalizeSuiAddress)(typeArgs[0])) {
+                                case "0x027792d9fed7f9844eb4839566001bb6f6cb4804f66aa2da6fe1ee242d896881":
+                                    return "WBTC";
+                                case "0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5":
+                                    return "WETH";
+                                case "0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf":
+                                    return "USDC";
+                                case "0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c":
+                                    return "USDT";
+                                default:
+                                    return typeArgs[2];
+                            }
+                        });
                         var oracleInfo = {
                             // @ts-ignore
                             price: portfolioVault.data.content.fields.info.fields.oracle_info.fields.price,

package/lib/utils/typus-dov-single/portfolio-vault.js

@@ -37,6 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPortfolioVaults = void 0;
+var sui_js_1 = require("@mysten/sui.js");
 var vault_1 = require("../typus-framework/vault");
 var dutch_1 = require("../typus-framework/dutch");
 function getPortfolioVaults(provider, registry, deposit_vault_registry, bid_vault_registry, index) {
@@ -82,7 +83,21 @@ function getPortfolioVaults(provider, registry, deposit_vault_registry, bid_vaul
                                 case 2:
                                     _a.sent();
                                     typeArgs = new RegExp(".*<(.*), (.*), (.*)>").exec(portfolioVault.data.content.type).slice(1, 4);
-                                    assets = typeArgs.map(function (x) { return x.split("::")[2]; });
+                                    assets = typeArgs.map(function (x) {
+                                        var typeArgs = x.split("::");
+                                        switch ((0, sui_js_1.normalizeSuiAddress)(typeArgs[0])) {
+                                            case "0x027792d9fed7f9844eb4839566001bb6f6cb4804f66aa2da6fe1ee242d896881":
+                                                return "WBTC";
+                                            case "0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5":
+                                                return "WETH";
+                                            case "0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf":
+                                                return "USDC";
+                                            case "0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c":
+                                                return "USDT";
+                                            default:
+                                                return typeArgs[2];
+                                        }
+                                    });
                                     deliveryInfo = 
                                     // @ts-ignore
                                     portfolioVault.data.content.fields.info.fields.delivery_info

package/lib/utils/typus-dov-single/user-entry.d.ts

@@ -9,7 +9,7 @@ import { TransactionBlock } from "@mysten/sui.js";
     )
     @param typeArguments [Deposit Vault Token, Bid Vault Token, Oracle Token]
 */
-export declare function getDepositTx(gasBudget: number, packageId: string, typeArguments: string[], registry: string, index: string, coins: string[], amount: string): Promise<TransactionBlock>;
+export declare function getDepositTx(gasBudget: number, packageId: string, typeArguments: string[], registry: string, index: string, coins: string[], amount: string, usingSponsoredGasCoin?: boolean): Promise<TransactionBlock>;
 /**
     public(friend) entry fun withdraw<TOKEN>(
         registry: &mut Registry,
@@ -78,4 +78,5 @@ export declare function getUnsubscribeTx(gasBudget: number, packageId: string, t
     )
     @param typeArguments [Deposit Vault Token, Bid Vault Token, Oracle Token]
 */
-export declare function getNewBidTx(gasBudget: number, packageId: string, typeArguments: string[], registry: string, index: string, priceOracle: string, coins: string[], size: string, premium_required: string): Promise<TransactionBlock>;
+export declare function getNewBidTx(gasBudget: number, packageId: string, typeArguments: string[], registry: string, index: string, priceOracle: string, coins: string[], size: string, premium_required: string, // fe float * b_token_decimal
+usingSponsoredGasCoin?: boolean): Promise<TransactionBlock>;

package/lib/utils/typus-dov-single/user-entry.js

@@ -64,12 +64,14 @@ var sui_js_1 = require("@mysten/sui.js");
     )
     @param typeArguments [Deposit Vault Token, Bid Vault Token, Oracle Token]
 */
-function getDepositTx(gasBudget, packageId, typeArguments, registry, index, coins, amount) {
+function getDepositTx(gasBudget, packageId, typeArguments, registry, index, coins, amount, usingSponsoredGasCoin) {
+    if (usingSponsoredGasCoin === void 0) { usingSponsoredGasCoin = false; }
     return __awaiter(this, void 0, void 0, function () {
         var tx, _a, coin;
         return __generator(this, function (_b) {
             tx = new sui_js_1.TransactionBlock();
-            if (typeArguments[0] == "0x2::sui::SUI" || typeArguments[0] == "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI") {
+            if (!usingSponsoredGasCoin &&
+                (typeArguments[0] == "0x2::sui::SUI" || typeArguments[0] == "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI")) {
                 _a = __read(tx.splitCoins(tx.gas, [tx.pure(amount)]), 1), coin = _a[0];
                 tx.moveCall({
                     target: "".concat(packageId, "::typus_dov_single::deposit"),
@@ -248,13 +250,15 @@ exports.getUnsubscribeTx = getUnsubscribeTx;
     )
     @param typeArguments [Deposit Vault Token, Bid Vault Token, Oracle Token]
 */
-function getNewBidTx(gasBudget, packageId, typeArguments, registry, index, priceOracle, coins, size, premium_required // fe float * b_token_decimal
-) {
+function getNewBidTx(gasBudget, packageId, typeArguments, registry, index, priceOracle, coins, size, premium_required, // fe float * b_token_decimal
+usingSponsoredGasCoin) {
+    if (usingSponsoredGasCoin === void 0) { usingSponsoredGasCoin = false; }
     return __awaiter(this, void 0, void 0, function () {
         var tx, _a, coin;
         return __generator(this, function (_b) {
             tx = new sui_js_1.TransactionBlock();
-            if (typeArguments[1] == "0x2::sui::SUI" || typeArguments[1] == "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI") {
+            if (!usingSponsoredGasCoin &&
+                (typeArguments[1] == "0x2::sui::SUI" || typeArguments[1] == "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI")) {
                 _a = __read(tx.splitCoins(tx.gas, [tx.pure(premium_required)]), 1), coin = _a[0];
                 tx.moveCall({
                     target: "".concat(packageId, "::typus_dov_single::new_bid"),

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typus/typus-sdk",
   "author": "Typus",
   "description": "typus sdk",
-  "version": "1.0.44",
+  "version": "1.0.45",
   "dependencies": {
     "@mysten/sui.js": "^0.34.0",
     "@types/node": "^17.0.0",