@0xobelisk/sui-client 0.5.17 → 0.5.19

package/dist/libs/suiTxBuilder/util.d.ts

@@ -1,6 +1,6 @@
-import type { TransactionArgument, TransactionBlock, TransactionObjectArgument } from '@mysten/sui.js/transactions';
-import type { SuiInputTypes, SuiObjectArg, SuiAddressArg, SuiTxArg, SuiVecTxArg } from '../../types';
-export declare const getDefaultSuiInputType: (value: SuiTxArg) => SuiInputTypes | undefined;
+import type { TransactionArgument, Transaction, TransactionObjectArgument } from '@mysten/sui/transactions';
+import type { SuiObjectArg, SuiAddressArg, SuiTxArg, SuiVecTxArg, SuiInputTypes } from 'src/types';
+export declare const getDefaultSuiInputType: (value: SuiTxArg) => 'u64' | 'bool' | 'object' | undefined;
 /**
  * Since we know the elements in the array are the same type
  * If type is not provided, we will try to infer the type from the first element
@@ -14,7 +14,7 @@ export declare const getDefaultSuiInputType: (value: SuiTxArg) => SuiInputTypes
  * @param args
  * @param type 'address' | 'bool' | 'u8' | 'u16' | 'u32' | 'u64' | 'u128' | 'u256' | 'signer' | 'object' | string
  */
-export declare function makeVecParam(txBlock: TransactionBlock, args: SuiTxArg[], type?: SuiInputTypes): TransactionArgument;
+export declare function makeVecParam(txBlock: Transaction, args: SuiTxArg[], type?: SuiInputTypes): TransactionArgument;
 /**
  * Check whether it is an valid move vec input.
  *
@@ -29,12 +29,7 @@ export declare function isMoveVecArg(arg: SuiTxArg | SuiVecTxArg): arg is SuiVec
  * @param args The array of argument to convert.
  * @returns The converted array of TransactionArgument.
  */
-export declare function convertArgs(txBlock: TransactionBlock, args: (SuiTxArg | SuiVecTxArg)[]): ({
-    index: number;
-    kind: "Input";
-    type: "pure";
-    value?: any;
-} | TransactionObjectArgument | import("@mysten/bcs").SerializedBcs<unknown, unknown>)[];
+export declare function convertArgs(txBlock: Transaction, args: (SuiTxArg | SuiVecTxArg)[]): TransactionArgument[];
 /**
  * Convert any valid address input into a TransactionArgument.
  *
@@ -42,12 +37,7 @@ export declare function convertArgs(txBlock: TransactionBlock, args: (SuiTxArg |
  * @param arg The address argument to convert.
  * @returns The converted TransactionArgument.
  */
-export declare function convertAddressArg(txBlock: TransactionBlock, arg: SuiAddressArg): TransactionObjectArgument | {
-    index: number;
-    kind: "Input";
-    type: "pure";
-    value?: any;
-} | import("@mysten/bcs").SerializedBcs<unknown, unknown>;
+export declare function convertAddressArg(txBlock: Transaction, arg: SuiAddressArg): TransactionArgument;
 /**
  * Convert any valid object input into a TransactionArgument.
  *
@@ -55,4 +45,5 @@ export declare function convertAddressArg(txBlock: TransactionBlock, arg: SuiAdd
  * @param arg The object argument to convert.
  * @returns The converted TransactionArgument.
  */
-export declare function convertObjArg(txb: TransactionBlock, arg: SuiObjectArg): TransactionObjectArgument;
+export declare function convertObjArg(txb: Transaction, arg: SuiObjectArg): TransactionObjectArgument;
+export declare function convertAmounts(txBlock: Transaction, amounts: (SuiTxArg | number | bigint)[]): (TransactionArgument | number | bigint)[];

package/dist/metadata/index.d.ts

@@ -1,3 +1,3 @@
-import { SuiMoveNormalizedModules } from '@mysten/sui.js/client';
+import { SuiMoveNormalizedModules } from '@mysten/sui/client';
 import { NetworkType } from '../types';
 export declare function loadMetadata(networkType: NetworkType, packageId: string): Promise<SuiMoveNormalizedModules | undefined>;

package/dist/obelisk.d.ts

@@ -1,9 +1,10 @@
 /// <reference types="node" />
