wowok 1.1.0 → 1.1.2

package/src/passport.ts

@@ -1,11 +1,10 @@
 import { SuiObjectResponse, SuiObjectDataOptions } from '@mysten/sui.js/client';
-import { TransactionBlock, type TransactionObjectInput, Inputs } from '@mysten/sui.js/transactions';
-import { FnCallType, Query_Param, PassportObject, GuardObject, Protocol, ContextType, OperatorType, Data_Type,
-    ValueType, MODULES,
-} from './protocol';
-import { parse_object_type, array_unique, BCS_CONVERT, ulebDecode } from './utils';
-import { VariableType, Guard, Guard_Vriable} from './guard';
-import { bcs, BCS, toHEX, fromHEX, getSuiMoveConfig, TypeName, StructTypeDefinition } from '@mysten/bcs';
+import { type TransactionObjectInput, Inputs } from '@mysten/sui.js/transactions';
+import { FnCallType, Query_Param, GuardObject, Protocol, ContextType, OperatorType, Data_Type,
+    ValueType, MODULES } from './protocol';
+import { parse_object_type, array_unique, Bcs, ulebDecode, IsValidAddress, IsValidArray } from './utils';
+import { VariableType, Guard, Guard_Vriable, GuardVariableMaker } from './guard';
+import { BCS } from '@mysten/bcs';
 import { ERROR, Errors } from './exception';
 
 export type Guard_Query_Object = {
@@ -15,45 +14,72 @@ export type Guard_Query_Object = {
     id: string, // object id
 }
 
-export type GUARD_QUERIES_TYPE = {
-    module:MODULES, 
-    name:string, 
-    cmd:number, 
-    params:Data_Type[], 
-    result:Data_Type
-};
-
-// de sense bsc => FutureValueRequest
-export type FutureValueRequest = {
-    guardid: string;
+interface FutrueInfo {
+    identifier: number;
+    type:  number;
+    witness: string;
+    futrue?: string;
+}
+interface GuardInfo {
+    id: string;
+    query_list: (string | {identifier:number, type:number, witness:string})[]; // object or future object query
+    futrue_list: FutrueInfo[];
+}
+interface FutrueFill {
+    guard: string;
     identifier: number;
-    type: ContextType | OperatorType,
-    witness: string,
-    value: string, // future object address
+    future: string;
 }
 
+interface PassportQuery {
+    query: Guard_Query_Object[];
+    witness: Guard_Query_Object[];
+}
 export class GuardParser {
-    // from guards: get objects to fill FUTURE value by singer 
-    static guard_futures = async (protocol:Protocol, guards:string[]) : Promise<FutureValueRequest[]> => {
-        let futrue_objects = guards.map((value) => {
-            return {objectid:value, callback:GuardParser.rpc_sense_objects_fn, parser:GuardParser.parse_futures, data:[]} as Query_Param
-        });
-        await protocol.Query(futrue_objects); // future objects
-        let future_objects_result:FutureValueRequest[] = [];
-        futrue_objects.forEach((futrue) => { 
-            futrue.data.forEach((f:FutureValueRequest) => {
-                if (future_objects_result.findIndex((v)=>{ return v.guardid == f.guardid && v.identifier == f.identifier}) ==  -1) {
-                    future_objects_result.push(f);
+    protected guard_list: GuardInfo[] = [];
+    protected protocol: Protocol;
+    private constructor(protocol: Protocol) { this.protocol = protocol }
+    guardlist = () => { return this.guard_list }
+
+    static CreateAsync = async (protocol: Protocol, guards: string[]) => {
+        if (!IsValidArray(guards, IsValidAddress)) {
+            ERROR(Errors.IsValidArray, 'guards');
+        }
+
+        let guard_list = array_unique(guards);
+        const me = new GuardParser(protocol);
+        
+        let res =  await protocol.Query_Raw(guards);
+        res.forEach((r) => {
+            let c = r.data?.content as any;
+            if (!c) return;
+
+            let index = protocol.WOWOK_OBJECTS_TYPE().findIndex(v => v.includes('guard::Guard') && v == c.type);
+            if (index == -1) return;
+
+            let info:GuardInfo = {id: c.fields.id.id, query_list:[],  futrue_list:[]};
+            me.parse_future(info,  c.fields.variables);
+            if (c.fields.input.type == (protocol.Package() + '::bcs::BCS')) {
+                me.parse_bcs(info,  Uint8Array.from(c.fields.input.fields.bytes));
+            }
+            me.guard_list.push(info);
+        })
+        return me
+    }
+
+    private parse_future = (info:GuardInfo, variables:any)  => {
+        variables.forEach((v:any) => {
+            if (v.type == (this.protocol.Package() + '::guard::Variable')) {
+                if (v.fields.type == OperatorType.TYPE_FUTURE_QUERY || v.fields.type == ContextType.TYPE_CONTEXT_FUTURE_ID) {
+                    info.futrue_list.push({identifier:v.fields.identifier, type:v.fields.type, 
+                        witness:'0x' + Bcs.getInstance().de(BCS.ADDRESS, Uint8Array.from(v.fields.value))});
                 }
-            }) ;
+            }
         });
-
-        return future_objects_result
     }
 
-    // parse  guard futures into result, WITH future variable READY.
-    static parse_futures(result:FutureValueRequest[], guardid: string, chain_sense_bsc:Uint8Array, variable?:VariableType) : boolean {
-        var arr = [].slice.call(chain_sense_bsc.reverse());
+    private parse_bcs = (info:GuardInfo, chain_bytes: Uint8Array) => {
+        var arr = [].slice.call(chain_bytes.reverse());
         while (arr.length > 0) {
             var type : unknown = arr.shift() ;
             // console.log(type);
@@ -68,19 +94,19 @@ export class GuardParser {
                 case OperatorType.TYPE_LOGIC_OPERATOR_EQUAL:
                 case OperatorType.TYPE_LOGIC_OPERATOR_HAS_SUBSTRING:
                 case OperatorType.TYPE_LOGIC_ALWAYS_TRUE:
+                case OperatorType.TYPE_LOGIC_NOT:
+                case OperatorType.TYPE_LOGIC_AND:
+                case OperatorType.TYPE_LOGIC_OR:
                 break;    
-            case ContextType.TYPE_CONTEXT_FUTURE_ID: // MACHINE-ID
+            case ContextType.TYPE_CONTEXT_FUTURE_ID: 
             case OperatorType.TYPE_FUTURE_QUERY:
                 var identifer = arr.splice(0, 1);  
+                let i = info.futrue_list.find(f => f.identifier == identifer[0]) ;
+                if (!i) { ERROR(Errors.Fail, 'futrue_list not found')}
                 if (type == OperatorType.TYPE_FUTURE_QUERY) {
+                    info.query_list.push({identifier:identifer[0], type:type as number, witness:i!.witness}); // query list item
                     arr.splice(0, 1); // cmd
                 }
-                if (!variable || variable?.get(identifer[0])?.type != type) return false;
-                
-                let witness = Guard.get_variable_witness(variable, identifer[0], type as OperatorType) ;
-                if (!witness)  return false;
-                result.push({guardid:guardid, identifier:identifer[0], type:type, value:'',
-                    witness:'0x' + BCS_CONVERT.de(BCS.ADDRESS, Uint8Array.from(witness as Uint8Array))} as FutureValueRequest);
                 break;
             case ContextType.TYPE_CONTEXT_address:
             case ContextType.TYPE_CONTEXT_bool:
@@ -108,198 +134,73 @@ export class GuardParser {
                 arr.splice(0, value+length);
                 break;     
             case OperatorType.TYPE_QUERY:
+                info.query_list.push('0x' + Bcs.getInstance().de(BCS.ADDRESS, Uint8Array.from(arr)).toString());
                 arr.splice(0, 33); // address + cmd
                 break;
             default:
-                console.error('parse_sense_bsc:undefined');
-                console.log(type as number)
-                console.log(arr)
-                return false; // error
+                ERROR(Errors.Fail, 'parse_bcs types')
             }
         } 
-        return true;
     }
 
-    // from guards: get objects to 'guard_query' on chain , with future variables had filled.
-    // passport verify for some guards, MUST be in ONE pxb:
-    // 0. construct Guard_Query_Objects(passport_quries) from queries for guards of objects
-    // 1. create passport
-    // 2. add all guards / guards future variables
-    // 3. verify passport
-    // 4. ops using passport(guard set on object)
-    // 5. ops using passport(guard set on object)
-    // 6. destroy passport
-    static guard_queries = async (protocol:Protocol, guards:string[], futures?:FutureValueRequest[]) : Promise<Guard_Query_Object[]> => {
-        let sense_objects = guards.map((value) => {
-            let v:VariableType = new Map();
-            futures?.forEach((f) => {
-                if (f.guardid == value) {   
-                    Guard.add_future_variable(v, f.identifier, f.type, f.witness.slice(0), f?.value?f.value.slice(0):undefined, true);
-                } 
+    done = async (fill?:FutrueFill[]) : Promise<PassportQuery>=> {
+        let objects: string[] = [];
+        this.guard_list.forEach((g) => {
+            g.futrue_list.forEach((f) => {
+                let r = fill?.find(i => i.identifier == f.identifier && g.id == i.guard);
+                if (!r && !f.futrue) { ERROR(Errors.InvalidParam, 'fill') }
+                
+                if (r) f.futrue = r!.future;
+                objects.push(f.futrue!);
             })
-            return {objectid:value, callback:GuardParser.rpc_sense_objects_fn, parser:GuardParser.parse_sense_bsc, data:[], variables:futures?v:undefined} as Query_Param
-        });
-
-        await protocol.Query(sense_objects); // objects need quering in guards
-        let sense_objects_result:string[] = [];
-        sense_objects.forEach((value) => { // DONT CHANGE objects sequence 
-            sense_objects_result = sense_objects_result.concat(value.data);
-        });
-        sense_objects_result = array_unique(sense_objects_result); // objects in guards
-        
-        let queries = sense_objects_result.map((value) => { 
-            return {objectid:value, callback:GuardParser.rpc_query_cmd_fn, data:[]} as Query_Param;
-        })
-
-        await protocol.Query(queries, {'showType':true}); // queries for passport verifing
-        let res : Guard_Query_Object[] = [];
-        sense_objects.forEach((guard) => { // DONT CHANGE objects sequence  for passport verifying
-            res = res.concat(guard.data.map((object:string) => {
-                let data = queries.filter((v) => {
-                    return v.objectid == object
-                });
-                if (!data) {
-                    console.error('error find data')
-                    console.log(queries)
-                    console.log(object)
-                    return 
+            g.query_list = g.query_list.map((q) => {
+                if (typeof(q) === "string") {
+                    objects.push(q)
+                    return q
+                } else {
+                    let r = g.futrue_list.find(f => f.identifier == q.identifier && f.type == q.type && f.witness == q.witness);
+                    if (!r || !r.futrue) { ERROR(Errors.Fail, 'query witness not match')}
+                    objects.push(r!.futrue!);
+                    return r!.futrue!
                 }
-                return data[0].data          
-            }))
+            })
         })
-        return res;
-    }
-
-    // parse guard senses input bytes of a guard, return [objectids] for 'query_cmd' 
-    static parse_sense_bsc(result:string[], guardid: string, chain_sense_bsc:Uint8Array, variable?:VariableType)  : boolean {
-        var arr = [].slice.call(chain_sense_bsc.reverse());
-    
-        while (arr.length > 0) {
-            var type : unknown = arr.shift() ;
-            // console.log(type);
-            switch (type as Data_Type) { 
-                case ContextType.TYPE_CONTEXT_SIGNER:
-                case ContextType.TYPE_CONTEXT_CLOCK:
-                case OperatorType.TYPE_LOGIC_OPERATOR_U128_GREATER:
-                case OperatorType.TYPE_LOGIC_OPERATOR_U128_GREATER_EQUAL:
-                case OperatorType.TYPE_LOGIC_OPERATOR_U128_LESSER:
-                case OperatorType.TYPE_LOGIC_OPERATOR_U128_LESSER_EQUAL:
-                case OperatorType.TYPE_LOGIC_OPERATOR_U128_EQUAL:
-                case OperatorType.TYPE_LOGIC_OPERATOR_EQUAL:
-                case OperatorType.TYPE_LOGIC_OPERATOR_HAS_SUBSTRING:
-                case OperatorType.TYPE_LOGIC_ALWAYS_TRUE:
-                break;    
-            case ContextType.TYPE_CONTEXT_FUTURE_ID: // MACHINE-ID
-                var v = arr.splice(0, 1);
-                if (!variable || variable?.get(v[0])?.type != type) return false;
-                break;
-            case ContextType.TYPE_CONTEXT_address:
-            case ContextType.TYPE_CONTEXT_bool:
-            case ContextType.TYPE_CONTEXT_u8:
-            case ContextType.TYPE_CONTEXT_u64:
-            case ContextType.TYPE_CONTEXT_vec_u8:
-                arr.splice(0, 1); // identifier
-                break;
-            case ValueType.TYPE_STATIC_address: 
-                //console.log('0x' + bcs.de(BCS.ADDRESS,  Uint8Array.from(array)).toString());
-                arr.splice(0, 32);
-                break;
-            case ValueType.TYPE_STATIC_bool:
-            case ValueType.TYPE_STATIC_u8:
-                arr.splice(0, 1);
-                break;
-            case ValueType.TYPE_STATIC_u64: 
-                arr.splice(0, 8);
-                break;
-            case ValueType.TYPE_STATIC_u128: 
-                arr.splice(0, 16);
-                break;
-            case ValueType.TYPE_STATIC_vec_u8:
-                let {value, length} = ulebDecode(Uint8Array.from(arr));
-                arr.splice(0, value+length);
-                break;     
-            case OperatorType.TYPE_QUERY:
-                result.push('0x' + BCS_CONVERT.de(BCS.ADDRESS, Uint8Array.from(arr)).toString());
-                arr.splice(0, 33); // address + cmd
-                break;
-            case OperatorType.TYPE_QUERY_FROM_CONTEXT: 
-            case OperatorType.TYPE_FUTURE_QUERY: 
-                var identifer = arr.splice(0, 1);
-                if (variable) {
-                    let v = Guard.get_variable_value(variable, identifer[0], type as OperatorType) ;
-                    if (v)  {
-                        result.push('0x' + BCS_CONVERT.de(BCS.ADDRESS, Uint8Array.from(v as Uint8Array)).toString());
-                        arr.splice(0, 1); // splice cmd  
-                        break;
-                    }
-                }; return false  
-            default:
-                console.error('parse_sense_bsc:undefined');
-                console.log(type as number)
-                console.log(arr)
-                return false; // error
-            }
-        } 
-        return true;
-    }
 
+        // objects info
+        let res = await  this.protocol.Query_Raw(array_unique(objects), {showType:true});
+        let query: Guard_Query_Object[] = [];
+        let witness: Guard_Query_Object[] = [];
+        this.guard_list.forEach(g => {
+            g.query_list.forEach(q => {
+                let r = res.find(r => r.data?.objectId == q as string);  
+                if (!r)   { ERROR(Errors.Fail, 'query object not match')} 
+                let object = this.object_query(r!.data);
+                if (!object) { ERROR(Errors.Fail, 'object fail')} 
+                query.push(object!);
+            })
+            g.futrue_list.forEach(f => {
+                let r = res.find(r => r.data?.objectId == f.futrue!);
+                if (!r) { ERROR(Errors.Fail, 'query future not match')} 
+                let object = this.object_query(r!.data, 'witness');
+                witness.push(object!)
+            })
+        })
 
-    // callback  to  parse guard's object-queries into Guard_Query_Object[]
-    static rpc_sense_objects_fn = (protocol:Protocol, response:SuiObjectResponse, param:Query_Param, option:SuiObjectDataOptions) => {
-        if (!response.error) {
-            let c = response?.data?.content as any;
-            let index = protocol.WOWOK_OBJECTS_TYPE().findIndex(v => v.includes('guard::Guard') && v == c.type);
-            if (index >= 0 && c.fields.id.id == param.objectid) { // GUARD OBJECT
-                if (!param?.variables)  {
-                    let v =  new Map<number, Guard_Vriable>();
-                    for (let i = 0; i < c.fields.variables.length; i ++) {
-                        let variable = c.fields.variables[i]; let bret ;
-                        if (variable.type == (protocol.WOWOK_OBJECTS_PREFIX_TYPE()[index] + 'Variable')) { // ...::guard::Variable
-                            if (variable.fields.type == OperatorType.TYPE_FUTURE_QUERY || variable.fields.type == ContextType.TYPE_CONTEXT_FUTURE_ID) {
-                                bret = Guard.add_future_variable(v, variable.fields.identifier, variable.fields.type, 
-                                    variable.fields?.value?Uint8Array.from(variable.fields.value):undefined, undefined, false);
-                            } else {
-                                bret = Guard.add_variable(v, variable.fields.identifier, variable.fields.type, 
-                                    variable.fields?.value?Uint8Array.from(variable.fields.value):undefined, false);
-                            }
-                            if (!bret) {
-                                console.log('rpc_sense_objects_fn add_variable error');
-                                console.log(variable);
-                                return ;       
-                            }
-                        }                         
-                    }
-                    param.variables = v;
-                }
-                
-                for (let i = 0; i < c.fields.senses.length; i ++) {
-                    let sense = c.fields.senses[i];
-                    if (sense.type == (protocol.WOWOK_OBJECTS_PREFIX_TYPE()[index] + 'Sense')) { // ...::guard::Sense    
-                        let result : any[] = [];
-                        if (param?.parser && param.parser(result, param.objectid, Uint8Array.from(sense.fields.input.fields.bytes), param.variables)) {
-                            param.data = param.data.concat(result);      // DONT array_unique senses                  
-                        }       
-                    }                         
-                }
-            } 
-        }
+        return {query:query,  witness:witness} as PassportQuery;
     }
 
-    // construct Guard_Query_Object of wowok objects for passport verify
-    static rpc_query_cmd_fn = (protocol:Protocol, response:SuiObjectResponse, param:Query_Param, option:SuiObjectDataOptions) => {
-        if (!response.error && response.data?.objectId == param.objectid && response.data?.type) {
-            for (let k = 0; k < protocol.WOWOK_OBJECTS_TYPE().length; k++) {
-                if (response?.data?.type.includes(protocol.WOWOK_OBJECTS_TYPE()[k]) ) { // type: pack::m::Object<...>
-                    param.data = { target:protocol.WOWOK_OBJECTS_PREFIX_TYPE()[k] + 'guard_query' as FnCallType,
-                        object:Inputs.SharedObjectRef({
-                            objectId: response.data.objectId,
-                            mutable: false,
-                            initialSharedVersion: response.data!.version,
-                        }) as TransactionObjectInput,
-                        types:parse_object_type(response?.data?.type as string),
-                        id: param.objectid,
-                    } as Guard_Query_Object;
-                }
+    private object_query = (data: any, method:string='guard_query') : Guard_Query_Object | undefined=> {
+        for (let k = 0; k < this.protocol.WOWOK_OBJECTS_TYPE().length; k++) {
+            if (data.type.includes(this.protocol.WOWOK_OBJECTS_TYPE()[k]) ) { // type: pack::m::Object<...>
+                return  { target:this.protocol.WOWOK_OBJECTS_PREFIX_TYPE()[k] + method as FnCallType,
+                    object:Inputs.SharedObjectRef({
+                        objectId: data.objectId,
+                        mutable: false,
+                        initialSharedVersion: data.version,
+                    }) as TransactionObjectInput,
+                    types:parse_object_type(data.type as string),
+                    id: data.objectId,
+                } as Guard_Query_Object;
             }
         }
     }
@@ -312,7 +213,7 @@ export class Passport {
 
     get_object () { return this.passport }
     // return passport object used
-    constructor (protocol:Protocol, guards:GuardObject[], guard_queries:Guard_Query_Object[], future_values?:FutureValueRequest[])  {
+    constructor (protocol:Protocol, guards:GuardObject[], query?:PassportQuery)  {
         if (!guards || guards.length > Passport.MAX_GUARD_COUNT)   {
             ERROR(Errors.InvalidParam, 'guards' )
         }
@@ -334,42 +235,29 @@ export class Passport {
                 arguments:[this.passport, Protocol.TXB_OBJECT(txb, guard)]
             });        
         })
-    
-        type futureResultItem = {
-            identifier:number[],
-            real_address: string[],
-        }
-        
-        let result = new Map<string, futureResultItem>();
-        future_values?.forEach((v) => {
-            if (result.has(v.guardid)) {
-                result.get(v.guardid)?.identifier.push(v.identifier);
-                result.get(v.guardid)?.real_address.push(v.value!);
-            } else {
-                result.set(v.guardid, {identifier:[v.identifier], real_address:[v.value!]})
-            }
-        })
-        
-        result.forEach((v, k) => {
+
+        // witness
+        query?.witness.forEach((w) => {
             txb.moveCall({
-                target:protocol.PassportFn('futures_set') as FnCallType,
-                arguments:[this.passport, txb.pure(BCS_CONVERT.ser_address(k)), txb.pure(BCS_CONVERT.ser_vector_u8(v.identifier)), 
-                    txb.pure(v.real_address, 'vector<address>')]
+                target: w.target as FnCallType,
+                arguments: [this.passport, txb.object(w.object)],
+                typeArguments: w.types,
             })
         })
 
         // rules: 'verify' & 'query' in turns；'verify' at final end.
-        for (let i = 0; i < guard_queries.length; i++) {
-            let res = txb.moveCall({
+        query?.query.forEach((q) => {
+            let [type, address] = txb.moveCall({
                 target: protocol.PassportFn('passport_verify') as FnCallType,
-                arguments: [ this.passport, txb.object(Protocol.CLOCK_OBJECT),  ]
+                arguments: [ this.passport, txb.object(Protocol.CLOCK_OBJECT)]
             }); 
             txb.moveCall({
-                target: guard_queries[i].target as FnCallType,
-                arguments: [ txb.object(guard_queries[i].object), this.passport, res ],
-                typeArguments: guard_queries[i].types,
+                target: q.target as FnCallType,
+                arguments: [ txb.object(q.object), this.passport, type, address ],
+                typeArguments: q.types,
             })
-        }  
+        })
+        
         txb.moveCall({
             target: protocol.PassportFn('passport_verify') as FnCallType,
             arguments: [ this.passport,  txb.object(Protocol.CLOCK_OBJECT) ]

package/src/permission.ts

@@ -1,6 +1,6 @@
 import { BCS } from '@mysten/bcs';
 import { FnCallType, TxbObject, PermissionObject, PermissionAddress, GuardObject, Protocol} from './protocol';
-import { array_unique, IsValidAddress, IsValidArray,  IsValidDesription, IsValidUint, BCS_CONVERT} from './utils';
+import { array_unique, IsValidAddress, IsValidArray,  IsValidDesription, IsValidUint, Bcs} from './utils';
 import { ERROR, Errors } from './exception';
 
 export enum PermissionIndex {
@@ -11,6 +11,9 @@ export enum PermissionIndex {
     repository_remove_policies = 104,
     repository_set_policy_description = 105,
     repository_set_policy_permission = 106,
+    repository_reference_add = 107,
+    repository_reference_remove = 108,
+    repository_reference_removeall = 108,
     vote = 150,
     vote_set_description = 151,
     vote_set_reference = 152, 
@@ -232,7 +235,7 @@ export class  Permission {
         txb.moveCall({
             target:this.protocol.PermissionFn('remove_index') as FnCallType,
             arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(entity_address, BCS.ADDRESS), 
-                txb.pure(BCS_CONVERT.ser_vector_u64(array_unique(index)))]
+                txb.pure(Bcs.getInstance().ser_vector_u64(array_unique(index)))]
         })            
     }
     remove_entity(entity_address:string[])  {

package/src/progress.ts

@@ -2,7 +2,7 @@ import { BCS } from '@mysten/bcs';
 import { FnCallType, PermissionObject, RepositoryObject, PassportObject, MachineObject, 
     ProgressObject, ProgressAddress, Protocol,
     TxbObject} from './protocol';
-import { BCS_CONVERT, array_unique,IsValidName, IsValidAddress, IsValidArray, OptionNone, IsValidInt  } from './utils'
+import { Bcs, array_unique,IsValidName, IsValidAddress, IsValidArray, OptionNone, IsValidInt  } from './utils'
 import { ERROR, Errors } from './exception';
 
 export type ProgressNext = {
@@ -244,8 +244,8 @@ export class Progress {
         }
 
         let txb = this.protocol.CurrentSession();
-        let diliverable = deliverables_address? txb.pure(BCS_CONVERT.ser_option_address(deliverables_address)) : OptionNone(txb)
-        let sub = sub_id? txb.pure(BCS_CONVERT.ser_option_address(sub_id)) : OptionNone(txb)
+        let diliverable = deliverables_address? txb.pure(Bcs.getInstance().ser_option_address(deliverables_address)) : OptionNone(txb)
+        let sub = sub_id? txb.pure(Bcs.getInstance().ser_option_address(sub_id)) : OptionNone(txb)
         
         if (passport) {
             txb.moveCall({

package/src/protocol.ts

@@ -67,7 +67,10 @@ export enum OperatorType {
     TYPE_LOGIC_OPERATOR_EQUAL = 16, // TYPE&DATA(vector<u8>) MUST BE EQUAL
     TYPE_LOGIC_OPERATOR_HAS_SUBSTRING = 17, // SUBSTRING
     TYPE_LOGIC_ALWAYS_TRUE = 18, // aways true
-}
+    TYPE_LOGIC_NOT = 19, // NOT
+    TYPE_LOGIC_AND = 20, // AND
+    TYPE_LOGIC_OR = 21, // OR
+}       
 
 export enum ContextType {
     TYPE_CONTEXT_SIGNER  = 60,
@@ -128,8 +131,7 @@ export class Protocol {
     protected graphql = '';
     protected txb: TransactionBlock | undefined;
 
-    constructor(network:ENTRYPOINT, signer_address:string) {
-        this.signer = signer_address;
+    constructor(network:ENTRYPOINT=ENTRYPOINT.testnet) {
         this.UseNetwork(network);
         this.NewSession();
     }
@@ -143,7 +145,7 @@ export class Protocol {
             case ENTRYPOINT.devnet:
                 break;
             case ENTRYPOINT.testnet:
-                this.package = "0x142a896540e7bb2858ca8a3ec6194511e409a7d81225abddf84ae58fd4764735";
+                this.package = "0xfca45168861085e920aa6e0dd0391b8dbe439fb4725004fe4e0fa5792870bae8";
                 this.everyone_guard = "0x78a41fcc4f566360839613f6b917fb101ae015e56b43143f496f265b6422fddc";
                 this.graphql = 'https://sui-testnet.mystenlabs.com/graphql';
                 break;
@@ -183,7 +185,6 @@ export class Protocol {
     ServiceFn = (fn: any) => { return `${this.package}::${MODULES.service}::${fn}`};
     WowokFn = (fn: any) => { return `${this.package}::${MODULES.wowok}::${fn}`};
     
-
     Query = async (objects: Query_Param[], options:SuiObjectDataOptions={showContent:true}) : Promise<SuiObjectResponse[]> => {
         const client =  new SuiClient({ url: this.NetworkUrl() });  
         const ids = objects.map((value) => value.objectid);
@@ -196,6 +197,11 @@ export class Protocol {
         }   
         return res;
     } 
+    Query_Raw = async (objects: string[], options:SuiObjectDataOptions={showContent:true}) : Promise<SuiObjectResponse[]> => {
+        const client =  new SuiClient({ url: this.NetworkUrl() });  
+        return await client.call('sui_multiGetObjects', [objects, options]) as SuiObjectResponse[];
+    }
+
     NewSession = () : TransactionBlock => {
         this.txb = new  TransactionBlock();
         return this.txb
@@ -246,6 +252,21 @@ export class Protocol {
         { let i = this.package + '::' + key + '::';  return i + capitalize(key); })
     WOWOK_OBJECTS_PREFIX_TYPE = () => (Object.keys(MODULES) as Array<keyof typeof MODULES>).map((key) => 
         { return this.package + '::' + key + '::'; })
+    object_name_from_type_repr = (type_repr:string) : string => {
+        let i = type_repr.indexOf('::');
+        if (i > 0 && type_repr.slice(0, i) === this.package) {
+            i = type_repr.indexOf('<');
+            if (i > 0) {
+                type_repr = type_repr.slice(0, i);
+            }
+            
+            let n = type_repr.lastIndexOf('::');
+            if (n > 0) {
+                return type_repr.slice(n+2);
+            }
+        }
+        return ''
+    }
 }
 
 export class RpcResultParser {