wowok 1.3.6 → 1.3.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wowok",
-  "version": "1.3.6",
+  "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/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'},

package/src/protocol.ts

@@ -191,9 +191,9 @@ export enum ENTRYPOINT {
 }
 
 const TESTNET = {
-    package: "0xa5a2e79de613b6585a584dd9aee8f464a1a1f2826fefc656f44e95ee3c60d673",
-    wowok_object: '0x4723d6660029b1d1a70d6ebb7bfed4b3f06c7e811d6b9845b41d7451555fee02',
-    entity_object: '0xb91ae0f0e38f205c7d4f90639fa0bd6fc6448889f8de38547dd6fb29304fc89b',
+    package: "0x366cbf58452fca91d1028af0bc9709c1826c2d89dce258ddf1d4fe9a95ffa6d7",
+    wowok_object: '0xadd1755c84aa7e99ecd84a71eed6b7150f097a88f3a60f4770be72a93f03fca4',
+    entity_object: '0x41b5e7defd512bb098c367c04f2731c81e468365f824b2ab354fb9dbf5a42549',
 }
 
 const MAINNET = {

package/src/service.ts

@@ -35,7 +35,6 @@ export type Service_Buy_RequiredInfo = {
     customer_info: string[];
 }
 export type Customer_RequiredInfo = {
-    pubkey: string;
     customer_pubkey: string;
     customer_info_crypt: string[];
 }
@@ -625,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')
@@ -644,8 +643,8 @@ export class Service {
                 typeArguments:[this.pay_token_type]
             })               
         }
-        
     }
+
     set_buy_guard(guard?:GuardObject, passport?:PassportObject) {
         if (passport) {
             if (guard) {
@@ -729,6 +728,7 @@ export class Service {
             })      
         }   
     }
+
     publish(passport?:PassportObject) {
         if (passport) {
             this.txb.moveCall({
@@ -745,6 +745,7 @@ export class Service {
         }      
         
     }
+
     clone(new_token_type?:string, passport?:PassportObject) : ServiceObject  {
         if (passport) {
             return this.txb.moveCall({
@@ -786,6 +787,7 @@ export class Service {
             })         
         }
     }
+
     remove_customer_required(passport?:PassportObject) {
         if (passport) {
             this.txb.moveCall({
@@ -801,6 +803,7 @@ export class Service {
             })  
         }       
     }
+
     change_required_pubkey(pubkey:string, passport?:PassportObject) {
         if (!pubkey) {
             ERROR(Errors.InvalidParam, 'pubkey')
@@ -822,6 +825,7 @@ export class Service {
             })    
         }     
     }
+/*
     change_order_required_pubkey(order:OrderObject, pubkey:string, passport?:PassportObject) {
         if (!Protocol.IsValidObjects([order])) {
             ERROR(Errors.IsValidObjects, 'order')
@@ -845,7 +849,8 @@ export class Service {
                 typeArguments:[this.pay_token_type]
             })   
         }    
-    }
+    } */
+
     pause(pause:boolean, passport?:PassportObject) {
         if (passport) {
             this.txb.moveCall({
@@ -860,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')
         }
@@ -883,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, 
@@ -924,7 +928,6 @@ export class Service {
         const clock = this.txb.sharedObjectRef(Protocol.CLOCK_OBJECT);
         if (passport) {
             if (discount) {
-                console.log(1)
                 order = this.txb.moveCall({
                     target:Protocol.Instance().ServiceFn('dicount_buy_with_passport') as FnCallType,
                     arguments: [passport, Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.vector('string', name), 
@@ -932,7 +935,6 @@ export class Service {
                         Protocol.TXB_OBJECT(this.txb, coin), Protocol.TXB_OBJECT(this.txb, discount), this.txb.object(clock)],                   
                     typeArguments:[this.pay_token_type]            
             })} else {
-                console.log(2)
                 order = this.txb.moveCall({
                     target:Protocol.Instance().ServiceFn('buy_with_passport') as FnCallType,
                     arguments: [passport, Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.vector('string', name), 
@@ -941,7 +943,6 @@ export class Service {
                     typeArguments:[this.pay_token_type]            
             })}             
         } else {
-            console.log(3)
             if (discount) {
                 order = this.txb.moveCall({
                     target:Protocol.Instance().ServiceFn('disoucnt_buy') as FnCallType,
@@ -952,7 +953,6 @@ export class Service {
                         Protocol.TXB_OBJECT(this.txb, discount), this.txb.object(clock)],                
                     typeArguments:[this.pay_token_type]            
             })} else {
-                console.log(4)
                 order = this.txb.moveCall({
                     target:Protocol.Instance().ServiceFn('buy') as FnCallType,
                     arguments: [Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.vector('string', name), 
@@ -1022,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
@@ -1029,6 +1041,7 @@ export class Service {
             return service_endpoint + '/sales/' + encodeURI(item_name);
         }
     }
+
     static DiscountObjects = (owner:string, handleDiscountObject:handleDiscountObject) => {
         Protocol.Client().getOwnedObjects({owner:owner, 
             filter:{MoveModule:{module:'order', package:Protocol.Instance().Package()}}, 

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 ''
@@ -558,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 {