wowok 1.1.5 → 1.2.0

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 { GuardVariable } from './guard';
+import { GuardConstant } from './guard';
 
 
 export enum MODULES {
@@ -106,38 +106,39 @@ export const IsValidValueType = (type:number) => { return ValueTypeArray.include
 interface ValueTypeString {
     type: ValueType;
     name: string;
+    description: 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'},
+    {type: ValueType.TYPE_BOOL, name: 'bool', description:'boolean. eg:true or false'},
+    {type: ValueType.TYPE_ADDRESS, name: 'address', description:'address or object-id. eg:0x6789af'},
+    {type: ValueType.TYPE_U64, name: 'number', description:'unsigned-64 number. eg:23870233'},
+    {type: ValueType.TYPE_U8, name: 'number', description:'unsigned-8 number. eg:255'},
+    {type: ValueType.TYPE_VEC_U8, name: '[number]', description:'unsigned-8 number array. eg:"wowok"'},
+    {type: ValueType.TYPE_U128, name: 'number', description:'unsigned-8 number. eg:12348900999'},
+    {type: ValueType.TYPE_VEC_ADDRESS, name: '[address]', description:'address array. eg:[0x2277f2, 0x3344af]'},
+    {type: ValueType.TYPE_VEC_BOOL, name: '[bool]', description:'boolean array. eg:[true, false, true]'},
+    {type: ValueType.TYPE_VEC_VEC_U8, name: '[[number]]', description:'array of unsigned-8 number array. eg:["i", "like", "wowok"]'},
+    {type: ValueType.TYPE_VEC_U64, name: '[number]', description:'unsigned-64 number array. eg:[123, 778888, 42312]'},
+    {type: ValueType.TYPE_VEC_U128, name: '[number]', description:'unsigned-128 number array. eg:[123, 778888, 42312]'},
+    {type: ValueType.TYPE_OPTION_ADDRESS, name: 'option', description:'option of address. eg:none or address'},
+    {type: ValueType.TYPE_OPTION_BOOL, name: 'option', description:'option of bool. eg:none or boolean value'},
+    {type: ValueType.TYPE_OPTION_U8, name: 'option', description:'option of u8. eg:none or u8 value'},
+    {type: ValueType.TYPE_OPTION_U64, name: 'option', description:'option of u64. eg:none or u64 value'},
+    {type: ValueType.TYPE_OPTION_U128, name: 'option', description:'option of u128. eg:none or u128 value'},
+    {type: ValueType.TYPE_OPTION_U256, name: 'option', description:'option of u256. eg:none or u256 value'},
+    {type: ValueType.TYPE_VEC_U256, name: '[number]', description:'unsigned-256 number array. eg:[123, 778888, 42312]'},
+    {type: ValueType.TYPE_U256, name: 'number', description:'unsigned-256 number. eg:12345678901233'},
 ]
 
 export enum ContextType {
     TYPE_SIGNER  = 60,
     TYPE_CLOCK = 61,
     TYPE_WITNESS_ID = 62, 
-    TYPE_VARIABLE = 80,
+    TYPE_CONSTANT = 80,
 }
 
-export type VariableType = ValueType | ContextType.TYPE_WITNESS_ID;
+export type ConstantType = ValueType | ContextType.TYPE_WITNESS_ID;
 export type Data_Type = ValueType | OperatorType | ContextType;
 
 export enum ENTRYPOINT {
@@ -164,14 +165,13 @@ export class Protocol {
         this.network = network;
         switch(network) {
             case ENTRYPOINT.localnet:
-                this.package = "0xe9721254e97dd074e06c5efe5c57be169b64b39ae48939d89c00bf2f62b19e10";
                 break;
             case ENTRYPOINT.devnet:
                 break;
             case ENTRYPOINT.testnet:
-                this.package = "0x9a7fc338ab9fd0a8f4c108e2f3dbe53393b83529263eb31a391120997d962400";
-                this.wowok_object = '';
-                this.entity_object= '';
+                this.package = "0x2ac00805aa0ec3c62b575e412108bb295389bbfc86202fd7b73c69dbbb80769a";
+                this.wowok_object = '0x49d49fb41c63c3f6c838fca20c25741f20aa74a176391685446794bdaa9b7934';
+                this.entity_object= '0xd21d8d76f553b2db6c6d28a8b2ae3405bec92f2a300676d80fcc004ca40b0a77';
                 this.graphql = 'https://sui-testnet.mystenlabs.com/graphql';
                 break;
             case ENTRYPOINT.mainnet:
@@ -335,7 +335,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?:GuardVariable)  => boolean;
+    parser?: (result:any[], guardid: string, chain_sense_bsc:Uint8Array, constant?:GuardConstant)  => boolean;
     data?: any; // response data filted by callback
-    variables?: GuardVariable;
+    constants?: GuardConstant;
 };

package/src/repository.ts

@@ -82,7 +82,7 @@ export class Repository {
             arguments: [Protocol.TXB_OBJECT(txb, this.object)],
         })   
     }
-
+/* move to: Entity.mark
     mark(like:'like' | 'unlike', resource:Resource)  {
         if (!Protocol.IsValidObjects([this.object])) return false;
         let txb = this.protocol.CurrentSession();
@@ -91,7 +91,7 @@ export class Repository {
             arguments: [Protocol.TXB_OBJECT(txb, resource.get_object()), Protocol.TXB_OBJECT(txb, this.object)],
         })   
     }
-
+*/
     add_data(data:Repository_Policy_Data)  {
         if (!Repository.IsValidName(data.key)) {
             ERROR(Errors.IsValidName)

package/src/resource.ts

@@ -25,39 +25,6 @@ export class Resource {
         return r
     }
 
-    static New(protocol:Protocol, description:string) : Resource {
-        if (!IsValidDesription(description)) {
-            ERROR(Errors.IsValidDesription)
-        }
-
-        let r = new Resource(protocol);
-        let txb = protocol.CurrentSession();
-
-        r.object = txb.moveCall({
-            target:protocol.ResourceFn('new') as FnCallType,
-            arguments:[txb.pure(description)],
-        })
-
-        return r
-    }
-
-    launch() : ResourceAddress {
-        let txb = this.protocol.CurrentSession();
-        return txb.moveCall({
-            target:this.protocol.ResourceFn('create') as FnCallType,
-            arguments:[Protocol.TXB_OBJECT(txb, this.object)],
-        })    
-    }
-
-    destroy()  {
-        if (!Protocol.IsValidObjects([this.object])) return false;
-        let txb = this.protocol.CurrentSession();
-        txb.moveCall({
-            target:this.protocol.ResourceFn('destroy') as FnCallType,
-            arguments: [Protocol.TXB_OBJECT(txb, this.object)],
-        })   
-    }
-
     add(name:string, object:string)  {
         if (!IsValidName(name)) ERROR(Errors.IsValidName, 'Resource: add');
         if (!IsValidAddress(object)) ERROR(Errors.IsValidAddress, 'Resource: add');
@@ -69,8 +36,9 @@ export class Resource {
         });
     }
 
-    remove(name:string, object:string, removeall?:boolean)  {
+    remove(name:string, object?:string, removeall?:boolean)  {
         if (!IsValidName(name)) ERROR(Errors.IsValidName, 'Resource: remove');
+        if (!object && !removeall) ERROR(Errors.InvalidParam, 'Resource: remove, BOTH param undefined');
         
         let txb = this.protocol.CurrentSession();
         if (removeall) {
@@ -78,7 +46,7 @@ export class Resource {
                 target:this.protocol.ResourceFn('remove_all')  as FnCallType,
                 arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(name, BCS.STRING)]
             });
-        } else {
+        } else if(object) {
             if (!IsValidAddress(object)) ERROR(Errors.IsValidAddress, 'Resource: remove');
 
             txb.moveCall({

package/src/reward.ts

@@ -82,7 +82,7 @@ export class Reward {
             arguments: [Protocol.TXB_OBJECT(txb, this.object)],
         })   
     }
-
+/*
     mark(like:'like' | 'unlike', resource:Resource)  {
         let txb = this.protocol.CurrentSession();
         txb.moveCall({
@@ -90,7 +90,7 @@ export class Reward {
             arguments: [Protocol.TXB_OBJECT(txb, resource.get_object()), Protocol.TXB_OBJECT(txb, this.object)],
         })   
     }
-
+*/
     refund(passport?:PassportObject) {
         let txb = this.protocol.CurrentSession();
         if (passport) {

package/src/service.ts

@@ -130,7 +130,7 @@ export class Service {
             typeArguments:[this.pay_token_type]
         })   
     }
-
+/*  move to: Entity.mark
     mark(like:'like' | 'unlike', resource:Resource) {
         let txb = this.protocol.CurrentSession();
         txb.moveCall({
@@ -139,7 +139,7 @@ export class Service {
             typeArguments:[this.pay_token_type]
         })   
     }
-
+*/
     set_description(description:string, passport?:PassportObject)  {
         if (!IsValidDesription(description)) {
             ERROR(Errors.IsValidDesription)

package/src/vote.ts

@@ -86,14 +86,6 @@ export class Vote {
         })
     }
 
-    mark(like:'like' | 'unlike', resource:Resource) {
-        let txb = this.protocol.CurrentSession();
-        txb.moveCall({
-            target:this.protocol.VoteFn(like) as FnCallType,
-            arguments:[Protocol.TXB_OBJECT(txb, resource.get_object()), Protocol.TXB_OBJECT(txb, this.object)]
-        })
-    }
-
     set_description(description:string, passport?:PassportObject)  {
         if (!IsValidDesription(description)) {
             ERROR(Errors.IsValidDesription)