wowok 1.3.4 → 1.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wowok",
-  "version": "1.3.4",
+  "version": "1.3.6",
   "description": "Create, collaborate, and transact on your own terms with the AI-driven web3 collaboration protocol.",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

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/permission.ts

@@ -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: "0xa5a2e79de613b6585a584dd9aee8f464a1a1f2826fefc656f44e95ee3c60d673",
+    wowok_object: '0x4723d6660029b1d1a70d6ebb7bfed4b3f06c7e811d6b9845b41d7451555fee02',
+    entity_object: '0xb91ae0f0e38f205c7d4f90639fa0bd6fc6448889f8de38547dd6fb29304fc89b',
 }
 
 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;
@@ -57,6 +58,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;
@@ -760,11 +762,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[];
@@ -925,6 +924,7 @@ 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,6 +932,7 @@ 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), 
@@ -940,6 +941,7 @@ 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,
@@ -950,6 +952,7 @@ 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), 
@@ -1026,5 +1029,13 @@ 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()}}, 
+            options:{showContent:true, showType:true}}).then((res) => {
+            handleDiscountObject(owner, res.data.map((v)=>v.data));
+        }).catch((e) => {
+            console.log(e);
+        })       
+    }
 }

package/src/utils.ts

@@ -388,7 +388,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;