@scallop-io/sui-scallop-sdk 1.4.15-rc.2 → 1.4.16

package/src/builders/vescaBuilder.ts

@@ -90,7 +90,8 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
 
   return {
     lockSca: (scaCoin, unlockAtInSecondTimestamp) => {
-      return txBlock.moveCall(
+      return builder.moveCall(
+        txBlock,
         `${veScaIds.pkgId}::ve_sca::mint_ve_sca_key`,
         [
           veScaIds.config,
@@ -104,7 +105,8 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
       );
     },
     extendLockPeriod: (veScaKey, newUnlockAtInSecondTimestamp) => {
-      txBlock.moveCall(
+      builder.moveCall(
+        txBlock,
         `${veScaIds.pkgId}::ve_sca::extend_lock_period`,
         [
           veScaIds.config,
@@ -118,7 +120,8 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
       );
     },
     extendLockAmount: (veScaKey, scaCoin) => {
-      txBlock.moveCall(
+      builder.moveCall(
+        txBlock,
         `${veScaIds.pkgId}::ve_sca::lock_more_sca`,
         [
           veScaIds.config,
@@ -132,7 +135,8 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
       );
     },
     renewExpiredVeSca: (veScaKey, scaCoin, newUnlockAtInSecondTimestamp) => {
-      txBlock.moveCall(
+      builder.moveCall(
+        txBlock,
         `${veScaIds.pkgId}::ve_sca::renew_expired_ve_sca`,
         [
           veScaIds.config,
@@ -147,7 +151,8 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
       );
     },
     redeemSca: (veScaKey) => {
-      return txBlock.moveCall(
+      return builder.moveCall(
+        txBlock,
         `${veScaIds.pkgId}::ve_sca::redeem`,
         [
           veScaIds.config,
@@ -160,7 +165,8 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
       );
     },
     mintEmptyVeSca: () => {
-      return txBlock.moveCall(
+      return builder.moveCall(
+        txBlock,
         `${veScaIds.pkgId}::ve_sca::mint_ve_sca_placeholder_key`,
         [veScaIds.config, veScaIds.table],
         []
@@ -346,7 +352,7 @@ const generateQuickVeScaMethod: GenerateVeScaQuickMethod = ({
       checkVesca(veSca?.unlockAt);
 
       if (veSca) {
-        const sca = txBlock.redeemSca(veSca.keyId);
+        const sca = await txBlock.redeemSca(veSca.keyId);
         if (transferSca) {
           txBlock.transferObjects([sca], sender);
           return;

package/src/constants/coinGecko.ts

@@ -3,6 +3,7 @@ import { SupportPoolCoins } from 'src/types/constant/common';
 export const COIN_GECKGO_IDS: Record<SupportPoolCoins, string> = {
   usdc: 'usdc',
   sbeth: 'ethereum',
+  sbusdt: 'tether',
   weth: 'ethereum',
   wbtc: 'bitcoin',
   wusdc: 'usdc',
@@ -15,6 +16,7 @@ export const COIN_GECKGO_IDS: Record<SupportPoolCoins, string> = {
   hasui: 'sui',
   vsui: 'sui',
   sca: 'scallop-2',
+  fdusd: 'first-digital-usd',
   deep: 'deepbook',
   fud: 'fud-the-pug',
 };

package/src/constants/common.ts

@@ -32,6 +32,7 @@ export const OLD_BORROW_INCENTIVE_PROTOCOL_ID =
 export const SUPPORT_POOLS = [
   'usdc', // native USDC
   'sbeth', // sui bridge ETH
+  'sbusdt', // sui bridge USDT
   'weth',
   'wbtc',
   'wusdc',
@@ -46,11 +47,13 @@ export const SUPPORT_POOLS = [
   'sca',
   'fud',
   'deep',
+  'fdusd',
 ] as const;
 
 export const SUPPORT_COLLATERALS = [
   'usdc', // native USDC
   'sbeth', // sui bridge ETH
+  'sbusdt', // sui bridge USDT
   'weth',
   'wbtc',
   'wusdc',
@@ -63,6 +66,7 @@ export const SUPPORT_COLLATERALS = [
   'hasui',
   'vsui',
   'sca',
+  'fdusd',
 ] as const;
 
 export const SUPPORT_SPOOLS = [
@@ -80,6 +84,7 @@ export const SUPPORT_SPOOLS = [
 export const SUPPORT_SCOIN = [
   'susdc',
   'ssbeth',
+  'ssbusdt',
   'ssui',
   'swusdc',
   'swusdt',
@@ -93,9 +98,10 @@ export const SUPPORT_SCOIN = [
   'swbtc',
   'sdeep',
   'sfud',
+  'sfdusd',
 ] as const;
 
-export const SUPPORT_SUI_BRIDGE = ['sbeth'] as const;
+export const SUPPORT_SUI_BRIDGE = ['sbeth', 'sbusdt'] as const;
 export const SUPPORT_WORMHOLE = [
   'wusdc',
   'wusdt',

package/src/constants/enum.ts

@@ -4,6 +4,7 @@ import { IS_VE_SCA_TEST } from './common';
 export const coinDecimals: types.SupportCoinDecimals = {
   usdc: 6,
   sbeth: 8,
+  sbusdt: 6,
   weth: 8,
   wbtc: 8,
   wusdc: 6,
@@ -16,11 +17,13 @@ export const coinDecimals: types.SupportCoinDecimals = {
   hasui: 9,
   vsui: 9,
   sca: 9,
+  fdusd: 6,
   deep: 6,
   fud: 5,
   susdc: 6,
   sweth: 8,
   ssbeth: 8,
+  ssbusdt: 6,
   swbtc: 8,
   swusdc: 6,
   swusdt: 6,
@@ -32,6 +35,7 @@ export const coinDecimals: types.SupportCoinDecimals = {
   shasui: 9,
   svsui: 9,
   ssca: 9,
+  sfdusd: 6,
   sdeep: 6,
   sfud: 5,
 };
@@ -39,6 +43,7 @@ export const coinDecimals: types.SupportCoinDecimals = {
 export const assetCoins: types.AssetCoins = {
   usdc: 'usdc',
   sbeth: 'sbeth',
+  sbusdt: 'sbusdt',
   weth: 'weth',
   wbtc: 'wbtc',
   wusdc: 'wusdc',
@@ -51,6 +56,7 @@ export const assetCoins: types.AssetCoins = {
   hasui: 'hasui',
   vsui: 'vsui',
   sca: 'sca',
+  fdusd: 'fdusd',
   deep: 'deep',
   fud: 'fud',
 };
@@ -58,6 +64,7 @@ export const assetCoins: types.AssetCoins = {
 export const marketCoins: types.MarketCoins = {
   susdc: 'susdc',
   ssbeth: 'ssbeth',
+  ssbusdt: 'ssbusdt',
   sweth: 'sweth',
   swbtc: 'swbtc',
   swusdc: 'swusdc',
@@ -70,6 +77,7 @@ export const marketCoins: types.MarketCoins = {
   shasui: 'shasui',
   svsui: 'svsui',
   ssca: 'ssca',
+  sfdusd: 'sfdusd',
   sdeep: 'sdeep',
   sfud: 'sfud',
 };
@@ -77,6 +85,7 @@ export const marketCoins: types.MarketCoins = {
 export const sCoins: types.SCoins = {
   susdc: 'susdc',
   ssbeth: 'ssbeth',
+  ssbusdt: 'ssbusdt',
   sweth: 'sweth',
   swusdc: 'swusdc',
   swusdt: 'swusdt',
@@ -88,6 +97,7 @@ export const sCoins: types.SCoins = {
   ssca: 'ssca',
   swsol: 'swsol',
   swbtc: 'swbtc',
+  sfdusd: 'sfdusd',
   sfud: 'sfud',
   sdeep: 'sdeep',
 };
@@ -118,28 +128,35 @@ export const spoolRewardCoins: types.StakeRewardCoins = {
 
 export const suiBridgeCoins: types.SuiBridgeCoins = {
   sbeth: 'sbeth',
+  sbusdt: 'sbusdt',
 };
 
 export const coinIds: types.AssetCoinIds = {
-  usdc: '0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7',
   sui: '0x0000000000000000000000000000000000000000000000000000000000000002',
-  sbeth: '0xd0e89b2af5e4910726fbcd8b8dd37bb79b29e5f83f7491bca830e94f7f226d29',
+  cetus: '0x06864a6f921804860930db6ddbe2e16acdf8504495ea7481637a1c8b9a8fe54b',
+  sca: IS_VE_SCA_TEST
+    ? '0x6cd813061a3adf3602b76545f076205f0c8e7ec1d3b1eab9a1da7992c18c0524'
+    : '0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6',
+  // Wormhole assets
   weth: '0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5',
   wbtc: '0x027792d9fed7f9844eb4839566001bb6f6cb4804f66aa2da6fe1ee242d896881',
-  wusdc: '0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf',
-  wusdt: '0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c',
   wapt: '0x3a5143bb1196e3bcdfab6203d1683ae29edd26294fc8bfeafe4aaa9d2704df37',
   wsol: '0xb7844e289a8410e50fb3ca48d69eb9cf29e27d223ef90353fe1bd8e27ff8f3f8',
-  cetus: '0x06864a6f921804860930db6ddbe2e16acdf8504495ea7481637a1c8b9a8fe54b',
+  // Sui LST
   afsui: '0xf325ce1300e8dac124071d3152c5c5ee6174914f8bc2161e88329cf579246efc',
   hasui: '0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d',
   vsui: '0x549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55',
-  sca: IS_VE_SCA_TEST
-    ? '0x6cd813061a3adf3602b76545f076205f0c8e7ec1d3b1eab9a1da7992c18c0524'
-    : '0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6',
+  // stable coins
+  usdc: '0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7',
+  wusdc: '0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf',
+  wusdt: '0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c',
+  fdusd: '0xf16e6b723f242ec745dfd7634ad072c42d5c1d9ac9d62a39c381303eaa57693a',
   // isolated assets
   deep: '0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270',
   fud: '0x76cb819b01abed502bee8a702b4c2d547532c12f25001c9dea795a5e631c26f1',
+  // Sui bridge assets
+  sbeth: '0xd0e89b2af5e4910726fbcd8b8dd37bb79b29e5f83f7491bca830e94f7f226d29',
+  sbusdt: '0x375f70cf2ae4c00bf37117d0c85a2c71545e6ee05c4a5c7d282cd66a4504b068',
 };
 
 export const wormholeCoinIds: types.WormholeCoinIds = {
@@ -157,33 +174,42 @@ export const voloCoinIds: types.VoloCoinIds = {
 
 // PROD VERSION
 export const sCoinIds: types.SCoinIds = {
-  susdc:
-    '0x854950aa624b1df59fe64e630b2ba7c550642e9342267a33061d59fb31582da5::scallop_usdc::SCALLOP_USDC',
-  ssbeth:
-    '0xb14f82d8506d139eacef109688d1b71e7236bcce9b2c0ad526abcd6aa5be7de0::scallop_sb_eth::SCALLOP_SB_ETH',
   ssui: '0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI',
-  swusdc:
-    '0xad4d71551d31092230db1fd482008ea42867dbf27b286e9c70a79d2a6191d58d::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
-  swusdt:
-    '0xe6e5a012ec20a49a3d1d57bd2b67140b96cd4d3400b9d79e541f7bdbab661f95::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT',
   ssca: '0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA',
   scetus:
     '0xea346ce428f91ab007210443efcea5f5cdbbb3aae7e9affc0ca93f9203c31f0c::scallop_cetus::SCALLOP_CETUS',
+  // Wormhole assets
   sweth:
     '0x67540ceb850d418679e69f1fb6b2093d6df78a2a699ffc733f7646096d552e9b::scallop_wormhole_eth::SCALLOP_WORMHOLE_ETH',
+  swsol:
+    '0x1392650f2eca9e3f6ffae3ff89e42a3590d7102b80e2b430f674730bc30d3259::scallop_wormhole_sol::SCALLOP_WORMHOLE_SOL',
+  swbtc:
+    '0x2cf76a9cf5d3337961d1154283234f94da2dcff18544dfe5cbdef65f319591b5::scallop_wormhole_btc::SCALLOP_WORMHOLE_BTC',
+  // Sui LST
   safsui:
     '0x00671b1fa2a124f5be8bdae8b91ee711462c5d9e31bda232e70fd9607b523c88::scallop_af_sui::SCALLOP_AF_SUI',
   shasui:
     '0x9a2376943f7d22f88087c259c5889925f332ca4347e669dc37d54c2bf651af3c::scallop_ha_sui::SCALLOP_HA_SUI',
   svsui:
     '0xe1a1cc6bcf0001a015eab84bcc6713393ce20535f55b8b6f35c142e057a25fbe::scallop_v_sui::SCALLOP_V_SUI',
-  swsol:
-    '0x1392650f2eca9e3f6ffae3ff89e42a3590d7102b80e2b430f674730bc30d3259::scallop_wormhole_sol::SCALLOP_WORMHOLE_SOL',
-  swbtc:
-    '0x2cf76a9cf5d3337961d1154283234f94da2dcff18544dfe5cbdef65f319591b5::scallop_wormhole_btc::SCALLOP_WORMHOLE_BTC',
+  // stable coins
+  susdc:
+    '0x854950aa624b1df59fe64e630b2ba7c550642e9342267a33061d59fb31582da5::scallop_usdc::SCALLOP_USDC',
+  swusdc:
+    '0xad4d71551d31092230db1fd482008ea42867dbf27b286e9c70a79d2a6191d58d::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
+  swusdt:
+    '0xe6e5a012ec20a49a3d1d57bd2b67140b96cd4d3400b9d79e541f7bdbab661f95::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT',
+  sfdusd:
+    '0x6711551c1e7652a270d9fbf0eee25d99594c157cde3cb5fbb49035eb59b1b001::scallop_fdusd::SCALLOP_FDUSD',
+  // isolated assets
   sdeep:
     '0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP',
   sfud: '0xe56d5167f427cbe597da9e8150ef5c337839aaf46891d62468dcf80bdd8e10d1::scallop_fud::SCALLOP_FUD',
+  // Sui bridge assets
+  ssbeth:
+    '0xb14f82d8506d139eacef109688d1b71e7236bcce9b2c0ad526abcd6aa5be7de0::scallop_sb_eth::SCALLOP_SB_ETH',
+  ssbusdt:
+    '0xb1d7df34829d1513b73ba17cb7ad90c88d1e104bb65ab8f62f13e0cc103783d3::scallop_sb_usdt::SCALLOP_SB_USDT',
 } as const;
 
 export const sCoinTypeToName = Object.entries(sCoinIds).reduce(

package/src/constants/index.ts

@@ -8,6 +8,5 @@ export * from './pyth';
 export * from './queryKeys';
 export * from './rpc';
 export * from './testAddress';
-export * from './tokenBucket';
 export * from './vesca';
 export * from './testAddress';