wowok 1.5.52 → 1.5.56

package/README.md

@@ -1,5 +1,5 @@
 
-# Wowok
+# WoWok
 
 Create, collaborate, and transact on your own terms with the AI-driven web3 collaboration protocol.
 
@@ -27,5 +27,8 @@ The protocol address may change due to protocol upgrade. Please update the SDK t
 * Encrypted personal information transfer and order management
 * Support compensation and dispute voting arbitration
 
-#### [See more examples](https://github.com/wowok-ai/sdk-examples)
+#### [How can social resources collaborate to meet a Kenya 10-day personalized travel dream](https://github.com/wowok-ai/sdk-examples/tree/main/kenya)
+* Demand + Service + Machine/Progress + Order + Permission + Treasury + Arbitration
+
+#### [See more examples...](https://github.com/wowok-ai/sdk-examples)
   

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wowok",
-  "version": "1.5.52",
+  "version": "1.5.56",
   "description": "Create, collaborate, and transact on your own terms with the AI-driven web3 collaboration protocol.",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
@@ -39,7 +39,8 @@
     "move",
     "treasury",
     "payment",
-    "arbitration"
+    "arbitration",
+    "oracle"
   ],
   "author": "wowok",
   "license": "Apache-2.0",

package/src/guard.ts

@@ -267,14 +267,14 @@ export class Guard {
         [MODULES.progress, 'Parent Node', 816, [], ValueType.TYPE_STRING, 'The node name of the parent process where the child process is located.', []],  
         [MODULES.progress, 'Forward Accomplished', 817, [ValueType.TYPE_U64, ValueType.TYPE_STRING, ValueType.TYPE_STRING], ValueType.TYPE_BOOL, 'Has the forward been accomplished?', ['session-id', 'next node name', 'forward name']],  
         [MODULES.progress, 'Forward Operator', 818, [ValueType.TYPE_U64, ValueType.TYPE_STRING, ValueType.TYPE_STRING], ValueType.TYPE_ADDRESS, 'The forward operator.', ['session-id', 'next node name', 'forward name']],   
-        [MODULES.progress, 'Forward Sub-progress', 819, [ValueType.TYPE_U64, ValueType.TYPE_STRING, ValueType.TYPE_STRING], ValueType.TYPE_ADDRESS, 'The forward child process address(if set).', ['session-id', 'next node name', 'forward name']],
-        [MODULES.progress, 'Forward Deliverables', 820, [ValueType.TYPE_U64, ValueType.TYPE_STRING, ValueType.TYPE_STRING], ValueType.TYPE_ADDRESS, 'The forward deliverable(if set).', ['session-id', 'next node name', 'forward name']],  
+        [MODULES.progress, 'Forward Message', 819, [ValueType.TYPE_U64, ValueType.TYPE_STRING, ValueType.TYPE_STRING], ValueType.TYPE_STRING, 'The forward message.', ['session-id', 'next node name', 'forward name']],
+        [MODULES.progress, 'Forward Order Count', 820, [ValueType.TYPE_U64, ValueType.TYPE_STRING, ValueType.TYPE_STRING], ValueType.TYPE_U64, 'The forward Order count.', ['session-id', 'next node name', 'forward name']],  
         [MODULES.progress, 'Forward time', 821, [ValueType.TYPE_U64, ValueType.TYPE_STRING, ValueType.TYPE_STRING], ValueType.TYPE_U64, 'The time when the forward was last triggered.', ['session-id', 'next node name', 'forward name']],  
         [MODULES.progress, 'Closest Session Time', 822, [ValueType.TYPE_STRING], ValueType.TYPE_U64, 'The time a node that closest time to the current node completes its session.', ['node name']],  
         [MODULES.progress, 'Closest Forward Accomplished', 823, [ValueType.TYPE_STRING, ValueType.TYPE_STRING, ValueType.TYPE_STRING], ValueType.TYPE_BOOL, 'Has the forward been accomplished?', ['node name', 'next node name', 'forward name']],  
         [MODULES.progress, 'Closest Forward Operator', 824, [ValueType.TYPE_STRING, ValueType.TYPE_STRING, ValueType.TYPE_STRING], ValueType.TYPE_ADDRESS, 'The operator of the forward that closest time to the current node.', ['node name', 'next node name', 'forward name']],   
-        [MODULES.progress, 'Closest Forward Sub-progress', 825, [ValueType.TYPE_STRING, ValueType.TYPE_STRING, ValueType.TYPE_STRING], ValueType.TYPE_ADDRESS, 'The child process address(if set) of the forward that closest time to the current node.', ['node name', 'next node name', 'forward name']],
-        [MODULES.progress, 'Closest Forward Deliverables', 826, [ValueType.TYPE_STRING, ValueType.TYPE_STRING, ValueType.TYPE_STRING], ValueType.TYPE_ADDRESS, 'The deliverable(if set) of the forward that closest time to the current node.', ['node name', 'next node name', 'forward name']],  
+        [MODULES.progress, 'Closest Forward Message', 825, [ValueType.TYPE_STRING, ValueType.TYPE_STRING, ValueType.TYPE_STRING], ValueType.TYPE_STRING, 'The message of the forward that closest time to the current node.', ['node name', 'next node name', 'forward name']],
+        [MODULES.progress, 'Closest Forward Order Count', 826, [ValueType.TYPE_STRING, ValueType.TYPE_STRING, ValueType.TYPE_STRING], ValueType.TYPE_U64, 'The Order count of the forward that closest time to the current node.', ['node name', 'next node name', 'forward name']],  
         [MODULES.progress, 'Closest Forward time', 827, [ValueType.TYPE_STRING, ValueType.TYPE_STRING, ValueType.TYPE_STRING], ValueType.TYPE_U64, 'The time when the forward that closest time to the current node was last triggered.', ['node name', 'next node name', 'forward name']],  
 
         [MODULES.wowok, 'Builder', 900, [], ValueType.TYPE_ADDRESS, 'Builder address of Wowok.', []], 

package/src/machine.ts

@@ -1,18 +1,24 @@
 import { Transaction as TransactionBlock, TransactionObjectArgument, type TransactionResult } from '@mysten/sui/transactions';
-import { Protocol, FnCallType, PermissionObject, RepositoryObject,  PassportObject, MachineObject, MachineAddress,  GuardObject, TxbObject} from './protocol';
+import { Protocol, FnCallType, PermissionObject, RepositoryObject,  PassportObject, MachineObject, MachineAddress,  GuardObject, TxbObject, ServiceObject} from './protocol';
 import { IsValidInt, Bcs, array_unique, IsValidArray, IsValidAddress, IsValidName, IsValidName_AllowEmpty, 
-    IsValidEndpoint, IsValidDesription, IsValidU64 } from './utils'
+    IsValidEndpoint, IsValidDesription, IsValidU64, 
+    IsValidTokenType} from './utils'
 import { Permission, PermissionIndexType } from './permission';
 import { Errors, ERROR}  from './exception'
 import { ValueType } from './protocol';
 
