@typemove/sui 1.0.0-rc.8 → 1.0.0

package/src/codegen/codegen.ts

@@ -1,8 +1,4 @@
-import {
-  SuiMoveNormalizedModule,
-  SuiEvent,
-  SuiMoveObject,
-} from '@mysten/sui.js'
+import { SuiMoveNormalizedModule, SuiEvent, SuiMoveObject } from '@mysten/sui.js/client'
 
 import * as fs from 'fs'
 import chalk from 'chalk'
@@ -34,13 +30,13 @@ export async function codegen(
   console.log(chalk.green(`Generated ${numFiles} for Sui`))
 }
 
-class SuiCodegen extends AbstractCodegen<
+export class SuiCodegen extends AbstractCodegen<
   // SuiNetwork,
   SuiMoveNormalizedModule,
   SuiEvent | SuiMoveObject
 > {
-  ADDRESS_TYPE = 'SuiAddress'
-  REFERENCE_TYPE = 'ObjectId'
+  ADDRESS_TYPE = 'string'
+  SYSTEM_PACKAGE = '@typemove/sui'
   // ADDRESS_TYPE = 'string'
   // MAIN_NET = SuiNetwork.MAIN_NET
   // TEST_NET = SuiNetwork.TEST_NET
@@ -61,11 +57,7 @@ class SuiCodegen extends AbstractCodegen<
     return res
   }
 
