wowok 1.6.69 → 1.6.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wowok",
-  "version": "1.6.69",
+  "version": "1.6.70",
   "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/exception.ts

@@ -21,10 +21,11 @@ export enum Errors {
     Fail = 'fail',
     IsValidIndentifier = 'indentifier invalid',
     isValidHttpUrl = 'invalid url',
-    IsValidUserDefinedIndex = 'invalid user defined permission index',
+    IsValidBizPermissionIndex = 'invalid biz-permission index',
     bcsTypeInvalid = 'invalid bcs type',
     IsValidServiceItemName = 'invalid service item name',
     IsValidCoinType = 'not the coin type',
+    IsValidGuardIdentifier = 'guard identifier invalid',
     noPermission = 'no permission',
 }
 

package/src/guard.ts

@@ -466,6 +466,10 @@ export class Guard {
         return Guard.CommonOptions(ret_type);
     }
 }
+
+export const IsValidGuardIdentifier = (identifier:number | undefined) : boolean => {
+    return IsValidU8(identifier) && identifier !== 0;
+}
 export class GuardMaker {
     protected data : Uint8Array[] = [];
     protected type_validator : Data_Type[] = [];
@@ -556,8 +560,8 @@ export class GuardMaker {
             this.type_validator.push(ValueType.TYPE_U64);
             break;
         case ContextType.TYPE_CONSTANT: 
-            if (typeof(param) !== 'number' || !IsValidInt(param) || param > 255) {
-                ERROR(Errors.InvalidParam, 'add_param param:'+type);
+            if (!IsValidGuardIdentifier(param)) {
+                ERROR(Errors.IsValidGuardIdentifier, 'add_param param:'+type);
             }
             
             var v = this.constant.get(param);

package/src/permission.ts

@@ -233,7 +233,7 @@ export interface Permission_Index {
     entities: Permission_Index_Entity[];
 }
 
-export interface UserDefinedIndex {
+export interface BizPermission {
     index: PermissionIndexType;
     name: string;
 }
@@ -271,13 +271,13 @@ export class  Permission {
         })
     }
 
-    add_userdefine(index: number, name:string) {
-        if (!Permission.IsValidUserDefinedIndex(index)) {
-            ERROR(Errors.IsValidUserDefinedIndex, 'add_userdefine');
+    add_bizPermission(index: number, name:string) {
+        if (!Permission.IsValidBizPermissionIndex(index)) {
+            ERROR(Errors.IsValidBizPermissionIndex, 'add_bizPermission');
         }
 
         if (!IsValidName(name)) {
-            ERROR(Errors.IsValidName, 'add_userdefine');
+            ERROR(Errors.IsValidName, 'add_bizPermission');
         }
         this.txb.moveCall({
             target:Protocol.Instance().permissionFn('user_define_add') as FnCallType,
@@ -285,9 +285,9 @@ export class  Permission {
         })   
     }
     
-    remove_userdefine(index: number) {
-        if (!Permission.IsValidUserDefinedIndex(index)) {
-            ERROR(Errors.IsValidUserDefinedIndex, 'add_userdefine');
+    remove_bizPermission(index: number) {
+        if (!Permission.IsValidBizPermissionIndex(index)) {
+            ERROR(Errors.IsValidBizPermissionIndex, 'remove_bizPermission');
         }
 
         this.txb.moveCall({
@@ -407,7 +407,7 @@ export class  Permission {
         if (!IsValidAddress(address)) {
             ERROR(Errors.IsValidAddress, 'address')
         }
-        if(!Permission.IsValidPermissionIndex(index) && !Permission.IsValidUserDefinedIndex(index)) {
+        if(!Permission.IsValidPermissionIndex(index) && !Permission.IsValidBizPermissionIndex(index)) {
             ERROR(Errors.IsValidPermissionIndex, 'index')
         }
 
@@ -572,7 +572,7 @@ export class  Permission {
     static PERMISSION_OWNER_AND_ADMIN = 3;
     static BUSINESS_PERMISSIONS_START = PermissionIndex.user_defined_start;
 
-    static IsValidUserDefinedIndex = (index:number)  => { 
+    static IsValidBizPermissionIndex = (index:number)  => { 
         return index >= Permission.BUSINESS_PERMISSIONS_START && IsValidU64(index)
     }
     
@@ -582,6 +582,6 @@ export class  Permission {
             return true
         }
         //console.log(Object.keys(PermissionIndex))
-        return Permission.IsValidUserDefinedIndex(index);
+        return Permission.IsValidBizPermissionIndex(index);
     }
 }

package/src/resource.ts

@@ -111,19 +111,6 @@ export class Resource {
         });
     }
 
-    query(address: TxbAddress) {
-        if (typeof(address) === 'string' && !IsValidAddress(address)) {
-            ERROR(Errors.IsValidAddress, 'Resource: query.address');
-        } 
-
-        this.txb.moveCall({
-            target:Protocol.Instance().resourceFn('query')  as FnCallType,
-            arguments:[Protocol.TXB_OBJECT(this.txb, this.object), 
-                typeof(address) === 'string' ? this.txb.pure.address(address) : address, 
-            ]
-        })
-    }
-
     static TagData(tags: Tags[], innerTag:boolean=true) : TagData[] {
         const data : TagData[] = [];
         tags.forEach(v => {