@scallop-io/sui-scallop-sdk 2.3.13 → 2.3.14-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "2.3.13",
+  "version": "2.3.14-rc.2",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",

package/src/models/scallopClient.ts

@@ -281,12 +281,27 @@ class ScallopClient implements ScallopClientInterface {
    * @param isSponsoredTx - Whether the transaction is sponsored.
    * @return Transaction block response or transaction block.
    */
+  async withdrawCollateral(
+    collateralCoinName: string,
+    amount: number
+  ): Promise<SuiTransactionBlockResponse>;
+
+  async withdrawCollateral<S extends boolean>(
+    collateralCoinName: string,
+    amount: number,
+    sign?: S,
+    obligationId?: string,
+    obligationKey?: string,
+    walletAddress?: string,
+    isSponsoredTx?: boolean
+  ): Promise<ScallopClientFnReturnType<S>>;
+
   async withdrawCollateral<S extends boolean>(
     collateralCoinName: string,
     amount: number,
     sign: S = true as S,
-    obligationId: string,
-    obligationKey: string,
+    obligationId?: string,
+    obligationKey?: string,
     walletAddress?: string,
     isSponsoredTx?: boolean
   ): Promise<ScallopClientFnReturnType<S>> {

package/src/models/scallopConstants.ts

@@ -47,11 +47,12 @@ const DEFAULT_WHITELIST = {
   rewardsAsPoint: new Set(),
   suiBridge: new Set(),
   wormhole: new Set(),
+  layerZero: new Set(),
   oracles: new Set(),
   pythEndpoints: new Set(),
   deprecated: new Set(),
   emerging: new Set(),
-} as Whitelist;
+} satisfies Whitelist;
 
 const parseWhitelistParams = (params: Record<string, any> | Whitelist) => {
   return Object.entries(params)

package/src/models/scallopUtils.ts

@@ -67,14 +67,18 @@ class ScallopUtils implements ScallopUtilsInterface {
   }
 
   // -------------- TYPE GUARDS --------------
-  isSuiBridgeAsset(coinName: any) {
+  isSuiBridgeAsset(coinName: string) {
     return this.constants.whitelist.suiBridge.has(coinName);
   }
 
-  isWormholeAsset(coinName: any) {
+  isWormholeAsset(coinName: string) {
     return this.constants.whitelist.wormhole.has(coinName);
   }
 
+  isLayerZeroAsset(coinName: string) {
+    return this.constants.whitelist.layerZero.has(coinName);
+  }
+
   isMarketCoin(coinName: string) {
     const assetCoinName = coinName.slice(1).toLowerCase() as string;
     return (
@@ -258,6 +262,11 @@ class ScallopUtils implements ScallopUtilsInterface {
         from: 'Wormhole',
         type: 'Portal from Ethereum',
       };
+    } else if (this.isLayerZeroAsset(assetCoinName)) {
+      return {
+        from: 'LayerZero',
+        type: 'Ominchain Fungible Token from LayerZero',
+      };
     }
 
     return undefined;

package/src/types/constant/common.ts

@@ -38,6 +38,7 @@ export type Whitelist = {
   scoin: Set<string>;
   suiBridge: Set<string>;
   wormhole: Set<string>;
+  layerZero: Set<string>;
   oracles: Set<string>;
   borrowIncentiveRewards: Set<string>;
   rewardsAsPoint: Set<string>;