-  generateStructs(
-    module: InternalMoveModule,
-    struct: InternalMoveStruct,
-    events: Set<string>
-  ): string {
+  generateStructs(module: InternalMoveModule, struct: InternalMoveStruct, events: Set<string>): string {
     let content = ''
     switch (structQname(module, struct)) {
       // TODO they should still have module code generated
@@ -84,15 +76,10 @@ class SuiCodegen extends AbstractCodegen<
         content += `export type Option<T> = T | undefined`
         break
     }
-    return (
-      content + super.generateStructs(module, struct, events, content !== '')
-    )
+    return content + super.generateStructs(module, struct, events, content !== '')
   }
 
-  generateForEvents(
-    module: InternalMoveModule,
-    struct: InternalMoveStruct
-  ): string {
+  generateForEvents(module: InternalMoveModule, struct: InternalMoveStruct): string {
     switch (structQname(module, struct)) {
       case '0x1::ascii::Char':
       case '0x1::ascii::String':
@@ -105,51 +92,81 @@ class SuiCodegen extends AbstractCodegen<
     return super.generateForEvents(module, struct)
   }
 
-  protected generateBuilder(module: InternalMoveModule): string {
-    const funcs = module.exposedFunctions.map((f) =>
-      this.generateBuilderForFunction(module, f)
-    )
+  protected generateExtra(module: InternalMoveModule): string {
+    const funcs = module.exposedFunctions.map((f) => this.generateBuilderForFunction(module, f))
+
+    const viewFuncs = module.exposedFunctions.map((f) => this.generateViewFunction(module, f))
 
     return `
     export namespace builder {
       ${funcs.join('\n')}
     }
+    export namespace view {
+      ${viewFuncs.join('\n')}
+    }
     `
   }
 
-  protected generateBuilderForFunction(
-    module: InternalMoveModule,
-    func: InternalMoveFunction
-  ): string {
-    if (func.visibility !== InternalMoveFunctionVisibility.PUBLIC) {
-      return ''
-    }
-
+  private generateArgs(module: InternalMoveModule, func: InternalMoveFunction) {
     const args = []
     for (const [idx, arg] of func.params.entries()) {
       if (arg.reference) {
         args.push({
-          paramType: 'ObjectId | ObjectCallArg | TransactionArgument',
+          paramType: `${this.ADDRESS_TYPE} | ObjectCallArg | TransactionArgument`,
           callValue: `_args.push(TransactionArgument.is(args[${idx}]) ? args[${idx}] : tx.object(args[${idx}]))`,
         })
       } else if (arg.isVector()) {
         args.push({
-          paramType: '(ObjectId | ObjectCallArg)[] | TransactionArgument',
+          paramType: `(${this.ADDRESS_TYPE} | ObjectCallArg)[] | TransactionArgument`,
           callValue: `_args.push(TransactionArgument.is(args[${idx}]) ? args[${idx}] : tx.makeMoveVec({
-            objects: args[${idx}].map(a => tx.object(a))
+            objects: args[${idx}].map((a: any) => tx.object(a))
             // type: TODO
           }))`,
         })
       } else {
         args.push({
-          paramType: `${this.generateTypeForDescriptor(
-            arg,
-            module.address
-          )} | TransactionArgument`,
+          paramType: `${this.generateTypeForDescriptor(arg, module.address)} | TransactionArgument`,
           callValue: `_args.push(TransactionArgument.is(args[${idx}]) ? args[${idx}] : tx.pure(args[${idx}]))`,
         })
       }
     }
+    return args
+  }
+
+  protected generateViewFunction(module: InternalMoveModule, func: InternalMoveFunction): string {
+    if (func.visibility !== InternalMoveFunctionVisibility.PUBLIC) {
+      return ''
+    }
+    const genericString = this.generateFunctionTypeParameters(func)
+
+    const typeParamArg = func.typeParams
+      .map((v, idx) => {
+        return `TypeDescriptor<T${idx}> | string`
+      })
+      .join(',')
+
+    const args = this.generateArgs(module, func)
+
+    return `export async function ${camel(normalizeToJSName(func.name))}${genericString}(
+      client: SuiClient,
+      args: [${args.map((a) => a.paramType).join(',')}],
+      ${typeParamArg.length > 0 ? `typeArguments: [${typeParamArg}]` : ``} ) {
+      const tx = new TransactionBlock()
+      builder.${camel(normalizeToJSName(func.name))}(tx, args ${typeParamArg.length > 0 ? `, typeArguments` : ''})
+      const res = await client.devInspectTransactionBlock({
+        transactionBlock: tx,
+        sender: ZERO_ADDRESS
+      })
+      return res
+    }`
+  }
+
+  protected generateBuilderForFunction(module: InternalMoveModule, func: InternalMoveFunction): string {
+    if (func.visibility !== InternalMoveFunctionVisibility.PUBLIC) {
+      return ''
+    }
+
+    const args = this.generateArgs(module, func)
 
     const genericString = this.generateFunctionTypeParameters(func)
 
@@ -164,14 +181,10 @@ class SuiCodegen extends AbstractCodegen<
       })
       .join(',')
 
-    return `export function ${camel(
-      normalizeToJSName(func.name)
-    )}${genericString}(tx: TransactionBlock, 
+    return `export function ${camel(normalizeToJSName(func.name))}${genericString}(tx: TransactionBlock, 
       args: [${args.map((a) => a.paramType).join(',')}],
       ${typeParamArg.length > 0 ? `typeArguments: [${typeParamArg}]` : ``} ):
-       TransactionArgument & [ ${'TransactionArgument,'.repeat(
-         func.params.length
-       )} ] {
+       TransactionArgument & [ ${'TransactionArgument,'.repeat(func.params.length)} ] {
       const _args: any[] = []
       ${args.map((a) => a.callValue).join('\n')}
       
@@ -179,9 +192,7 @@ class SuiCodegen extends AbstractCodegen<
       return tx.moveCall({
         target: "${module.address}::${module.name}::${func.name}",
         arguments: _args,
-        ${
-          typeParamArg.length > 0 ? `typeArguments: [${typeParamToString}]` : ``
-        }
+        ${typeParamArg.length > 0 ? `typeArguments: [${typeParamToString}]` : ``}
       })
     }`
   }
@@ -189,7 +200,10 @@ class SuiCodegen extends AbstractCodegen<
   generateImports(): string {
     return `
       ${super.generateImports()}
-      import { TransactionBlock, TransactionArgument, ObjectCallArg } from '@mysten/sui.js'
+      import { ZERO_ADDRESS } from '@typemove/sui'
+      import { TransactionBlock } from '@mysten/sui.js/transactions'
+      import { ObjectCallArg, TransactionArgument } from '@mysten/sui.js'
+      import { SuiClient } from '@mysten/sui.js/client'
     `
   }
 }

package/src/index.ts

@@ -4,5 +4,3 @@ export type { SuiAddress, ObjectId } from '@mysten/sui.js'
 // export * as builtin from './builtin/index.js'
 
 export { MoveCoder, defaultMoveCoder } from './move-coder.js'
-
-export { ModuleClient } from './module-client.js'

package/src/models.ts

@@ -1,20 +1,17 @@
-import type {
-  SuiEvent,
-  MoveCallSuiTransaction,
-  SuiMoveObject,
-} from '@mysten/sui.js'
+import type { SuiEvent, MoveCallSuiTransaction, SuiMoveObject } from '@mysten/sui.js/client'
 import { DecodedStruct } from '@typemove/move'
 
+export const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000000000000000000000000000'
+
 export type TypedEventInstance<T> = DecodedStruct<SuiEvent, T>
 export type TypedSuiMoveObject<T> = DecodedStruct<SuiMoveObject, T>
 
-export type TypedFunctionPayload<T extends Array<any>> =
-  MoveCallSuiTransaction & {
-    /**
-     * decoded argument data using ABI, undefined if there is decoding error, usually because the ABI/data mismatch
-     */
-    arguments_decoded: T
-  }
+export type TypedFunctionPayload<T extends Array<any>> = MoveCallSuiTransaction & {
+  /**
+   * decoded argument data using ABI, undefined if there is decoding error, usually because the ABI/data mismatch
+   */
+  arguments_decoded: T
+}
 
 // export interface TypedExecutionResultType<T> extends ExecutionResultType {
 //

package/src/move-coder.ts

@@ -14,7 +14,7 @@ import {
   SuiEvent,
   SuiMoveNormalizedModule,
   SuiMoveObject,
-} from '@mysten/sui.js'
+} from '@mysten/sui.js/client'
 import { toInternalModule } from './to-internal.js'
 import { SuiChainAdapter } from './sui-chain-adapter.js'
 import { dynamic_field } from './builtin/0x2.js'
@@ -60,10 +60,7 @@ export class MoveCoder extends AbstractMoveCoder<
   decodeEvent<T>(event: SuiEvent): Promise<TypedEventInstance<T> | undefined> {
     return this.decodedStruct(event)
   }
-  filterAndDecodeEvents<T>(
-    type: TypeDescriptor<T> | string,
-    resources: SuiEvent[]
-  ): Promise<TypedEventInstance<T>[]> {
+  filterAndDecodeEvents<T>(type: TypeDescriptor<T> | string, resources: SuiEvent[]): Promise<TypedEventInstance<T>[]> {
     if (typeof type === 'string') {
       type = parseMoveType(type)
     }
@@ -77,9 +74,7 @@ export class MoveCoder extends AbstractMoveCoder<
   ): Promise<dynamic_field.Field<T1, T2>[]> {
     // const type = dynamic_field.Field.TYPE
     // Not using the code above to avoid cycle initialize failed
-    const type = new TypeDescriptor<dynamic_field.Field<T1, T2>>(
-      '0x2::dynamic_field::Field'
-    )
+    const type = new TypeDescriptor<dynamic_field.Field<T1, T2>>('0x2::dynamic_field::Field')
     type.typeArgs = [keyType, valueType]
     const res = await this.filterAndDecodeObjects(type, objects)
     return res.map((o) => o.data_decoded)
@@ -92,15 +87,8 @@ export class MoveCoder extends AbstractMoveCoder<
     return this.filterAndDecodeStruct(type, objects)
   }
 
-  async decodeFunctionPayload(
-    payload: MoveCallSuiTransaction,
-    inputs: SuiCallArg[]
-  ): Promise<MoveCallSuiTransaction> {
-    const functionType = [
-      payload.package,
-      payload.module,
-      payload.function,
-    ].join(SPLITTER)
+  async decodeFunctionPayload(payload: MoveCallSuiTransaction, inputs: SuiCallArg[]): Promise<MoveCallSuiTransaction> {
+    const functionType = [payload.package, payload.module, payload.function].join(SPLITTER)
     const func = await this.getMoveFunction(functionType)
     const params = this.adapter.getMeaningfulFunctionParams(func.params)
     const args = []
@@ -135,9 +123,7 @@ export class MoveCoder extends AbstractMoveCoder<
 const DEFAULT_ENDPOINT = 'https://fullnode.mainnet.sui.io/'
 const CODER_MAP = new Map<string, MoveCoder>()
 
-export function defaultMoveCoder(
-  endpoint: string = DEFAULT_ENDPOINT
-): MoveCoder {
+export function defaultMoveCoder(endpoint: string = DEFAULT_ENDPOINT): MoveCoder {
   let coder = CODER_MAP.get(endpoint)
   if (!coder) {
     coder = new MoveCoder(DEFAULT_ENDPOINT)

package/src/sui-chain-adapter.ts

@@ -7,14 +7,8 @@ import {
   SPLITTER,
   TypeDescriptor,
 } from '@typemove/move'
-import {
-  Connection,
-  JsonRpcProvider,
-  SuiMoveNormalizedModule,
-  SuiEvent,
-  SuiMoveObject,
-  SuiParsedData,
-} from '@mysten/sui.js'
+
+import { SuiMoveNormalizedModule, SuiEvent, SuiMoveObject, SuiClient } from '@mysten/sui.js/client'
 
 export class SuiChainAdapter extends ChainAdapter<
   // SuiNetwork,
@@ -55,9 +49,7 @@ export class SuiChainAdapter extends ChainAdapter<
     return Object.values(modules).map(toInternalModule)
   }
 
-  getAllEventStructs(
-    modules: InternalMoveModule[]
-  ): Map<string, InternalMoveStruct> {
+  getAllEventStructs(modules: InternalMoveModule[]): Map<string, InternalMoveStruct> {
     const eventMap = new Map<string, InternalMoveStruct>()
 
     for (const module of modules) {
@@ -78,10 +70,16 @@ export class SuiChainAdapter extends ChainAdapter<
   }
 
   getData(val: SuiEvent | SuiMoveObject) {
-    if (SuiEvent.is(val)) {
+    // if (val.parsedJson) {
+    //   return val.parsedJson as any
+    // }
+    if ('parsedJson' in val) {
       return val.parsedJson as any
     }
-    if (SuiParsedData.is(val)) {
+    // if (SuiParsedData.is(val)) {
+    //   return val.fields as any
+    // }
+    if (val.dataType === 'moveObject') {
       return val.fields as any
     }
     // if (SuiMoveObject.is(val)) {
@@ -108,6 +106,6 @@ export class SuiChainAdapter extends ChainAdapter<
 //   return 'https://fullnode.mainnet.sui.io/'
 // }
 
-function getRpcClient(endpoint: string): JsonRpcProvider {
-  return new JsonRpcProvider(new Connection({ fullnode: endpoint }))
+function getRpcClient(endpoint: string): SuiClient {
+  return new SuiClient({ url: endpoint })
 }

package/src/tests/types/testnet/0x1e2b124f746a339b3cf99b9f969393a96594519aafb1d06517aacfeeae20e7a5.ts

@@ -5,14 +5,14 @@
 /* Generated modules for account 0x1e2b124f746a339b3cf99b9f969393a96594519aafb1d06517aacfeeae20e7a5 */
 
 import { TypeDescriptor, ANY_TYPE } from "@typemove/move";
-import { MoveCoder, defaultMoveCoder, TypedEventInstance } from "@typemove/sui";
-import { SuiAddress, ObjectId, ModuleClient } from "@typemove/sui";
+import { MoveCoder, TypedEventInstance } from "@typemove/sui";
 
-import {
-  TransactionBlock,
-  TransactionArgument,
-  ObjectCallArg,
-} from "@mysten/sui.js";
+import { defaultMoveCoder } from "@typemove/sui";
+
+import { ZERO_ADDRESS } from "@typemove/sui";
+import { TransactionBlock } from "@mysten/sui.js/transactions";
+import { ObjectCallArg, TransactionArgument } from "@mysten/sui.js";
+import { SuiClient } from "@mysten/sui.js/client";
 
 import { _0x2 } from "@typemove/sui/builtin";
 import { _0x1 } from "@typemove/sui/builtin";
@@ -30,7 +30,7 @@ export namespace oracle {
     const TYPE = new TypeDescriptor<Key<any>>(Key.TYPE_QNAME);
 
     export function type<T0>(
-      arg0: TypeDescriptor<T0> = ANY_TYPE
+      arg0: TypeDescriptor<T0> = ANY_TYPE,
     ): TypeDescriptor<Key<T0>> {
       return TYPE.apply(arg0);
     }
@@ -52,7 +52,7 @@ export namespace oracle {
     const TYPE = new TypeDescriptor<Oracle<any>>(Oracle.TYPE_QNAME);
 
     export function type<T0>(
-      arg0: TypeDescriptor<T0> = ANY_TYPE
+      arg0: TypeDescriptor<T0> = ANY_TYPE,
     ): TypeDescriptor<Oracle<T0>> {
       return TYPE.apply(arg0);
     }
@@ -85,20 +85,20 @@ export namespace oracle {
     export function copyKey<T0 = any>(
       tx: TransactionBlock,
       args: [
-        ObjectId | ObjectCallArg | TransactionArgument,
-        SuiAddress | TransactionArgument,
-        ObjectId | ObjectCallArg | TransactionArgument
+        string | ObjectCallArg | TransactionArgument,
+        string | TransactionArgument,
+        string | ObjectCallArg | TransactionArgument,
       ],
-      typeArguments: [TypeDescriptor<T0> | string]
+      typeArguments: [TypeDescriptor<T0> | string],
     ): TransactionArgument &
       [TransactionArgument, TransactionArgument, TransactionArgument] {
       const _args: any[] = [];
       _args.push(
-        TransactionArgument.is(args[0]) ? args[0] : tx.object(args[0])
+        TransactionArgument.is(args[0]) ? args[0] : tx.object(args[0]),
       );
       _args.push(TransactionArgument.is(args[1]) ? args[1] : tx.pure(args[1]));
       _args.push(
-        TransactionArgument.is(args[2]) ? args[2] : tx.object(args[2])
+        TransactionArgument.is(args[2]) ? args[2] : tx.object(args[2]),
       );
 
       // @ts-ignore
@@ -115,12 +115,12 @@ export namespace oracle {
     }
     export function getOracle<T0 = any>(
       tx: TransactionBlock,
-      args: [ObjectId | ObjectCallArg | TransactionArgument],
-      typeArguments: [TypeDescriptor<T0> | string]
+      args: [string | ObjectCallArg | TransactionArgument],
+      typeArguments: [TypeDescriptor<T0> | string],
     ): TransactionArgument & [TransactionArgument] {
       const _args: any[] = [];
       _args.push(
-        TransactionArgument.is(args[0]) ? args[0] : tx.object(args[0])
+        TransactionArgument.is(args[0]) ? args[0] : tx.object(args[0]),
       );
 
       // @ts-ignore
@@ -139,14 +139,14 @@ export namespace oracle {
       tx: TransactionBlock,
       args: [
         bigint | TransactionArgument,
-        ObjectId | ObjectCallArg | TransactionArgument
+        string | ObjectCallArg | TransactionArgument,
       ],
-      typeArguments: [TypeDescriptor<T0> | string]
+      typeArguments: [TypeDescriptor<T0> | string],
     ): TransactionArgument & [TransactionArgument, TransactionArgument] {
       const _args: any[] = [];
       _args.push(TransactionArgument.is(args[0]) ? args[0] : tx.pure(args[0]));
       _args.push(
-        TransactionArgument.is(args[1]) ? args[1] : tx.object(args[1])
+        TransactionArgument.is(args[1]) ? args[1] : tx.object(args[1]),
       );
 
       // @ts-ignore
@@ -164,14 +164,14 @@ export namespace oracle {
     export function update<T0 = any>(
       tx: TransactionBlock,
       args: [
-        ObjectId | ObjectCallArg | TransactionArgument,
-        ObjectId | ObjectCallArg | TransactionArgument,
+        string | ObjectCallArg | TransactionArgument,
+        string | ObjectCallArg | TransactionArgument,
         bigint | TransactionArgument,
         bigint | TransactionArgument,
         bigint | TransactionArgument,
-        ObjectId | ObjectCallArg | TransactionArgument
+        string | ObjectCallArg | TransactionArgument,
       ],
-      typeArguments: [TypeDescriptor<T0> | string]
+      typeArguments: [TypeDescriptor<T0> | string],
     ): TransactionArgument &
       [
         TransactionArgument,
@@ -179,20 +179,20 @@ export namespace oracle {
         TransactionArgument,
         TransactionArgument,
         TransactionArgument,
-        TransactionArgument
+        TransactionArgument,
       ] {
       const _args: any[] = [];
       _args.push(
-        TransactionArgument.is(args[0]) ? args[0] : tx.object(args[0])
+        TransactionArgument.is(args[0]) ? args[0] : tx.object(args[0]),
       );
       _args.push(
-        TransactionArgument.is(args[1]) ? args[1] : tx.object(args[1])
+        TransactionArgument.is(args[1]) ? args[1] : tx.object(args[1]),
       );
       _args.push(TransactionArgument.is(args[2]) ? args[2] : tx.pure(args[2]));
       _args.push(TransactionArgument.is(args[3]) ? args[3] : tx.pure(args[3]));
       _args.push(TransactionArgument.is(args[4]) ? args[4] : tx.pure(args[4]));
       _args.push(
-        TransactionArgument.is(args[5]) ? args[5] : tx.object(args[5])
+        TransactionArgument.is(args[5]) ? args[5] : tx.object(args[5]),
       );
 
       // @ts-ignore
@@ -208,10 +208,78 @@ export namespace oracle {
       });
     }
   }
+  export namespace view {
+    export async function copyKey<T0 = any>(
+      client: SuiClient,
+      args: [
+        string | ObjectCallArg | TransactionArgument,
+        string | TransactionArgument,
+        string | ObjectCallArg | TransactionArgument,
+      ],
+      typeArguments: [TypeDescriptor<T0> | string],
+    ) {
+      const tx = new TransactionBlock();
+      builder.copyKey(tx, args, typeArguments);
+      const res = await client.devInspectTransactionBlock({
+        transactionBlock: tx,
+        sender: ZERO_ADDRESS,
+      });
+      return res;
+    }
+    export async function getOracle<T0 = any>(
+      client: SuiClient,
+      args: [string | ObjectCallArg | TransactionArgument],
+      typeArguments: [TypeDescriptor<T0> | string],
+    ) {
+      const tx = new TransactionBlock();
+      builder.getOracle(tx, args, typeArguments);
+      const res = await client.devInspectTransactionBlock({
+        transactionBlock: tx,
+        sender: ZERO_ADDRESS,
+      });
+      return res;
+    }
+    export async function newOracle<T0 = any>(
+      client: SuiClient,
+      args: [
+        bigint | TransactionArgument,
+        string | ObjectCallArg | TransactionArgument,
+      ],
+      typeArguments: [TypeDescriptor<T0> | string],
+    ) {
+      const tx = new TransactionBlock();
+      builder.newOracle(tx, args, typeArguments);
+      const res = await client.devInspectTransactionBlock({
+        transactionBlock: tx,
+        sender: ZERO_ADDRESS,
+      });
+      return res;
+    }
+    export async function update<T0 = any>(
+      client: SuiClient,
+      args: [
+        string | ObjectCallArg | TransactionArgument,
+        string | ObjectCallArg | TransactionArgument,
+        bigint | TransactionArgument,
+        bigint | TransactionArgument,
+        bigint | TransactionArgument,
+        string | ObjectCallArg | TransactionArgument,
+      ],
+      typeArguments: [TypeDescriptor<T0> | string],
+    ) {
+      const tx = new TransactionBlock();
+      builder.update(tx, args, typeArguments);
+      const res = await client.devInspectTransactionBlock({
+        transactionBlock: tx,
+        sender: ZERO_ADDRESS,
+      });
+      return res;
+    }
+  }
 }
 
 const MODULES = JSON.parse(
-  '[{"fileFormatVersion":6,"address":"0x1e2b124f746a339b3cf99b9f969393a96594519aafb1d06517aacfeeae20e7a5","name":"oracle","friends":[],"structs":{"Key":{"abilities":{"abilities":["Key"]},"typeParameters":[{"constraints":{"abilities":[]},"isPhantom":true}],"fields":[{"name":"id","type":{"Struct":{"address":"0x2","module":"object","name":"UID","typeArguments":[]}}},{"name":"for","type":{"Struct":{"address":"0x2","module":"object","name":"ID","typeArguments":[]}}}]},"Oracle":{"abilities":{"abilities":["Key"]},"typeParameters":[{"constraints":{"abilities":[]},"isPhantom":true}],"fields":[{"name":"id","type":{"Struct":{"address":"0x2","module":"object","name":"UID","typeArguments":[]}}},{"name":"decimal","type":"U64"},{"name":"price","type":"U64"},{"name":"twap_price_1h","type":"U64"},{"name":"ts_ms","type":"U64"},{"name":"epoch","type":"U64"}]},"PriceEvent":{"abilities":{"abilities":["Copy","Drop"]},"typeParameters":[],"fields":[{"name":"token","type":{"Struct":{"address":"0x1","module":"ascii","name":"String","typeArguments":[]}}},{"name":"price","type":"U64"},{"name":"ts_ms","type":"U64"},{"name":"epoch","type":"U64"}]}},"exposedFunctions":{"copy_key":{"visibility":"Public","isEntry":true,"typeParameters":[{"abilities":[]}],"parameters":[{"Reference":{"Struct":{"address":"0x1e2b124f746a339b3cf99b9f969393a96594519aafb1d06517aacfeeae20e7a5","module":"oracle","name":"Key","typeArguments":[{"TypeParameter":0}]}}},"Address",{"MutableReference":{"Struct":{"address":"0x2","module":"tx_context","name":"TxContext","typeArguments":[]}}}],"return":[]},"get_oracle":{"visibility":"Public","isEntry":false,"typeParameters":[{"abilities":[]}],"parameters":[{"Reference":{"Struct":{"address":"0x1e2b124f746a339b3cf99b9f969393a96594519aafb1d06517aacfeeae20e7a5","module":"oracle","name":"Oracle","typeArguments":[{"TypeParameter":0}]}}}],"return":["U64","U64","U64","U64"]},"new_oracle":{"visibility":"Public","isEntry":true,"typeParameters":[{"abilities":[]}],"parameters":["U64",{"MutableReference":{"Struct":{"address":"0x2","module":"tx_context","name":"TxContext","typeArguments":[]}}}],"return":[]},"update":{"visibility":"Public","isEntry":true,"typeParameters":[{"abilities":[]}],"parameters":[{"MutableReference":{"Struct":{"address":"0x1e2b124f746a339b3cf99b9f969393a96594519aafb1d06517aacfeeae20e7a5","module":"oracle","name":"Oracle","typeArguments":[{"TypeParameter":0}]}}},{"Reference":{"Struct":{"address":"0x1e2b124f746a339b3cf99b9f969393a96594519aafb1d06517aacfeeae20e7a5","module":"oracle","name":"Key","typeArguments":[{"TypeParameter":0}]}}},"U64","U64","U64",{"MutableReference":{"Struct":{"address":"0x2","module":"tx_context","name":"TxContext","typeArguments":[]}}}],"return":[]}}}]'
+  '[{"fileFormatVersion":6,"address":"0x1e2b124f746a339b3cf99b9f969393a96594519aafb1d06517aacfeeae20e7a5","name":"oracle","friends":[],"structs":{"Key":{"abilities":{"abilities":["Key"]},"typeParameters":[{"constraints":{"abilities":[]},"isPhantom":true}],"fields":[{"name":"id","type":{"Struct":{"address":"0x2","module":"object","name":"UID","typeArguments":[]}}},{"name":"for","type":{"Struct":{"address":"0x2","module":"object","name":"ID","typeArguments":[]}}}]},"Oracle":{"abilities":{"abilities":["Key"]},"typeParameters":[{"constraints":{"abilities":[]},"isPhantom":true}],"fields":[{"name":"id","type":{"Struct":{"address":"0x2","module":"object","name":"UID","typeArguments":[]}}},{"name":"decimal","type":"U64"},{"name":"price","type":"U64"},{"name":"twap_price_1h","type":"U64"},{"name":"ts_ms","type":"U64"},{"name":"epoch","type":"U64"}]},"PriceEvent":{"abilities":{"abilities":["Copy","Drop"]},"typeParameters":[],"fields":[{"name":"token","type":{"Struct":{"address":"0x1","module":"ascii","name":"String","typeArguments":[]}}},{"name":"price","type":"U64"},{"name":"ts_ms","type":"U64"},{"name":"epoch","type":"U64"}]}},"exposedFunctions":{"copy_key":{"visibility":"Public","isEntry":true,"typeParameters":[{"abilities":[]}],"parameters":[{"Reference":{"Struct":{"address":"0x1e2b124f746a339b3cf99b9f969393a96594519aafb1d06517aacfeeae20e7a5","module":"oracle","name":"Key","typeArguments":[{"TypeParameter":0}]}}},"Address",{"MutableReference":{"Struct":{"address":"0x2","module":"tx_context","name":"TxContext","typeArguments":[]}}}],"return":[]},"get_oracle":{"visibility":"Public","isEntry":false,"typeParameters":[{"abilities":[]}],"parameters":[{"Reference":{"Struct":{"address":"0x1e2b124f746a339b3cf99b9f969393a96594519aafb1d06517aacfeeae20e7a5","module":"oracle","name":"Oracle","typeArguments":[{"TypeParameter":0}]}}}],"return":["U64","U64","U64","U64"]},"new_oracle":{"visibility":"Public","isEntry":true,"typeParameters":[{"abilities":[]}],"parameters":["U64",{"MutableReference":{"Struct":{"address":"0x2","module":"tx_context","name":"TxContext","typeArguments":[]}}}],"return":[]},"update":{"visibility":"Public","isEntry":true,"typeParameters":[{"abilities":[]}],"parameters":[{"MutableReference":{"Struct":{"address":"0x1e2b124f746a339b3cf99b9f969393a96594519aafb1d06517aacfeeae20e7a5","module":"oracle","name":"Oracle","typeArguments":[{"TypeParameter":0}]}}},{"Reference":{"Struct":{"address":"0x1e2b124f746a339b3cf99b9f969393a96594519aafb1d06517aacfeeae20e7a5","module":"oracle","name":"Key","typeArguments":[{"TypeParameter":0}]}}},"U64","U64","U64",{"MutableReference":{"Struct":{"address":"0x2","module":"tx_context","name":"TxContext","typeArguments":[]}}}],"return":[]}}}]',
 );
 
 export function loadAllTypes(coder: MoveCoder) {