wowok 1.1.2 → 1.1.4

package/src/protocol.ts

@@ -4,7 +4,7 @@ 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';
 import { capitalize, IsValidArray } from './utils'
-import { VariableType } from './guard';
+import { GuardVariable } from './guard';
 
 
 export enum MODULES {
@@ -56,64 +56,82 @@ export type FnCallType = `${string}::${string}::${string}`;
 
 export enum OperatorType {
     TYPE_QUERY = 1, // query wowok object
-    TYPE_FUTURE_QUERY = 2,
-    TYPE_QUERY_FROM_CONTEXT = 3, 
 
-    TYPE_LOGIC_OPERATOR_U128_GREATER = 11,
-    TYPE_LOGIC_OPERATOR_U128_GREATER_EQUAL = 12,
-    TYPE_LOGIC_OPERATOR_U128_LESSER = 13,
-    TYPE_LOGIC_OPERATOR_U128_LESSER_EQUAL = 14,
-    TYPE_LOGIC_OPERATOR_U128_EQUAL = 15,
-    TYPE_LOGIC_OPERATOR_EQUAL = 16, // TYPE&DATA(vector<u8>) MUST BE EQUAL
-    TYPE_LOGIC_OPERATOR_HAS_SUBSTRING = 17, // SUBSTRING
+    TYPE_LOGIC_AS_U256_GREATER = 11,
+    TYPE_LOGIC_AS_U256_GREATER_EQUAL = 12,
+    TYPE_LOGIC_AS_U256_LESSER = 13,
+    TYPE_LOGIC_AS_U256_LESSER_EQUAL = 14,
+    TYPE_LOGIC_AS_U256_EQUAL = 15,
+    TYPE_LOGIC_EQUAL = 16, // TYPE&DATA(vector<u8>) MUST BE EQUAL
+    TYPE_LOGIC_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,
-    TYPE_CONTEXT_CLOCK = 61,
-    TYPE_CONTEXT_FUTURE_ID = 62, 
-    
-    TYPE_CONTEXT_bool = 70,
-    TYPE_CONTEXT_address = 71,
-    TYPE_CONTEXT_u64 = 72,
-    TYPE_CONTEXT_u8 = 73,
-    TYPE_CONTEXT_vec_u8 = 74,
- /*   TYPE_CONTEXT_u128 = 75,
-    TYPE_CONTEXT_vec_address = 76,
-    TYPE_CONTEXT_vec_bool = 77,
-    TYPE_CONTEXT_vec_vec_u8 = 78,
-    TYPE_CONTEXT_vec_u64 = 79,
-    TYPE_CONTEXT_vec_u128 = 80,
-    TYPE_CONTEXT_option_address = 81,
-    TYPE_CONTEXT_option_bool = 82,
-    TYPE_CONTEXT_option_u8 = 83,
-    TYPE_CONTEXT_option_u64 = 84,
-    TYPE_CONTEXT_option_u128 = 85,*/
+export enum ValueType {
+    TYPE_BOOL = 100,
+    TYPE_ADDRESS = 101,
+    TYPE_U64 = 102,
+    TYPE_U8 = 103,
+    TYPE_VEC_U8 = 104,
+    TYPE_U128 = 105,
+    TYPE_VEC_ADDRESS = 106,
+    TYPE_VEC_BOOL = 107,
+    TYPE_VEC_VEC_U8 = 108,
+    TYPE_VEC_U64 = 109,
+    TYPE_VEC_U128 = 110,
+    TYPE_OPTION_ADDRESS = 111,
+    TYPE_OPTION_BOOL = 112,
+    TYPE_OPTION_U8 = 113,
+    TYPE_OPTION_U64 = 114,
+    TYPE_OPTION_U128 = 115,
+    TYPE_OPTION_U256 = 116,
+    TYPE_VEC_U256 = 117,
+    TYPE_U256 = 118,
 }
 
-export enum ValueType {
-    TYPE_STATIC_bool = 100,
-    TYPE_STATIC_address = 101,
-    TYPE_STATIC_u64 = 102,
-    TYPE_STATIC_u8 = 103,
-    TYPE_STATIC_vec_u8 = 104,
-    TYPE_STATIC_u128 = 105,
-    TYPE_STATIC_vec_address = 106,
-    TYPE_STATIC_vec_bool = 107,
-    TYPE_STATIC_vec_vec_u8 = 108,
-    TYPE_STATIC_vec_u64 = 109,
-    TYPE_STATIC_vec_u128 = 110,
-    TYPE_STATIC_option_address = 111,
-    TYPE_STATIC_option_bool = 112,
-    TYPE_STATIC_option_u8 = 113,
-    TYPE_STATIC_option_u64 = 114,
-    TYPE_STATIC_option_u128 = 115,
+export const OperatorTypeArray = (Object.values(OperatorType) as []).filter((v)=>typeof(v) === 'number') as number[];
+export const ValueTypeArray = (Object.values(ValueType) as []).filter((v)=>typeof(v) === 'number') as number[];
+export const IsValidOperatorType = (type:number) => { return OperatorTypeArray.includes(type)}
+export const IsValidValueType = (type:number) => { return ValueTypeArray.includes(type)}
+
+interface ValueTypeString {
+    type: ValueType;
+    name: string;
+}
+
+export const SER_VALUE: ValueTypeString[] = [
+    {type: ValueType.TYPE_BOOL, name: 'bool'},
+    {type: ValueType.TYPE_ADDRESS, name: 'address'},
+    {type: ValueType.TYPE_U64, name: 'u64'},
+    {type: ValueType.TYPE_U8, name: 'u8'},
+    {type: ValueType.TYPE_VEC_U8, name: 'vector<u8>'},
+    {type: ValueType.TYPE_U128, name: 'u128'},
+    {type: ValueType.TYPE_VEC_ADDRESS, name: 'vector<address>'},
+    {type: ValueType.TYPE_VEC_BOOL, name: 'vector<bool>'},
+    {type: ValueType.TYPE_VEC_VEC_U8, name: 'vector<vector<u8>>'},
+    {type: ValueType.TYPE_VEC_U64, name: 'vector<u64>'},
+    {type: ValueType.TYPE_VEC_U128, name: 'vector<u128>'},
+    {type: ValueType.TYPE_OPTION_ADDRESS, name: 'Option<address>'},
+    {type: ValueType.TYPE_OPTION_BOOL, name: 'Option<bool>'},
+    {type: ValueType.TYPE_OPTION_U8, name: 'Option<u8>'},
+    {type: ValueType.TYPE_OPTION_U64, name: 'Option<u64>'},
+    {type: ValueType.TYPE_OPTION_U128, name: 'Option<u128>'},
+    {type: ValueType.TYPE_OPTION_U256, name: 'Option<u256>'},
+    {type: ValueType.TYPE_VEC_U256, name: 'vector<u256>'},
+    {type: ValueType.TYPE_U256, name: 'u256'},
+]
+
+export enum ContextType {
+    TYPE_SIGNER  = 60,
+    TYPE_CLOCK = 61,
+    TYPE_WITNESS_ID = 62, 
+    TYPE_VARIABLE = 80,
 }
 
+export type VariableType = ValueType | ContextType.TYPE_WITNESS_ID;
 export type Data_Type = ValueType | OperatorType | ContextType;
 
 export enum ENTRYPOINT {
@@ -145,7 +163,7 @@ export class Protocol {
             case ENTRYPOINT.devnet:
                 break;
             case ENTRYPOINT.testnet:
-                this.package = "0xfca45168861085e920aa6e0dd0391b8dbe439fb4725004fe4e0fa5792870bae8";
+                this.package = "0x9a7fc338ab9fd0a8f4c108e2f3dbe53393b83529263eb31a391120997d962400";
                 this.everyone_guard = "0x78a41fcc4f566360839613f6b917fb101ae015e56b43143f496f265b6422fddc";
                 this.graphql = 'https://sui-testnet.mystenlabs.com/graphql';
                 break;
@@ -307,7 +325,7 @@ export class RpcResultParser {
 export type Query_Param = {
     objectid: string;
     callback: (protocol:Protocol, response:SuiObjectResponse, param:Query_Param, option:SuiObjectDataOptions)=>void;
-    parser?: (result:any[], guardid: string, chain_sense_bsc:Uint8Array, variable?:VariableType)  => boolean;
+    parser?: (result:any[], guardid: string, chain_sense_bsc:Uint8Array, variable?:GuardVariable)  => boolean;
     data?: any; // response data filted by callback
-    variables?: VariableType;
+    variables?: GuardVariable;
 };

package/src/utils.ts

@@ -1,7 +1,22 @@
 import { bcs, BCS, toHEX, fromHEX, getSuiMoveConfig, TypeName, StructTypeDefinition } from '@mysten/bcs';
 import { TransactionBlock, Inputs, TransactionResult, TransactionArgument } from '@mysten/sui.js/transactions';
+import { ERROR, Errors } from './exception';
+import { OperatorType } from './protocol';
 
-export const ulebDecode = (arr: number[] | Uint8Array) : {value: number, length: number} => {
+export const OPTION_NONE = 0;
+export const readOption = (arr: number[], de:string) : {bNone:boolean, value:any}=> {
+    let o = arr.splice(0, 1);
+    if (o[0] == 1) { // true
+        return {bNone:false,  value:Bcs.getInstance().de(de, Uint8Array.from(arr))};
+    } else if (o[0] == 0) {
+        return {bNone:true, value:OPTION_NONE};
+    } else {
+        ERROR(Errors.Fail, 'readOption: option invalid')
+        return {bNone:true, value:OPTION_NONE}
+    }
+}
+
+export const ulebDecode = (arr: Uint8Array) : {value: number, length: number} => {
 	let total = 0;
 	let shift = 0;
 	let len = 0;
@@ -23,6 +38,30 @@ export const ulebDecode = (arr: number[] | Uint8Array) : {value: number, length:
 	};
 }
 
+export const readVec = (arr: any[], cb:(arr:any[], i:number, length:number) => any) : any[] => {
+    let r = ulebDecode(Uint8Array.from(arr));
+    arr.splice(0, r.length) ;
+
+    let result = [];
+    for (let i = 0; i < r.value; i++) {
+        result.push(cb(arr, i, r.value));
+    }    
+    return result;
+}
+
+export const cb_U8 = (arr:any[], i:number, length:number) : any => {
+    return arr.shift();
+}
+export const cb_U64 = (arr:any[], i:number, length:number) : any => {
+    return arr.splice(0, 8);
+}
+export const cb_U128 = (arr:any[], i:number, length:number) : any => {
+    return arr.splice(0, 16);
+}
+export const cb_U256 = (arr:any[], i:number, length:number) : any => {
+    return arr.splice(0, 32);
+}
+
 export const concatenate = (resultConstructor:any, ...arrays:any[]) => {
     let totalLength = 0;
     for (const arr of arrays) {
@@ -106,6 +145,16 @@ export class Bcs {
     ser_vector_u8(data:number[])  : Uint8Array {
         return this.bcs.ser('vector<u8>', data).toBytes();
     }
+    ser_vector_address(data:number[])  : Uint8Array {
+        return this.bcs.ser('vector<address>', data).toBytes();
+    }
+    ser_vector_bool(data:number[])  : Uint8Array {
+        return this.bcs.ser('vector<bool>', data).toBytes();
+    }
+    ser_vector_u128(data:number[])  : Uint8Array {
+        return this.bcs.ser('vector<u128>', data).toBytes();
+    }
+
     ser_address(data:string) : Uint8Array {
         return this.bcs.ser(BCS.ADDRESS, data).toBytes();
     }
@@ -118,9 +167,18 @@ export class Bcs {
     ser_u64(data:number) : Uint8Array {
         return this.bcs.ser(BCS.U64, data).toBytes();
     }
+    ser_u128(data:number) : Uint8Array {
+        return this.bcs.ser(BCS.U128, data).toBytes();
+    }
+    ser_u256(data:number) : Uint8Array {
+        return this.bcs.ser(BCS.U256, data).toBytes();
+    }
     ser_string(data:string) : Uint8Array {
         return this.bcs.ser(BCS.STRING, data).toBytes();
     }
+    ser(type:TypeName | StructTypeDefinition, data:Uint8Array) {
+        return this.bcs.ser(type, data).toBytes();
+    }
     de(type:TypeName | StructTypeDefinition, data:Uint8Array) {
         return this.bcs.de(type, data)
     }