@sentio/sdk 2.23.0 → 2.24.0-rc.2

package/src/sui/codegen/codegen.ts

@@ -1,13 +1,12 @@
-import { SuiMoveNormalizedModule, SuiEvent, SuiMoveObject } from '@mysten/sui.js'
+import { SuiMoveNormalizedModule, SuiEvent, SuiMoveObject } from '@mysten/sui.js/client'
 
-import { SuiNetwork } from '../network.js'
 import * as fs from 'fs'
 import chalk from 'chalk'
-import { InternalMoveModule, InternalMoveStruct } from '../../move/internal-models.js'
-import { AbstractCodegen } from '../../move/abstract-codegen.js'
-import { structQname } from '../../move/index.js'
-import { join } from 'path'
-import { SuiChainAdapter } from '../sui-chain-adapter.js'
+import { InternalMoveModule, InternalMoveStruct, structQname } from '@typemove/move'
+import { SuiCodegen as BaseSuiCodegen } from '@typemove/sui/codegen'
+import path, { join } from 'path'
+import { SharedNetworkCodegen } from '../../move/shared-network-codegen.js'
+import { getRpcEndpoint, SuiNetwork } from '../network.js'
 
 export async function codegen(
   abisDir: string,
@@ -23,58 +22,85 @@ export async function codegen(
   console.log(chalk.green(`Generated ${numFiles} for Sui`))
 }
 
-class SuiCodegen extends AbstractCodegen<SuiNetwork, SuiMoveNormalizedModule, SuiEvent | SuiMoveObject> {
-  MAIN_NET = SuiNetwork.MAIN_NET
-  TEST_NET = SuiNetwork.TEST_NET
-  PREFIX = 'Sui'
-  // STRUCT_FIELD_NAME = 'fields'
-  // GENERATE_ON_ENTRY = true
-  PAYLOAD_OPTIONAL = true
+class SuiNetworkCodegen extends BaseSuiCodegen {
+  moduleGenerator: SharedNetworkCodegen<SuiNetwork, SuiMoveNormalizedModule, SuiEvent | SuiMoveObject>
 
-  constructor() {
-    super(new SuiChainAdapter())
-  }
+  constructor(network: SuiNetwork) {
+    const endpoint = getRpcEndpoint(network)
+    super(endpoint)
+    this.moduleGenerator = new (class extends SharedNetworkCodegen<
+      SuiNetwork,
+      SuiMoveNormalizedModule,
+      SuiEvent | SuiMoveObject
+    > {
+      ADDRESS_TYPE = 'string'
+      PREFIX = 'Sui'
+      SYSTEM_PACKAGE = '@typemove/sui'
+
+      generateNetworkOption(network: SuiNetwork): string {
+        switch (network) {
+          case SuiNetwork.MAIN_NET:
+            return 'MAIN_NET'
+          default:
+            return 'TEST_NET'
+        }
+      }
+
+      generateStructs(module: InternalMoveModule, struct: InternalMoveStruct, events: Set<string>): string {
+        let content = ''
+        switch (structQname(module, struct)) {
+          // TODO they should still have module code generated
+          case '0x1::ascii::Char':
+          case '0x1::ascii::String':
+          case '0x2::object::ID':
+            content += `export type ${struct.name} = string`
+            break
+          case '0x2::coin::Coin':
+            content += `export type ${struct.name}<T> = string`
+            break
+          case '0x2::balance::Balance':
+            content += `export type ${struct.name}<T> = bigint`
+            break
+          case '0x1::option::Option':
+            content += `export type Option<T> = T | undefined`
+            break
+        }
+        return content + super.generateStructs(module, struct, events, content !== '')
+      }
 
-  readModulesFile(fullPath: string) {
-    const res = super.readModulesFile(fullPath)
-    if (res.result) {
-      return res.result
-    }
-    return res
+      generateForOnEvents(module: InternalMoveModule, struct: InternalMoveStruct): string {
+        switch (structQname(module, struct)) {
+          case '0x1::ascii::Char':
+          case '0x1::ascii::String':
+          case '0x2::object::ID':
+          case '0x2::coin::Coin':
+          case '0x1::option::Option':
+          case '0x2::balance::Balance':
+            return ''
+        }
+        return super.generateForOnEvents(module, struct)
+      }
+    })(network, this.chainAdapter)
   }
 
-  generateStructs(module: InternalMoveModule, struct: InternalMoveStruct, events: Set<string>): string {
-    let content = ''
-    switch (structQname(module, struct)) {
-      // TODO they should still have module code generated
-      case '0x1::ascii::Char':
-      case '0x1::ascii::String':
-      case '0x2::object::ID':
-        content += `export type ${struct.name} = string`
-        break
-      case '0x2::coin::Coin':
-        content += `export type ${struct.name}<T> = string`
-        break
-      case '0x2::balance::Balance':
-        content += `export type ${struct.name}<T> = bigint`
-        break
-      case '0x1::option::Option':
-        content += `export type Option<T> = T | undefined`
-        break
-    }
-    return content + super.generateStructs(module, struct, events, content !== '')
+  generateModule(module: InternalMoveModule, allEventStructs: Map<string, InternalMoveStruct>) {
+    return this.moduleGenerator.generateModule(module, allEventStructs)
   }
+  generateImports() {
+    return this.moduleGenerator.generateImports()
+  }
+  generateLoadAll(isSystem: boolean): string {
+    return this.moduleGenerator.generateLoadAll(isSystem)
+  }
+}
+//
+const MAINNET_CODEGEN = new SuiNetworkCodegen(SuiNetwork.MAIN_NET)
+const TESTNET_CODEGEN = new SuiNetworkCodegen(SuiNetwork.TEST_NET)
 
-  generateForEvents(module: InternalMoveModule, struct: InternalMoveStruct): string {
-    switch (structQname(module, struct)) {
-      case '0x1::ascii::Char':
-      case '0x1::ascii::String':
-      case '0x2::object::ID':
-      case '0x2::coin::Coin':
-      case '0x1::option::Option':
-      case '0x2::balance::Balance':
-        return ''
-    }
-    return super.generateForEvents(module, struct)
+class SuiCodegen {
+  async generate(srcDir: string, outputDir: string, builtin = false): Promise<number> {
+    const num1 = await MAINNET_CODEGEN.generate(srcDir, outputDir, builtin)
+    const num2 = await TESTNET_CODEGEN.generate(path.join(srcDir, 'testnet'), path.join(outputDir, 'testnet'), builtin)
+    return num1 + num2
   }
 }

package/src/sui/context.ts

@@ -3,12 +3,13 @@ import { type Labels, normalizeLabels } from '../index.js'
 import { getClient, SuiNetwork } from './network.js'
 import {
   SuiTransactionBlockResponse,
-  JsonRpcProvider,
   SuiEvent,
   SuiMoveNormalizedModule,
   SuiMoveObject,
-} from '@mysten/sui.js'
-import { MoveCoder, defaultMoveCoder } from './move-coder.js'
+  SuiClient
+} from '@mysten/sui.js/client'
+import { MoveCoder } from '@sentio/sdk/sui'
+import { defaultMoveCoder } from './move-coder.js'
 import { MoveAccountContext, MoveContext } from '../move/index.js'
 
 export class SuiContext extends MoveContext<SuiNetwork, SuiMoveNormalizedModule, SuiEvent | SuiMoveObject> {
@@ -60,11 +61,11 @@ export class SuiContext extends MoveContext<SuiNetwork, SuiMoveNormalizedModule,
       logIndex: 0,
       chainId: this.getChainId(),
       name: name,
-      labels: normalizeLabels(labels),
+      labels: normalizeLabels(labels)
     }
   }
 
-  get client(): JsonRpcProvider {
+  get client(): SuiClient {
     return getClient(this.network)
   }
 }
@@ -112,11 +113,11 @@ export class SuiAddressContext extends MoveAccountContext<
       logIndex: 0,
       chainId: this.getChainId(),
       name: name,
-      labels: normalizeLabels(labels),
+      labels: normalizeLabels(labels)
     }
   }
 
-  get client(): JsonRpcProvider {
+  get client(): SuiClient {
     return getClient(this.network)
   }
 

package/src/sui/ext/coin.ts

@@ -5,7 +5,7 @@ import { getPriceByType } from '../../utils/index.js'
 import { SuiChainId } from '@sentio/chain'
 // import { validateAndNormalizeAddress } from '../utils.js'
 import { getClient, SuiNetwork } from '../network.js'
-import { CoinMetadata } from '@mysten/sui.js'
+import { CoinMetadata } from '@mysten/sui.js/client'
 
 const WHITELISTED_COINS = new Map<string, SimpleCoinInfo>()
 
@@ -50,11 +50,11 @@ function setCoinList(list: SuiCoinInfo[]) {
     WHITELISTED_COINS.set(info.address, {
       token_type: {
         type: info.address,
-        account_address: info.address.split('::')[0],
+        account_address: info.address.split('::')[0]
       },
       symbol: info.symbol,
       decimals: info.decimals,
-      bridge,
+      bridge
     })
   }
 }
@@ -78,7 +78,7 @@ export function getCoinInfo(type: string): SimpleCoinInfo {
       token_type: { type: type, account_address: parts[0] },
       symbol: parts[2],
       decimals: 8,
-      bridge: 'native',
+      bridge: 'native'
     }
   }
   return r
