wowok 1.1.1 → 1.1.3

package/src/protocol.ts

@@ -4,7 +4,7 @@ import { Ed25519Keypair } from '@mysten/sui.js/keypairs/ed25519';
 import { BCS, getSuiMoveConfig, toHEX, fromHEX, BcsReader } from '@mysten/bcs';
 import { TransactionBlock, Inputs, TransactionResult, TransactionArgument } from '@mysten/sui.js/transactions';
 import { capitalize, IsValidArray } from './utils'
-import { VariableType } from './guard';
+import { GuardVariable } from './guard';
 
 
 export enum MODULES {
@@ -56,61 +56,48 @@ export type FnCallType = `${string}::${string}::${string}`;
 
 export enum OperatorType {
     TYPE_QUERY = 1, // query wowok object
-    TYPE_FUTURE_QUERY = 2,
-    TYPE_QUERY_FROM_CONTEXT = 3, 
 
-    TYPE_LOGIC_OPERATOR_U128_GREATER = 11,
-    TYPE_LOGIC_OPERATOR_U128_GREATER_EQUAL = 12,
-    TYPE_LOGIC_OPERATOR_U128_LESSER = 13,
-    TYPE_LOGIC_OPERATOR_U128_LESSER_EQUAL = 14,
-    TYPE_LOGIC_OPERATOR_U128_EQUAL = 15,
-    TYPE_LOGIC_OPERATOR_EQUAL = 16, // TYPE&DATA(vector<u8>) MUST BE EQUAL
-    TYPE_LOGIC_OPERATOR_HAS_SUBSTRING = 17, // SUBSTRING
+    TYPE_LOGIC_AS_U256_GREATER = 11,
+    TYPE_LOGIC_AS_U256_GREATER_EQUAL = 12,
+    TYPE_LOGIC_AS_U256_LESSER = 13,
+    TYPE_LOGIC_AS_U256_LESSER_EQUAL = 14,
+    TYPE_LOGIC_AS_U256_EQUAL = 15,
+    TYPE_LOGIC_EQUAL = 16, // TYPE&DATA(vector<u8>) MUST BE EQUAL
+    TYPE_LOGIC_HAS_SUBSTRING = 17, // SUBSTRING
     TYPE_LOGIC_ALWAYS_TRUE = 18, // aways true
-}
+    TYPE_LOGIC_NOT = 19, // NOT
+    TYPE_LOGIC_AND = 20, // AND
+    TYPE_LOGIC_OR = 21, // OR
+}       
 
