wowok 1.5.51 → 1.5.52

package/README.md

@@ -12,8 +12,9 @@ X: [https://x.com/Wowok_Ai](https://x.com/Wowok_Ai)
 ### Installation
 
 ```
-$ npm i wowok
+$ npm i wowok@latest
 ```
+The protocol address may change due to protocol upgrade. Please update the SDK to the latest version.
 
 ### Examples 
 #### [An airdrop collection system for different behaviors, allowing three collection mechanisms:](https://github.com/wowok-ai/sdk-examples/tree/main/airdrop)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wowok",
-  "version": "1.5.51",
+  "version": "1.5.52",
   "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

@@ -1,6 +1,6 @@
 import { type TransactionResult, Transaction as TransactionBlock } from '@mysten/sui/transactions';
-import { FnCallType, Protocol, PassportObject, PermissionObject, GuardObject, DemandAddress, TxbObject } from './protocol';
-import { IsValidDesription, IsValidAddress, IsValidArgType, IsValidU64, parseObjectType } from './utils'
+import { FnCallType, Protocol, PassportObject, PermissionObject, GuardObject, DemandAddress, TxbObject, ServiceObject } from './protocol';
+import { IsValidDesription, IsValidAddress, IsValidArgType, IsValidU64, parseObjectType, IsValidU8 } from './utils'
 import { Errors, ERROR}  from './exception'
 
 export class Demand {
@@ -107,16 +107,20 @@ export class Demand {
         }
     }
     
-   set_guard(guard?:GuardObject, passport?:PassportObject)  {  
+   set_guard(guard?:GuardObject, service_identifier?:number, passport?:PassportObject)  {  
         if (guard && !Protocol.IsValidObjects([guard])) {
             ERROR(Errors.IsValidObjects, 'guard');
         }
-        
+        if (service_identifier !== undefined && !IsValidU8(service_identifier)) {
+            ERROR(Errors.InvalidParam, 'set_guard.service_identifier');
+        }
+        let id =  this.txb.pure.option('u8', service_identifier !== undefined ? service_identifier : undefined);
+
         if (passport) {
             if (guard) {
                 this.txb.moveCall({
                     target:Protocol.Instance().DemandFn('guard_set_with_passport') as FnCallType,
-                    arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, guard), 
+                    arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, guard), id, 
                         Protocol.TXB_OBJECT(this.txb, this.permission)],
                     typeArguments:[this.bounty_type],
                 })            
@@ -131,7 +135,7 @@ export class Demand {
             if (guard) {
                 this.txb.moveCall({
                     target:Protocol.Instance().DemandFn('guard_set') as FnCallType,
-                    arguments:[Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, guard), 
+                    arguments:[Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, guard), id, 
                         Protocol.TXB_OBJECT(this.txb, this.permission)],
                     typeArguments:[this.bounty_type],
                 })            
@@ -202,31 +206,48 @@ export class Demand {
         })    
     }
     
-    present(service_address: string, service_pay_type:string, tips:string, passport?:PassportObject) {
+    present(service: ServiceObject | number, service_pay_type:string, tips:string, passport?:PassportObject) {
         if (!IsValidDesription(tips)) {
-            ERROR(Errors.IsValidDesription, 'tips')
-        }
-        if (!IsValidAddress(service_address)) {
-            ERROR(Errors.IsValidAddress, 'service_address')
+            ERROR(Errors.IsValidDesription, 'present.tips')
         }
-        if (!IsValidArgType(service_pay_type)) {
+        if (service_pay_type && !IsValidArgType(service_pay_type)) {
             ERROR(Errors.IsValidArgType, 'service_pay_type')
         }
-        
+        if (typeof(service) === 'number') {
+            if (!IsValidU8(service) || !passport) {
+                ERROR(Errors.IsValidU8, 'present.service or present.passport')
+            }
+        } else {
+            if (!Protocol.IsValidObjects([service])) {
+                ERROR(Errors.IsValidObjects, 'present.service')
+            }
+        }
+
         if (passport) {
-            this.txb.moveCall({
-                target:Protocol.Instance().DemandFn('present_with_passport') as FnCallType,
-                arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, service_address), 
-                    this.txb.pure.string(tips)],
-                typeArguments:[this.bounty_type, service_pay_type],
-            })   
+            if (typeof(service) === 'number') {
+                this.txb.moveCall({
+                    target:Protocol.Instance().DemandFn('present_with_passport2') as FnCallType,
+                    arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.string(tips)],
+                    typeArguments:[this.bounty_type],
+                })  
+            } else {
+                this.txb.moveCall({
+                    target:Protocol.Instance().DemandFn('present_with_passport') as FnCallType,
+                    arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, service), 
+                        this.txb.pure.string(tips)],
+                    typeArguments:[this.bounty_type, service_pay_type],
+                })  
+            }
+ 
         } else {
-            this.txb.moveCall({
-                target:Protocol.Instance().DemandFn('present') as FnCallType,
-                arguments:[Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, service_address), 
-                    this.txb.pure.string(tips)],
-                typeArguments:[this.bounty_type, service_pay_type],
-            })   
+            if (typeof(service) !== 'number') {
+                this.txb.moveCall({
+                    target:Protocol.Instance().DemandFn('present') as FnCallType,
+                    arguments:[Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, service), 
+                        this.txb.pure.string(tips)],
+                    typeArguments:[this.bounty_type, service_pay_type],
+                })                   
+            }
         } 
     }
     change_permission(new_permission:PermissionObject)  {

package/src/exception.ts

@@ -10,6 +10,7 @@ export enum Errors {
     IsValidUint = 'invalid uint',
     IsValidInt = 'invalid int', 
     IsValidU64 = 'invalid u64',
+    IsValidU8 = 'invalid u8',
     IsValidPercent = 'invalid percent',
     IsValidArray = 'invalid array',
     IsValidObjects = 'invalid objects',

package/src/guard.ts

@@ -21,6 +21,14 @@ export  interface Guard_Options {
     group?: string;
 }
 
+export interface GuardAnswer {
+    txb: TransactionBlock;
+    err?: string;
+    identifiers: number[];
+}
+
+export type OnQueryAnswer = (answer: GuardAnswer) => void;
+
 export class Guard {
     static MAX_INPUT_LENGTH = 10240;
 //    static MAX_PAYLOADS_LENGTH = 4096;
@@ -104,6 +112,27 @@ export class Guard {
             arguments: []
         }); 
     }
+
+    static QueryAddressIdentifiers(guard:GuardObject, onQueryAnswer:OnQueryAnswer, sender:string) {    
+        const txb = new TransactionBlock();
+        txb.moveCall({
+            target: Protocol.Instance().GuardFn('query_address_identifiers') as FnCallType,
+            arguments: [txb.object(guard)]
+        })
+
+        Protocol.Client().devInspectTransactionBlock({sender:sender, transactionBlock:txb}).then((res) => {
+            if (res.results && res.results[0]?.returnValues && res.results[0]?.returnValues?.length !== 1 )  {
+                onQueryAnswer({err:'not match', txb:txb, identifiers:[]});
+                return 
+            }
+            const identifiers = Bcs.getInstance().de('vector<u8>', Uint8Array.from((res.results as any)[0].returnValues[0][0]));
+            onQueryAnswer({identifiers:identifiers, txb:txb});
+        }).catch((e) => {
+            console.log(e);
+            onQueryAnswer({err:e, txb:txb, identifiers:[]});
+        })
+    }
+
     static QUERIES:any[] = [ 
         // module, 'name', 'id', [input], output
         [MODULES.permission, 'Owner', 1, [], ValueType.TYPE_ADDRESS, "Owner's address."],

package/src/protocol.ts

@@ -221,14 +221,14 @@ const TESTNET = {
 }
 */
 const TESTNET = {
-    wowok: "0x03ff6124da870ac002831580572339292d12eed6d41bc1e15c20a63b725e4d13",
-    wowok_origin:'0x03ff6124da870ac002831580572339292d12eed6d41bc1e15c20a63b725e4d13' ,
-    base: '0x697414cbf771c0cb0ab4e2ec335fc310a19936b628cfdb0d8d4190042ee998f9',
-    base_origin: '0x697414cbf771c0cb0ab4e2ec335fc310a19936b628cfdb0d8d4190042ee998f9',
-
-    wowok_object: '0x05929fea08ee82f0711ae25590dcd58182af81ff34cc275eb1caca4f7c7041f5',
-    entity_object: '0x42e6da560324e891e8d695464da3ccc9f1fc0d33bc3b962cb7338d8f9198a595',
-    treasury_cap:'0x66a76f713edd26d4db2aa64343edc10e3df6cacbd66f2e5c5e5b6fbddac6e575',
+    wowok: "0x4cd9cecc9720f778678a8d7c4005834a99aff27bb573b15738fbbc6419e380ac",
+    wowok_origin:'0x4cd9cecc9720f778678a8d7c4005834a99aff27bb573b15738fbbc6419e380ac' ,
+    base: '0x985dd058e7f7d6c216b8a55d0170c47c1a6db048a8045c56c6cca4ba9333684d',
+    base_origin: '0x985dd058e7f7d6c216b8a55d0170c47c1a6db048a8045c56c6cca4ba9333684d',
+
+    wowok_object: '0x60aab3dc3e911a5f952a97fd411531b4e1e61676cdf0f8fe10685ce15310dd31',
+    entity_object: '0xec60850cde84c92bad3a161f7c5db4f7b86440e1fdc819be94523a29fff67497',
+    treasury_cap:'0x4bf3375d58afc7b9de3335e777223b3fad16f154305c313d65ec75c2183e2df9',
 }
 const MAINNET = {
     wowok: "",