-
+export interface ServiceWrap {
+    object:ServiceObject,
+    pay_token_type: string,
+    bOptional: boolean,
+}
 export interface Machine_Forward {
     name: string; // foward name
     namedOperator?: string; // dynamic operator
     permission?: PermissionIndexType; // this.permission-index or named-operator MUST one defined.
     weight?: number;
     guard?: GuardObject;
+    suppliers?: ServiceWrap[];
 }
 export interface Machine_Node_Pair {
     prior_node: string;
@@ -156,6 +162,16 @@ export class Machine {
             ERROR(Errors.InvalidParam, 'forward')
         }
 
+        forward?.suppliers?.forEach((v) => {
+            if (!IsValidTokenType(v.pay_token_type)) {
+                ERROR(Errors.IsValidTokenType, 'forward.suppliers:'+v.object);
+            }
+            this.txb.moveCall({ 
+                target:Protocol.Instance().ServiceFn('add_to') as FnCallType,
+                    arguments:[this.txb.object(v.object), this.txb.pure.bool(v.bOptional), f],
+                    typeArguments:[v.pay_token_type]
+            });  
+        })
         return f
     }
 
@@ -481,7 +497,9 @@ export class Machine {
                     let forward_namedOperator = f.fields.value.fields.namedOperator;
                     let forward_permission_index = f.fields.value.fields.permission_index;
                     forwards.push({name:forward_name, namedOperator:forward_namedOperator, permission:forward_permission_index,
-                        weight:forward_weight, guard:forward_guard?forward_guard:''});
+                        weight:forward_weight, guard:forward_guard?forward_guard:'', suppliers:f.fields.value.fields.suppliers.fields.contents.map((v:any) => {
+                            return {object:v.fields.key, bOptional:v.fields.value, pay_token_type:''}
+                        })}); //@ NOTICE...
                 });
                 pairs.push({prior_node:p.fields.key, threshold:p.fields.value.fields.threshold, forwards:forwards});
             });

package/src/progress.ts