-export enum ContextType {
-    TYPE_CONTEXT_SIGNER  = 60,
-    TYPE_CONTEXT_CLOCK = 61,
-    TYPE_CONTEXT_FUTURE_ID = 62, 
-    
-    TYPE_CONTEXT_bool = 70,
-    TYPE_CONTEXT_address = 71,
-    TYPE_CONTEXT_u64 = 72,
-    TYPE_CONTEXT_u8 = 73,
-    TYPE_CONTEXT_vec_u8 = 74,
- /*   TYPE_CONTEXT_u128 = 75,
-    TYPE_CONTEXT_vec_address = 76,
-    TYPE_CONTEXT_vec_bool = 77,
-    TYPE_CONTEXT_vec_vec_u8 = 78,
-    TYPE_CONTEXT_vec_u64 = 79,
-    TYPE_CONTEXT_vec_u128 = 80,
-    TYPE_CONTEXT_option_address = 81,
-    TYPE_CONTEXT_option_bool = 82,
-    TYPE_CONTEXT_option_u8 = 83,
-    TYPE_CONTEXT_option_u64 = 84,
-    TYPE_CONTEXT_option_u128 = 85,*/
+export enum ValueType {
+    TYPE_BOOL = 100,
+    TYPE_ADDRESS = 101,
+    TYPE_U64 = 102,
+    TYPE_U8 = 103,
+    TYPE_VEC_U8 = 104,
+    TYPE_U128 = 105,
+    TYPE_VEC_ADDRESS = 106,
+    TYPE_VEC_BOOL = 107,
+    TYPE_VEC_VEC_U8 = 108,
+    TYPE_VEC_U64 = 109,
+    TYPE_VEC_U128 = 110,
+    TYPE_OPTION_ADDRESS = 111,
+    TYPE_OPTION_BOOL = 112,
+    TYPE_OPTION_U8 = 113,
+    TYPE_OPTION_U64 = 114,
+    TYPE_OPTION_U128 = 115,
+    TYPE_U256 = 116,
 }
 
-export enum ValueType {
-    TYPE_STATIC_bool = 100,
-    TYPE_STATIC_address = 101,
-    TYPE_STATIC_u64 = 102,
-    TYPE_STATIC_u8 = 103,
-    TYPE_STATIC_vec_u8 = 104,
-    TYPE_STATIC_u128 = 105,
-    TYPE_STATIC_vec_address = 106,
-    TYPE_STATIC_vec_bool = 107,
-    TYPE_STATIC_vec_vec_u8 = 108,
-    TYPE_STATIC_vec_u64 = 109,
-    TYPE_STATIC_vec_u128 = 110,
-    TYPE_STATIC_option_address = 111,
-    TYPE_STATIC_option_bool = 112,
-    TYPE_STATIC_option_u8 = 113,
-    TYPE_STATIC_option_u64 = 114,
-    TYPE_STATIC_option_u128 = 115,
+export enum ContextType {
+    TYPE_SIGNER  = 60,
+    TYPE_CLOCK = 61,
+    TYPE_WITNESS_ID = 62, 
+    TYPE_VARIABLE = 80,
 }
 
+export type VariableType = ValueType | ContextType.TYPE_WITNESS_ID;
 export type Data_Type = ValueType | OperatorType | ContextType;
 
 export enum ENTRYPOINT {
@@ -128,8 +115,7 @@ export class Protocol {
     protected graphql = '';
     protected txb: TransactionBlock | undefined;
 
-    constructor(network:ENTRYPOINT, signer_address:string) {
-        this.signer = signer_address;
+    constructor(network:ENTRYPOINT=ENTRYPOINT.testnet) {
         this.UseNetwork(network);
         this.NewSession();
     }
@@ -143,7 +129,7 @@ export class Protocol {
             case ENTRYPOINT.devnet:
                 break;
             case ENTRYPOINT.testnet:
-                this.package = "0x142a896540e7bb2858ca8a3ec6194511e409a7d81225abddf84ae58fd4764735";
+                this.package = "0xffd87461cb8e54e0ae612a0d6a323d8c6fb4a85933e7481d3f4926ced3e6d7c7";
                 this.everyone_guard = "0x78a41fcc4f566360839613f6b917fb101ae015e56b43143f496f265b6422fddc";
                 this.graphql = 'https://sui-testnet.mystenlabs.com/graphql';
                 break;
@@ -183,7 +169,6 @@ export class Protocol {
     ServiceFn = (fn: any) => { return `${this.package}::${MODULES.service}::${fn}`};
     WowokFn = (fn: any) => { return `${this.package}::${MODULES.wowok}::${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);
@@ -196,6 +181,11 @@ export class Protocol {
         }   
         return res;
     } 
+    Query_Raw = async (objects: string[], options:SuiObjectDataOptions={showContent:true}) : Promise<SuiObjectResponse[]> => {
+        const client =  new SuiClient({ url: this.NetworkUrl() });  
+        return await client.call('sui_multiGetObjects', [objects, options]) as SuiObjectResponse[];
+    }
+
     NewSession = () : TransactionBlock => {
         this.txb = new  TransactionBlock();
         return this.txb
@@ -248,7 +238,12 @@ export class Protocol {
         { return this.package + '::' + key + '::'; })
     object_name_from_type_repr = (type_repr:string) : string => {
         let i = type_repr.indexOf('::');
-        if (i > 0 && type_repr.slice(0, i).includes(this.package)) {
+        if (i > 0 && type_repr.slice(0, i) === this.package) {
+            i = type_repr.indexOf('<');
+            if (i > 0) {
+                type_repr = type_repr.slice(0, i);
+            }
+            
             let n = type_repr.lastIndexOf('::');
             if (n > 0) {
                 return type_repr.slice(n+2);
@@ -296,7 +291,7 @@ export class RpcResultParser {
 export type Query_Param = {
     objectid: string;
     callback: (protocol:Protocol, response:SuiObjectResponse, param:Query_Param, option:SuiObjectDataOptions)=>void;
-    parser?: (result:any[], guardid: string, chain_sense_bsc:Uint8Array, variable?:VariableType)  => boolean;
+    parser?: (result:any[], guardid: string, chain_sense_bsc:Uint8Array, variable?:GuardVariable)  => boolean;
     data?: any; // response data filted by callback
-    variables?: VariableType;
+    variables?: GuardVariable;
 };

package/src/repository.ts

@@ -139,6 +139,74 @@ export class Repository {
             ],
         })  
     }
+    add_reference(references:string[], passport?:PassportObject) {
+        if (!references) {
+            ERROR(Errors.InvalidParam, 'references')
+        }
+
+        if (!IsValidArray(references, IsValidAddress)) {
+            ERROR(Errors.IsValidArray, 'references')
+        }
+
+        let txb = this.protocol.CurrentSession();
+        if (passport) {
+            txb.moveCall({
+                target:this.protocol.RepositoryFn('reference_add_with_passport') as FnCallType,
+                arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), 
+                    txb.pure(array_unique(references), 'vector<address>'),
+                    Protocol.TXB_OBJECT(txb, this.permission)]
+            })      
+        } else {
+            txb.moveCall({
+                target:this.protocol.RepositoryFn('reference_add') as FnCallType,
+                arguments:[Protocol.TXB_OBJECT(txb, this.object), 
+                    txb.pure(array_unique(references), 'vector<address>'),
+                    Protocol.TXB_OBJECT(txb, this.permission)]
+            })  
+        }
+    }
+    remove_reference(references:string[], removeall?:boolean, passport?:PassportObject) {
+        if (!references) {
+            ERROR(Errors.InvalidParam, 'references')
+        }
+
+        if (!IsValidArray(references, IsValidAddress)) {
+            ERROR(Errors.IsValidArray, 'references')
+        }
+
+        let txb = this.protocol.CurrentSession();
+        if (removeall) {
+            if (passport) {
+                txb.moveCall({
+                    target:this.protocol.RepositoryFn('reference_removeall_with_passport') as FnCallType,
+                    arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), 
+                        Protocol.TXB_OBJECT(txb, this.permission)]
+                })      
+            } else {
+                txb.moveCall({
+                    target:this.protocol.RepositoryFn('reference_removeall') as FnCallType,
+                    arguments:[Protocol.TXB_OBJECT(txb, this.object), 
+                        Protocol.TXB_OBJECT(txb, this.permission)]
+                })  
+            }            
+        } else {
+            if (passport) {
+                txb.moveCall({
+                    target:this.protocol.RepositoryFn('reference_remove_with_passport') as FnCallType,
+                    arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), 
+                        txb.pure(array_unique(references), 'vector<address>'),
+                        Protocol.TXB_OBJECT(txb, this.permission)]
+                })      
+            } else {
+                txb.moveCall({
+                    target:this.protocol.RepositoryFn('reference_remove') as FnCallType,
+                    arguments:[Protocol.TXB_OBJECT(txb, this.object), 
+                        txb.pure(array_unique(references), 'vector<address>'),
+                        Protocol.TXB_OBJECT(txb, this.permission)]
+                })  
+            }  
+        }
+    }
     // add or modify the old 
     add_policies(policies:Repository_Policy[], passport?:PassportObject)  {
         if (!policies) {

package/src/utils.ts

@@ -118,6 +118,12 @@ export class Bcs {
     ser_u64(data:number) : Uint8Array {
         return this.bcs.ser(BCS.U64, data).toBytes();
     }
+    ser_u128(data:number) : Uint8Array {
+        return this.bcs.ser(BCS.U128, data).toBytes();
+    }
+    ser_u256(data:number) : Uint8Array {
+        return this.bcs.ser(BCS.U256, data).toBytes();
+    }
     ser_string(data:string) : Uint8Array {
         return this.bcs.ser(BCS.STRING, data).toBytes();
     }
@@ -197,3 +203,39 @@ export const IsValidArray = (arr: any[], validFunc:any) : boolean => {
 
 export const OptionNone = (txb:TransactionBlock) : TransactionArgument => { return txb.pure([], BCS.U8) };
 
+export type ArgType = {
+    isCoin: boolean;
+    coin: string;
+    token: string;
+}
+export const ParseType = (type:string) : ArgType => {
+    let i = type.indexOf('<');
+    if (i > 0 && type.length > 12) {
+        let c = type.slice(0, i);
+        if (c === '0x2::coin::Coin' || c === '0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin') {
+            let coin = type.slice(i+1, type.length-1); // < >>
+            let t = coin.lastIndexOf('::');
+            return {isCoin:true, coin:coin, token:coin.slice(t+2)}
+        }
+    }
+    return  {isCoin:false, coin:'', token:''}
+}
+
+export function toFixed(x:number) {
+    let res = '';
+    if (Math.abs(x) < 1.0) {
+      var e = parseInt(x.toString().split('e-')[1]);
+      if (e) {
+          x *= Math.pow(10,e-1);
+          res = '0.' + (new Array(e)).join('0') + x.toString().substring(2);
+      }
+    } else {
+      var e = parseInt(x.toString().split('+')[1]);
+      if (e > 20) {
+          e -= 20;
+          x /= Math.pow(10,e);
+          res = x + (new Array(e+1)).join('0');
+      }
+    }
+    return res;
+  }

package/tsconfig.json

@@ -1,7 +1,7 @@
 {
     "compilerOptions": {
       /* Visit https://aka.ms/tsconfig to read more about this file */
-      // "outDir": "out", // 输出的文件夹
+      // "outDir": "out", 
       // "sourceMap": true,
       /* Projects */
       // "incremental": true,                              /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
@@ -14,7 +14,8 @@
       /* Language and Environment */
         "target": "ESNext",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
         "lib": ["es2020", "DOM"],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
-      // "jsx": "preserve",                                /* Specify what JSX code is generated. */
+        "downlevelIteration": true,
+        // "jsx": "preserve",                                /* Specify what JSX code is generated. */
       // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */
       // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
       // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */