wowok 1.1.0 → 1.1.2

package/src/repository.ts

@@ -1,7 +1,7 @@
 import { BCS } from '@mysten/bcs';
 import { Protocol, FnCallType, ValueType, RepositoryObject, RepositoryAddress, PermissionObject, PassportObject, TxbObject} from './protocol';
 import { PermissionIndexType, Permission } from './permission'
-import { BCS_CONVERT, array_unique, IsValidDesription, IsValidAddress, IsValidArray, OptionNone,  } from './utils';
+import { Bcs, array_unique, IsValidDesription, IsValidAddress, IsValidArray, OptionNone,  } from './utils';
 import { ERROR, Errors } from './exception';
 
 export enum Repository_Policy_Mode {
@@ -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) {
@@ -157,7 +225,7 @@ export class Repository {
 
         let txb = this.protocol.CurrentSession();
         policies.forEach((policy) => {
-            let permission_index = policy?.permission ? txb.pure(BCS_CONVERT.ser_option_u64(policy.permission)) : OptionNone(txb);
+            let permission_index = policy?.permission ? txb.pure(Bcs.getInstance().ser_option_u64(policy.permission)) : OptionNone(txb);
             if (passport) {
                 txb.moveCall({
                     target:this.protocol.RepositoryFn('policy_add_with_passport') as FnCallType,
@@ -199,7 +267,7 @@ export class Repository {
                 txb.moveCall({
                     target:this.protocol.RepositoryFn('policy_remove_with_passport') as FnCallType,
                     arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), 
-                        txb.pure(BCS_CONVERT.ser_vector_string(array_unique(policy_keys))), 
+                        txb.pure(Bcs.getInstance().ser_vector_string(array_unique(policy_keys))), 
                         Protocol.TXB_OBJECT(txb, this.permission)]
                 })                
             }
@@ -213,7 +281,7 @@ export class Repository {
                 txb.moveCall({
                     target:this.protocol.RepositoryFn('policy_remove') as FnCallType,
                     arguments:[Protocol.TXB_OBJECT(txb, this.object), 
-                        txb.pure(BCS_CONVERT.ser_vector_string(array_unique(policy_keys))), 
+                        txb.pure(Bcs.getInstance().ser_vector_string(array_unique(policy_keys))), 
                         Protocol.TXB_OBJECT(txb, this.permission)]
                 })                
             }
@@ -293,7 +361,7 @@ export class Repository {
             if(!Permission.IsValidPermissionIndex(permission_index)) {
                 ERROR(Errors.IsValidPermissionIndex)
             }
-            index = txb.pure(BCS_CONVERT.ser_option_u64(permission_index));
+            index = txb.pure(Bcs.getInstance().ser_option_u64(permission_index));
         }
 
         if (passport) {

package/src/service.ts

@@ -1,5 +1,5 @@
 import { bcs, BCS, toHEX, fromHEX, getSuiMoveConfig } from '@mysten/bcs';
-import { IsValidArray, IsValidPercent, IsValidName_AllowEmpty, BCS_CONVERT, array_unique, IsValidArgType, IsValidDesription, 
+import { IsValidArray, IsValidPercent, IsValidName_AllowEmpty, Bcs, array_unique, IsValidArgType, IsValidDesription, 
     IsValidAddress, IsValidEndpoint, OptionNone, IsValidUint, IsValidInt, IsValidName, } from './utils'
 import { FnCallType, GuardObject, PassportObject, PermissionObject, RepositoryObject, MachineObject, ServiceAddress, 
     ServiceObject, DiscountObject, OrderObject, OrderAddress, CoinObject, Protocol, 
@@ -95,7 +95,7 @@ export class Service {
         }
 
         let txb = protocol.CurrentSession();
-        let ep = endpoint? txb.pure(BCS_CONVERT.ser_option_string(endpoint)) : OptionNone(txb);
+        let ep = endpoint? txb.pure(Bcs.getInstance().ser_option_string(endpoint)) : OptionNone(txb);
         
         if (passport) {
             s.object = txb.moveCall({
@@ -499,16 +499,16 @@ export class Service {
         if (passport) {
             txb.moveCall({
                 target:this.protocol.ServiceFn('sales_add_with_passport') as FnCallType,
-                arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), txb.pure(BCS_CONVERT.ser_vector_string(names)), 
-                    txb.pure(BCS_CONVERT.ser_vector_u64(price)), txb.pure(BCS_CONVERT.ser_vector_u64(stock)), 
+                arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser_vector_string(names)), 
+                    txb.pure(Bcs.getInstance().ser_vector_u64(price)), txb.pure(Bcs.getInstance().ser_vector_u64(stock)), 
                     Protocol.TXB_OBJECT(txb, this.permission)],
                 typeArguments:[this.pay_token_type]
             })
         } else {
             txb.moveCall({
                 target:this.protocol.ServiceFn('sales_add') as FnCallType,
-                arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(BCS_CONVERT.ser_vector_string(names)), 
-                    txb.pure(BCS_CONVERT.ser_vector_u64(price)), txb.pure(BCS_CONVERT.ser_vector_u64(stock)), 
+                arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser_vector_string(names)), 
+                    txb.pure(Bcs.getInstance().ser_vector_u64(price)), txb.pure(Bcs.getInstance().ser_vector_u64(stock)), 
                     Protocol.TXB_OBJECT(txb, this.permission)],
                 typeArguments:[this.pay_token_type]
             })
@@ -534,7 +534,7 @@ export class Service {
             } else {
                 txb.moveCall({
                     target:this.protocol.ServiceFn('sales_remove_with_passport') as FnCallType,
-                    arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), txb.pure(BCS_CONVERT.ser_vector_string(array_unique(sales!))), 
+                    arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser_vector_string(array_unique(sales!))), 
                         Protocol.TXB_OBJECT(txb, this.permission)],
                     typeArguments:[this.pay_token_type]
                 })            
@@ -549,7 +549,7 @@ export class Service {
             } else {
                 txb.moveCall({
                     target:this.protocol.ServiceFn('sales_remove') as FnCallType,
-                    arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(BCS_CONVERT.ser_vector_string(array_unique(sales!))), 
+                    arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser_vector_string(array_unique(sales!))), 
                         Protocol.TXB_OBJECT(txb, this.permission)],
                     typeArguments:[this.pay_token_type]
                 })            
@@ -579,9 +579,9 @@ export class Service {
         let txb = this.protocol.CurrentSession();
         discount_dispatch.forEach((discount) => {
             let price_greater = discount.discount?.price_greater ? 
-                txb.pure(BCS_CONVERT.ser_option_u64(discount.discount.price_greater)) : OptionNone(txb);
+                txb.pure(Bcs.getInstance().ser_option_u64(discount.discount.price_greater)) : OptionNone(txb);
             let time_start = discount.discount?.time_start ? 
-                txb.pure(BCS_CONVERT.ser_option_u64(discount.discount.time_start)) : OptionNone(txb);
+                txb.pure(Bcs.getInstance().ser_option_u64(discount.discount.time_start)) : OptionNone(txb);
 
             if (passport) {
                 txb.moveCall({
@@ -700,7 +700,7 @@ export class Service {
         }
 
         let txb = this.protocol.CurrentSession();
-        let ep = endpoint? txb.pure(BCS_CONVERT.ser_option_string(endpoint)) : OptionNone(txb);
+        let ep = endpoint? txb.pure(Bcs.getInstance().ser_option_string(endpoint)) : OptionNone(txb);
         
         if (passport) {
             txb.moveCall({
@@ -763,7 +763,7 @@ export class Service {
             txb.moveCall({
                 target:this.protocol.ServiceFn('required_set_with_passport') as FnCallType,
                 arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), 
-                    txb.pure(BCS_CONVERT.ser_vector_vector_u8(array_unique(customer_required))), 
+                    txb.pure(Bcs.getInstance().ser_vector_vector_u8(array_unique(customer_required))), 
                     txb.pure(pubkey, 'vector<u8>'), Protocol.TXB_OBJECT(txb, this.permission)],
                 typeArguments:[this.pay_token_type]
             })         
@@ -771,7 +771,7 @@ export class Service {
             txb.moveCall({
                 target:this.protocol.ServiceFn('required_set') as FnCallType,
                 arguments:[Protocol.TXB_OBJECT(txb, this.object), 
-                    txb.pure(BCS_CONVERT.ser_vector_vector_u8(array_unique(customer_required))), 
+                    txb.pure(Bcs.getInstance().ser_vector_vector_u8(array_unique(customer_required))), 
                     txb.pure(pubkey, 'vector<u8>'), Protocol.TXB_OBJECT(txb, this.permission)],
                 typeArguments:[this.pay_token_type]
             })         
@@ -892,7 +892,7 @@ export class Service {
             arguments:[Protocol.TXB_OBJECT(txb, this.object), Protocol.TXB_OBJECT(txb, order), 
                 txb.pure(customer_info_crypto.pubkey, 'vector<u8>'), 
                 txb.pure(customer_info_crypto.customer_pubkey, 'vector<u8>'), 
-                txb.pure(BCS_CONVERT.ser_vector_vector_u8(array_unique(customer_info_crypto.customer_info_crypt)))],
+                txb.pure(Bcs.getInstance().ser_vector_vector_u8(array_unique(customer_info_crypto.customer_info_crypt)))],
             typeArguments:[this.pay_token_type]
         })    
         
@@ -924,16 +924,16 @@ export class Service {
             if (discount) {
                 order = txb.moveCall({
                     target:this.protocol.ServiceFn('dicount_buy_with_passport') as FnCallType,
-                    arguments: [passport, Protocol.TXB_OBJECT(txb, this.object), txb.pure(BCS_CONVERT.ser_vector_string(name)), 
-                        txb.pure(BCS_CONVERT.ser_vector_u64(price)), txb.pure(BCS_CONVERT.ser_vector_u64(stock)), 
+                    arguments: [passport, Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser_vector_string(name)), 
+                        txb.pure(Bcs.getInstance().ser_vector_u64(price)), txb.pure(Bcs.getInstance().ser_vector_u64(stock)), 
                         Protocol.TXB_OBJECT(txb, coin), Protocol.TXB_OBJECT(txb, discount), txb.object(Protocol.CLOCK_OBJECT)],                   
                     typeArguments:[this.pay_token_type]            
             })} else {
                 order = txb.moveCall({
                     target:this.protocol.ServiceFn('buy_with_passport') as FnCallType,
-                    arguments: [passport, Protocol.TXB_OBJECT(txb, this.object), txb.pure(BCS_CONVERT.ser_vector_string(name)), 
-                        txb.pure(BCS_CONVERT.ser_vector_u64(price)), 
-                        txb.pure(BCS_CONVERT.ser_vector_u64(stock)), 
+                    arguments: [passport, Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser_vector_string(name)), 
+                        txb.pure(Bcs.getInstance().ser_vector_u64(price)), 
+                        txb.pure(Bcs.getInstance().ser_vector_u64(stock)), 
                         Protocol.TXB_OBJECT(txb, coin)],
                     typeArguments:[this.pay_token_type]            
             })}             
@@ -941,18 +941,18 @@ export class Service {
             if (discount) {
                 order = txb.moveCall({
                     target:this.protocol.ServiceFn('disoucnt_buy') as FnCallType,
-                    arguments: [Protocol.TXB_OBJECT(txb, this.object), txb.pure(BCS_CONVERT.ser_vector_string(name)), 
-                        txb.pure(BCS_CONVERT.ser_vector_u64(price)), 
-                        txb.pure(BCS_CONVERT.ser_vector_u64(stock)), 
+                    arguments: [Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser_vector_string(name)), 
+                        txb.pure(Bcs.getInstance().ser_vector_u64(price)), 
+                        txb.pure(Bcs.getInstance().ser_vector_u64(stock)), 
                         Protocol.TXB_OBJECT(txb, coin), 
                         Protocol.TXB_OBJECT(txb, discount), txb.object(Protocol.CLOCK_OBJECT)],                
                     typeArguments:[this.pay_token_type]            
             })} else {
                 order = txb.moveCall({
                     target:this.protocol.ServiceFn('buy') as FnCallType,
-                    arguments: [Protocol.TXB_OBJECT(txb, this.object), txb.pure(BCS_CONVERT.ser_vector_string(name)), 
-                        txb.pure(BCS_CONVERT.ser_vector_u64(price)), 
-                        txb.pure(BCS_CONVERT.ser_vector_u64(stock)), 
+                    arguments: [Protocol.TXB_OBJECT(txb, this.object), txb.pure(Bcs.getInstance().ser_vector_string(name)), 
+                        txb.pure(Bcs.getInstance().ser_vector_u64(price)), 
+                        txb.pure(Bcs.getInstance().ser_vector_u64(stock)), 
                         Protocol.TXB_OBJECT(txb, coin)],
                     typeArguments:[this.pay_token_type]            
             })}           

package/src/utils.ts

@@ -72,12 +72,19 @@ export function parse_object_type(object_data:string) : string[] {
 
 export class Bcs {
     bcs = new BCS(getSuiMoveConfig());
-    constructor() {
+    private static _instance : any;
+    private constructor() {
         this.bcs.registerEnumType('Option<T>', {
             'none': null,
             'some': 'T',
         });
     }
+    static getInstance() : Bcs { 
+        if (!Bcs._instance) {
+            Bcs._instance =  new Bcs();
+        };
+        return Bcs._instance;
+     }
     ser_option_string(data:string) : Uint8Array {
         return this.bcs.ser('Option<string>', {'some': data}).toBytes();
     }
@@ -119,9 +126,6 @@ export class Bcs {
     }
 }
 
-export const BCS_CONVERT = new Bcs();
-
-
 export function stringToUint8Array(str:string) : Uint8Array {
     var arr = [];
     for (var i = 0, j = str.length; i < j; ++i) {
@@ -193,3 +197,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/src/vote.ts

@@ -1,6 +1,6 @@
 import { BCS } from '@mysten/bcs';
 import { FnCallType, PassportObject, PermissionObject, GuardObject, VoteAddress, Protocol, TxbObject} from './protocol';
-import { IsValidDesription, IsValidUint, IsValidAddress, OptionNone, BCS_CONVERT, array_unique, IsValidArray, IsValidName } from './utils';
+import { IsValidDesription, IsValidUint, IsValidAddress, OptionNone, Bcs, array_unique, IsValidArray, IsValidName } from './utils';
 import { ERROR, Errors } from './exception';
 
 export const MAX_AGREES_COUNT = 200;
@@ -50,7 +50,7 @@ export class Vote {
         }
 
         let txb  = protocol.CurrentSession();
-        let reference = reference_address?  txb.pure(BCS_CONVERT.ser_option_address(reference_address)) : OptionNone(txb);
+        let reference = reference_address?  txb.pure(Bcs.getInstance().ser_option_address(reference_address)) : OptionNone(txb);
         let choice_count = max_choice_count ? max_choice_count : 1;
 
         if (passport) {
@@ -111,7 +111,7 @@ export class Vote {
         }
 
         let txb = this.protocol.CurrentSession();
-        let reference = reference_address?  txb.pure(BCS_CONVERT.ser_option_address(reference_address)) : OptionNone(txb); 
+        let reference = reference_address?  txb.pure(Bcs.getInstance().ser_option_address(reference_address)) : OptionNone(txb); 
         if (passport) {
             txb.moveCall({
                 target:this.protocol.VoteFn('reference_set_with_passport') as FnCallType,
@@ -206,7 +206,7 @@ export class Vote {
         let txb = this.protocol.CurrentSession();
         options.forEach((option) => {
             let reference = option?.reference_address ? 
-                txb.pure(BCS_CONVERT.ser_option_address(option.reference_address)) : 
+                txb.pure(Bcs.getInstance().ser_option_address(option.reference_address)) : 
                 OptionNone(txb); 
 
             if (passport) {
@@ -243,7 +243,7 @@ export class Vote {
                 txb.moveCall({
                     target:this.protocol.VoteFn('agrees_remove_with_passport') as FnCallType,
                     arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), 
-                        txb.pure(BCS_CONVERT.ser_vector_string(array_unique(options))), 
+                        txb.pure(Bcs.getInstance().ser_vector_string(array_unique(options))), 
                         Protocol.TXB_OBJECT(txb, this.permission)]
                 })             
             }
@@ -257,7 +257,7 @@ export class Vote {
                 txb.moveCall({
                     target:this.protocol.VoteFn('agrees_remove') as FnCallType,
                     arguments:[Protocol.TXB_OBJECT(txb, this.object), 
-                        txb.pure(BCS_CONVERT.ser_vector_string(array_unique(options))), 
+                        txb.pure(Bcs.getInstance().ser_vector_string(array_unique(options))), 
                         Protocol.TXB_OBJECT(txb, this.permission)]
                 })        
             }
@@ -359,13 +359,13 @@ export class Vote {
             txb.moveCall({
                 target:this.protocol.VoteFn('with_passport') as FnCallType,
                 arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), 
-                    txb.pure(BCS_CONVERT.ser_vector_string(array_unique(options)))]
+                    txb.pure(Bcs.getInstance().ser_vector_string(array_unique(options)))]
             })  
         } else {
             txb.moveCall({
                 target:this.protocol.VoteFn('this.object') as FnCallType,
                 arguments:[Protocol.TXB_OBJECT(txb, this.object), 
-                    txb.pure(BCS_CONVERT.ser_vector_string(array_unique(options)))]
+                    txb.pure(Bcs.getInstance().ser_vector_string(array_unique(options)))]
             })           
         }
         

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'. */