@@ -107,7 +107,7 @@ export async function getCoinInfoWithFallback(type: string, network?: SuiNetwork
       token_type: { type: type, account_address: parts[0] },
       symbol: meta.symbol,
       decimals: meta.decimals,
-      bridge: 'native',
+      bridge: 'native'
     }
   }
   return r
@@ -146,8 +146,8 @@ const DEFAULT_LIST = {
       logoURI: 'https://cryptototem.com/wp-content/uploads/2022/08/SUI-logo.jpg',
       tags: [],
       extensions: {
-        coingeckoId: 'sui',
-      },
+        coingeckoId: 'sui'
+      }
     },
     {
       network: 'testnet',
@@ -158,8 +158,8 @@ const DEFAULT_LIST = {
       logoURI: 'https://cryptototem.com/wp-content/uploads/2022/08/SUI-logo.jpg',
       tags: [],
       extensions: {
-        coingeckoId: 'sui',
-      },
+        coingeckoId: 'sui'
+      }
     },
     {
       network: 'devnet',
@@ -170,8 +170,8 @@ const DEFAULT_LIST = {
       logoURI: 'https://cryptototem.com/wp-content/uploads/2022/08/SUI-logo.jpg',
       tags: [],
       extensions: {
-        coingeckoId: 'sui',
-      },
+        coingeckoId: 'sui'
+      }
     },
     {
       network: 'mainnet',
@@ -182,8 +182,8 @@ const DEFAULT_LIST = {
       logoURI: 'https://cryptototem.com/wp-content/uploads/2022/08/SUI-logo.jpg',
       tags: [],
       extensions: {
-        coingeckoId: 'sui',
-      },
+        coingeckoId: 'sui'
+      }
     },
     {
       network: 'testnet',
@@ -194,8 +194,8 @@ const DEFAULT_LIST = {
       logoURI: 'https://cryptototem.com/wp-content/uploads/2022/08/SUI-logo.jpg',
       tags: [],
       extensions: {
-        coingeckoId: 'sui',
-      },
+        coingeckoId: 'sui'
+      }
     },
     {
       network: 'devnet',
@@ -206,8 +206,8 @@ const DEFAULT_LIST = {
       logoURI: 'https://cryptototem.com/wp-content/uploads/2022/08/SUI-logo.jpg',
       tags: [],
       extensions: {
-        coingeckoId: 'sui',
-      },
+        coingeckoId: 'sui'
+      }
     },
     {
       network: 'testnet',
@@ -217,7 +217,7 @@ const DEFAULT_LIST = {
       logoURI: 'https://suiswap.app/images/token/suiswap-test.svg',
       tags: [],
       decimals: 8,
-      extensions: {},
+      extensions: {}
     },
     {
       network: 'testnet',
@@ -229,8 +229,8 @@ const DEFAULT_LIST = {
       tags: [],
       decimals: 8,
       extensions: {
-        coingeckoId: 'tether',
-      },
+        coingeckoId: 'tether'
+      }
     },
     {
       network: 'testnet',
@@ -242,8 +242,8 @@ const DEFAULT_LIST = {
       decimals: 8,
       tags: [],
       extensions: {
-        coingeckoId: 'usd-coin',
-      },
+        coingeckoId: 'usd-coin'
+      }
     },
     {
       network: 'testnet',
@@ -254,8 +254,8 @@ const DEFAULT_LIST = {
         'https://raw.githubusercontent.com/solana-labs/token-list/main/assets/mainnet/So11111111111111111111111111111111111111112/logo.png',
       decimals: 8,
       extensions: {
-        coingeckoId: 'solana',
-      },
+        coingeckoId: 'solana'
+      }
     },
     {
       network: 'testnet',
@@ -267,8 +267,8 @@ const DEFAULT_LIST = {
       decimals: 8,
       tags: [],
       extensions: {
-        coingeckoId: 'bitcoin',
-      },
+        coingeckoId: 'bitcoin'
+      }
     },
     {
       network: 'testnet',
@@ -280,8 +280,8 @@ const DEFAULT_LIST = {
       decimals: 8,
       tags: [],
       extensions: {
-        coingeckoId: 'dai',
-      },
+        coingeckoId: 'dai'
+      }
     },
     {
       network: 'testnet',
@@ -292,8 +292,8 @@ const DEFAULT_LIST = {
       decimals: 8,
       tags: [],
       extensions: {
-        coingeckoId: 'binancecoin',
-      },
+        coingeckoId: 'binancecoin'
+      }
     },
     {
       network: 'testnet',
@@ -304,8 +304,8 @@ const DEFAULT_LIST = {
       decimals: 8,
       tags: [],
       extensions: {
-        coingeckoId: 'ethereum',
-      },
+        coingeckoId: 'ethereum'
+      }
     },
     {
       network: 'testnet',
@@ -317,8 +317,8 @@ const DEFAULT_LIST = {
       decimals: 8,
       tags: [],
       extensions: {
-        coingeckoId: 'usd-coin',
-      },
+        coingeckoId: 'usd-coin'
+      }
     },
     {
       network: 'devnet',
@@ -328,7 +328,7 @@ const DEFAULT_LIST = {
       logoURI: 'https://suiswap.app/images/token/suiswap-test.svg',
       tags: [],
       decimals: 8,
-      extensions: {},
+      extensions: {}
     },
     {
       network: 'devnet',
@@ -340,8 +340,8 @@ const DEFAULT_LIST = {
       tags: [],
       decimals: 8,
       extensions: {
-        coingeckoId: 'tether',
-      },
+        coingeckoId: 'tether'
+      }
     },
     {
       network: 'devnet',
@@ -353,8 +353,8 @@ const DEFAULT_LIST = {
       decimals: 8,
       tags: [],
       extensions: {
-        coingeckoId: 'usd-coin',
-      },
+        coingeckoId: 'usd-coin'
+      }
     },
     {
       network: 'devnet',
@@ -365,8 +365,8 @@ const DEFAULT_LIST = {
         'https://raw.githubusercontent.com/solana-labs/token-list/main/assets/mainnet/So11111111111111111111111111111111111111112/logo.png',
       decimals: 8,
       extensions: {
-        coingeckoId: 'solana',
-      },
+        coingeckoId: 'solana'
+      }
     },
     {
       network: 'devnet',
@@ -378,8 +378,8 @@ const DEFAULT_LIST = {
       decimals: 8,
       tags: [],
       extensions: {
-        coingeckoId: 'bitcoin',
-      },
+        coingeckoId: 'bitcoin'
+      }
     },
     {
       network: 'devnet',
@@ -391,8 +391,8 @@ const DEFAULT_LIST = {
       decimals: 8,
       tags: [],
       extensions: {
-        coingeckoId: 'dai',
-      },
+        coingeckoId: 'dai'
+      }
     },
     {
       network: 'devnet',
@@ -403,8 +403,8 @@ const DEFAULT_LIST = {
       decimals: 8,
       tags: [],
       extensions: {
-        coingeckoId: 'binancecoin',
-      },
+        coingeckoId: 'binancecoin'
+      }
     },
     {
       network: 'devnet',
@@ -415,8 +415,8 @@ const DEFAULT_LIST = {
       decimals: 8,
       tags: [],
       extensions: {
-        coingeckoId: 'ethereum',
-      },
+        coingeckoId: 'ethereum'
+      }
     },
     {
       network: 'mainnet',
@@ -427,8 +427,8 @@ const DEFAULT_LIST = {
       logoURI: 'https://assets.coingecko.com/coins/images/279/large/ethereum.png',
       tags: [],
       extensions: {
-        coingeckoId: 'ethereum',
-      },
+        coingeckoId: 'ethereum'
+      }
     },
     {
       network: 'mainnet',
@@ -440,8 +440,8 @@ const DEFAULT_LIST = {
         'https://raw.githubusercontent.com/solana-labs/token-list/main/assets/mainnet/BQcdHdAQW1hczDbBi9hiegXAR7A98Q9jx3X3iBBBDiq4/logo.png',
       tags: [],
       extensions: {
-        coingeckoId: 'tether',
-      },
+        coingeckoId: 'tether'
+      }
     },
     {
       network: 'mainnet',
@@ -453,8 +453,8 @@ const DEFAULT_LIST = {
         'https://raw.githubusercontent.com/solana-labs/token-list/main/assets/mainnet/EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v/logo.png',
       tags: [],
       extensions: {
-        coingeckoId: 'usd-coin',
-      },
+        coingeckoId: 'usd-coin'
+      }
     },
     {
       network: 'mainnet',
@@ -465,8 +465,8 @@ const DEFAULT_LIST = {
       logoURI: 'https://assets.coingecko.com/coins/images/11090/large/InjXBNx9_400x400.jpg',
       tags: [],
       extensions: {
-        coingeckoId: 'celo',
-      },
+        coingeckoId: 'celo'
+      }
     },
     {
       network: 'mainnet',
@@ -477,8 +477,8 @@ const DEFAULT_LIST = {
       logoURI: 'https://assets.coingecko.com/coins/images/4713/large/matic-token-icon.png',
       tags: [],
       extensions: {
-        coingeckoId: 'matic-network',
-      },
+        coingeckoId: 'matic-network'
+      }
     },
     {
       network: 'mainnet',
@@ -489,8 +489,8 @@ const DEFAULT_LIST = {
       logoURI: 'https://assets.coingecko.com/coins/images/825/large/bnb-icon2_2x.png',
       tags: [],
       extensions: {
-        coingeckoId: 'binancecoin',
-      },
+        coingeckoId: 'binancecoin'
+      }
     },
     {
       network: 'mainnet',
@@ -501,8 +501,8 @@ const DEFAULT_LIST = {
       logoURI: 'https://assets.coingecko.com/coins/images/1/large/bitcoin.png',
       tags: [],
       extensions: {
-        coingeckoId: 'bitcoin',
-      },
+        coingeckoId: 'bitcoin'
+      }
     },
     {
       network: 'mainnet',
@@ -513,8 +513,8 @@ const DEFAULT_LIST = {
       logoURI: 'https://assets.coingecko.com/coins/images/12559/large/Avalanche_Circle_RedWhite_Trans.png',
       tags: [],
       extensions: {
-        coingeckoId: 'avalanche-2',
-      },
+        coingeckoId: 'avalanche-2'
+      }
     },
     {
       network: 'mainnet',
@@ -525,8 +525,8 @@ const DEFAULT_LIST = {
       logoURI: 'https://assets.coingecko.com/coins/images/4001/large/Fantom_round.png',
       tags: [],
       extensions: {
-        coingeckoId: 'fantom',
-      },
+        coingeckoId: 'fantom'
+      }
     },
     {
       network: 'mainnet',
@@ -537,8 +537,8 @@ const DEFAULT_LIST = {
       logoURI: 'https://assets.coingecko.com/coins/images/22459/large/glmr.png',
       tags: [],
       extensions: {
-        coingeckoId: 'moonbeam',
-      },
+        coingeckoId: 'moonbeam'
+      }
     },
     {
       network: 'mainnet',
@@ -549,8 +549,8 @@ const DEFAULT_LIST = {
       logoURI: 'https://assets.coingecko.com/coins/images/4128/large/solana.png',
       tags: [],
       extensions: {
-        coingeckoId: 'solana',
-      },
+        coingeckoId: 'solana'
+      }
     },
     {
       network: 'mainnet',
@@ -561,8 +561,8 @@ const DEFAULT_LIST = {
       logoURI: 'https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png',
       tags: [],
       extensions: {
-        coingeckoId: 'usd-coin',
-      },
-    },
-  ],
+        coingeckoId: 'usd-coin'
+      }
+    }
+  ]
 }

package/src/sui/ext/move-dex.ts

@@ -1,7 +1,7 @@
 import { BigDecimal } from '@sentio/bigdecimal'
 import { calculateValueInUsd, getCoinInfo, whitelistCoins, whiteListed } from './coin.js'
 import { MoveCoinList, MoveDex, moveGetPairValue, MovePoolAdaptor, SimpleCoinInfo } from '../../move/ext/index.js'
-import { SuiMoveObject, SuiMovePackage } from '@mysten/sui.js'
+import { SuiEvent, SuiMoveNormalizedModule, SuiMoveObject } from '@mysten/sui.js/client'
 import { SuiNetwork } from '../network.js'
 import { SuiContext, SuiObjectContext } from '../context.js'
 
@@ -29,9 +29,9 @@ export const SuiCoinList = new CoinList()
 
 export class SuiDex<T> extends MoveDex<
   SuiNetwork,
-  SuiMovePackage,
+  SuiMoveNormalizedModule,
   SuiMoveObject,
-  Event,
+  SuiEvent,
   SuiContext,
   SuiObjectContext,
   T

package/src/sui/index.ts

@@ -3,25 +3,25 @@ export {
   SuiAddressProcessor,
   SuiObjectProcessor,
   SuiWrappedObjectProcessor,
-  type SuiObjectBindOptions,
+  type SuiObjectBindOptions
 } from './sui-object-processor.js'
 
 export {
   SuiAddressProcessorTemplate,
   SuiObjectProcessorTemplate,
-  SuiWrappedObjectProcessorTemplate,
+  SuiWrappedObjectProcessorTemplate
 } from './sui-object-processor-template.js'
 
 export * from './network.js'
 export * from './context.js'
 export * from './models.js'
 
-export { BUILTIN_TYPES } from '../move/types.js'
-
 export * from './move-coder.js'
 
 export { SuiPlugin } from './sui-plugin.js'
 
-export { ModuleClient } from './module-client.js'
+export { BUILTIN_TYPES } from '@typemove/move'
+
+export { MoveCoder } from '@typemove/sui'
 
 // export { validateAndNormalizeAddress, isValidSuiAddress } from './utils.js'

package/src/sui/models.ts

@@ -1,5 +1,5 @@
-import type { SuiEvent, MoveCallSuiTransaction, SuiMoveObject } from '@mysten/sui.js'
-import { DecodedStruct } from '../move/types.js'
+import type { SuiEvent, MoveCallSuiTransaction, SuiMoveObject } from '@mysten/sui.js/client'
+import { DecodedStruct } from '@typemove/move'
 
 export type TypedEventInstance<T> = DecodedStruct<SuiEvent, T>
 export type TypedSuiMoveObject<T> = DecodedStruct<SuiMoveObject, T>