@@ -1,11 +1,21 @@
 
 import { FnCallType, PermissionObject, RepositoryObject, PassportObject, MachineObject, 
-    ProgressObject, ProgressAddress, Protocol, TxbObject} from './protocol';
+    ProgressObject, ProgressAddress, Protocol, TxbObject,
+    OrderObject} from './protocol';
 import { Machine } from './machine';
-import { Bcs, array_unique,IsValidName, IsValidAddress, IsValidArray, IsValidInt  } from './utils'
+import { Bcs, array_unique,IsValidName, IsValidAddress, IsValidArray, IsValidInt, IsValidDesription, IsValidTokenType  } from './utils'
 import { ERROR, Errors } from './exception';
-import { type TransactionResult, Transaction as TransactionBlock } from '@mysten/sui/transactions';
+import { type TransactionResult, Transaction as TransactionBlock,  } from '@mysten/sui/transactions';
 
+export interface OrderWrap {
+    object: OrderObject;
+    pay_token_type: string;
+}
+
+export interface Deliverable {
+    msg: string;
+    orders: OrderWrap[];
+}
 
 export type ProgressNext = {
     next_node_name: string;
@@ -23,8 +33,7 @@ export type CurrentSessionId = TransactionResult;
 export interface Holder {
     forward: string;
     who?:string;
-    sub_progress?:string;
-    deliverables?:string;
+    deliverable: Deliverable;
     accomplished:boolean;
 }
 export interface Session {
@@ -251,19 +260,37 @@ export class Progress {
         }
     }
 
-    next(next:ProgressNext, deliverables_address?:string, sub_id?:string, passport?:PassportObject) : CurrentSessionId {
-        if (!Progress.IsValidProgressNext(next)) {
-            ERROR(Errors.InvalidParam, 'next')
+    private deliverable(deliverable:Deliverable) : TransactionResult {
+        if (!IsValidDesription(deliverable.msg)) {
+            ERROR(Errors.IsValidDesription, 'deliverable.msg')
         }
-        if (deliverables_address && !IsValidAddress(deliverables_address)) {
-            ERROR(Errors.IsValidAddress, 'deliverables_address');
+        if (deliverable.orders.length > 0 && !Protocol.IsValidObjects(deliverable.orders.map(v=>v.object))) {
+            ERROR(Errors.IsValidObjects, 'deliverable.orders')
         }
-        if (sub_id && !IsValidAddress(sub_id)) {
-            ERROR(Errors.IsValidAddress, 'sub_id');
+
+        const d = this.txb.moveCall({ 
+            target:Protocol.Instance().ProgressFn('deliverable_new') as FnCallType,
+            arguments: [this.txb.pure.string(deliverable.msg)],
+        })   
+        deliverable.orders.forEach(v => {
+            if (!IsValidTokenType(v.pay_token_type)) {
+                ERROR(Errors.IsValidTokenType, 'deliverable.orders:' + v.object)
+            }
+            this.txb.moveCall({ 
+                target:Protocol.Instance().OrderFn('as_deliverable') as FnCallType,
+                arguments: [this.txb.object(v.object), d],
+                typeArguments:[v.pay_token_type]
+            })   
+        })
+        return d
+    }
+
+    next(next:ProgressNext, deliverable:Deliverable, passport?:PassportObject) : CurrentSessionId {
+        if (!Progress.IsValidProgressNext(next)) {
+            ERROR(Errors.InvalidParam, 'next')
         }
-        
-        const diliverable = this.txb.pure.option('address', deliverables_address ? deliverables_address  : undefined);
-        const sub = this.txb.pure.option('address', sub_id ? sub_id : undefined);
+
+        const d = this.deliverable(deliverable);
         const clock = this.txb.sharedObjectRef(Protocol.CLOCK_OBJECT);
 
         if (passport) {
@@ -271,14 +298,14 @@ export class Progress {
                 target:Protocol.Instance().ProgressFn('next_with_passport') as FnCallType,
                 arguments: [passport, Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, this.machine), 
                     this.txb.pure.string(next.next_node_name), 
-                    this.txb.pure.string(next.forward), diliverable, sub, 
+                    this.txb.pure.string(next.forward), d, 
                     Protocol.TXB_OBJECT(this.txb, this.permission), this.txb.object(clock)],
             })    
         } else {
             return this.txb.moveCall({
                 target:Protocol.Instance().ProgressFn('next') as FnCallType,
                 arguments: [Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, this.machine), this.txb.pure.string(next.next_node_name), 
-                    this.txb.pure.string(next.forward), diliverable, sub, Protocol.TXB_OBJECT(this.txb, this.permission), this.txb.object(clock)],
+                    this.txb.pure.string(next.forward), d, Protocol.TXB_OBJECT(this.txb, this.permission), this.txb.object(clock)],
             })               
         }
     }
@@ -301,8 +328,8 @@ export class Progress {
             var s:Session = {next_node: v.fields.key, holders:[], weights:v.fields.value.fields.weights, threshold:v.fields.value.fields.threshold};
             v.fields.value.fields.forwards.fields.contents.forEach((i:any) => {
               s.holders.push({forward:i.fields.key, accomplished:i.fields.value.fields.accomplished, 
-                who:i.fields.value.fields.who, deliverables:i.fields.value.fields.deliverables ?? undefined,
-                sub_progress: i.fields.value.fields.sub_progress ?? undefined
+                who:i.fields.value.fields.who, deliverable:{msg:i.fields.value.fields.msg, 
+                    orders:i.fields.value.fields.orders ?? []},
               })
             })
             sessions.push(s);
@@ -320,7 +347,8 @@ export class Progress {
               weights:i.fields.value.fields.weights, threshold:i.fields.value.fields.threshold, bComplete:i.fields.key === next_node};
               i.fields.value.fields.forwards.fields.contents.forEach((k:any) => {
               s.holders.push({forward:k.fields.key, who:k.fields.value.fields.who, accomplished:k.fields.value.fields.accomplished,
-                sub_progress:k.fields.value.fields.sub_progress ?? undefined, deliverables:k.fields.value.fields.deliverables ?? undefined});
+                deliverable:{msg:k.fields.value.fields.msg, 
+                    orders:k.fields.value.fields.orders ?? []}});
             })
             sessions.push(s);
           })
