npm - wowok - Versions diffs - 1.2.11 → 1.3.3 - Mend

wowok 1.2.11 → 1.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

package/src/progress.ts CHANGED Viewed

@@ -1,10 +1,11 @@
-import { BCS } from '@mysten/bcs';
 import { FnCallType, PermissionObject, RepositoryObject, PassportObject, MachineObject,
     ProgressObject, ProgressAddress, Protocol, ValueType,
     TxbObject} from './protocol';
-import { Bcs, array_unique,IsValidName, IsValidAddress, IsValidArray, OptionNone, IsValidInt  } from './utils'
+import { Bcs, array_unique,IsValidName, IsValidAddress, IsValidArray, IsValidInt  } from './utils'
 import { ERROR, Errors } from './exception';
-import { Resource } from './resource';
+import { type TransactionResult, Transaction as TransactionBlock } from '@mysten/sui/transactions';
 export type ProgressNext = {
     next_node_name: string;
@@ -39,37 +40,36 @@ export class Progress {
     protected permission ;
     protected machine;
     protected object : TxbObject;
-    protected protocol;
+    protected txb;
     get_object() { return this.object }
-    private constructor(protocol:Protocol, machine:MachineObject, permission:PermissionObject) {
+    private constructor(txb:TransactionBlock, machine:MachineObject, permission:PermissionObject) {
         this.permission = permission;
-        this.protocol = protocol;
+        this.txb = txb;
         this.machine = machine;
         this.object = '';
     }
-    static From(protocol:Protocol, machine:MachineObject, permission:PermissionObject, object:TxbObject) : Progress{
-        let p = new Progress(protocol, machine, permission)
-        p.object = Protocol.TXB_OBJECT(protocol.CurrentSession(), object);
+    static From(txb:TransactionBlock, machine:MachineObject, permission:PermissionObject, object:TxbObject) : Progress{
+        let p = new Progress(txb, machine, permission)
+        p.object = Protocol.TXB_OBJECT(txb, object);
         return p
     }
-    static New(protocol:Protocol, machine:MachineObject, permission:PermissionObject, task?:string, passport?:PassportObject) : Progress {
+    static New(txb:TransactionBlock, machine:MachineObject, permission:PermissionObject, task?:string | null, passport?:PassportObject) : Progress {
         if (!Protocol.IsValidObjects([machine, permission])) {
             ERROR(Errors.IsValidObjects, 'machine & permission')
         }
-        let p = new Progress(protocol, machine, permission);
-        let txb = protocol.CurrentSession();
-        let t = task? txb.pure(Bcs.getInstance().ser(ValueType.TYPE_OPTION_ADDRESS, task)) : OptionNone(txb);
+        let p = new Progress(txb, machine, permission);
+        let t = txb.pure.option('address', task ? task : undefined);
         if (passport) {
             p.object = txb.moveCall({
-                target:protocol.ProgressFn('new_with_passport') as FnCallType,
+                target:Protocol.Instance().ProgressFn('new_with_passport') as FnCallType,
                 arguments: [passport, t, Protocol.TXB_OBJECT(txb, machine), Protocol.TXB_OBJECT(txb, permission)],
             })
         } else {
             p.object = txb.moveCall({
-                target:protocol.ProgressFn('new') as FnCallType,
+                target:Protocol.Instance().ProgressFn('new') as FnCallType,
                 arguments: [t, Protocol.TXB_OBJECT(txb, machine), Protocol.TXB_OBJECT(txb, permission)],
             })
         }
@@ -77,10 +77,10 @@ export class Progress {
     }
     launch() : ProgressAddress {
-        let txb = this.protocol.CurrentSession();
-        return txb.moveCall({
-            target:this.protocol.ProgressFn('create') as FnCallType,
-            arguments: [Protocol.TXB_OBJECT(txb, this.object)],
+        return this.txb.moveCall({
+            target:Protocol.Instance().ProgressFn('create') as FnCallType,
+            arguments: [Protocol.TXB_OBJECT(this.txb, this.object)],
         })
     }
@@ -91,19 +91,19 @@ export class Progress {
         if (!Progress.IsValidProgressNext(parent_next)) {
             ERROR(Errors.InvalidParam, 'parent_next')
         }
-        let txb = this.protocol.CurrentSession();
-        return txb.moveCall({
-            target:this.protocol.ProgressFn('create_as_child') as FnCallType,
-            arguments: [Protocol.TXB_OBJECT(txb, this.object), Protocol.TXB_OBJECT(txb, parent),
-                txb.pure(parent_next.next_node_name), txb.pure(parent_next.forward)],
+        return this.txb.moveCall({
+            target:Protocol.Instance().ProgressFn('create_as_child') as FnCallType,
+            arguments: [Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, parent),
+                this.txb.pure.string(parent_next.next_node_name), this.txb.pure.string(parent_next.forward)],
         })
     }
     destroy()  {
-        let txb = this.protocol.CurrentSession();
-        txb.moveCall({
-            target:this.protocol.ProgressFn('destroy') as FnCallType,
-            arguments: [Protocol.TXB_OBJECT(txb, this.object)],
+        this.txb.moveCall({
+            target:Protocol.Instance().ProgressFn('destroy') as FnCallType,
+            arguments: [Protocol.TXB_OBJECT(this.txb, this.object)],
         })
     }
@@ -115,20 +115,20 @@ export class Progress {
             ERROR(Errors.InvalidParam, 'addresses')
         }
-        let txb = this.protocol.CurrentSession();
         if (passport) {
-            txb.moveCall({
-                target:this.protocol.ProgressFn('namedOperator_set_with_passport') as FnCallType,
-                arguments: [passport, Protocol.TXB_OBJECT(txb, this.object), txb.pure(name),
-                    txb.pure(array_unique(addresses), 'vector<address>'),
-                Protocol.TXB_OBJECT(txb, this.machine), Protocol.TXB_OBJECT(txb, this.permission)],
+            this.txb.moveCall({
+                target:Protocol.Instance().ProgressFn('namedOperator_set_with_passport') as FnCallType,
+                arguments: [passport, Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.string(name),
+                    this.txb.pure.vector('address', array_unique(addresses)),
+                Protocol.TXB_OBJECT(this.txb, this.machine), Protocol.TXB_OBJECT(this.txb, this.permission)],
             })
         } else {
-            txb.moveCall({
-                target:this.protocol.ProgressFn('namedOperator_set') as FnCallType,
-                arguments: [Protocol.TXB_OBJECT(txb, this.object), txb.pure(name),
-                    txb.pure(array_unique(addresses), 'vector<address>'),
-                Protocol.TXB_OBJECT(txb, this.machine), Protocol.TXB_OBJECT(txb, this.permission)],
+            this.txb.moveCall({
+                target:Protocol.Instance().ProgressFn('namedOperator_set') as FnCallType,
+                arguments: [Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.string(name),
+                    this.txb.pure.vector('address', array_unique(addresses)),
+                Protocol.TXB_OBJECT(this.txb, this.machine), Protocol.TXB_OBJECT(this.txb, this.permission)],
             })
         }
     }
@@ -138,18 +138,18 @@ export class Progress {
             ERROR(Errors.IsValidAddress)
         }
-        let txb = this.protocol.CurrentSession();
         if (passport) {
-            txb.moveCall({
-                target:this.protocol.ProgressFn('task_set_with_passport') as FnCallType,
-                arguments: [passport, Protocol.TXB_OBJECT(txb, this.object),
-                    txb.pure(task_address, BCS.ADDRESS), Protocol.TXB_OBJECT(txb, this.machine), Protocol.TXB_OBJECT(txb, this.permission)],
+            this.txb.moveCall({
+                target:Protocol.Instance().ProgressFn('task_set_with_passport') as FnCallType,
+                arguments: [passport, Protocol.TXB_OBJECT(this.txb, this.object),
+                    this.txb.pure.address(task_address), Protocol.TXB_OBJECT(this.txb, this.machine), Protocol.TXB_OBJECT(this.txb, this.permission)],
             })
         } else {
-            txb.moveCall({
-                target:this.protocol.ProgressFn('task_set') as FnCallType,
-                arguments: [Protocol.TXB_OBJECT(txb, this.object), txb.pure(task_address, BCS.ADDRESS),
-                    Protocol.TXB_OBJECT(txb, this.machine), Protocol.TXB_OBJECT(txb, this.permission)],
+            this.txb.moveCall({
+                target:Protocol.Instance().ProgressFn('task_set') as FnCallType,
+                arguments: [Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.address(task_address),
+                    Protocol.TXB_OBJECT(this.txb, this.machine), Protocol.TXB_OBJECT(this.txb, this.permission)],
             })
         }
     }
@@ -158,70 +158,69 @@ export class Progress {
             ERROR(Errors.IsValidObjects, 'repository')
         }
-        let txb = this.protocol.CurrentSession();
         if (passport) {
             if (repository) {
-                txb.moveCall({
-                    target:this.protocol.ProgressFn('context_repository_set_with_passport') as FnCallType,
-                    arguments: [passport, Protocol.TXB_OBJECT(txb, this.object), Protocol.TXB_OBJECT(txb, repository),
-                        Protocol.TXB_OBJECT(txb, this.machine), Protocol.TXB_OBJECT(txb, this.permission)],
+                this.txb.moveCall({
+                    target:Protocol.Instance().ProgressFn('context_repository_set_with_passport') as FnCallType,
+                    arguments: [passport, Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, repository),
+                        Protocol.TXB_OBJECT(this.txb, this.machine), Protocol.TXB_OBJECT(this.txb, this.permission)],
                 })
             } else {
-                txb.moveCall({
-                    target:this.protocol.ProgressFn('context_repository_none_with_passport') as FnCallType,
-                    arguments: [passport, Protocol.TXB_OBJECT(txb, this.object),
-                        Protocol.TXB_OBJECT(txb, this.machine), Protocol.TXB_OBJECT(txb, this.permission)],
+                this.txb.moveCall({
+                    target:Protocol.Instance().ProgressFn('context_repository_none_with_passport') as FnCallType,
+                    arguments: [passport, Protocol.TXB_OBJECT(this.txb, this.object),
+                        Protocol.TXB_OBJECT(this.txb, this.machine), Protocol.TXB_OBJECT(this.txb, this.permission)],
                 })
             }
         } else {
             if (repository) {
-                txb.moveCall({
-                    target:this.protocol.ProgressFn('context_repository_set') as FnCallType,
-                    arguments: [Protocol.TXB_OBJECT(txb, this.object), Protocol.TXB_OBJECT(txb, repository),
-                        Protocol.TXB_OBJECT(txb, this.machine), Protocol.TXB_OBJECT(txb, this.permission)],
+                this.txb.moveCall({
+                    target:Protocol.Instance().ProgressFn('context_repository_set') as FnCallType,
+                    arguments: [Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, repository),
+                        Protocol.TXB_OBJECT(this.txb, this.machine), Protocol.TXB_OBJECT(this.txb, this.permission)],
                 })
             } else {
-                txb.moveCall({
-                    target:this.protocol.ProgressFn('context_repository_none') as FnCallType,
-                    arguments: [Protocol.TXB_OBJECT(txb, this.object), Protocol.TXB_OBJECT(txb, this.machine), Protocol.TXB_OBJECT(txb, this.permission)],
+                this.txb.moveCall({
+                    target:Protocol.Instance().ProgressFn('context_repository_none') as FnCallType,
+                    arguments: [Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, this.machine), Protocol.TXB_OBJECT(this.txb, this.permission)],
                 })
             }
         }
     }
     unhold(next:ProgressNext, passport?:PassportObject)  {
+        console.log(next)
         if (!Progress.IsValidProgressNext(next)) {
-            ERROR(Errors.InvalidParam, 'next')
+            ERROR(Errors.InvalidParam, 'unhold')
         }
-        let txb = this.protocol.CurrentSession();
         if (passport) {
-            txb.moveCall({
-                target:this.protocol.ProgressFn('unhold_with_passport') as FnCallType,
-                arguments: [passport, Protocol.TXB_OBJECT(txb, this.object),
-                    Protocol.TXB_OBJECT(txb, this.machine), txb.pure(next.next_node_name),
-                    txb.pure(next.forward), Protocol.TXB_OBJECT(txb, this.permission)],
+            this.txb.moveCall({
+                target:Protocol.Instance().ProgressFn('unhold_with_passport') as FnCallType,
+                arguments: [passport, Protocol.TXB_OBJECT(this.txb, this.object),
+                    Protocol.TXB_OBJECT(this.txb, this.machine), this.txb.pure.string(next.next_node_name),
+                    this.txb.pure.string(next.forward), Protocol.TXB_OBJECT(this.txb, this.permission)],
             })
         } else {
-            txb.moveCall({
-                target:this.protocol.ProgressFn('unhold') as FnCallType,
-                arguments: [Protocol.TXB_OBJECT(txb, this.object), Protocol.TXB_OBJECT(txb, this.machine),
-                    txb.pure(next.next_node_name), txb.pure(next.forward),
-                    Protocol.TXB_OBJECT(txb, this.permission)],
+            this.txb.moveCall({
+                target:Protocol.Instance().ProgressFn('unhold') as FnCallType,
+                arguments: [Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, this.machine),
+                    this.txb.pure.string(next.next_node_name), this.txb.pure.string(next.forward),
+                    Protocol.TXB_OBJECT(this.txb, this.permission)],
             })
         }
     }
     parent_none(passport?:PassportObject) {
-        let txb = this.protocol.CurrentSession();
         if (passport) {
-            txb.moveCall({
-                target:this.protocol.ProgressFn('parent_none_with_passport') as FnCallType,
-                arguments: [passport, Protocol.TXB_OBJECT(txb, this.object),
-                    Protocol.TXB_OBJECT(txb, this.machine), Protocol.TXB_OBJECT(txb, this.permission)],
+            this.txb.moveCall({
+                target:Protocol.Instance().ProgressFn('parent_none_with_passport') as FnCallType,
+                arguments: [passport, Protocol.TXB_OBJECT(this.txb, this.object),
+                    Protocol.TXB_OBJECT(this.txb, this.machine), Protocol.TXB_OBJECT(this.txb, this.permission)],
             })
         } else {
-            txb.moveCall({
-                target:this.protocol.ProgressFn('parent_none') as FnCallType,
-                arguments: [Protocol.TXB_OBJECT(txb, this.object), Protocol.TXB_OBJECT(txb, this.machine),
-                    Protocol.TXB_OBJECT(txb, this.permission)],
+            this.txb.moveCall({
+                target:Protocol.Instance().ProgressFn('parent_none') as FnCallType,
+                arguments: [Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, this.machine),
+                    Protocol.TXB_OBJECT(this.txb, this.permission)],
             })
         }
     }
@@ -234,31 +233,31 @@ export class Progress {
             ERROR(Errors.InvalidParam, 'parent')
         }
-        let txb = this.protocol.CurrentSession();
         if (passport) {
-            txb.moveCall({
-                target:this.protocol.ProgressFn('parent_set_with_passport') as FnCallType,
-                arguments: [passport, Protocol.TXB_OBJECT(txb, this.object), Protocol.TXB_OBJECT(txb, this.machine),
-                    txb.pure(parent.parent_id, BCS.ADDRESS),
-                    txb.pure(parent.parent_session_id, BCS.U64),
-                    txb.pure(parent.next_node),
-                    txb.pure(parent.forward),
-                    Protocol.TXB_OBJECT(txb, this.permission)],
+            this.txb.moveCall({
+                target:Protocol.Instance().ProgressFn('parent_set_with_passport') as FnCallType,
+                arguments: [passport, Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, this.machine),
+                    this.txb.pure.address(parent.parent_id),
+                    this.txb.pure.u64(parent.parent_session_id),
+                    this.txb.pure.string(parent.next_node),
+                    this.txb.pure.string(parent.forward),
+                    Protocol.TXB_OBJECT(this.txb, this.permission)],
             })
         } else {
-            txb.moveCall({
-                target:this.protocol.ProgressFn('parent_set') as FnCallType,
-                arguments: [Protocol.TXB_OBJECT(txb, this.object), Protocol.TXB_OBJECT(txb, this.machine),
-                    txb.pure(parent.parent_id, BCS.ADDRESS),
-                    txb.pure(parent.parent_session_id, BCS.U64),
-                    txb.pure(parent.next_node),
-                    txb.pure(parent.forward),
-                    Protocol.TXB_OBJECT(txb, this.permission)],
+            this.txb.moveCall({
+                target:Protocol.Instance().ProgressFn('parent_set') as FnCallType,
+                arguments: [Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, this.machine),
+                    this.txb.pure.address(parent.parent_id),
+                    this.txb.pure.u64(parent.parent_session_id),
+                    this.txb.pure.string(parent.next_node),
+                    this.txb.pure.string(parent.forward),
+                    Protocol.TXB_OBJECT(this.txb, this.permission)],
             })
         }
     }
     next(next:ProgressNext, deliverables_address?:string, sub_id?:string, passport?:PassportObject)  {
+        console.log(next)
         if (!Progress.IsValidProgressNext(next)) {
             ERROR(Errors.InvalidParam, 'next')
         }
@@ -268,40 +267,40 @@ export class Progress {
         if (sub_id && !IsValidAddress(sub_id)) {
             ERROR(Errors.IsValidAddress, 'sub_id');
         }
-        let txb = this.protocol.CurrentSession();
-        let diliverable = deliverables_address? txb.pure(Bcs.getInstance().ser(ValueType.TYPE_OPTION_ADDRESS, deliverables_address)) : OptionNone(txb)
-        let sub = sub_id? txb.pure(Bcs.getInstance().ser(ValueType.TYPE_OPTION_ADDRESS, sub_id)) : OptionNone(txb)
+        let diliverable = this.txb.pure.option('address', deliverables_address ? deliverables_address  : undefined);
+        let sub = this.txb.pure.option('address', sub_id ? sub_id : undefined);
         if (passport) {
-            txb.moveCall({
-                target:this.protocol.ProgressFn('next_with_passport') as FnCallType,
-                arguments: [passport, Protocol.TXB_OBJECT(txb, this.object), Protocol.TXB_OBJECT(txb, this.machine),
-                    txb.pure(next.next_node_name),
-                    txb.pure(next.forward), diliverable, sub,
-                    Protocol.TXB_OBJECT(txb, this.permission)],
+            console.log(11111)
+            this.txb.moveCall({
+                target:Protocol.Instance().ProgressFn('next_with_passport') as FnCallType,
+                arguments: [passport, Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, this.machine),
+                    this.txb.pure.string(next.next_node_name),
+                    this.txb.pure.string(next.forward), diliverable, sub,
+                    Protocol.TXB_OBJECT(this.txb, this.permission)],
             })
         } else {
-            txb.moveCall({
-                target:this.protocol.ProgressFn('next') as FnCallType,
-                arguments: [Protocol.TXB_OBJECT(txb, this.object), Protocol.TXB_OBJECT(txb, this.machine), txb.pure(next.next_node_name),
-                    txb.pure(next.forward), diliverable, sub, Protocol.TXB_OBJECT(txb, this.permission)],
+            this.txb.moveCall({
+                target:Protocol.Instance().ProgressFn('next') as FnCallType,
+                arguments: [Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, this.machine), this.txb.pure.string(next.next_node_name),
+                    this.txb.pure.string(next.forward), diliverable, sub, Protocol.TXB_OBJECT(this.txb, this.permission)],
             })
         }
     }
     hold(next:ProgressNext, hold:boolean)  {
         if (!Progress.IsValidProgressNext(next)) {
-            ERROR(Errors.InvalidParam, 'next')
+            ERROR(Errors.InvalidParam, 'hold')
         }
-        let txb = this.protocol.CurrentSession();
-        txb.moveCall({
-            target:this.protocol.ProgressFn('hold') as FnCallType,
-            arguments: [Protocol.TXB_OBJECT(txb, this.object), Protocol.TXB_OBJECT(txb, this.machine), txb.pure(next.next_node_name),
-                txb.pure(next.forward), txb.pure(hold, BCS.BOOL), Protocol.TXB_OBJECT(txb, this.permission)],
+        this.txb.moveCall({
+            target:Protocol.Instance().ProgressFn('hold') as FnCallType,
+            arguments: [Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, this.machine), this.txb.pure.string(next.next_node_name),
+                this.txb.pure.string(next.forward), this.txb.pure.bool(hold), Protocol.TXB_OBJECT(this.txb, this.permission)],
         })
     }
     static rpc_de_sessions = (session: any) : Session[] => {
         let sessions : Session[] = [];
         session?.fields?.contents?.forEach((v:any) => {

package/src/protocol.ts CHANGED Viewed

@@ -1,11 +1,11 @@
 import { SuiClient, SuiObjectResponse, SuiObjectDataOptions, SuiTransactionBlockResponseOptions,
-    SuiTransactionBlockResponse, SuiObjectChange } from '@mysten/sui.js/client';
-import { Ed25519Keypair } from '@mysten/sui.js/keypairs/ed25519';
-import { BCS, getSuiMoveConfig, toHEX, fromHEX, BcsReader } from '@mysten/bcs';
-import { TransactionBlock, Inputs, TransactionResult, TransactionArgument } from '@mysten/sui.js/transactions';
+    SuiTransactionBlockResponse, SuiObjectChange } from '@mysten/sui/client';
+import { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519';
+import { toHEX, fromHEX, BcsReader } from '@mysten/bcs';
+import { Transaction as TransactionBlock, Inputs, TransactionResult, TransactionArgument } from '@mysten/sui/transactions';
 import { capitalize, IsValidAddress, IsValidArray, IsValidU128, IsValidU64, IsValidU8, IsValidUintLarge } from './utils'
 import { GuardConstant } from './guard';
-import { isValidSuiAddress, isValidSuiObjectId } from '@mysten/sui.js/utils'
+import { isValidSuiAddress, isValidSuiObjectId } from '@mysten/sui/utils'
 export enum MODULES {
     machine = 'machine',
@@ -27,34 +27,34 @@ export enum MODULES {
 }
 export type PermissionAddress = TransactionResult;
-export type PermissionObject = TransactionResult | string;
+export type PermissionObject = TransactionResult | string | TransactionArgument;
 export type RepositoryAddress = TransactionResult;
-export type RepositoryObject = TransactionResult | string;
+export type RepositoryObject = TransactionResult | string | TransactionArgument;
 export type GuardAddress = TransactionResult;
-export type GuardObject = TransactionResult | string ;
+export type GuardObject = TransactionResult | string | TransactionArgument ;
 export type MachineAddress = TransactionResult;
-export type MachineObject = TransactionResult | string;
+export type MachineObject = TransactionResult | string | TransactionArgument;
 export type PassportObject = TransactionResult;
 export type DemandAddress = TransactionResult;
-export type DemandObject = TransactionResult | string;
-export type ServiceObject = TransactionResult  | string;
+export type DemandObject = TransactionResult | string | TransactionArgument;
+export type ServiceObject = TransactionResult  | string | TransactionArgument;
 export type ServiceAddress = TransactionResult;
-export type ProgressObject = TransactionResult | string;
+export type ProgressObject = TransactionResult | string | TransactionArgument;
 export type ProgressAddress = TransactionResult;
-export type RewardObject = TransactionResult | string;
+export type RewardObject = TransactionResult | string | TransactionArgument;
 export type RewardAddress = TransactionResult;
-export type OrderObject = TransactionResult | string;
+export type OrderObject = TransactionResult | string | TransactionArgument;
 export type OrderAddress = TransactionResult;
-export type DiscountObject = TransactionResult | string;
-export type CoinObject = TransactionResult | string;
-export type VoteObject = TransactionResult | string;
+export type DiscountObject = TransactionResult | string | TransactionArgument;
+export type CoinObject = TransactionResult | string | TransactionArgument;
+export type VoteObject = TransactionResult | string | TransactionArgument;
 export type VoteAddress = TransactionResult;
-export type ResourceObject = TransactionResult | string;
+export type ResourceObject = TransactionResult | string | TransactionArgument;
 export type ResourceAddress = TransactionResult;
-export type EntityObject = TransactionResult | string;
+export type EntityObject = TransactionResult | string | TransactionArgument;
 export type EntityAddress = TransactionResult;
-export type TxbObject = string | TransactionResult | GuardObject |  RepositoryObject | PermissionObject | MachineObject | PassportObject |
+export type TxbObject = string | TransactionResult | TransactionArgument | GuardObject |  RepositoryObject | PermissionObject | MachineObject | PassportObject |
     DemandObject | ServiceObject | RewardObject | OrderObject | DiscountObject | VoteObject | DemandObject | ResourceObject | EntityObject;
 export type WowokObject = TransactionResult;
@@ -191,9 +191,9 @@ export enum ENTRYPOINT {
 }
 const TESTNET = {
-    package: "0xc5bcb215cb4bc861203739b7378199969d4f60f5e8130fa1ebf87987bdee0b6a",
-    wowok_object: '0xe9fdb9c3ad7aa81ee32d3fc9618d6e69637111253445e864f898d29179d11a4d',
-    entity_object: '0xe1205f43507c943a82d5a67cb7d2b3b251ff4a80f3b38e815a78291ed53125ce',
+    package: "0x8f547c4bd00eedc72307d67c8c1c7b22da88c29ac530cce57bbfe7b6add45a91",
+    wowok_object: '0x1ccee2dbac69f76db35d92869cc4840fb537020a927dd035cdac811803d9d191',
+    entity_object: '0xb75b6953254cf9a426fb06b1ceb711784031cf7817b66630ba00daf5660ab04e',
 }
 const MAINNET = {
@@ -316,11 +316,10 @@ export class Protocol {
         const privkey = fromHEX(priv_key);
         const keypair = Ed25519Keypair.fromSecretKey(privkey);
-        const response = await client.signAndExecuteTransactionBlock({
-            transactionBlock: this.CurrentSession(),
+        const response = await client.signAndExecuteTransaction({
+            transaction: this.CurrentSession(),
             signer: keypair,
             options,
         });
         this.txb = undefined; // reset the txb to undefine
         return response;
@@ -392,13 +391,10 @@ export class Protocol {
         }; return 'loading';
     }
-    static CLOCK_OBJECT = Inputs.SharedObjectRef({
-        objectId:"0x6",
-        mutable: false,
-        initialSharedVersion: 1,
-    });
-    static TXB_OBJECT(txb:TransactionBlock, arg:TxbObject) : TransactionResult {
-        if (typeof arg == 'string') return txb.object(arg) as TransactionResult;
+    static CLOCK_OBJECT = {objectId:'0x6', mutable:false, initialSharedVersion:1};
+    static TXB_OBJECT(txb:TransactionBlock, arg:TxbObject) : TransactionArgument {
+        if (typeof(arg) == 'string') return txb.object(arg) as TransactionArgument;
         return arg;
     }
     static IsValidObjects = (arr:TxbObject[]) : boolean => {