V2 (#3)

* upgrade sui.js to 0.41.0

* update

* update

* update

* update

* update

* add cocos-lib-builder

* update obelisk client

* update

* update obelisk project_name to projectName

* update

* update

---------

Co-authored-by: vladilen11 <[email protected]>

.gitignore

@@ -26,6 +26,7 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+pnpm-lock.yaml
 
 # local env files
 .env.local

packages/cli/obelisk.config.ts

@@ -1,7 +1,7 @@
 import { ObeliskConfig } from "@0xobelisk/common/src/codegen/types";
 
 export const obeliskConfig = {
-  project_name: "withinfinity",
+  projectName: "withinfinity",
   systems: [
       "fee_system",
       "home_system",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xobelisk/cli",
-  "version": "0.0.5",
+  "version": "0.1.3",
   "description": "Tookit for interacting with move eps framework",
   "keywords": [
     "sui",
@@ -39,7 +39,7 @@
     "lint": "eslint . --ext .ts"
   },
   "dependencies": {
-    "@0xobelisk/common": "0.0.2",
+    "@0xobelisk/common": "0.1.3",
     "@mysten/sui.js": "^0.41.0",
     "chalk": "^5.0.1",
     "child_process": "^1.0.2",

packages/cli/scripts/compgen-test.js

@@ -42,7 +42,7 @@ function init() {
         var config, output, a;
         return __generator(this, function (_a) {
             config = {
-                project_name: "withinfinity",
+                projectName: "withinfinity",
                 systems: [
                     "fee_system",
                     "home_system",

packages/cli/scripts/compgen-test.ts

@@ -6,7 +6,7 @@ type ComponentValueType = string
 type ConfigDataType = Record<string, string>
 
 type ObeliskConfig = {
-    project_name: string,
+    projectName: string,
     systems: string[],
     components: Record<string, ComponentMapType | ComponentValueType>
     // world 的顶级存储，适合定义world的规则，比如一个admin, 一个fee，并且可以帮你初始化数据
@@ -43,7 +43,7 @@ type ObeliskConfig = {
 
 async function init() {
   let config = {
-    project_name: "withinfinity",
+    projectName: "withinfinity",
     systems: [
         "fee_system",
         "home_system",

packages/cli/src/commands/publish.ts

@@ -27,7 +27,7 @@ const commandModule: CommandModule<Options, Options> = {
     try {
       const obeliskConfig = await loadConfig(configPath) as ObeliskConfig;
 
-      await publishHandler(obeliskConfig.project_name, network, savePath);
+      await publishHandler(obeliskConfig.projectName, network, savePath);
     } catch (error: any) {
       logError(error);
       process.exit(1);

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xobelisk/client",
-  "version": "0.0.7",
+  "version": "0.1.3",
   "description": "Tookit for interacting with move eps framework",
   "keywords": [
     "sui",
@@ -58,7 +58,7 @@
   },
   "dependencies": {
     "@mysten/bcs": "^0.7.3",
-    "@mysten/sui.js": "^0.37.1",
+    "@mysten/sui.js": "^0.41.0",
     "@obelisk/common": "link:../common",
     "@scure/bip39": "^1.2.1",
     "assert": "^2.0.0",
@@ -71,7 +71,7 @@
     "ts-retry-promise": "^0.7.0"
   },
   "peerDependencies": {
-    "@mysten/sui.js": "^0.37.1"
+    "@mysten/sui.js": "^0.41.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.6.6",

packages/client/scripts/init.ts

@@ -48,8 +48,8 @@ async function init() {
 
   const obelisk = new Obelisk({
     networkType: network as NetworkType,
-    packageId: packageId,
-    metadata: metadata,
+    // packageId: packageId,
+    // metadata: metadata,
     // secretKey: privkey
   });
 
@@ -59,7 +59,7 @@ async function init() {
   console.log(JSON.stringify(data1))
   let content = data1.data!.content as data;
   console.log(content.fields.value.fields.value);
-
+  await obelisk.requestFaucet("0x1804b821bba181110599b8757008eabe6f89f62774d7fafb5ee666ac742a41f8", "devnet");
   // let ownerdObjects = await obelisk.getOwnedEntities("0x1804b821bba181110599b8757008eabe6f89f62774d7fafb5ee666ac742a41f8")
   // console.log(ownerdObjects)
 

packages/client/src/index.ts

@@ -3,10 +3,12 @@ export {
   SUI_CLOCK_OBJECT_ID,
   SUI_SYSTEM_STATE_OBJECT_ID,
 } from '@mysten/sui.js';
+export { Ed25519Keypair } from '@mysten/sui.js/keypairs/ed25519';
+export { fromB64, toB64 } from '@mysten/sui.js';
+export * from '@mysten/sui.js/bcs';
 export { Obelisk } from './obelisk';
 export { SuiAccountManager } from './libs/suiAccountManager';
 export { SuiTxBlock } from './libs/suiTxBuilder';
-export { SuiRpcProvider } from './libs/suiRpcProvider';
 export { SuiContractFactory } from './libs/suiContractFactory';
 export { getMetadata } from './metadata';
 export type * from './types';

packages/client/src/libs/suiAccountManager/index.ts

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

packages/client/src/libs/suiAccountManager/keypair.ts

@@ -1,5 +1,5 @@
-import { Ed25519Keypair } from '@mysten/sui.js';
-import type { DerivePathParams } from './types';
+import { Ed25519Keypair, fromB64 } from '@mysten/sui.js';
+import type { DerivePathParams } from 'src/types';
 
 /**
  * @description Get ed25519 derive path for SUI

packages/client/src/libs/suiContractFactory/index.ts

@@ -88,7 +88,6 @@ export class SuiContractFactory {
       }
     );
   }
-  async worldCall() {}
 
   //   async call(arguments: ({
   //     kind: "Input";

packages/client/src/libs/suiRpcProvider/defaultChainConfigs.ts → packages/client/src/libs/suiInteractor/defaultConfig.ts

@@ -5,14 +5,16 @@ import {
   mainnetConnection,
 } from '@mysten/sui.js';
 import type { Connection } from '@mysten/sui.js';
-import type { NetworkType } from './types';
+import type { NetworkType } from 'src/types';
+export const defaultGasBudget = 10 ** 8; // 0.1 SUI, should be enough for most of the transactions
+export const defaultGasPrice = 1000; // 1000 MIST
 
 /**
  * @description Get the default fullnode url and faucet url for the given network type
  * @param networkType, 'testnet' | 'mainnet' | 'devnet' | 'localnet', default is 'devnet'
  * @returns { fullNode: string, websocket: string, faucet?: string }
  */
-export const getDefaultNetworkParams = (
+export const getDefaultConnection = (
   networkType: NetworkType = 'devnet'
 ): Connection => {
   switch (networkType) {

packages/client/src/libs/suiInteractor/index.ts

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