-import { TransactionBlock } from '@mysten/sui.js/transactions';
-import type { SuiTransactionBlockResponse, DevInspectResults, SuiMoveNormalizedModules, SuiObjectData } from '@mysten/sui.js/client';
+import { Transaction } from '@mysten/sui/transactions';
+import type { SuiTransactionBlockResponse, DevInspectResults, SuiMoveNormalizedModules, SuiObjectData } from '@mysten/sui/client';
 import { SuiAccountManager } from './libs/suiAccountManager';
-import { SuiTxBlock } from './libs/suiTxBuilder';
+import { SuiTx } from './libs/suiTxBuilder';
 import { SuiInteractor } from './libs/suiInteractor';
+import { MapMoudleStruct, NetworkType } from './types';
 import { SuiContractFactory } from './libs/suiContractFactory';
 import { SuiMoveMoudleFuncType } from './libs/suiContractFactory/types';
 import { DerivePathParams, FaucetNetworkType, MapMoudleFuncQuery, MapMoudleFuncTx, ObeliskParams, SuiTxArg, SuiVecTxArg } from './types';
@@ -37,13 +38,14 @@ export declare class Obelisk {
     constructor({ mnemonics, secretKey, networkType, fullnodeUrls, packageId, metadata, }?: ObeliskParams);
     get query(): MapMoudleFuncQuery;
     get tx(): MapMoudleFuncTx;
+    get struct(): MapMoudleStruct;
     /**
      * if derivePathParams is not provided or mnemonics is empty, it will return the keypair.
      * else:
      * it will generate signer from the mnemonic with the given derivePathParams.
      * @param derivePathParams, such as { accountIndex: 2, isExternal: false, addressIndex: 10 }, comply with the BIP44 standard
      */
-    getKeypair(derivePathParams?: DerivePathParams): import("@mysten/sui.js/dist/cjs/keypairs/ed25519").Ed25519Keypair;
+    getKeypair(derivePathParams?: DerivePathParams): import("@mysten/sui/dist/cjs/keypairs/ed25519").Ed25519Keypair;
     /**
      * @description Switch the current account with the given derivePathParams
      * @param derivePathParams, such as { accountIndex: 2, isExternal: false, addressIndex: 10 }, comply with the BIP44 standard
@@ -57,18 +59,20 @@ export declare class Obelisk {
     currentAddress(): string;
     getPackageId(): string;
     getMetadata(): SuiMoveNormalizedModules | undefined;
+    getNetwork(): NetworkType | undefined;
     /**
      * Request some SUI from faucet
      * @Returns {Promise<boolean>}, true if the request is successful, false otherwise.
      */
-    requestFaucet(address: string, network: FaucetNetworkType): Promise<void>;
-    getBalance(coinType?: string, derivePathParams?: DerivePathParams): Promise<import("@mysten/sui.js/client").CoinBalance>;
-    balanceOf(accountAddress?: string, coinType?: string, derivePathParams?: DerivePathParams): Promise<import("@mysten/sui.js/client").CoinBalance>;
-    client(): import("@mysten/sui.js/client").SuiClient;
+    requestFaucet(address?: string, network?: FaucetNetworkType, derivePathParams?: DerivePathParams): Promise<void>;
+    getBalance(coinType?: string, derivePathParams?: DerivePathParams): Promise<import("@mysten/sui/client").CoinBalance>;
+    balanceOf(accountAddress?: string, coinType?: string, derivePathParams?: DerivePathParams): Promise<import("@mysten/sui/client").CoinBalance>;
+    client(): import("@mysten/sui/client").SuiClient;
     getObject(objectId: string): Promise<SuiObjectData>;
     getObjects(objectIds: string[]): Promise<SuiObjectData[]>;
-    signTxn(tx: Uint8Array | TransactionBlock | SuiTxBlock, derivePathParams?: DerivePathParams): Promise<import("@mysten/sui.js/dist/cjs/cryptography").SignatureWithBytes>;
-    signAndSendTxn(tx: Uint8Array | TransactionBlock | SuiTxBlock, derivePathParams?: DerivePathParams): Promise<SuiTransactionBlockResponse>;
+    signTxn(tx: Uint8Array | Transaction | SuiTx, derivePathParams?: DerivePathParams): Promise<import("@mysten/sui/dist/cjs/cryptography").SignatureWithBytes>;
+    signAndSendTxn(tx: Uint8Array | Transaction | SuiTx, derivePathParams?: DerivePathParams): Promise<SuiTransactionBlockResponse>;
+    sendTxn(transactionBlock: Uint8Array | string, signature: string | string[]): Promise<SuiTransactionBlockResponse>;
     /**
      * Transfer the given amount of SUI to the recipient
      * @param recipient
@@ -121,7 +125,7 @@ export declare class Obelisk {
      * @param derivePathParams the derive path params
      * @returns the effects and events of the transaction, such as object changes, gas cost, event emitted.
      */
-    inspectTxn(tx: Uint8Array | TransactionBlock | SuiTxBlock, derivePathParams?: DerivePathParams): Promise<DevInspectResults>;
+    inspectTxn(tx: Uint8Array | Transaction | SuiTx, derivePathParams?: DerivePathParams): Promise<DevInspectResults>;
     getWorld(worldObjectId: string): Promise<SuiObjectData>;
     listSchemaNames(worldId: string): Promise<any>;
     getEntity(worldId: string, schemaName: string, entityId?: string): Promise<any[] | undefined>;
@@ -132,5 +136,5 @@ export declare class Obelisk {
     entity_key_from_address_with_seed(objectId: string, seed: string): Promise<string | undefined>;
     entity_key_from_address_with_u256(objectId: string, x: number): Promise<string | undefined>;
     entity_key_from_u256(x: number): Promise<string>;
-    formatData(type: string, value: Buffer | number[] | Uint8Array): Promise<any>;
+    autoFormatDryValue(value: DevInspectResults): Promise<(string | number | boolean | number[] | null)[] | undefined>;
 }

package/dist/types/index.d.ts

@@ -1,9 +1,8 @@
 import type { Infer } from 'superstruct';
-import type { SerializedBcs } from '@mysten/bcs';
-import type { TransactionArgument } from '@mysten/sui.js/transactions';
-import type { TransactionBlock, TransactionObjectArgument, TransactionResult } from '@mysten/sui.js/transactions';
-import type { SuiObjectRef, SuiMoveNormalizedModules, DevInspectResults, SuiTransactionBlockResponse, DisplayFieldsResponse, MoveStruct } from '@mysten/sui.js/client';
-import type { SharedObjectRef, ObjectArg } from '@mysten/sui.js/bcs';
+import type { BcsType, SerializedBcs } from '@mysten/bcs';
+import type { TransactionArgument } from '@mysten/sui/transactions';
+import type { Transaction, TransactionObjectArgument, TransactionResult, Argument, Inputs } from '@mysten/sui/transactions';
+import type { SuiMoveNormalizedModules, DevInspectResults, SuiTransactionBlockResponse, DisplayFieldsResponse, SuiMoveNormalizedType, MoveStruct } from '@mysten/sui/client';
 import { SuiMoveMoudleFuncType } from '../libs/suiContractFactory/types';
 export declare const ObjectContentFields: import("superstruct").Struct<Record<string, any>, null>;
 export type ObjectContentFields = Infer<typeof ObjectContentFields>;
@@ -60,15 +59,38 @@ export interface MessageMeta {
     readonly meta: SuiMoveMoudleFuncType;
 }
 export interface ContractQuery extends MessageMeta {
-    (tx: TransactionBlock, params: (TransactionArgument | SerializedBcs<any>)[], typeArguments?: string[], isRaw?: boolean): Promise<DevInspectResults | TransactionResult>;
+    (tx: Transaction, params: (TransactionArgument | SerializedBcs<any>)[], typeArguments?: string[], isRaw?: boolean): Promise<DevInspectResults | TransactionResult>;
 }
 export interface ContractTx extends MessageMeta {
-    (tx: TransactionBlock, params: (TransactionArgument | SerializedBcs<any>)[], typeArguments?: string[], isRaw?: boolean): Promise<SuiTransactionBlockResponse | TransactionResult>;
+    (tx: Transaction, params: (TransactionArgument | SerializedBcs<any>)[], typeArguments?: string[], isRaw?: boolean): Promise<SuiTransactionBlockResponse | TransactionResult>;
 }
 export type MapMessageTx = Record<string, ContractTx>;
 export type MapMessageQuery = Record<string, ContractQuery>;
 export type MapMoudleFuncTx = Record<string, MapMessageTx>;
 export type MapMoudleFuncQuery = Record<string, MapMessageQuery>;
+type MoveStructType = {
+    struct: Record<string, {
+        fields: {
+            type: SuiMoveNormalizedType;
+            name: string;
+        }[];
+        abilities: {
+            abilities: string[];
+        };
+        typeParameters: {
+            constraints: {
+                abilities: string[];
+            };
+            isPhantom: boolean;
+        }[];
+    }>;
+    bcs: BcsType<{
+        [x: string]: any;
+    }, {
+        [x: string]: any;
+    }>;
+};
+export type MapMoudleStruct = Record<string, MoveStructType>;
 export type MapMoudleFuncTest = Record<string, Record<string, string>>;
 export type MapMoudleFuncQueryTest = Record<string, Record<string, string>>;
 export type AccountMangerParams = {
@@ -98,17 +120,27 @@ export type ObjectData = {
     objectDisplay: DisplayFieldsResponse;
     objectFields: ObjectContentFields;
 };
-type TransactionBlockType = InstanceType<typeof TransactionBlock>;
+type TransactionBlockType = InstanceType<typeof Transaction>;
 export type PureCallArg = {
     Pure: number[];
 };
+/**
+ * An object argument.
+ */
+type ObjectArg = {
+    ImmOrOwnedObject: SuiObjectRef;
+} | {
+    SharedObject: SharedObjectRef;
+} | {
+    Receiving: SuiObjectRef;
+};
 export type ObjectCallArg = {
     Object: ObjectArg;
 };
 export type TransactionType = Parameters<TransactionBlockType['add']>;
-export type TransactionPureArgument = Extract<TransactionArgument, {
-    kind: 'Input';
-    type: 'pure';
+export type TransactionPureArgument = Extract<Argument, {
+    $kind: 'Input';
+    type?: 'pure';
 }>;
 export type ObjectFieldType = {
     id: {
@@ -122,17 +154,35 @@ export type EntityData = {
     index: string;
     key: string;
 };
-export type SuiAddressArg = TransactionArgument | SerializedBcs<any> | string | PureCallArg;
-export type SuiTxArg = SuiAddressArg | number | bigint | boolean;
-export type SuiObjectArg = TransactionObjectArgument | string | SharedObjectRef | SuiObjectRef | ObjectCallArg;
+type SharedObjectRef = {
+    /** Hex code as string representing the object id */
+    objectId: string;
+    /** The version the object was shared at */
+    initialSharedVersion: number | string;
+    /** Whether reference is mutable */
+    mutable: boolean;
+};
+type SuiObjectRef = {
+    /** Base64 string representing the object digest */
+    objectId: string;
+    /** Object version */
+    version: number | string;
+    /** Hex code as string representing the object id */
+    digest: string;
+};
+export type SuiTxArg = TransactionArgument | SerializedBcs<any>;
+export type SuiAddressArg = Argument | SerializedBcs<any> | string;
+export type SuiAmountsArg = SuiTxArg | number | bigint;
+export type SuiObjectArg = TransactionObjectArgument | string | Parameters<typeof Inputs.ObjectRef>[0] | Parameters<typeof Inputs.SharedObjectRef>[0] | ObjectCallArg;
 export type SuiVecTxArg = {
     value: SuiTxArg[];
     vecType: SuiInputTypes;
 } | SuiTxArg[];
+export type DryTxReturnValues = Array<[Uint8Array, string]>;
 /**
  * These are the basics types that can be used in the SUI
  */
-export type SuiBasicTypes = 'address' | 'bool' | 'u8' | 'u16' | 'u32' | 'u64' | 'u128' | 'u256' | 'signer';
+export type SuiBasicTypes = 'address' | 'bool' | 'u8' | 'u16' | 'u32' | 'u64' | 'u128' | 'u256';
 export type SuiInputTypes = 'object' | SuiBasicTypes;
 export type SuiReturnValues = {
     returnValues: [number[], string][];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xobelisk/sui-client",
-  "version": "0.5.17",
+  "version": "0.5.19",
   "description": "Tookit for interacting with move eps framework",
   "keywords": [
     "sui",
@@ -37,11 +37,14 @@
     "src"
   ],
   "dependencies": {
-    "@mysten/bcs": "^0.11.1",
-    "@mysten/sui.js": "^0.51.2",
+    "@mysten/bcs": "^1.0.2",
+    "@mysten/sui": "^1.1.2",
+    "@mysten/zklogin": "^0.7.8",
+    "@graphql-typed-document-node/core": "^3.2.0",
     "@noble/curves": "^1.2.0",
     "@noble/hashes": "^1.3.2",
     "@scure/bip39": "^1.2.1",
+    "@suchipi/femver": "^1.0.0",
     "assert": "^2.1.0",
     "bech32": "^2.0.0",
     "superstruct": "^1.0.3",
@@ -51,10 +54,10 @@
     "husky": "^8.0.3",
     "keccak256": "^1.0.6",
     "process": "^0.11.10",
-    "tmp": "^0.2.1"
-  },
-  "peerDependencies": {
-    "@mysten/sui.js": "^0.51.2"
+    "gql.tada": "^1.7.0",
+    "graphql": "^16.8.1",
+    "tmp": "^0.2.1",
+    "valibot": "^0.25.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^18.0.0",
@@ -74,7 +77,7 @@
     "tsconfig-paths": "^4.2.0",
     "tsup": "^7.1.0",
     "typedoc": "^0.25.2",
-    "typescript": "^5.0.4"
+    "typescript": "^5.2.2"
   },
   "lint-staged": {
     "**/*.ts": [

package/src/index.ts

@@ -1,13 +1,14 @@
-export * from '@mysten/sui.js/client';
-export * from '@mysten/sui.js/utils';
-export * from '@mysten/sui.js/transactions';
-export * from '@mysten/sui.js/keypairs/ed25519';
-export * from '@mysten/sui.js/keypairs/secp256k1';
-export * from '@mysten/sui.js/keypairs/secp256r1';
-export { BCS, getSuiMoveConfig } from '@mysten/bcs';
+export * from '@mysten/sui/client';
+export * from '@mysten/sui/utils';
+export * from '@mysten/sui/transactions';
+export * from '@mysten/sui/bcs';
+export * from '@mysten/sui/keypairs/ed25519';
+export * from '@mysten/sui/keypairs/secp256k1';
+export * from '@mysten/sui/keypairs/secp256r1';
+export { bcs, BcsType } from '@mysten/bcs';
 export { Obelisk } from './obelisk';
 export { SuiAccountManager } from './libs/suiAccountManager';
-export { SuiTxBlock } from './libs/suiTxBuilder';
+export { SuiTx } from './libs/suiTxBuilder';
 export { MultiSigClient } from './libs/multiSig';
 export { SuiContractFactory } from './libs/suiContractFactory';
 export { loadMetadata } from './metadata';

package/src/libs/multiSig/client.ts

@@ -1,5 +1,5 @@
-import { MultiSigPublicKey } from '@mysten/sui.js/multisig';
-import type { PublicKey } from '@mysten/sui.js/src/cryptography';
+import { MultiSigPublicKey } from '@mysten/sui/multisig';
+import type { PublicKey } from '@mysten/sui/cryptography';
 import { ed25519PublicKeyFromBase64 } from './publickey';
 
 export type PublicKeyWeightPair = {

package/src/libs/multiSig/publickey.ts

@@ -1,6 +1,6 @@
-import { PublicKey } from '@mysten/sui.js/cryptography';
-import { Ed25519PublicKey } from '@mysten/sui.js/keypairs/ed25519';
-import { fromB64 } from '@mysten/sui.js/utils';
+import { PublicKey } from '@mysten/sui/cryptography';
+import { Ed25519PublicKey } from '@mysten/sui/keypairs/ed25519';
+import { fromB64 } from '@mysten/sui/utils';
 
 export function ed25519PublicKeyFromBase64(rawPubkey: string): PublicKey {
   let bytes = fromB64(rawPubkey);

package/src/libs/suiAccountManager/index.ts

@@ -1,4 +1,4 @@
-import { Ed25519Keypair } from '@mysten/sui.js/keypairs/ed25519';
+import { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519';
 import { getKeyPair } from './keypair';
 import { hexOrBase64ToUint8Array, normalizePrivateKey } from './util';
 import { generateMnemonic } from './crypto';
@@ -6,7 +6,7 @@ import type { AccountMangerParams, DerivePathParams } from 'src/types';
 import {
   SUI_PRIVATE_KEY_PREFIX,
   decodeSuiPrivateKey,
-} from '@mysten/sui.js/cryptography';
+} from '@mysten/sui/cryptography';
 
 export class SuiAccountManager {
   private mnemonics: string;

package/src/libs/suiAccountManager/keypair.ts

@@ -1,4 +1,4 @@
-import { Ed25519Keypair } from '@mysten/sui.js/keypairs/ed25519';
+import { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519';
 import type { DerivePathParams } from '../../types';
 
 /**

package/src/libs/suiAccountManager/util.ts

@@ -1,4 +1,4 @@
-import { fromB64 } from '@mysten/sui.js/utils';
+import { fromB64 } from '@mysten/sui/utils';
 
 /**
  * @description This regular expression matches any string that contains only hexadecimal digits (0-9, A-F, a-f).

package/src/libs/suiContractFactory/index.ts

@@ -1,4 +1,4 @@
-import type { SuiMoveNormalizedModules } from '@mysten/sui.js/client';
+import type { SuiMoveNormalizedModules } from '@mysten/sui/client';
 import type { ContractFactoryParams, SuiMoveMoudleValueType } from './types';
 export type ApiTypes = 'promise' | 'rxjs';
 

package/src/libs/suiContractFactory/types.ts

@@ -1,7 +1,7 @@
 import type {
   SuiMoveNormalizedModules,
   SuiMoveNormalizedType,
-} from '@mysten/sui.js/client';
+} from '@mysten/sui/client';
 
 export type ContractFactoryParams = {
   packageId?: string;

package/src/libs/suiInteractor/index.ts

@@ -1,2 +1 @@
 export { SuiInteractor } from './suiInteractor';
-// export { getDefaultConnection } from './defaultConfig';

package/src/libs/suiInteractor/suiInteractor.ts

@@ -1,12 +1,12 @@
-import { SuiClient } from '@mysten/sui.js/client';
+import { SuiClient } from '@mysten/sui/client';
 import type {
   SuiTransactionBlockResponseOptions,
   SuiTransactionBlockResponse,
   SuiObjectDataOptions,
   SuiObjectData,
-} from '@mysten/sui.js/client';
-import type * as RpcTypes from '@mysten/sui.js/dist/cjs/client/types/generated';
-import { requestSuiFromFaucetV0, getFaucetHost } from '@mysten/sui.js/faucet';
+} from '@mysten/sui/client';
+import type * as RpcTypes from '@mysten/sui/dist/cjs/client/types/generated';
+import { requestSuiFromFaucetV0, getFaucetHost } from '@mysten/sui/faucet';
 import { FaucetNetworkType, NetworkType, ObjectData } from '../../types';
 import { SuiOwnedObject, SuiSharedObject } from '../suiModel';
 import { delay } from './util';

package/src/libs/suiModel/suiOwnedObject.ts

@@ -1,5 +1,5 @@
-import type { SuiTransactionBlockResponse } from '@mysten/sui.js/client';
-import type { CallArg } from '@mysten/sui.js/bcs';
+import type { SuiTransactionBlockResponse } from '@mysten/sui/client';
+import type { CallArg } from '@mysten/sui/transactions';
 
 export class SuiOwnedObject {
   public readonly objectId: string;
@@ -26,8 +26,10 @@ export class SuiOwnedObject {
       return this.objectId;
     }
     return {
+      $kind: 'Object',
       Object: {
-        ImmOrOwned: {
+        $kind: 'ImmOrOwnedObject',
+        ImmOrOwnedObject: {
           objectId: this.objectId,
           version: this.version,
           digest: this.digest,

package/src/libs/suiModel/suiSharedObject.ts

@@ -1,4 +1,4 @@
-import type { CallArg } from '@mysten/sui.js/bcs';
+import type { CallArg } from '@mysten/sui/transactions';
 
 export class SuiSharedObject {
   public readonly objectId: string;
@@ -18,8 +18,10 @@ export class SuiSharedObject {
       return this.objectId;
     }
     return {
+      $kind: 'Object',
       Object: {
-        Shared: {
+        $kind: 'SharedObject',
+        SharedObject: {
           objectId: this.objectId,
           initialSharedVersion: this.initialSharedVersion,
           mutable,