@@ -329,6 +357,7 @@ export class Progress {
     }
 
     static MAX_NAMED_OPERATOR_COUNT = 20;
+    static MAX_DELEVERABLE_ORDER_COUNT = 20;
     static IsValidProgressNext = (next:ProgressNext) => {
         return IsValidName(next.forward)  && IsValidName(next.next_node_name);
     }

package/src/protocol.ts

@@ -221,14 +221,15 @@ const TESTNET = {
 }
 */
 const TESTNET = {
-    wowok: "0x4cd9cecc9720f778678a8d7c4005834a99aff27bb573b15738fbbc6419e380ac",
-    wowok_origin:'0x4cd9cecc9720f778678a8d7c4005834a99aff27bb573b15738fbbc6419e380ac' ,
-    base: '0x985dd058e7f7d6c216b8a55d0170c47c1a6db048a8045c56c6cca4ba9333684d',
-    base_origin: '0x985dd058e7f7d6c216b8a55d0170c47c1a6db048a8045c56c6cca4ba9333684d',
-
-    wowok_object: '0x60aab3dc3e911a5f952a97fd411531b4e1e61676cdf0f8fe10685ce15310dd31',
-    entity_object: '0xec60850cde84c92bad3a161f7c5db4f7b86440e1fdc819be94523a29fff67497',
-    treasury_cap:'0x4bf3375d58afc7b9de3335e777223b3fad16f154305c313d65ec75c2183e2df9',
+    wowok: "0x66f08884668a7b18b34ce0ae91cfb7bdab284d4dbbc28ad3fb009df50f88e11e",
+    wowok_origin:'0x66f08884668a7b18b34ce0ae91cfb7bdab284d4dbbc28ad3fb009df50f88e11e' ,
+    base: '0x3960658ad695c829bd62a083a8a92f94f04404ae3ea6b13bbc72e5780cfeec4c',
+    base_origin: '0x3960658ad695c829bd62a083a8a92f94f04404ae3ea6b13bbc72e5780cfeec4c',
+
+    wowok_object: '0xa51c94e11a4693e63b77cc6577a2deb0e4eed1cc6a1fbc3971b35edafc72eaed',
+    entity_object: '0x5f45ec58ed208c7b1b5d427fa77bbc64ad2256203aa6f11961b9417a7eeca053',
+    treasury_cap:'0xc1f614972987e8839584710c0a8b9f284745e667f2e19594c0ffa09ca5e59721',
+    oracle_object:'0x57c89a7ba9f2aaf784a5325da111989f157939a14df15bb9698de0a46285d746',
 }
 const MAINNET = {
     wowok: "",
@@ -239,6 +240,7 @@ const MAINNET = {
     wowok_object: '',
     entity_object: '',
     treasury_cap:'',
+    oracle_object:'',
 }
 
 export interface CoinTypeInfo {
@@ -254,6 +256,7 @@ export class Protocol {
     protected wowok_object = '';
     protected entity_object = '';
     protected treasury_cap = '';
+    protected oracle_object = '';
     protected graphql = '';
     protected txb: TransactionBlock | undefined;
     static _instance: any;
@@ -288,6 +291,7 @@ export class Protocol {
                 this.entity_object= TESTNET.entity_object;
                 this.treasury_cap = TESTNET.treasury_cap;
                 this.graphql = 'https://sui-testnet.mystenlabs.com/graphql';
+                this.oracle_object = TESTNET.oracle_object;
                 break;
             case ENTRYPOINT.mainnet:
                 this.package.set('wowok', MAINNET.wowok);
@@ -298,6 +302,7 @@ export class Protocol {
                 this.entity_object= MAINNET.entity_object;
                 this.treasury_cap = MAINNET.treasury_cap;
                 this.graphql = 'https://sui-mainnet.mystenlabs.com/graphql';
+                this.oracle_object = MAINNET.oracle_object;
                 break;
         };
     }
@@ -307,6 +312,7 @@ export class Protocol {
 
     WowokObject(): string { return this.wowok_object }
     EntityObject(): string { return this.entity_object }
+    OracleObject(): string { return this.oracle_object }
     TreasuryCap() : string { return this.treasury_cap }
     GraphqlUrl() : string { return this.graphql }
     
@@ -339,7 +345,7 @@ export class Protocol {
     TreasuryFn = (fn: any) => { return `${this.package.get('wowok')}::${MODULES.treasury}::${fn}`};
     PaymentFn = (fn: any) => { return `${this.package.get('wowok')}::${MODULES.payment}::${fn}`};
     GuardFn = (fn: any) => { return `${this.package.get('base')}::${MODULES.guard}::${fn}`};
-    MintFn = (fn: any) => { return `${this.package.get('base')}::${MODULES.wowok}::${fn}`};
+    BaseWowokFn = (fn: any) => { return `${this.package.get('base')}::${MODULES.wowok}::${fn}`};
     ArbitrationFn = (fn: any) => { return `${this.package.get('wowok')}::${MODULES.arbitration}::${fn}`};
     ArbFn = (fn: any) => { return `${this.package.get('wowok')}::${MODULES.arb}::${fn}`};
 

package/src/repository.ts

@@ -380,6 +380,11 @@ export class Repository {
     static MAX_KEY_LENGTH = 128;
     static MAX_VALUE_LENGTH = 204800;
     static MAX_REFERENCE_COUNT = 100;
+
+    static TYPE_NORMAL = 0;
+    static TYPE_WOWOK_GRANTEE = 1;
+    static TYPE_WOWOK_ORACLE = 2;
+
     static IsValidName = (key:string)  => {
         return key.length <= Repository.MAX_KEY_LENGTH && key.length != 0;
     }

package/src/wowok.ts

@@ -1,4 +1,4 @@
-import { Protocol, FnCallType, TxbObject, ResourceAddress, PermissionObject} from './protocol';
+import { Protocol, FnCallType, TxbObject, ResourceAddress, PermissionObject, RepositoryAddress} from './protocol';
 import { IsValidDesription, IsValidAddress, IsValidName, IsValidArray, IsValidU64,  } from './utils';
 import { ERROR, Errors } from './exception';
 import { Transaction as TransactionBlock} from '@mysten/sui/transactions';
@@ -52,10 +52,19 @@ export class Wowok {
         if (!IsValidAddress(recipient)) ERROR(Errors.IsValidAddress, 'mint');
         if (!IsValidU64(amount)) ERROR(Errors.IsValidU64, 'mint');
         this.txb.moveCall({
-            target:Protocol.Instance().MintFn('mint') as FnCallType, //@ base package
+            target:Protocol.Instance().BaseWowokFn('mint') as FnCallType, //@ base package
             arguments:[Protocol.TXB_OBJECT(this.txb, Protocol.Instance().TreasuryCap()), this.txb.pure.u64(amount), 
                 this.txb.pure.address(recipient)]
         })
     }
+    oracle(description: string, permission: PermissionObject) : RepositoryAddress  {
+        if (!IsValidDesription(description)) ERROR(Errors.IsValidDesription, 'oracle.description');
+        if (!Protocol.IsValidObjects([permission])) ERROR(Errors.IsValidObjects, 'oracle.permission');
+        return this.txb.moveCall({
+            target:Protocol.Instance().WowokFn('oracle_repository') as FnCallType, //@ base package
+            arguments:[Protocol.TXB_OBJECT(this.txb, Protocol.Instance().OracleObject()), this.txb.pure.string(description), 
+                this.txb.object(permission)]
+        })
+    }
 }