wowok 1.5.36 → 1.5.39

package/src/permission.ts

@@ -12,7 +12,7 @@ export enum PermissionIndex {
     repository_policy_description = 105,
     repository_policy_permission = 106,
     repository_reference = 107,
-
+/*
     vote = 150,
     vote_description = 151,
     vote_reference = 152, 
@@ -23,7 +23,7 @@ export enum PermissionIndex {
     vote_lock_deadline = 159,
     vote_expand_deadline = 160,
     vote_lock_guard = 161,
-
+*/
     service = 200,
     service_description = 201,
     service_price = 202,
@@ -46,7 +46,7 @@ export enum PermissionIndex {
     //service_change_order_required_pubkey = 224,
     service_pause = 225,
     service_treasury = 226,
-
+/*
     reward = 240,
     reward_refund = 241,
     reward_expand_time = 242,
@@ -55,7 +55,7 @@ export enum PermissionIndex {
     reward_lock_guards = 246,
     reward_claim_repeatably = 247,
     reward_allow_claiming = 248,
-
+*/
     demand = 260,
     demand_refund = 261,
     demand_expand_time = 262,
@@ -94,10 +94,11 @@ export enum PermissionIndex {
     arbitration_voting_guard = 803,
     arbitration_endpoint = 804,
     arbitration_guard = 805,
-    arbitration_publish = 806,
+    arbitration_pause = 806,
     arbitration_vote = 807,
     arbitration_arbitration = 808,
     arbitration_withdraw = 809,
+    arbitration_treasury = 810,
     
     user_defined_start = 1000,
 }
@@ -132,7 +133,7 @@ export const PermissionInfo : PermissionInfoType[] = [
     {index:PermissionIndex.repository_policy_description, name:'Policy Description', description:'Set Repository policy description', module: 'repository'},
     {index:PermissionIndex.repository_policy_permission, name:'Policy Permission', description:'Set Repository policy permission',  module: 'repository'},
     {index:PermissionIndex.repository_reference, name:'Reference', description:'Set Repository reference', module: 'repository'},
-
+/*
     {index:PermissionIndex.vote, name:'Vote', description:'Launch new Vote', module: 'vote'},
     {index:PermissionIndex.vote_description, name:'Description', description:'Set Vote description', module: 'vote'},
     {index:PermissionIndex.vote_reference, name:'Reference', description:'Set Vote reference', module: 'vote'},
@@ -143,7 +144,7 @@ export const PermissionInfo : PermissionInfoType[] = [
     {index:PermissionIndex.vote_lock_deadline, name:'Lock deadline', description:'Set Vote deadline immutable', module: 'vote'},
     {index:PermissionIndex.vote_expand_deadline, name:'Expand deadline', description:'Expand Vote deadline', module: 'vote'},
     {index:PermissionIndex.vote_lock_guard, name:'Lock Guard', description:'Set Vote guards immutable', module: 'vote'},
-
+*/
     {index:PermissionIndex.service, name:'Service', description:'Launch new Service', module: 'service'},
     {index:PermissionIndex.service_description, name:'Description', description:'Set Service description', module: 'service'},
     {index:PermissionIndex.service_price, name:'Price', description:'Set Service item price', module: 'service'},
@@ -165,7 +166,7 @@ export const PermissionInfo : PermissionInfoType[] = [
     //{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.service_treasury, name:'Treasury', description:'Externally withdrawable treasury for compensation or rewards', module: 'service'},
-
+/*
     {index:PermissionIndex.reward, name:'reward', description:'Launch new reward', module: 'reward'},
     {index:PermissionIndex.reward_refund, name:'Refund', description:'Refund from reward', module: 'reward'},
     {index:PermissionIndex.reward_expand_time, name:'Expand deadline', description:'Expand reward deadline', module: 'reward'},
@@ -174,7 +175,7 @@ export const PermissionInfo : PermissionInfoType[] = [
     {index:PermissionIndex.reward_lock_guards, name:'Lock Guard', description:'Set reward guard immutable', module: 'reward'},
     {index:PermissionIndex.reward_claim_repeatably, name:'Claim repeatably', description:'Allow claimming repeatably', module: 'reward'},
     {index:PermissionIndex.reward_allow_claiming, name:'Allow claiming', description:'Allow claiming', module: 'reward'},
-
+*/
     {index:PermissionIndex.demand, name:'Demand', description:'Launch new Demand', module: 'demand'},
     {index:PermissionIndex.demand_refund, name:'Refund', description:'Refund from Demand', module: 'demand'},
     {index:PermissionIndex.demand_expand_time, name:'Expand deadline', description:'Expand Demand deadline', module: 'demand'},
@@ -213,10 +214,11 @@ export const PermissionInfo : PermissionInfoType[] = [
     {index:PermissionIndex.arbitration_fee, name: 'Fee', description:'Set Arbitration fee', module: 'arbitration'},
     {index:PermissionIndex.arbitration_guard, name: 'Guard', description:'Set Guard to apply for arbitration', module: 'arbitration'},
     {index:PermissionIndex.arbitration_arbitration, name: 'Arbitrate', description:'Determine the outcome of arbitration', module: 'arbitration'},
-    {index:PermissionIndex.arbitration_publish, name: 'Publish', description:'Allowing the creation of Arb', module: 'arbitration'},
+    {index:PermissionIndex.arbitration_pause, name: 'Pause', description:'Allowing/forbidding the creation of Arb', module: 'arbitration'},
     {index:PermissionIndex.arbitration_voting_guard, name: 'Voting Guard', description:'Add/Remove voting Guard', module: 'arbitration'},
     {index:PermissionIndex.arbitration_vote, name: 'Vote', description:'Vote on the application for arbitration', module: 'arbitration'},
     {index:PermissionIndex.arbitration_withdraw, name: 'Withdraw', description:'Withdraw the arbitration fee', module: 'arbitration'},
+    {index:PermissionIndex.arbitration_treasury, name: 'Withdraw', description:'Set Treasury that fees was collected at the time of withdrawal', module: 'arbitration'},
 ]
 
 export type PermissionIndexType = PermissionIndex | number;

package/src/protocol.ts

@@ -41,28 +41,33 @@ export type DemandAddress = TransactionResult;
 export type DemandObject = TransactionResult | string | TransactionArgument;
 export type ServiceObject = TransactionResult  | string | TransactionArgument;
 export type ServiceAddress = TransactionResult;
+export type ArbitrationObject = TransactionResult  | string | TransactionArgument;
+export type ArbitrationAddress = TransactionResult;
+export type ArbObject = TransactionResult  | string | TransactionArgument;
+export type ArbAddress = TransactionResult;
 export type ProgressObject = TransactionResult | string | TransactionArgument;
 export type ProgressAddress = TransactionResult;
-export type RewardObject = TransactionResult | string | TransactionArgument;
-export type RewardAddress = TransactionResult;
+export type TreasuryObject = TransactionResult | string | TransactionArgument;
+export type TreasuryAddress = TransactionResult;
+//export type RewardObject = TransactionResult | string | TransactionArgument;
+//export type RewardAddress = TransactionResult;
 export type OrderObject = TransactionResult | string | TransactionArgument;
 export type OrderAddress = TransactionResult;
 export type DiscountObject = TransactionResult | string | TransactionArgument;
 export type CoinObject = TransactionResult | string | TransactionArgument;
-export type VoteObject = TransactionResult | string | TransactionArgument;
-export type VoteAddress = TransactionResult;
+//export type VoteObject = TransactionResult | string | TransactionArgument;
+//export type VoteAddress = TransactionResult;
 export type ResourceObject = TransactionResult | string | TransactionArgument;
 export type ResourceAddress = TransactionResult;
 export type EntityObject = TransactionResult | string | TransactionArgument;
 export type EntityAddress = TransactionResult;
-export type TreasuryAddress = TransactionResult;
 export type PaymentObject = TransactionResult | string | TransactionArgument;
 export type PaymentAddress = TransactionResult;
 export type ReceivedObject = TransactionResult | string | TransactionArgument;
 export type CoinWrapperObject = TransactionResult;
 
 export type TxbObject = string | TransactionResult | TransactionArgument | GuardObject |  RepositoryObject | PermissionObject | MachineObject | PassportObject |
-    DemandObject | ServiceObject | RewardObject | OrderObject | DiscountObject | VoteObject | DemandObject | ResourceObject | EntityObject;
+    DemandObject | ServiceObject  | OrderObject | DiscountObject  | DemandObject | ResourceObject | EntityObject | ArbitrationObject | ArbObject | TreasuryObject;
 
 export type WowokObject = TransactionResult;
 export type FnCallType = `${string}::${string}::${string}`;
@@ -215,16 +220,21 @@ const TESTNET = {
 }
 */
 const TESTNET = {
-    wowok: "0xd8909c47713ee1199f41caaccff1a822cd82512e0ec4f9e7af04e71d3db6cb4b",
-    wowok_origin:'0xd8909c47713ee1199f41caaccff1a822cd82512e0ec4f9e7af04e71d3db6cb4b' ,
+    wowok: "0x1633497f1d7a9cdb7f8afc619fb25e138dcfa3b04d8685a0b3f266c5f4c33d37",
+    wowok_origin:'0x1633497f1d7a9cdb7f8afc619fb25e138dcfa3b04d8685a0b3f266c5f4c33d37' ,
     base: '0x7efcdab72af2351e5915e34ad2ac8d4ea7f4f408e08138d3498af35a362db782',
-    wowok_object: '0xb1105b665e0bc583cb91e80c7ea17cb35f5f145ccda25145328db1c1b984ea1a',
-    entity_object: '0x9d5a8823ccdbc369097d74672d25ac2045bce9bfb993858441513469469a44d0',
+    base_origin: '0x7efcdab72af2351e5915e34ad2ac8d4ea7f4f408e08138d3498af35a362db782',
+
+    wowok_object: '0x2806f245ec96a33c9dcb1b03c569f262e94f00d8ae9e759f8c8edbcffdb99986',
+    entity_object: '0x2e90eeafd6df01a92704ffc3420f18801626403b322b1a0267bf4d6db268037a',
     treasury_cap:'0x538cf8f32d59f58c0450a3a97c1eeed3096f4ce63e07e0bdf343a5cc1464887c',
 }
 const MAINNET = {
     wowok: "",
+    wowok_origin:"",
     base:"",
+    base_origin:"",
+
     wowok_object: '',
     entity_object: '',
     treasury_cap:'',
@@ -272,6 +282,7 @@ export class Protocol {
                 this.package.set('wowok', TESTNET.wowok);
                 this.package.set('base', TESTNET.base);
                 this.package.set('wowok_origin', TESTNET.wowok_origin); //@ orgin package!!!
+                this.package.set('base_origin', TESTNET.base_origin);
                 this.wowok_object = TESTNET.wowok_object;
                 this.entity_object= TESTNET.entity_object;
                 this.treasury_cap = TESTNET.treasury_cap;
@@ -280,6 +291,8 @@ export class Protocol {
             case ENTRYPOINT.mainnet:
                 this.package.set('wowok', MAINNET.wowok);
                 this.package.set('base', MAINNET.base);
+                this.package.set('wowok_origin', MAINNET.wowok_origin); //@ orgin package!!!
+                this.package.set('base_origin', MAINNET.base_origin);
                 this.wowok_object = MAINNET.wowok_object;
                 this.entity_object= MAINNET.entity_object;
                 this.treasury_cap = MAINNET.treasury_cap;
@@ -326,7 +339,9 @@ export class Protocol {
     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}`};
-    
+    ArbitrationFn = (fn: any) => { return `${this.package.get('wowok')}::${MODULES.arbitration}::${fn}`};
+    ArbFn = (fn: any) => { return `${this.package.get('wowok')}::${MODULES.arb}::${fn}`};
+
     Query = async (objects: Query_Param[], options:SuiObjectDataOptions={showContent:true}) : Promise<SuiObjectResponse[]> => {
         const client =  new SuiClient({ url: this.NetworkUrl() });  
         const ids = objects.map((value) => value.objectid);

package/src/service.ts

@@ -2,7 +2,8 @@ import { IsValidArray, IsValidPercent, IsValidName_AllowEmpty, parseObjectType,
     IsValidAddress, IsValidEndpoint, IsValidU64, } from './utils'
 import { FnCallType, GuardObject, PassportObject, PermissionObject, RepositoryObject, MachineObject, ServiceAddress, 
     ServiceObject, DiscountObject, OrderObject, OrderAddress, CoinObject, Protocol, ValueType,
-    TxbObject} from './protocol';
+    TxbObject,
+    TreasuryObject} from './protocol';
 import { ERROR, Errors } from './exception';
 import { Transaction as TransactionBlock,  } from '@mysten/sui/transactions';
 import { SuiObjectData } from '@mysten/sui/client';
@@ -80,7 +81,7 @@ export class Service {
         return s
     }
     static New(txb: TransactionBlock, token_type:string, permission:PermissionObject, description:string, 
-        payee_address:string, endpoint?:string, passport?:PassportObject) : Service {
+        payee_address:string, passport?:PassportObject) : Service {
         if (!Protocol.IsValidObjects([permission])) {
             ERROR(Errors.IsValidObjects)
         }
@@ -94,25 +95,20 @@ export class Service {
             ERROR(Errors.IsValidAddress, 'payee_address')
         }
 
-        if (endpoint && !IsValidEndpoint(endpoint)) {
-            ERROR(Errors.IsValidEndpoint)
-        }
-
         let pay_token_type = token_type;
         let s = new Service(txb, pay_token_type, permission);
-        let ep = txb.pure.option('string', endpoint ? endpoint : undefined);
         
 
         if (passport) {
             s.object = txb.moveCall({
                 target:Protocol.Instance().ServiceFn('new_with_passport') as FnCallType,
-                arguments:[passport, txb.pure.string(description), txb.pure.address(payee_address), ep, Protocol.TXB_OBJECT(txb, permission)],
+                arguments:[passport, txb.pure.string(description), txb.pure.address(payee_address), Protocol.TXB_OBJECT(txb, permission)],
                 typeArguments:[pay_token_type],
             })
         } else {
             s.object = txb.moveCall({
                 target:Protocol.Instance().ServiceFn('new') as FnCallType,
-                arguments:[txb.pure.string(description), txb.pure.address(payee_address), ep, Protocol.TXB_OBJECT(txb, permission)],
+                arguments:[txb.pure.string(description), txb.pure.address(payee_address), Protocol.TXB_OBJECT(txb, permission)],
                 typeArguments:[pay_token_type],
             })
         }
@@ -124,8 +120,8 @@ export class Service {
             target:Protocol.Instance().ServiceFn('create') as FnCallType,
             arguments:[Protocol.TXB_OBJECT(this.txb, this.object)],
             typeArguments:[this.pay_token_type]
-    })
-}
+        })
+    }
     destroy() {
         this.txb.moveCall({
             target:Protocol.Instance().ServiceFn('destroy') as FnCallType,
@@ -1006,6 +1002,63 @@ export class Service {
         })    
     }
 
+    add_treasury(treasury_token_type:string, treasury:TreasuryObject, passport?:PassportObject) {
+        if (!Protocol.IsValidObjects([treasury])) {
+            ERROR(Errors.IsValidObjects, 'add_treasury.treasury')
+        }
+        if (!IsValidTokenType(treasury_token_type)) {
+            ERROR(Errors.IsValidTokenType, 'add_treasury.treasury_token_type')
+        }
+
+        if (passport) {
+            this.txb.moveCall({
+                target:Protocol.Instance().ServiceFn('treasury_add_with_passport') as FnCallType,
+                arguments: [passport, Protocol.TXB_OBJECT(this.txb, this.object), this.txb.object(treasury), Protocol.TXB_OBJECT(this.txb, this.permission)],
+                typeArguments:[this.pay_token_type, treasury_token_type]            
+            })                    
+        } else {
+            this.txb.moveCall({
+                target:Protocol.Instance().ServiceFn('treasury_add') as FnCallType,
+                arguments: [Protocol.TXB_OBJECT(this.txb, this.object), this.txb.object(treasury), Protocol.TXB_OBJECT(this.txb, this.permission)],
+                typeArguments:[this.pay_token_type, treasury_token_type]            
+            })                    
+        }
+    }
+
+    remove_treasury(treasury:string[], removeall?:boolean, passport?:PassportObject) {
+        if (!removeall && treasury.length === 0) return ;
+
+        if (passport) {
+            if (removeall) {
+                this.txb.moveCall({
+                    target:Protocol.Instance().ServiceFn('treasury_remove_all_with_passport') as FnCallType,
+                    arguments: [passport, Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, this.permission)],
+                    typeArguments:[this.pay_token_type]            
+                })    
+            } else {
+                this.txb.moveCall({
+                    target:Protocol.Instance().ServiceFn('treasury_remove_with_passport') as FnCallType,
+                    arguments: [passport, Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.vector('address', treasury), Protocol.TXB_OBJECT(this.txb, this.permission)],
+                    typeArguments:[this.pay_token_type]            
+                })    
+            }
+        } else {
+            if (removeall) {
+                this.txb.moveCall({
+                    target:Protocol.Instance().ServiceFn('treasury_remove_all') as FnCallType,
+                    arguments: [Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, this.permission)],
+                    typeArguments:[this.pay_token_type]            
+                })    
+            } else {
+                this.txb.moveCall({
+                    target:Protocol.Instance().ServiceFn('treasury_remove') as FnCallType,
+                    arguments: [Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.vector('address', treasury), Protocol.TXB_OBJECT(this.txb, this.permission)],
+                    typeArguments:[this.pay_token_type]            
+                })    
+            }
+        }
+    }
+
     change_permission(new_permission:PermissionObject) {
         if (!Protocol.IsValidObjects([new_permission])) {
             ERROR(Errors.IsValidObjects)
@@ -1019,12 +1072,19 @@ export class Service {
         this.permission = new_permission
     }
 
+    set_order_agent(order:OrderObject, agent:string[]) {
+        Service.SetOrderAgent(this.txb, this.pay_token_type, order, agent)
+    }
+    
     static MAX_DISCOUNT_COUNT_ONCE = 200;
     static MAX_DISCOUNT_RECEIVER_COUNT = 20;
     static MAX_GUARD_COUNT = 16;
     static MAX_REPOSITORY_COUNT = 32;
     static MAX_ITEM_NAME_LENGTH = 256;
-     
+    static MAX_TREASURY_COUNT= 8;
+    static MAX_ORDER_AGENT_COUNT = 8;
+    static MAX_ORDER_ARBS_COUNT = 8;
+
     static IsValidItemName(name:string) : boolean {
         if (!name) return false;
         return new TextEncoder().encode(name).length <= Service.MAX_ITEM_NAME_LENGTH;
@@ -1055,4 +1115,26 @@ export class Service {
             console.log(e);
         })       
     }
+
+    // The agent has the same order operation power as the order payer; The agent can only be set by the order payer.
+    static SetOrderAgent = (txb:TransactionBlock, order_token_type:string, order:OrderObject, agent:string[]) => {
+        if (!IsValidTokenType(order_token_type)) {
+            ERROR(Errors.IsValidTokenType, 'SetOrderAgent.order_token_type');
+        }
+        if (!Protocol.IsValidObjects([order])) {
+            ERROR(Errors.IsValidObjects, 'SetOrderAgent.order')
+        }
+        if (!IsValidArray(agent, IsValidAddress)) {
+            ERROR(Errors.IsValidArray, 'SetOrderAgent.agent')
+        }
+        if (array_unique(agent).length > Service.MAX_ORDER_AGENT_COUNT) {
+            ERROR(Errors.Fail, 'SetOrderAgent.agent count')
+        }
+
+        txb.moveCall({
+            target:Protocol.Instance().OrderFn('agent_set') as FnCallType,
+            arguments: [txb.object(order), txb.pure.vector('string', array_unique(agent))],
+            typeArguments:[order_token_type]            
+        })    
+    }
 }

package/src/treasury.ts

@@ -154,7 +154,7 @@ export class Treasury {
             ERROR(Errors.InvalidParam, 'deposit.param.index')
         }
 
-        const for_obj = this.txb.pure.option('address', param.for_object ?? undefined);
+        const for_obj = this.txb.pure.option('address', param.for_object ? param.for_object: undefined);
         const clock = this.txb.sharedObjectRef(Protocol.CLOCK_OBJECT);
         if (passport) {
             if (param.for_guard) {
@@ -240,7 +240,7 @@ export class Treasury {
             ERROR(Errors.IsValidAddress, 'withdraw.param.withdraw_guard')
         }
 
-        const for_obj = this.txb.pure.option('address', param.for_object ?? undefined);
+        const for_obj = this.txb.pure.option('address', param.for_object ?  param.for_object : undefined);
         const clock = this.txb.sharedObjectRef(Protocol.CLOCK_OBJECT);
 
         if (param.withdraw_guard && passport) { //@ dont need passport, use withdraw guard!
@@ -290,7 +290,6 @@ export class Treasury {
                         typeArguments:[this.token_type],
                     })
                 } else {
-                    console.log(param)
                     return this.txb.moveCall({
                         target:Protocol.Instance().TreasuryFn('withdraw') as FnCallType,
                         arguments:[Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.vector('address', param.items.map(v=>v.address)), 

package/src/graphql.ts

@@ -1,123 +0,0 @@
-import { gql } from "graphql-tag";
-
-export const GRAPHQL_OBJECTS_TYPE = gql(`
- query objects_type_version($filter:ObjectFilter!) {
-  objects(filter:$filter) {
-    nodes {
-      address
-      version
-      asMoveObject {
-        contents {
-          type {
-            repr
-          }
-        }
-    }
-    }
-  }
-}
-`);
-export const GRAPHQL_CHILD_OBJECT = gql(`
-  query object($ObjectID:SuiAddress!) {
-    object(address:$ObjectID)  {
-      address
-      asMoveObject {
-        contents {
-          json
-        }
-      }
-    }
-  }
-`);
-
-export const GRAPHQL_OBJECT = gql(`
-  query object($ObjectID:SuiAddress!) {
-    object(address:$ObjectID)  {
-      address
-      asMoveObject {
-        contents {
-          json
-          type {
-            repr
-          }
-        }
-      }
-      dynamicFields {
-        pageInfo {
-            hasNextPage
-            endCursor
-        }
-        nodes {
-          name {
-            json
-          }
-          value {
-            ... on MoveValue {
-              json
-            }
-            ... on MoveObject {
-              contents {
-                json
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-`);
-
-export const GRAPHQL_OWNER = gql(`
-  query owner($ObjectID:SuiAddress!) {
-    owner (address: $ObjectID) {
-        address
-        dynamicFields {
-          pageInfo {
-            hasNextPage
-            endCursor
-            }
-            nodes {
-                name {
-                    json
-                }
-                value {
-                ... on MoveValue {
-                    json
-                }
-                ... on MoveObject {
-                    contents {
-                    json
-                    }
-                }
-                }
-            }
-        }
-    }
-    }
-`);
-
-export const GRAPHQL_OBJECTS = gql(`
-  query objects($filter:ObjectFilter!){
-    objects(filter:$filter) {
-      nodes {
-        address
-            asMoveObject {
-        contents {
-          json
-          type {
-            repr
-          }
-        }
-      }
-      }
-  }
-  }
-`);
-
-export const GRAPHQL_DECIMALS = gql(`
-query getTotalSupply($coinType: String!) {
-	coinMetadata(coinType: $coinType) {
-		decimals
-	}
-} 
-`);