wowok 1.3.4 → 1.3.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wowok",
-  "version": "1.3.4",
+  "version": "1.3.9",
   "description": "Create, collaborate, and transact on your own terms with the AI-driven web3 collaboration protocol.",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
@@ -42,8 +42,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@mysten/bcs": "^0.11.1",
-    "@mysten/sui": "^1.7.0",
-    "graphql-tag": "^2.12.6"
+    "@mysten/sui": "^1.7.0"
   },
   "devDependencies": {
     "@types/node": "^20.12.12",

package/src/demand.ts

@@ -24,7 +24,7 @@ export class Demand {
         this.txb = txb;
         this.object = '';
     }
-    static New(txb:TransactionBlock, bounty_type:string, permission:PermissionObject, description:string, 
+    static New(txb:TransactionBlock, bounty_type:string, ms_expand:boolean, time:number, permission:PermissionObject, description:string, 
         bounty:TransactionResult | string, passport?:PassportObject) : Demand {
         if (!Protocol.IsValidObjects([permission, bounty])) {
             ERROR(Errors.IsValidObjects, 'permission, bounty');
@@ -35,18 +35,24 @@ export class Demand {
         if (!IsValidArgType(bounty_type)) {
             ERROR(Errors.IsValidArgType, bounty_type);
         }
-
+        if (!IsValidUintLarge(time)) {
+            ERROR(Errors.IsValidUint, 'time')
+        }
+        
         let  d = new Demand(txb, bounty_type, permission);
+        const clock = txb.sharedObjectRef(Protocol.CLOCK_OBJECT);
         if (passport) {
             d.object = txb.moveCall({
                 target:Protocol.Instance().DemandFn('new_with_passport') as FnCallType,
-                arguments:[passport, txb.pure.string(description), txb.object(bounty), Protocol.TXB_OBJECT(txb, permission)],
+                arguments:[passport, txb.pure.string(description), txb.object(bounty), txb.pure.bool(ms_expand), txb.pure.u64(time), 
+                    txb.object(clock), Protocol.TXB_OBJECT(txb, permission)],
                 typeArguments:[bounty_type],
             })        
         } else {
             d.object = txb.moveCall({
                 target:Protocol.Instance().DemandFn('new') as FnCallType,
-                arguments:[txb.pure.string(description), txb.object(bounty), Protocol.TXB_OBJECT(txb, permission)],
+                arguments:[txb.pure.string(description), txb.object(bounty), txb.pure.bool(ms_expand), txb.pure.u64(time), 
+                    txb.object(clock), Protocol.TXB_OBJECT(txb, permission)],
                 typeArguments:[bounty_type],
             })        
         }

package/src/entity.ts

@@ -1,9 +1,13 @@
 import { Protocol, FnCallType, TxbObject, ResourceAddress, PermissionObject, ResourceObject} from './protocol';
-import { IsValidDesription, IsValidAddress, IsValidName, isValidHttpUrl, Bcs,  } from './utils';
+import { IsValidDesription, IsValidAddress, IsValidName, isValidHttpUrl, Bcs, IsValidArray,  } from './utils';
 import { ERROR, Errors } from './exception';
 import { Resource } from './resource';
 import { type TransactionResult, Transaction as TransactionBlock } from '@mysten/sui/transactions';
 
+export interface Safer {
+    name: string;
+    value: string;
+}
 export interface Entity_Info {
     name: string;
     description?: string;
@@ -39,7 +43,42 @@ export class Entity {
                 this.txb.pure.address(address)]
         })
     }
- 
+    
+    add_safer(safer: Safer[], bExistModify:boolean=true) {
+        if (safer.length === 0) return ;
+        if (!IsValidArray(safer, (v:Safer) => {
+            if (!IsValidName(v.name) || !IsValidDesription(v.value)) {
+                return false
+            }
+        })) {
+            ERROR(Errors.InvalidParam, 'add_safer');
+        }
+
+        const name = safer.map((v)=>v.name);
+        const value = safer.map((v)=>v.value);
+        this.txb.moveCall({
+            target:Protocol.Instance().EntityFn('safer_add') as FnCallType,
+            arguments:[Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.vector('string', name), 
+                this.txb.pure.vector('string', value),  this.txb.pure.bool(bExistModify)]
+        })
+    }
+
+    remove_safer(name:string[], removeall?:boolean) {
+        if (name.length === 0 && !removeall) return;
+
+        if (removeall) {
+            this.txb.moveCall({
+                target:Protocol.Instance().EntityFn('safer_remove_all') as FnCallType,
+                arguments:[Protocol.TXB_OBJECT(this.txb, this.object)]
+            })
+        } else {
+            this.txb.moveCall({
+                target:Protocol.Instance().EntityFn('safer_remove') as FnCallType,
+                arguments:[Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.vector('string', name)]
+            })
+        }
+    }
+
     update(info: Entity_Info) {
         if (!IsValidName(info.name)) ERROR(Errors.IsValidName, 'update');
         if (info?.description && !IsValidDesription(info.description)) ERROR(Errors.IsValidDesription, 'update');
@@ -63,7 +102,6 @@ export class Entity {
     }
 
     create_resource() : ResourceAddress {
-        
         return this.txb.moveCall({
             target:Protocol.Instance().EntityFn('resource_create') as FnCallType,
             arguments:[Protocol.TXB_OBJECT(this.txb, this.object)]
@@ -71,7 +109,6 @@ export class Entity {
     }
 
     create_resource2(): ResourceObject {
-        
         return this.txb.moveCall({
             target:Protocol.Instance().EntityFn('resource_create2') as FnCallType,
             arguments:[Protocol.TXB_OBJECT(this.txb, this.object)]
@@ -79,7 +116,6 @@ export class Entity {
     }
     
     destroy_resource(resource:Resource) {
-        
         return this.txb.moveCall({
             target:Protocol.Instance().EntityFn('resource_destroy') as FnCallType,
             arguments:[Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, resource.get_object())]
@@ -98,7 +134,7 @@ export class Entity {
 
     query_ent(address_queried:string) {
         if (!IsValidAddress(address_queried)) {
-            ERROR(Errors.InvalidParam, 'query_ent');
+            ERROR(Errors.InvalidParam, 'query_ent');    
         }
 
         this.txb.moveCall({

package/src/guard.ts

@@ -157,15 +157,12 @@ export class Guard {
         [MODULES.order, 'Service', 93, [], ValueType.TYPE_ADDRESS],   
         [MODULES.order, 'Has Progress', 94, [], ValueType.TYPE_BOOL],   
         [MODULES.order, 'Progress', 95, [], ValueType.TYPE_ADDRESS],       
-        [MODULES.order, 'Has Required Info', 96, [], ValueType.TYPE_BOOL],
-        [MODULES.order, 'Required Info of Service-Pubkey', 97, [], ValueType.TYPE_VEC_U8],   
-        [MODULES.order, 'Required Info of Customer-Pubkey', 98, [], ValueType.TYPE_VEC_U8], 
-        [MODULES.order, 'Required Info', 99, [], ValueType.TYPE_VEC_VEC_U8],
-        [MODULES.order, 'Discount Used', 100, [], ValueType.TYPE_BOOL],   
-        [MODULES.order, 'Discount', 101, [], ValueType.TYPE_ADDRESS], 
-        [MODULES.order, 'Balance', 102, [], ValueType.TYPE_U64], 
-        [MODULES.order, 'Be Refunded', 103, [], ValueType.TYPE_BOOL],
-        [MODULES.order, 'Be Withdrawed', 104, [], ValueType.TYPE_BOOL],   
+        [MODULES.order, 'Required Info Counts', 96, [], ValueType.TYPE_U64],
+        [MODULES.order, 'Discount Used', 97, [], ValueType.TYPE_BOOL],   
+        [MODULES.order, 'Discount', 98, [], ValueType.TYPE_ADDRESS], 
+        [MODULES.order, 'Balance', 99, [], ValueType.TYPE_U64], 
+        [MODULES.order, 'Be Refunded', 100, [], ValueType.TYPE_BOOL],
+        [MODULES.order, 'Be Withdrawed', 101, [], ValueType.TYPE_BOOL],   
     
         [MODULES.service, 'Permission', 111, [], ValueType.TYPE_ADDRESS],       
         [MODULES.service, 'Payee', 112, [], ValueType.TYPE_ADDRESS],

package/src/permission.ts

@@ -44,7 +44,7 @@ export enum PermissionIndex {
     service_publish = 220,
     service_clone = 221,
     service_customer_required = 222,
-    service_change_order_required_pubkey = 224,
+    //service_change_order_required_pubkey = 224,
     service_pause = 225,
 
     reward = 240,
@@ -141,7 +141,7 @@ export const PermissionInfo : PermissionInfoType[] = [
     {index:PermissionIndex.service_publish, name:'Publish', description:'Publish Service', module: 'service'},
     {index:PermissionIndex.service_clone, name:'Clone', description:'Clone Service', module: 'service'},
     {index:PermissionIndex.service_customer_required, name:'Buyer info', description:'Set Service buyer info required', module: 'service'},
-    {index:PermissionIndex.service_change_order_required_pubkey, name:'Order pubkey', description:'Update Serivce order pubkey', module: 'service'},
+    //{index:PermissionIndex.service_change_order_required_pubkey, name:'Order pubkey', description:'Update Serivce order pubkey', module: 'service'},
     {index:PermissionIndex.service_pause, name:'Pause', description:'Pause/Unpause Service', module: 'service'},
 
     {index:PermissionIndex.reward, name:'Reward', description:'Launch new Reward', module: 'reward'},
@@ -523,6 +523,7 @@ export class  Permission {
             onPermissionAnswer({who:address_queried, object:permission});
         })
     }
+    
     static HasPermission(answer:PermissionAnswer|undefined, index:PermissionIndexType, bStrict:boolean=false) : {has:boolean, guard?:string, owner?:boolean} | undefined {
         if (answer) {
             if (answer.admin) return {has:true, owner:answer.owner}; // admin

package/src/protocol.ts

@@ -191,9 +191,9 @@ export enum ENTRYPOINT {
 }
 
 const TESTNET = {
-    package: "0xdfead784f096e93d025e3e29c4fa48cf5585867e7bcc304c83d3f410f210e4c9",
-    wowok_object: '0xe386bb9e01b3528b75f3751ad8a1e418b207ad979fea364087deef5250a73d3f',
-    entity_object: '0xbc8be56e8924f7ddcce0ebbc8bd9a2bf1f00d1db9a12e36b9290f009ba305dd9',
+    package: "0x366cbf58452fca91d1028af0bc9709c1826c2d89dce258ddf1d4fe9a95ffa6d7",
+    wowok_object: '0xadd1755c84aa7e99ecd84a71eed6b7150f097a88f3a60f4770be72a93f03fca4',
+    entity_object: '0x41b5e7defd512bb098c367c04f2731c81e468365f824b2ab354fb9dbf5a42549',
 }
 
 const MAINNET = {
@@ -253,7 +253,7 @@ export class Protocol {
                 break;
         };
     }
-    Package(): string { return this.package }
+        Package(): string { return this.package }
     WowokObject(): string { return this.wowok_object }
     EntityObject(): string { return this.entity_object }
     GraphqlUrl() : string { return this.graphql }
@@ -380,6 +380,7 @@ export class Protocol {
     ];
 
     GetCoinTypeInfo = (token_type: string, handler:(info:CoinTypeInfo)=>void) : CoinTypeInfo | 'loading' => {
+        if (!token_type) return 'loading';
         let r = this.COINS_TYPE().find((v) => v?.type === token_type);
         if (!r) {
             Protocol.Client().getCoinMetadata({coinType:token_type}).then((res) => {

package/src/service.ts

@@ -4,7 +4,8 @@ import { FnCallType, GuardObject, PassportObject, PermissionObject, RepositoryOb
     ServiceObject, DiscountObject, OrderObject, OrderAddress, CoinObject, Protocol, ValueType,
     TxbObject} from './protocol';
 import { ERROR, Errors } from './exception';
-import { type TransactionResult, Transaction as TransactionBlock } from '@mysten/sui/transactions';
+import { Transaction as TransactionBlock,  } from '@mysten/sui/transactions';
+import { SuiObjectData } from '@mysten/sui/client';
 
 export type Service_Guard_Percent = {
     guard:GuardObject;
@@ -34,7 +35,6 @@ export type Service_Buy_RequiredInfo = {
     customer_info: string[];
 }
 export type Customer_RequiredInfo = {
-    pubkey: string;
     customer_pubkey: string;
     customer_info_crypt: string[];
 }
@@ -57,6 +57,7 @@ export type DicountDispatch = {
     discount: Service_Discount;
 }
 
+export type handleDiscountObject = (owner:string, objects:(SuiObjectData|null|undefined)[]) => void;
 export class Service {
     protected pay_token_type;
     protected permission;
@@ -623,7 +624,7 @@ export class Service {
         });
     }
 
-    // 同时支持withdraw guard和permission guard
+    // support both withdraw guard and permission guard
     withdraw(order:OrderObject, passport?:PassportObject) {
         if (!Protocol.IsValidObjects([order]))  {
             ERROR(Errors.IsValidObjects, 'order')
@@ -642,8 +643,8 @@ export class Service {
                 typeArguments:[this.pay_token_type]
             })               
         }
-        
     }
+
     set_buy_guard(guard?:GuardObject, passport?:PassportObject) {
         if (passport) {
             if (guard) {
@@ -727,6 +728,7 @@ export class Service {
             })      
         }   
     }
+
     publish(passport?:PassportObject) {
         if (passport) {
             this.txb.moveCall({
@@ -743,6 +745,7 @@ export class Service {
         }      
         
     }
+
     clone(new_token_type?:string, passport?:PassportObject) : ServiceObject  {
         if (passport) {
             return this.txb.moveCall({
@@ -760,11 +763,8 @@ export class Service {
     }
 
     set_customer_required(pubkey:string, customer_required: BuyRequiredEnum[], passport?:PassportObject) {
-        if (!pubkey) {
+        if(customer_required.length > 0 && !pubkey) {
             ERROR(Errors.InvalidParam, 'pubkey')
-        } 
-        if(!customer_required) {
-            ERROR(Errors.InvalidParam, 'customer_required')
         }
 
         let req = array_unique(customer_required) as string[];
@@ -787,6 +787,7 @@ export class Service {
             })         
         }
     }
+
     remove_customer_required(passport?:PassportObject) {
         if (passport) {
             this.txb.moveCall({
@@ -802,6 +803,7 @@ export class Service {
             })  
         }       
     }
+
     change_required_pubkey(pubkey:string, passport?:PassportObject) {
         if (!pubkey) {
             ERROR(Errors.InvalidParam, 'pubkey')
@@ -823,6 +825,7 @@ export class Service {
             })    
         }     
     }
+/*
     change_order_required_pubkey(order:OrderObject, pubkey:string, passport?:PassportObject) {
         if (!Protocol.IsValidObjects([order])) {
             ERROR(Errors.IsValidObjects, 'order')
@@ -846,7 +849,8 @@ export class Service {
                 typeArguments:[this.pay_token_type]
             })   
         }    
-    }
+    } */
+
     pause(pause:boolean, passport?:PassportObject) {
         if (passport) {
             this.txb.moveCall({
@@ -861,9 +865,9 @@ export class Service {
                 typeArguments:[this.pay_token_type]
             })     
         }    
-        
     }
-    customer_refund(order:OrderObject, passport?:PassportObject) {
+
+    refund(order:OrderObject, passport?:PassportObject) {
         if (!Protocol.IsValidObjects([order])) {
             ERROR(Errors.IsValidObjects, 'order')
         }
@@ -884,22 +888,21 @@ export class Service {
     }
 
     update_order_required_info(order:OrderObject, customer_info_crypto: Customer_RequiredInfo) {
+        if (!customer_info_crypto.customer_pubkey || customer_info_crypto.customer_info_crypt.length === 0) {
+            return 
+        }
+
         if (!Protocol.IsValidObjects([order])) {
             ERROR(Errors.IsValidObjects, 'order')
         }
-        if (!customer_info_crypto.pubkey || !customer_info_crypto.customer_info_crypt) {
-            ERROR(Errors.InvalidParam, 'customer_info_crypto')
-        }
         
         this.txb.moveCall({
             target:Protocol.Instance().ServiceFn('order_required_info_update') as FnCallType,
             arguments:[Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, order), 
-                this.txb.pure.string(customer_info_crypto.pubkey), 
                 this.txb.pure.string(customer_info_crypto.customer_pubkey), 
-                this.txb.pure.vector('vector<u8>', array_unique(customer_info_crypto.customer_info_crypt))],
+                this.txb.pure.vector('string', customer_info_crypto.customer_info_crypt)],
             typeArguments:[this.pay_token_type]
         })    
-        
     }
     
     buy(buy_items:Service_Buy[], coin:CoinObject, discount?:DiscountObject, machine?:MachineObject, 
@@ -1019,6 +1022,18 @@ export class Service {
         }
         return '';
     }
+
+    static parseOrderObjectType = (chain_type:string | undefined | null) : string =>  {
+        if (chain_type) {
+            const s = 'order::Order<'
+            const i = chain_type.indexOf(s);
+            if (i > 0) {
+                return chain_type.slice(i + s.length, chain_type.length-1);
+            }
+        }
+        return '';
+    }
+
     static endpoint = (service_endpoint:string, item_endpoint:string, item_name:string) => {
         if (item_endpoint) {
             return item_endpoint
@@ -1027,4 +1042,13 @@ export class Service {
         }
     }
 
+    static DiscountObjects = (owner:string, handleDiscountObject:handleDiscountObject) => {
+        Protocol.Client().getOwnedObjects({owner:owner, 
+            filter:{MoveModule:{module:'order', package:Protocol.Instance().Package()}}, 
+            options:{showContent:true, showType:true}}).then((res) => {
+            handleDiscountObject(owner, res.data.map((v)=>v.data));
+        }).catch((e) => {
+            console.log(e);
+        })       
+    }
 }

package/src/utils.ts

@@ -1,8 +1,7 @@
-import { bcs, BCS, toHEX, fromHEX, getSuiMoveConfig, TypeName, BcsReader } from '@mysten/bcs';
-import { Transaction as TransactionBlock, Inputs, TransactionResult, TransactionArgument } from '@mysten/sui/transactions';
+import { BCS, getSuiMoveConfig, } from '@mysten/bcs';
 import { SuiObjectResponse, DynamicFieldPage } from '@mysten/sui/client';
 import { ERROR, Errors } from './exception';
-import { isValidSuiAddress, isValidSuiObjectId } from '@mysten/sui/utils'
+import { isValidSuiAddress} from '@mysten/sui/utils'
 import { RepositoryValueType, ValueType, Protocol } from './protocol'
 
 export const MAX_U8 = BigInt('255');
@@ -162,6 +161,8 @@ export class Bcs {
         this.bcs.registerStructType('EntStruct', {
             'avatar': 'vector<u8>',
             'resource': "Option<address>",
+            "safer_name": "vector<string>",
+            "safer_value": "vector<string>",
             'like': BCS.U32,
             'dislike': BCS.U32,
         })
@@ -306,19 +307,6 @@ export class Bcs {
         if (!data || data.length < 2) return ''
         const struct_vec = this.bcs.de('vector<u8>', data);
         return this.bcs.de('EntStruct', Uint8Array.from(struct_vec));
-/*        const reader = new BcsReader(data);
-        const total_len = reader.readULEB();
-        console.log(avatar_len)
-        const avatar = reader.readBytes(avatar_len);
-        console.log(avatar)
-        const option_resource = reader.read8();
-        var resource = '';
-        if (option_resource != 0) {
-            resource = reader.read256();
-        }
-        const like = reader.read32();
-        const dislike = reader.read32();
-        return {avatar:avatar, resource:resource, like:like, dislike:dislike}*/
     }    
     de_entInfo(data:Uint8Array | undefined) : any {
         if (!data || data.length === 0) return ''
@@ -388,7 +376,9 @@ export const MAX_ENDPOINT_LENGTH = 1024;
 export const IsValidDesription = (description:string) : boolean => { return description?.length <= MAX_DESCRIPTION_LENGTH }
 export const IsValidName = (name:string) : boolean => { if(!name) return false; return name.length <= MAX_NAME_LENGTH && name.length != 0 }
 export const IsValidName_AllowEmpty = (name:string) : boolean => { return name.length <= MAX_NAME_LENGTH }
-export const IsValidEndpoint = (endpoint:string) : boolean => { if (!endpoint) return false; return endpoint.length <= MAX_ENDPOINT_LENGTH }
+export const IsValidEndpoint = (endpoint:string) : boolean => { 
+    return (endpoint.length > 0 && endpoint.length <= MAX_ENDPOINT_LENGTH && isValidHttpUrl(endpoint)) ;
+}
 export const IsValidAddress = (addr:string | undefined) : boolean => { 
     if (!addr || !isValidSuiAddress(addr)) {
         return false; 
@@ -556,7 +546,7 @@ export interface query_object_param {
 export const query_object = (param:query_object_param) => {
     if (param.id) {
       if(param?.onBegin) param.onBegin(param.id);
-      Protocol.Client().getObject({id:param.id, options:{showContent:true, showType:true}}).then((res) => {
+      Protocol.Client().getObject({id:param.id, options:{showContent:true, showType:true, showOwner:true}}).then((res) => {
         if (res.error) {
             if(param?.onObjectErr) param.onObjectErr(param.id, res.error);
         } else {