diff --git a/packages/aptos-client/package.json b/packages/aptos-client/package.json index aa2724053..634296af1 100644 --- a/packages/aptos-client/package.json +++ b/packages/aptos-client/package.json @@ -1,6 +1,6 @@ { "name": "@0xobelisk/aptos-client", - "version": "0.0.14", + "version": "0.0.16", "description": "Tookit for interacting with move eps framework", "keywords": [ "aptos", diff --git a/packages/aptos-client/scripts/init.ts b/packages/aptos-client/scripts/init.ts index 8385f5257..1b5a590a2 100644 --- a/packages/aptos-client/scripts/init.ts +++ b/packages/aptos-client/scripts/init.ts @@ -31,32 +31,40 @@ async function init() { console.log('======= query other user message ========'); - let message = await dubhe.query.message.get_message([ - '0x35cc4910b9934ceacf0bbb014e3a823f9dee5b8725110360729b500ee81a2d3a', - ]); + let message = await dubhe.query.message.get_message({ + params: [ + '0x35cc4910b9934ceacf0bbb014e3a823f9dee5b8725110360729b500ee81a2d3a', + ], + }); console.log(message); console.log('======= set our message ========'); - const res1 = (await dubhe.tx.message.set_message(dubhe.getAddress(), [ - 'first set', - ])) as PendingTransactionResponse; + const res1 = (await dubhe.tx.message.set_message({ + sender: dubhe.getAddress(), + params: ['first set'], + })) as PendingTransactionResponse; console.log(res1.hash); await delay(1000); console.log('======= query our message ========'); - let myMessage = await dubhe.query.message.get_message([myAddr]); + let myMessage = await dubhe.query.message.get_message({ + params: [myAddr], + }); console.log(myMessage); console.log('======= set our message again ========'); - const res2 = (await dubhe.tx.message.set_message(dubhe.getAddress(), [ - 'hello world', - ])) as PendingTransactionResponse; + const res2 = (await dubhe.tx.message.set_message({ + sender: dubhe.getAddress(), + params: ['hello world'], + })) as PendingTransactionResponse; console.log(res2.hash); await delay(1000); console.log('======= query our message ========'); - let mySecondMessage = await dubhe.query.message.get_message([myAddr]); + let mySecondMessage = await dubhe.query.message.get_message({ + params: [myAddr], + }); console.log(mySecondMessage); let faucetRes = await dubhe.requestFaucet(network); diff --git a/packages/aptos-client/src/dubhe.ts b/packages/aptos-client/src/dubhe.ts index e212ca05e..43432b9d0 100644 --- a/packages/aptos-client/src/dubhe.ts +++ b/packages/aptos-client/src/dubhe.ts @@ -68,12 +68,15 @@ function createQuery( ): ContractQuery { return withMeta( meta, - async ( + async ({ + params, + typeArguments, + }: { params?: Array< EntryFunctionArgumentTypes | SimpleEntryFunctionArgumentTypes - >, - typeArguments?: Array - ): Promise => { + >; + typeArguments?: Array; + } = {}): Promise => { const result = await fn(params, typeArguments); return result; } @@ -93,14 +96,19 @@ function createTx( ): ContractTx { return withMeta( meta, - async ( - sender?: AccountAddressInput, + async ({ + sender, + params, + typeArguments, + isRaw, + }: { + sender?: AccountAddressInput; params?: Array< EntryFunctionArgumentTypes | SimpleEntryFunctionArgumentTypes - >, - typeArguments?: Array, - isRaw?: boolean - ): Promise< + >; + typeArguments?: Array; + isRaw?: boolean; + } = {}): Promise< PendingTransactionResponse | InputGenerateTransactionPayloadData > => { const result = await fn(sender, params, typeArguments, isRaw); @@ -184,7 +192,8 @@ export class Dubhe { if (isUndefined(this.#query[moduleName][value.name])) { this.#query[moduleName][value.name] = createQuery( meta, - (p, type_p) => this.#read(meta, p, type_p) + (params, typeArguments) => + this.#read(meta, params, typeArguments) ); } } @@ -196,7 +205,8 @@ export class Dubhe { if (isUndefined(this.#tx[moduleName][value.name])) { this.#tx[moduleName][value.name] = createTx( meta, - (s, p, type_p, isRaw) => this.#exec(meta, s, p, type_p, isRaw) + (sender, params, typeArguments, isRaw) => + this.#exec(meta, sender, params, typeArguments, isRaw) ); } } @@ -348,7 +358,7 @@ export class Dubhe { } if (coinType === undefined) { coinType = '0x1::aptos_coin::AptosCoin'; - } + } // tx.xx.xx(undef, undef, true) const resource = await this.aptosInteractor.getAccountResource( accountAddress, diff --git a/packages/aptos-client/src/types/index.ts b/packages/aptos-client/src/types/index.ts index c00b66bf2..37ca23e93 100644 --- a/packages/aptos-client/src/types/index.ts +++ b/packages/aptos-client/src/types/index.ts @@ -60,23 +60,33 @@ export interface MessageMeta { } export interface ContractQuery extends MessageMeta { - ( + (): Promise; + ({ + params, + typeArguments, + }: { params?: Array< EntryFunctionArgumentTypes | SimpleEntryFunctionArgumentTypes - >, - typeArguments?: Array - ): Promise; + >; + typeArguments?: Array; + }): Promise; } export interface ContractTx extends MessageMeta { - ( - sender?: AccountAddressInput, + (): Promise; + ({ + sender, + params, + typeArguments, + isRaw, + }: { + sender?: AccountAddressInput; params?: Array< EntryFunctionArgumentTypes | SimpleEntryFunctionArgumentTypes - >, - typeArguments?: Array, - isRaw?: boolean - ): Promise; + >; + typeArguments?: Array; + isRaw?: boolean; + }): Promise; } export type MapMessageTx = Record; diff --git a/packages/create-dubhe/cocos-lib-builder/package.json b/packages/create-dubhe/cocos-lib-builder/package.json index 4a3bdacfe..36f9c3c54 100644 --- a/packages/create-dubhe/cocos-lib-builder/package.json +++ b/packages/create-dubhe/cocos-lib-builder/package.json @@ -13,7 +13,7 @@ "author": "team@0xobelisk.com", "license": "ISC", "dependencies": { - "@0xobelisk/sui-client": "v0.5.28", + "@0xobelisk/sui-client": "v0.5.30", "@0xobelisk/aptos-client": "^0.0.13", "browser-resolve": "^2.0.0", "browser-sync": "^2.29.3" diff --git a/packages/create-dubhe/package.json b/packages/create-dubhe/package.json index 8610d416b..3506f812c 100644 --- a/packages/create-dubhe/package.json +++ b/packages/create-dubhe/package.json @@ -1,6 +1,6 @@ { "name": "create-dubhe", - "version": "0.0.11", + "version": "0.0.12", "type": "module", "license": "MIT", "author": "team@obelisk.build", diff --git a/packages/create-dubhe/template/101/aptos-template/package.json b/packages/create-dubhe/template/101/aptos-template/package.json index cbd4d8aeb..c1c31a1a0 100644 --- a/packages/create-dubhe/template/101/aptos-template/package.json +++ b/packages/create-dubhe/template/101/aptos-template/package.json @@ -28,7 +28,7 @@ }, "dependencies": { "@0xobelisk/aptos-common": "^0.0.7", - "@0xobelisk/aptos-client": "^0.0.14", + "@0xobelisk/aptos-client": "^0.0.16", "@0xobelisk/aptos-cli": "^0.0.12", "clsx": "^1.2.1", "dotenv": "^16.4.5", diff --git a/packages/create-dubhe/template/101/initia-template/package.json b/packages/create-dubhe/template/101/initia-template/package.json index 48cd61cac..99507b8d8 100644 --- a/packages/create-dubhe/template/101/initia-template/package.json +++ b/packages/create-dubhe/template/101/initia-template/package.json @@ -27,7 +27,7 @@ "prod:testnet": "pnpm config:store testnet && pnpm next" }, "dependencies": { - "@0xobelisk/initia-client": "^0.0.3", + "@0xobelisk/initia-client": "^0.0.5", "@0xobelisk/initia-cli": "^0.0.3", "@0xobelisk/sui-common": "^0.5.21", "clsx": "^1.2.1", diff --git a/packages/create-dubhe/template/101/movement-template/package.json b/packages/create-dubhe/template/101/movement-template/package.json index d9b3f9ec6..ae071f8c6 100644 --- a/packages/create-dubhe/template/101/movement-template/package.json +++ b/packages/create-dubhe/template/101/movement-template/package.json @@ -28,7 +28,7 @@ }, "dependencies": { "@0xobelisk/aptos-common": "^0.0.7", - "@0xobelisk/aptos-client": "^0.0.14", + "@0xobelisk/aptos-client": "^0.0.16", "@0xobelisk/aptos-cli": "^0.0.12", "clsx": "^1.2.1", "dotenv": "^16.4.5", diff --git a/packages/create-dubhe/template/101/rooch-template/package.json b/packages/create-dubhe/template/101/rooch-template/package.json index a50c31135..6e12a43de 100644 --- a/packages/create-dubhe/template/101/rooch-template/package.json +++ b/packages/create-dubhe/template/101/rooch-template/package.json @@ -26,7 +26,7 @@ "prod:testnet": "pnpm config:store testnet && pnpm next" }, "dependencies": { - "@0xobelisk/rooch-client": "^0.0.3", + "@0xobelisk/rooch-client": "^0.0.5", "@0xobelisk/rooch-cli": "^0.0.3", "@0xobelisk/sui-common": "^0.5.21", "clsx": "^1.2.1", diff --git a/packages/create-dubhe/template/101/rooch-template/src/pages/home/index.tsx b/packages/create-dubhe/template/101/rooch-template/src/pages/home/index.tsx index 4f0937195..313233d0e 100644 --- a/packages/create-dubhe/template/101/rooch-template/src/pages/home/index.tsx +++ b/packages/create-dubhe/template/101/rooch-template/src/pages/home/index.tsx @@ -39,7 +39,9 @@ const Home = () => { }); const tx = new Transaction(); - const response = await dubhe.tx.counter.increase(tx); + const response = await dubhe.tx.counter.increase({ + tx, + }); console.log(response.execution_info.tx_hash, response.execution_info.status.type); if (response.execution_info.status.type == 'executed') { setTimeout(async () => { diff --git a/packages/create-dubhe/template/101/sui-template/package.json b/packages/create-dubhe/template/101/sui-template/package.json index 095aaa8b3..819d7cd8f 100644 --- a/packages/create-dubhe/template/101/sui-template/package.json +++ b/packages/create-dubhe/template/101/sui-template/package.json @@ -26,7 +26,7 @@ }, "dependencies": { "@0xobelisk/sui-cli": "^0.5.34", - "@0xobelisk/sui-client": "^0.5.28", + "@0xobelisk/sui-client": "^0.5.30", "@0xobelisk/sui-common": "^0.5.23", "@mysten/sui": "1.7.0", "clsx": "^1.2.1", diff --git a/packages/create-dubhe/template/101/sui-template/src/pages/home/index.tsx b/packages/create-dubhe/template/101/sui-template/src/pages/home/index.tsx index 0f9e2129a..a41128dad 100644 --- a/packages/create-dubhe/template/101/sui-template/src/pages/home/index.tsx +++ b/packages/create-dubhe/template/101/sui-template/src/pages/home/index.tsx @@ -40,9 +40,10 @@ const Home = () => { metadata: metadata, }); const tx = new Transaction(); - const query_value = (await dubhe.query.counter_schema.get_value(tx, [ - tx.object(Counter_Object_Id), - ])) as DevInspectResults; + const query_value = (await dubhe.query.counter_schema.get_value({ + tx, + params: [tx.object(Counter_Object_Id)], + })) as DevInspectResults; console.log('Counter value:', dubhe.view(query_value)[0]); setValue(dubhe.view(query_value)[0]); }; @@ -58,7 +59,11 @@ const Home = () => { secretKey: PRIVATEKEY, }); const tx = new Transaction(); - (await dubhe.tx.counter_system.inc(tx, [tx.object(Counter_Object_Id)], undefined, true)) as TransactionResult; + (await dubhe.tx.counter_system.inc({ + tx, + params: [tx.object(Counter_Object_Id)], + isRaw: true, + })) as TransactionResult; const response = await dubhe.signAndSendTxn(tx); if (response.effects.status.status == 'success') { setTimeout(async () => { diff --git a/packages/create-dubhe/template/cocos/sui-template/assets/lib/dubhe.js b/packages/create-dubhe/template/cocos/sui-template/assets/lib/dubhe.js index 43cceb894..ba62e955b 100644 --- a/packages/create-dubhe/template/cocos/sui-template/assets/lib/dubhe.js +++ b/packages/create-dubhe/template/cocos/sui-template/assets/lib/dubhe.js @@ -4590,13 +4590,23 @@ function withMeta(meta, creator) { return creator; } function createQuery(meta, fn) { - return withMeta(meta, async (tx, params, typeArguments, isRaw) => { + return withMeta(meta, async ({ + tx, + params, + typeArguments, + isRaw + }) => { const result = await fn(tx, params, typeArguments, isRaw); return result; }); } function createTx(meta, fn) { - return withMeta(meta, async (tx, params, typeArguments, isRaw) => { + return withMeta(meta, async ({ + tx, + params, + typeArguments, + isRaw + }) => { return await fn(tx, params, typeArguments, isRaw); }); } diff --git a/packages/create-dubhe/template/cocos/sui-template/package.json b/packages/create-dubhe/template/cocos/sui-template/package.json index 63c80cb45..951f75f84 100644 --- a/packages/create-dubhe/template/cocos/sui-template/package.json +++ b/packages/create-dubhe/template/cocos/sui-template/package.json @@ -16,7 +16,7 @@ }, "dependencies": { "@0xobelisk/sui-cli": "^0.5.34", - "@0xobelisk/sui-client": "^0.5.28", + "@0xobelisk/sui-client": "^0.5.30", "@0xobelisk/sui-common": "^0.5.23" }, "devDependencies": { diff --git a/packages/create-dubhe/template/contract/sui-template/package.json b/packages/create-dubhe/template/contract/sui-template/package.json index 6b71cb133..66849bb2b 100644 --- a/packages/create-dubhe/template/contract/sui-template/package.json +++ b/packages/create-dubhe/template/contract/sui-template/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "@0xobelisk/sui-cli": "^0.5.34", - "@0xobelisk/sui-client": "^0.5.28", + "@0xobelisk/sui-client": "^0.5.30", "@0xobelisk/sui-common": "^0.5.23", "dotenv": "^16.4.5", "chalk": "^4.1.2" diff --git a/packages/create-dubhe/template/nextjs/sui-template/package.json b/packages/create-dubhe/template/nextjs/sui-template/package.json index 542ab9330..e56a55c0e 100644 --- a/packages/create-dubhe/template/nextjs/sui-template/package.json +++ b/packages/create-dubhe/template/nextjs/sui-template/package.json @@ -26,7 +26,7 @@ }, "dependencies": { "@0xobelisk/sui-cli": "^0.5.34", - "@0xobelisk/sui-client": "^0.5.28", + "@0xobelisk/sui-client": "^0.5.30", "@0xobelisk/sui-common": "^0.5.23", "@mysten/dapp-kit": "0.14.9", "@mysten/sui": "1.7.0", diff --git a/packages/create-dubhe/template/nextjs/sui-template/src/pages/home/index.tsx b/packages/create-dubhe/template/nextjs/sui-template/src/pages/home/index.tsx index 7358ab132..acc5a3a73 100644 --- a/packages/create-dubhe/template/nextjs/sui-template/src/pages/home/index.tsx +++ b/packages/create-dubhe/template/nextjs/sui-template/src/pages/home/index.tsx @@ -45,9 +45,10 @@ const Home: React.FC = () => { metadata: metadata, }); const tx = new Transaction(); - const queryValue = (await dubhe.query.counter_schema.get_value(tx, [ - tx.object(Counter_Object_Id), - ])) as DevInspectResults; + const queryValue = (await dubhe.query.counter_schema.get_value({ + tx, + params: [tx.object(Counter_Object_Id)], + })) as DevInspectResults; console.log('Counter value:', dubhe.view(queryValue)[0]); setValue(dubhe.view(queryValue)[0]); } catch (error) { @@ -82,7 +83,11 @@ const Home: React.FC = () => { metadata: metadata, }); const tx = new Transaction(); - await dubhe.tx.counter_system.inc(tx, [tx.object(Counter_Object_Id)], undefined, true); + await dubhe.tx.counter_system.inc({ + tx, + params: [tx.object(Counter_Object_Id)], + isRaw: true, + }); await signAndExecuteTransaction( { transaction: tx.serialize(), diff --git a/packages/initia-client/package.json b/packages/initia-client/package.json index 321f84ad8..d93176fee 100644 --- a/packages/initia-client/package.json +++ b/packages/initia-client/package.json @@ -1,6 +1,6 @@ { "name": "@0xobelisk/initia-client", - "version": "0.0.3", + "version": "0.0.5", "description": "Tookit for interacting with initia move framework", "keywords": [ "initia", diff --git a/packages/initia-client/scripts/init.ts b/packages/initia-client/scripts/init.ts index 3431093e3..d4fb32249 100644 --- a/packages/initia-client/scripts/init.ts +++ b/packages/initia-client/scripts/init.ts @@ -30,9 +30,10 @@ async function init() { console.log(content); console.log('======= write content value ========'); - const res1 = await dubhe.tx.read_write.write(myHexAddr, [ - bcs.string().serialize('reset new content!').toBase64(), - ]); + const res1 = await dubhe.tx.read_write.write({ + sender: myHexAddr, + params: [bcs.string().serialize('reset new content!').toBase64()], + }); console.log(res1); await delay(6000); diff --git a/packages/initia-client/scripts/query-counter.ts b/packages/initia-client/scripts/query-counter.ts new file mode 100644 index 000000000..ddc10979d --- /dev/null +++ b/packages/initia-client/scripts/query-counter.ts @@ -0,0 +1,24 @@ +import { NetworkType, Dubhe, bcs } from '../src'; +import { loadMetadata } from '../src/metadata/index'; +import dotenv from 'dotenv'; +dotenv.config(); + +export const delay = (ms: number) => + new Promise((resolve) => setTimeout(resolve, ms)); + +async function init() { + const NETWORK: NetworkType = 'localnet'; + + const PACKAGE_ID = '0x44349b49ff0d95d9f45d3e183d226512ac70f8f6'; + + const metadata = await loadMetadata(NETWORK, PACKAGE_ID); + const dubhe = new Dubhe({ + networkType: NETWORK, + packageId: PACKAGE_ID, + metadata: metadata, + }); + const query_value = await dubhe.query.counter.value(); + console.log(query_value); +} + +init(); diff --git a/packages/initia-client/src/dubhe.ts b/packages/initia-client/src/dubhe.ts index 1237dee9f..80442bea1 100644 --- a/packages/initia-client/src/dubhe.ts +++ b/packages/initia-client/src/dubhe.ts @@ -44,7 +44,13 @@ function createQuery( ): ContractQuery { return withMeta( meta, - async (params?: string[], typeArguments?: string[]): Promise => { + async ({ + params, + typeArguments, + }: { + params?: string[]; + typeArguments?: string[]; + } = {}): Promise => { const result = await fn(params, typeArguments); return result; } @@ -62,13 +68,17 @@ function createTx( ): ContractTx { return withMeta( meta, - async ( - sender?: AccAddress | string, - params?: string[], - typeArguments?: string[], - isRaw?: boolean - ): Promise => { - // const result = await fn(signer, params, typeArguments, isRaw); + async ({ + sender, + params, + typeArguments, + isRaw, + }: { + sender?: AccAddress | string; + params?: string[]; + typeArguments?: string[]; + isRaw?: boolean; + } = {}): Promise => { const result = await fn(sender, params, typeArguments, isRaw); return result; } diff --git a/packages/initia-client/src/types/index.ts b/packages/initia-client/src/types/index.ts index 98f8b6811..26d1aec96 100644 --- a/packages/initia-client/src/types/index.ts +++ b/packages/initia-client/src/types/index.ts @@ -72,16 +72,29 @@ export interface MessageMeta { } export interface ContractQuery extends MessageMeta { - (params?: string[], typeArguments?: string[]): Promise; + (): Promise; + ({ + params, + typeArguments, + }: { + params?: string[]; + typeArguments?: string[]; + }): Promise; } export interface ContractTx extends MessageMeta { - ( - sender?: AccAddress | string, - params?: any[], - typeArguments?: string[], - isRaw?: boolean - ): Promise; + (): Promise; + ({ + sender, + params, + typeArguments, + isRaw, + }: { + sender?: AccAddress | string; + params?: any[]; + typeArguments?: string[]; + isRaw?: boolean; + }): Promise; } export type MapMessageTx = Record; diff --git a/packages/rooch-client/package.json b/packages/rooch-client/package.json index 16308a644..6200c5e72 100644 --- a/packages/rooch-client/package.json +++ b/packages/rooch-client/package.json @@ -1,6 +1,6 @@ { "name": "@0xobelisk/rooch-client", - "version": "0.0.3", + "version": "0.0.5", "description": "Tookit for interacting with rooch move framework", "keywords": [ "rooch", diff --git a/packages/rooch-client/scripts/init.ts b/packages/rooch-client/scripts/init.ts index fc9803471..40421f56c 100644 --- a/packages/rooch-client/scripts/init.ts +++ b/packages/rooch-client/scripts/init.ts @@ -37,7 +37,7 @@ async function init() { console.log('======= increase counter value ========'); const tx = new Transaction(); - const res1 = await dubhe.tx.counter.increase(tx); + const res1 = await dubhe.tx.counter.increase({ tx }); console.log(res1.execution_info.tx_hash, res1.execution_info.status); await delay(1000); diff --git a/packages/rooch-client/scripts/publish.ts b/packages/rooch-client/scripts/publish.ts index 47b1963fc..0a34de295 100644 --- a/packages/rooch-client/scripts/publish.ts +++ b/packages/rooch-client/scripts/publish.ts @@ -1,4 +1,4 @@ -import { NetWorkType, Dubhe } from '../src'; +import { NetworkType, Dubhe } from '../src'; import * as fs from 'fs'; import dotenv from 'dotenv'; @@ -8,7 +8,7 @@ export const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms)); async function init() { - const network = 'localnet' as NetWorkType; + const network = 'localnet' as NetworkType; const privateKey = process.env.PRIVATE_KEY; const dubhe = new Dubhe({ networkType: network, diff --git a/packages/rooch-client/src/dubhe.ts b/packages/rooch-client/src/dubhe.ts index c1c83b5c1..6173fafd4 100644 --- a/packages/rooch-client/src/dubhe.ts +++ b/packages/rooch-client/src/dubhe.ts @@ -52,10 +52,13 @@ function createQuery( ): ContractQuery { return withMeta( meta, - async ( - params?: Args[], - typeArguments?: TypeTag[] - ): Promise => { + async ({ + params, + typeArguments, + }: { + params?: Args[]; + typeArguments?: TypeTag[]; + } = {}): Promise => { const result = await fn(params, typeArguments); return result; } @@ -74,13 +77,19 @@ function createTx( ): ContractTx { return withMeta( meta, - async ( - tx: Transaction, - signer?: Secp256k1Keypair, - params?: Args[], - typeArguments?: TypeTag[], - isRaw?: boolean - ): Promise => { + async ({ + tx, + signer, + params, + typeArguments, + isRaw, + }: { + tx: Transaction; + signer?: Secp256k1Keypair; + params?: Args[]; + typeArguments?: TypeTag[]; + isRaw?: boolean; + }): Promise => { // const result = await fn(signer, params, typeArguments, isRaw); const result = await fn(tx, signer, params, typeArguments, isRaw); return result; diff --git a/packages/rooch-client/src/types/index.ts b/packages/rooch-client/src/types/index.ts index e71324abe..db8806b67 100644 --- a/packages/rooch-client/src/types/index.ts +++ b/packages/rooch-client/src/types/index.ts @@ -71,20 +71,30 @@ export interface MessageMeta { } export interface ContractQuery extends MessageMeta { - ( - params?: any[], - typeArguments?: TypeTag[] - ): Promise; + (): Promise; + ({ + params, + typeArguments, + }: { + params?: any[]; + typeArguments?: TypeTag[]; + }): Promise; } export interface ContractTx extends MessageMeta { - ( - tx: Transaction, - sender?: string, - params?: any[], - typeArguments?: TypeTag[], - isRaw?: boolean - ): Promise; + ({ + tx, + sender, + params, + typeArguments, + isRaw, + }: { + tx: Transaction; + sender?: string; + params?: any[]; + typeArguments?: TypeTag[]; + isRaw?: boolean; + }): Promise; } export type MapMessageTx = Record; diff --git a/packages/sui-client/package.json b/packages/sui-client/package.json index f65fa728e..8b92b8c7c 100644 --- a/packages/sui-client/package.json +++ b/packages/sui-client/package.json @@ -1,6 +1,6 @@ { "name": "@0xobelisk/sui-client", - "version": "0.5.28", + "version": "0.5.30", "description": "Tookit for interacting with move eps framework", "keywords": [ "sui", diff --git a/packages/sui-client/scripts/bcs_test.ts b/packages/sui-client/scripts/bcs_test.ts index 834028b5f..fa66aab0f 100644 --- a/packages/sui-client/scripts/bcs_test.ts +++ b/packages/sui-client/scripts/bcs_test.ts @@ -57,10 +57,10 @@ async function init() { let asset_id = tx.pure.u32(assetId); let params: TransactionArgument[] = [assets, asset_id]; - let asset_metadata = (await dubhe.query.assets_system.metadata_of( + let asset_metadata = (await dubhe.query.assets_system.metadata_of({ tx, - params - )) as DevInspectResults; + params, + })) as DevInspectResults; console.log('asset_metadata.results[0]', asset_metadata.results![0]); const format_metadata = dubhe.view(asset_metadata); diff --git a/packages/sui-client/scripts/init.ts b/packages/sui-client/scripts/init.ts index ad5a55393..f8827b9dd 100644 --- a/packages/sui-client/scripts/init.ts +++ b/packages/sui-client/scripts/init.ts @@ -32,117 +32,114 @@ async function init() { console.log('balance', balance); let tx = new Transaction(); - let params: TransactionArgument[] = []; - let query1 = (await dubhe.query.funt.get_u8(tx, params)) as DevInspectResults; + let query1 = (await dubhe.query.funt.get_u8({ + tx, + })) as DevInspectResults; console.log(JSON.stringify(query1.results![0])); let formatData1 = dubhe.view(query1); console.log(formatData1); let tx2 = new Transaction(); - let params2: TransactionArgument[] = []; - let query2 = (await dubhe.query.funt.get_u64( - tx2, - params2 - )) as DevInspectResults; + let query2 = (await dubhe.query.funt.get_u64({ + tx: tx2, + })) as DevInspectResults; console.log(JSON.stringify(query2.results![0])); let formatData2 = dubhe.view(query2); console.log(formatData2); let tx3 = new Transaction(); - let params3: TransactionArgument[] = []; - let query3 = (await dubhe.query.funt.get_u128( - tx3, - params3 - )) as DevInspectResults; + let query3 = (await dubhe.query.funt.get_u128({ + tx: tx3, + })) as DevInspectResults; console.log(JSON.stringify(query3.results![0])); let formatData3 = dubhe.view(query3); console.log(formatData3); let tx4 = new Transaction(); let params4: TransactionArgument[] = []; - let query4 = (await dubhe.query.funt.get_u256( - tx4, - params4 - )) as DevInspectResults; + let query4 = (await dubhe.query.funt.get_u256({ + tx: tx4, + params: params4, + })) as DevInspectResults; console.log(JSON.stringify(query4.results![0])); let formatData4 = dubhe.view(query4); console.log(formatData4); let tx5 = new Transaction(); let params5: TransactionArgument[] = []; - let query5 = (await dubhe.query.funt.get_bool( - tx5, - params5 - )) as DevInspectResults; + let query5 = (await dubhe.query.funt.get_bool({ + tx: tx5, + params: params5, + })) as DevInspectResults; console.log(JSON.stringify(query5.results![0])); let formatData5 = dubhe.view(query5); console.log(formatData5); let tx6 = new Transaction(); let params6: TransactionArgument[] = []; - let query6 = (await dubhe.query.funt.get_address( - tx6, - params6 - )) as DevInspectResults; + let query6 = (await dubhe.query.funt.get_address({ + tx: tx6, + params: params6, + })) as DevInspectResults; console.log(JSON.stringify(query6.results![0])); let formatData6 = dubhe.view(query6); console.log(formatData6); let tx7 = new Transaction(); let params7: TransactionArgument[] = []; - let query7 = (await dubhe.query.funt.get_vector_u8( - tx7, - params7 - )) as DevInspectResults; + let query7 = (await dubhe.query.funt.get_vector_u8({ + tx: tx7, + params: params7, + })) as DevInspectResults; console.log(JSON.stringify(query7.results![0])); let formatData7 = dubhe.view(query7); console.log(formatData7); let tx8 = new Transaction(); let params8: TransactionArgument[] = []; - let query8 = (await dubhe.query.funt.get_tuple( - tx8, - params8 - )) as DevInspectResults; + let query8 = (await dubhe.query.funt.get_tuple({ + tx: tx8, + params: params8, + })) as DevInspectResults; console.log(JSON.stringify(query8.results![0])); let formatData8 = dubhe.view(query8); console.log(formatData8); let tx9 = new Transaction(); let params9: TransactionArgument[] = []; - let query9 = (await dubhe.query.funt.get_string( - tx9, - params9 - )) as DevInspectResults; + let query9 = (await dubhe.query.funt.get_string({ + tx: tx9, + params: params9, + })) as DevInspectResults; console.log(JSON.stringify(query9.results![0])); let formatData9 = dubhe.view(query9); console.log(formatData9); let tx10 = new Transaction(); let params10: TransactionArgument[] = []; - let query10 = (await dubhe.query.funt.get_option_type( - tx10, - params10 - )) as DevInspectResults; + let query10 = (await dubhe.query.funt.get_option_type({ + tx: tx10, + params: params10, + })) as DevInspectResults; console.log(JSON.stringify(query10.results![0])); let formatData10 = dubhe.view(query10); console.log(formatData10); let tx11 = new Transaction(); let params11: TransactionArgument[] = []; - let query11 = (await dubhe.query.funt.get_struct( - tx11, - params11 - )) as DevInspectResults; + let query11 = (await dubhe.query.funt.get_struct({ + tx: tx11, + params: params11, + })) as DevInspectResults; let datares = dubhe.view(query11); console.log(datares); let tx12 = new Transaction(); let params12: TransactionArgument[] = []; - let query12 = (await dubhe.query.funt.get_obj( - tx12, - params12 - )) as DevInspectResults; + let query12 = (await dubhe.query.funt.get_obj({ + tx: tx12, + params: params12, + })) as DevInspectResults; console.log(JSON.stringify(query12.results![0])); let formatData12 = dubhe.view(query12); console.log(formatData12); diff --git a/packages/sui-client/scripts/test.ts b/packages/sui-client/scripts/test.ts index 14ce3f0da..d95db8d5b 100644 --- a/packages/sui-client/scripts/test.ts +++ b/packages/sui-client/scripts/test.ts @@ -40,10 +40,10 @@ async function init() { '0x156f9442fa03ba6b8a33817f3a2999fcbdbf30714bee31960289af2301a9ac54' ), ]; - let query1 = (await dubhe.query.assets_schema.get_next_asset_id( - tx1, - params - )) as DevInspectResults; + let query1 = (await dubhe.query.assets_schema.get_next_asset_id({ + tx: tx1, + params, + })) as DevInspectResults; console.log(JSON.stringify(query1.results![0])); let formatData1 = dubhe.view(query1); console.log(formatData1); @@ -55,10 +55,10 @@ async function init() { ), tx2.pure.u32(1), ]; - let query2 = (await dubhe.query.assets_schema.get_metadata( - tx2, - params2 - )) as DevInspectResults; + let query2 = (await dubhe.query.assets_schema.get_metadata({ + tx: tx2, + params: params2, + })) as DevInspectResults; try { console.log(JSON.stringify(query2.results![0])); let formatData2 = dubhe.view(query2); @@ -73,10 +73,10 @@ async function init() { '0x156f9442fa03ba6b8a33817f3a2999fcbdbf30714bee31960289af2301a9ac54' ), ]; - let query3 = (await dubhe.query.assets_schema.get_metadata_keys( - tx3, - params3 - )) as DevInspectResults; + let query3 = (await dubhe.query.assets_schema.get_metadata_keys({ + tx: tx3, + params: params3, + })) as DevInspectResults; console.log(JSON.stringify(query3.results![0])); let formatData3 = dubhe.view(query3); console.log(formatData3); @@ -87,10 +87,10 @@ async function init() { '0x156f9442fa03ba6b8a33817f3a2999fcbdbf30714bee31960289af2301a9ac54' ), ]; - let query4 = (await dubhe.query.assets_schema.get_metadata_values( - tx4, - params4 - )) as DevInspectResults; + let query4 = (await dubhe.query.assets_schema.get_metadata_values({ + tx: tx4, + params: params4, + })) as DevInspectResults; try { console.log(JSON.stringify(query4.results![0])); let formatData4 = dubhe.view(query4); @@ -106,10 +106,10 @@ async function init() { ), tx5.pure.u32(1), ]; - let query5 = (await dubhe.query.assets_schema.get_details( - tx5, - params5 - )) as DevInspectResults; + let query5 = (await dubhe.query.assets_schema.get_details({ + tx: tx5, + params: params5, + })) as DevInspectResults; try { console.log(JSON.stringify(query5.results![0])); let formatData5 = dubhe.view(query5); @@ -124,10 +124,10 @@ async function init() { '0x156f9442fa03ba6b8a33817f3a2999fcbdbf30714bee31960289af2301a9ac54' ), ]; - let query6 = (await dubhe.query.assets_schema.get_details_keys( - tx6, - params6 - )) as DevInspectResults; + let query6 = (await dubhe.query.assets_schema.get_details_keys({ + tx: tx6, + params: params6, + })) as DevInspectResults; try { console.log(JSON.stringify(query6.results![0])); let formatData6 = dubhe.view(query6); @@ -142,10 +142,10 @@ async function init() { '0x156f9442fa03ba6b8a33817f3a2999fcbdbf30714bee31960289af2301a9ac54' ), ]; - let query7 = (await dubhe.query.assets_schema.get_details_values( - tx7, - params7 - )) as DevInspectResults; + let query7 = (await dubhe.query.assets_schema.get_details_values({ + tx: tx7, + params: params7, + })) as DevInspectResults; try { console.log(JSON.stringify(query7.results![0])); let formatData7 = dubhe.view(query7); @@ -162,10 +162,10 @@ async function init() { tx8.pure.u32(0), tx8.pure.address('0x0'), ]; - let query8 = (await dubhe.query.assets_schema.get_account( - tx8, - params8 - )) as DevInspectResults; + let query8 = (await dubhe.query.assets_schema.get_account({ + tx: tx8, + params: params8, + })) as DevInspectResults; try { console.log(JSON.stringify(query8.results![0])); let formatData8 = dubhe.view(query8); @@ -180,10 +180,10 @@ async function init() { '0x156f9442fa03ba6b8a33817f3a2999fcbdbf30714bee31960289af2301a9ac54' ), ]; - let query9 = (await dubhe.query.assets_schema.get_account_keys( - tx9, - params9 - )) as DevInspectResults; + let query9 = (await dubhe.query.assets_schema.get_account_keys({ + tx: tx9, + params: params9, + })) as DevInspectResults; try { console.log(JSON.stringify(query9.results![0])); let formatData9 = dubhe.view(query9); @@ -198,10 +198,10 @@ async function init() { '0x156f9442fa03ba6b8a33817f3a2999fcbdbf30714bee31960289af2301a9ac54' ), ]; - let query10 = (await dubhe.query.assets_schema.get_account_values( - tx10, - params10 - )) as DevInspectResults; + let query10 = (await dubhe.query.assets_schema.get_account_values({ + tx: tx10, + params: params10, + })) as DevInspectResults; try { console.log(JSON.stringify(query10.results![0])); const databcs = bcs.vector( diff --git a/packages/sui-client/scripts/test_error.ts b/packages/sui-client/scripts/test_error.ts index 0dd7c136d..66487c447 100644 --- a/packages/sui-client/scripts/test_error.ts +++ b/packages/sui-client/scripts/test_error.ts @@ -47,10 +47,10 @@ async function main() { tx.pure.u64(1000000000), ] as TransactionArgument[]; - const dryResult = (await dubhe.query['dex_system'].get_amount_out( + const dryResult = (await dubhe.query['dex_system'].get_amount_out({ tx, - params - )) as DevInspectResults; + params, + })) as DevInspectResults; console.log('getAmountOut', dryResult); console.log('getAmountOut'); const res = dubhe.view(dryResult); diff --git a/packages/sui-client/src/dubhe.ts b/packages/sui-client/src/dubhe.ts index 7111ac0da..091ef2119 100644 --- a/packages/sui-client/src/dubhe.ts +++ b/packages/sui-client/src/dubhe.ts @@ -58,19 +58,24 @@ function createQuery( meta: SuiMoveMoudleFuncType, fn: ( tx: Transaction, - params: (TransactionArgument | SerializedBcs)[], + params?: (TransactionArgument | SerializedBcs)[], typeArguments?: string[], isRaw?: boolean ) => Promise ): ContractQuery { return withMeta( meta, - async ( - tx: Transaction, - params: (TransactionArgument | SerializedBcs)[], - typeArguments?: string[], - isRaw?: boolean - ): Promise => { + async ({ + tx, + params, + typeArguments, + isRaw, + }: { + tx: Transaction; + params?: (TransactionArgument | SerializedBcs)[]; + typeArguments?: string[]; + isRaw?: boolean; + }): Promise => { const result = await fn(tx, params, typeArguments, isRaw); return result; } @@ -81,19 +86,24 @@ function createTx( meta: SuiMoveMoudleFuncType, fn: ( tx: Transaction, - params: (TransactionArgument | SerializedBcs)[], + params?: (TransactionArgument | SerializedBcs)[], typeArguments?: string[], isRaw?: boolean ) => Promise ): ContractTx { return withMeta( meta, - async ( - tx: Transaction, - params: (TransactionArgument | SerializedBcs)[], - typeArguments?: string[], - isRaw?: boolean - ): Promise => { + async ({ + tx, + params, + typeArguments, + isRaw, + }: { + tx: Transaction; + params?: (TransactionArgument | SerializedBcs)[]; + typeArguments?: string[]; + isRaw?: boolean; + }): Promise => { return await fn(tx, params, typeArguments, isRaw); } ); @@ -307,7 +317,7 @@ export class Dubhe { #exec = async ( meta: SuiMoveMoudleFuncType, tx: Transaction, - params: (TransactionArgument | SerializedBcs)[], + params?: (TransactionArgument | SerializedBcs)[], typeArguments?: string[], isRaw?: boolean ) => { @@ -330,7 +340,7 @@ export class Dubhe { #read = async ( meta: SuiMoveMoudleFuncType, tx: Transaction, - params: (TransactionArgument | SerializedBcs)[], + params?: (TransactionArgument | SerializedBcs)[], typeArguments?: string[], isRaw?: boolean ) => { diff --git a/packages/sui-client/src/types/index.ts b/packages/sui-client/src/types/index.ts index 9eaa94c1a..4b683c1d3 100644 --- a/packages/sui-client/src/types/index.ts +++ b/packages/sui-client/src/types/index.ts @@ -85,21 +85,31 @@ export interface MessageMeta { } export interface ContractQuery extends MessageMeta { - ( - tx: Transaction, - params: (TransactionArgument | SerializedBcs)[], - typeArguments?: string[], - isRaw?: boolean - ): Promise; + ({ + tx, + params, + typeArguments, + isRaw, + }: { + tx: Transaction; + params?: (TransactionArgument | SerializedBcs)[]; + typeArguments?: string[]; + isRaw?: boolean; + }): Promise; } export interface ContractTx extends MessageMeta { - ( - tx: Transaction, - params: (TransactionArgument | SerializedBcs)[], - typeArguments?: string[], - isRaw?: boolean - ): Promise; + ({ + tx, + params, + typeArguments, + isRaw, + }: { + tx: Transaction; + params?: (TransactionArgument | SerializedBcs)[]; + typeArguments?: string[]; + isRaw?: boolean; + }): Promise; } export type MapMessageTx = Record; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8f6c01290..9ead370af 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -529,7 +529,7 @@ importers: dependencies: '@0xobelisk/rooch-client': specifier: ^0.0.3 - version: link:../rooch-client + version: 0.0.3(typescript@5.1.6) '@0xobelisk/sui-common': specifier: ^0.5.21 version: link:../sui-common @@ -1006,6 +1006,24 @@ packages: typescript: 5.7.2 dev: false + /@0xobelisk/rooch-client@0.0.3(typescript@5.1.6): + resolution: {integrity: sha512-LzalSTbSNRy7/mzdL5RBGa4wWQy2fKrFQ01Y2vmfoF+jqxQnITAraopTw4Kb1tTRh5sbgsjGBqtbr2p8hSUIxA==} + engines: {node: '>=18'} + dependencies: + '@roochnetwork/rooch-sdk': 0.2.8(typescript@5.1.6) + '@scure/bip39': 1.5.0 + assert: 2.1.0 + colorts: 0.1.63 + husky: 8.0.3 + keccak256: 1.0.6 + process: 0.11.10 + superstruct: 1.0.4 + tmp: 0.2.3 + ts-retry-promise: 0.7.1 + transitivePeerDependencies: + - typescript + dev: false + /@ampproject/remapping@2.3.0: resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==} engines: {node: '>=6.0.0'}