wowok 1.4.19 → 1.4.21

package/src/permission.ts

@@ -78,6 +78,10 @@ export enum PermissionIndex {
     progress_context_repository = 653,
     progress_unhold = 654,
     progress_parent = 655,
+
+    treasury = 700,
+    treasury_deposit = 701,
+    treasury_take = 702,
     user_defined_start = 1000,
 }
 
@@ -175,6 +179,10 @@ export const PermissionInfo : PermissionInfoType[] = [
     {index:PermissionIndex.progress_context_repository, name: 'Repository', description:'Set Progress repository', module: 'progress'},
     {index:PermissionIndex.progress_unhold, name: 'Unhold', description:'Release Progress holdings', module: 'progress'},
     {index:PermissionIndex.progress_parent, name: 'Parent', description:'Set Progress parent', module: 'progress'},
+    
+    {index:PermissionIndex.treasury, name: 'Treasury', description:'Launch new Treasury', module: 'treasury'},
+    {index:PermissionIndex.treasury_deposit, name: 'Deposit', description:'Deposit coins', module: 'treasury'},
+    {index:PermissionIndex.treasury_take, name: 'Take', description:'Take out coins', module: 'treasury'},
 ]
 
 export type PermissionIndexType = PermissionIndex | number;

package/src/progress.ts

@@ -19,6 +19,7 @@ export type ParentProgress = {
     forward: string;
 }
 
+export type CurrentSessionId = TransactionResult;
 export interface Holder {
     forward: string;
     who?:string;
@@ -257,7 +258,7 @@ export class Progress {
         }
     }
 
-    next(next:ProgressNext, deliverables_address?:string, sub_id?:string, passport?:PassportObject)  {
+    next(next:ProgressNext, deliverables_address?:string, sub_id?:string, passport?:PassportObject) : CurrentSessionId {
         if (!Progress.IsValidProgressNext(next)) {
             ERROR(Errors.InvalidParam, 'next')
         }
@@ -273,7 +274,7 @@ export class Progress {
         const clock = this.txb.sharedObjectRef(Protocol.CLOCK_OBJECT);
 
         if (passport) {
-            this.txb.moveCall({
+            return this.txb.moveCall({
                 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), 
@@ -281,7 +282,7 @@ export class Progress {
                     Protocol.TXB_OBJECT(this.txb, this.permission), this.txb.object(clock)],
             })    
         } else {
-            this.txb.moveCall({
+            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)],
@@ -289,12 +290,12 @@ export class Progress {
         }
     }
 
-    hold(next:ProgressNext, hold:boolean)  {
+    hold(next:ProgressNext, hold:boolean)  : CurrentSessionId  {
         if (!Progress.IsValidProgressNext(next)) {
             ERROR(Errors.InvalidParam, 'hold')
         }
         const clock = this.txb.sharedObjectRef(Protocol.CLOCK_OBJECT);
-        this.txb.moveCall({
+        return this.txb.moveCall({
             target:Protocol.Instance().ProgressFn('hold') 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), this.txb.pure.bool(hold), Protocol.TXB_OBJECT(this.txb, this.permission), this.txb.object(clock)],

package/src/protocol.ts

@@ -24,6 +24,9 @@ export enum MODULES {
     resource = 'resource',
     entity = 'entity',
     wowok = 'wowok',
+    treasury = 'treasury',
+    payment = 'payment',
+    withholding = 'withholding',
 }
 
 export type PermissionAddress = TransactionResult;
@@ -152,7 +155,7 @@ export const IsNumberType = (type:ValueType | any) : boolean => { return type===
 export enum ContextType {
     TYPE_SIGNER  = 60,
     TYPE_CLOCK = 61,
-    TYPE_WITNESS_ID = 62, 
+    TYPE_GUARD = 62, // current guard address
     TYPE_CONSTANT = 80,
 }
 interface ValueTypeString {
@@ -165,8 +168,8 @@ interface ValueTypeString {
 export const SER_VALUE: ValueTypeString[] = [
     {type: ValueType.TYPE_BOOL, name: 'bool', description:'boolean. eg:true or false', validator:(value:any) => { return (value === true || value === false)}},
     {type: ValueType.TYPE_ADDRESS, name: 'address', description:'address or object-id. eg:0x6789af', validator:IsValidAddress},
-    {type: ContextType.TYPE_WITNESS_ID, name: 'witness address', description:"For example, the address of the Machine object ensures that the Progress generated in the past or future is verified; the address of the Service object ensures that the Order generated in the past or future is verified.",  validator:IsValidAddress},
-    {type: ContextType.TYPE_SIGNER, name: 'txn signer', description:"signer address of the transaction, "},
+    {type: ContextType.TYPE_SIGNER, name: 'txn signer', description:"signer address of the transaction"},
+    {type: ContextType.TYPE_GUARD, name: 'guard address', description:"current guard address"},
     {type: ContextType.TYPE_CLOCK, name: 'txn time', description:"unsigned-64 number for the transaction time"},
     {type: ValueType.TYPE_U64, name: 'number', description:'unsigned-64 number. eg:23870233', validator:IsValidU64},
     {type: ValueType.TYPE_U8, name: 'number', description:'unsigned-8 number. eg:255', validator:IsValidU8},
@@ -190,7 +193,7 @@ export const SER_VALUE: ValueTypeString[] = [
     {type: ValueType.TYPE_U256, name: 'number', description:'unsigned-256 number. eg:12345678901233', validator:IsValidUintLarge},
 ]
 
-export type ConstantType = ValueType | ContextType.TYPE_WITNESS_ID;
+//export type ConstantType = ValueType | ContextType.TYPE_WITNESS_ID;
 export type Data_Type = ValueType | OperatorType | ContextType;
 
 export enum ENTRYPOINT {
@@ -208,10 +211,10 @@ const TESTNET = {
 }
 */
 const TESTNET = {
-    package: "0x46e9a55686124138132d83098a1ae0b9d63d91e93d96d636c47b5e6f7f00a3d4",
-    wowok_object: '0xa78e02dd7d537ddeab3a33bb9b40df4663f58b4e835dfa5dc430f5ae4e71b4fe',
-    entity_object: '0x487524f61ed9dd3f4a02ae7311b2879f3b0ebeef1a9a4cd36f291dcd351e8e56',
-    treasury_cap:'0xf5ecc294e9e5524c55a5775c7fb3e8aa8e7d4b6bb4fc2f91712f8610d02e0287',
+    package: "0x61dad08ebbda7d4f38223e222a2dcc18cec644d99c66937cde65dd99a9ba93b1",
+    wowok_object: '0xed0a7c40db1f8de42e4dd5ecca2e7912701dee0fe9f7b6fe7ebd7205133a80b7',
+    entity_object: '0x4a4850bf062bb29fec3b64de337db02f7ccee0ae13b85f287ee5850a568ae330',
+    treasury_cap:'0xb33d469f8164eefbf02b260e02194faab5bfad2acafd36088e1e64302bbcd797',
 }
 const MAINNET = {
     package: "",

package/src/utils.ts

@@ -244,8 +244,6 @@ export class Bcs {
                 return this.bcs.ser('vector<u8>', d).toBytes();
             case ValueType.TYPE_VEC_STRING:
                 return this.bcs.ser('vector<vector<u8>>', data.map((v:string)=>{return new TextEncoder().encode(v)})).toBytes();
-            case ContextType.TYPE_WITNESS_ID:
-                return this.bcs.ser(BCS.ADDRESS, data).toBytes();
             default:
                 ERROR(Errors.bcsTypeInvalid, 'ser');
         }
@@ -589,7 +587,7 @@ export const query_object = (param:query_object_param) => {
     }
   }
 
-  export const FirstLetterUppercase = (str:string) => {
-    if (!str) return str;
+  export const FirstLetterUppercase = (str:string|undefined|null) : string => {
+    if (!str) return '';
     return str.substring(0, 1).toUpperCase() + str.substring(1);
   }