npm - wowok - Versions diffs - 1.2.10 → 1.2.12 - Mend

wowok 1.2.10 → 1.2.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

package/src/repository.ts CHANGED Viewed

@@ -1,9 +1,10 @@
 import { BCS } from '@mysten/bcs';
 import { Protocol, FnCallType, ValueType, RepositoryValueType, RepositoryAddress, PermissionObject, PassportObject, TxbObject} from './protocol';
 import { PermissionIndexType, Permission } from './permission'
-import { Bcs, array_unique, IsValidDesription, IsValidAddress, IsValidArray, OptionNone, IsValidName,  ValueTypeConvert} from './utils';
+import { Bcs, array_unique, IsValidDesription, IsValidAddress, IsValidArray, IsValidName,  ValueTypeConvert} from './utils';
 import { ERROR, Errors } from './exception';
 import { MAX_U8, MAX_U128, MAX_U256, MAX_U64 } from './utils';
+import { type TransactionResult, Transaction as TransactionBlock } from '@mysten/sui/transactions';
 export enum Repository_Policy_Mode {
     POLICY_MODE_FREE = 0,
@@ -37,20 +38,20 @@ export type Repository_Value = {
 export class Repository {
     protected permission ;
     protected object:TxbObject;
-    protected protocol;
+    protected txb;
     get_object() { return this.object }
-    private constructor(protocol:Protocol, permission:PermissionObject) {
-        this.protocol = protocol;
+    private constructor(txb:TransactionBlock, permission:PermissionObject) {
+        this.txb = txb;
         this.permission = permission;
         this.object = '';
     }
-    static From(protocol:Protocol, permission:PermissionObject, object:TxbObject) : Repository {
-        let r = new Repository(protocol, permission);
-        r.object = Protocol.TXB_OBJECT(protocol.CurrentSession(), object);
+    static From(txb:TransactionBlock, permission:PermissionObject, object:TxbObject) : Repository {
+        let r = new Repository(txb, permission);
+        r.object = Protocol.TXB_OBJECT(txb, object);
         return r
     }
-    static New(protocol:Protocol, permission:PermissionObject, description:string,
+    static New(txb:TransactionBlock, permission:PermissionObject, description:string,
         policy_mode: Repository_Policy_Mode, passport?:PassportObject) : Repository {
         if (!Protocol.IsValidObjects([permission])) {
             ERROR(Errors.IsValidObjects, 'permission')
@@ -59,36 +60,34 @@ export class Repository {
             ERROR(Errors.IsValidDesription)
         }
-        let r = new Repository(protocol, permission);
-        let txb = protocol.CurrentSession();
+        let r = new Repository(txb, permission);
         if (passport) {
             r.object = txb.moveCall({
-                target:protocol.RepositoryFn('new_with_passport') as FnCallType,
-                arguments:[passport, txb.pure(description), txb.pure(policy_mode, BCS.U8), Protocol.TXB_OBJECT(txb, permission)],
+                target:Protocol.Instance().RepositoryFn('new_with_passport') as FnCallType,
+                arguments:[passport, txb.pure.string(description), txb.pure.u8(policy_mode), Protocol.TXB_OBJECT(txb, permission)],
             })
         } else {
             r.object = txb.moveCall({
-                target:protocol.RepositoryFn('new') as FnCallType,
-                arguments:[txb.pure(description), txb.pure(policy_mode, BCS.U8), Protocol.TXB_OBJECT(txb, permission)],
+                target:Protocol.Instance().RepositoryFn('new') as FnCallType,
+                arguments:[txb.pure.string(description), txb.pure.u8(policy_mode), Protocol.TXB_OBJECT(txb, permission)],
             })
         }
         return r
     }
     launch() : RepositoryAddress {
-        let txb = this.protocol.CurrentSession();
-        return txb.moveCall({
-            target:this.protocol.RepositoryFn('create') as FnCallType,
-            arguments:[Protocol.TXB_OBJECT(txb, this.object)],
+        return this.txb.moveCall({
+            target:Protocol.Instance().RepositoryFn('create') as FnCallType,
+            arguments:[Protocol.TXB_OBJECT(this.txb, this.object)],
         })
     }
     destroy()  {
         if (!Protocol.IsValidObjects([this.object])) return false;
-        let txb = this.protocol.CurrentSession();
-        txb.moveCall({
-            target:this.protocol.RepositoryFn('destroy') as FnCallType,
-            arguments: [Protocol.TXB_OBJECT(txb, this.object)],
+        this.txb.moveCall({
+            target:Protocol.Instance().RepositoryFn('destroy') as FnCallType,
+            arguments: [Protocol.TXB_OBJECT(this.txb, this.object)],
         })
     }
@@ -105,27 +104,26 @@ export class Repository {
         if (!bValid) {
             ERROR(Errors.InvalidParam)
         }
-        let txb = this.protocol.CurrentSession();
-        if (data?.value_type) {
-            data.data.forEach((d) => txb.moveCall({
-                target:this.protocol.RepositoryFn('add') as FnCallType,
-                arguments:[Protocol.TXB_OBJECT(txb, this.object),
-                    txb.pure(d.address, BCS.ADDRESS),
-                    txb.pure(data.key),
-                    txb.pure(data.value_type, BCS.U8),
-                    txb.pure([...d.bcsBytes], 'vector<u8>'),
-                    Protocol.TXB_OBJECT(txb, this.permission),
+        if (data?.value_type !== undefined) {
+            data.data.forEach((d) => this.txb.moveCall({
+                target:Protocol.Instance().RepositoryFn('add') as FnCallType,
+                arguments:[Protocol.TXB_OBJECT(this.txb, this.object),
+                    this.txb.pure.address(d.address),
+                    this.txb.pure.string(data.key),
+                    this.txb.pure.u8(data.value_type!),
+                    this.txb.pure.vector('u8', [...d.bcsBytes]),
+                    Protocol.TXB_OBJECT(this.txb, this.permission),
                 ],
             }))
         } else {
-            data.data.forEach((d) => txb.moveCall({
-                target:this.protocol.RepositoryFn('add_typed_data') as FnCallType,
-                arguments:[Protocol.TXB_OBJECT(txb, this.object),
-                    txb.pure(d.address, BCS.ADDRESS),
-                    txb.pure(data.key),
-                    txb.pure([...d.bcsBytes], 'vector<u8>'),
-                    Protocol.TXB_OBJECT(txb, this.permission),
+            data.data.forEach((d) => this.txb.moveCall({
+                target:Protocol.Instance().RepositoryFn('add_typed_data') as FnCallType,
+                arguments:[Protocol.TXB_OBJECT(this.txb, this.object),
+                    this.txb.pure.address(d.address),
+                    this.txb.pure.string(data.key),
+                    this.txb.pure.vector('u8', [...d.bcsBytes]),
+                    Protocol.TXB_OBJECT(this.txb, this.permission),
                 ],
             }))
         }
@@ -138,14 +136,13 @@ export class Repository {
         if (!IsValidAddress(address)) {
             ERROR(Errors.IsValidAddress)
         }
-        let txb = this.protocol.CurrentSession();
-        txb.moveCall({
-            target:this.protocol.RepositoryFn('remove') as FnCallType,
-            arguments:[Protocol.TXB_OBJECT(txb, this.object),
-                txb.pure(address, BCS.ADDRESS),
-                txb.pure(key),
-                Protocol.TXB_OBJECT(txb, this.permission),
+        this.txb.moveCall({
+            target:Protocol.Instance().RepositoryFn('remove') as FnCallType,
+            arguments:[Protocol.TXB_OBJECT(this.txb, this.object),
+                this.txb.pure.address(address),
+                this.txb.pure.string(key),
+                Protocol.TXB_OBJECT(this.txb, this.permission),
             ],
         })
     }
@@ -154,21 +151,20 @@ export class Repository {
         if (!IsValidArray(references, IsValidAddress)) {
             ERROR(Errors.IsValidArray, 'add_reference')
         }
-        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)]
+            this.txb.moveCall({
+                target:Protocol.Instance().RepositoryFn('reference_add_with_passport') as FnCallType,
+                arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object),
+                    this.txb.pure.vector('address', array_unique(references)),
+                    Protocol.TXB_OBJECT(this.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)]
+            this.txb.moveCall({
+                target:Protocol.Instance().RepositoryFn('reference_add') as FnCallType,
+                arguments:[Protocol.TXB_OBJECT(this.txb, this.object),
+                    this.txb.pure.vector('address', array_unique(references)),
+                    Protocol.TXB_OBJECT(this.txb, this.permission)]
             })
         }
     }
@@ -178,36 +174,35 @@ export class Repository {
         if (!IsValidArray(references, IsValidAddress)) {
             ERROR(Errors.IsValidArray, 'remove_reference')
         }
-        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)]
+                this.txb.moveCall({
+                    target:Protocol.Instance().RepositoryFn('reference_removeall_with_passport') as FnCallType,
+                    arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object),
+                        Protocol.TXB_OBJECT(this.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)]
+                this.txb.moveCall({
+                    target:Protocol.Instance().RepositoryFn('reference_removeall') as FnCallType,
+                    arguments:[Protocol.TXB_OBJECT(this.txb, this.object),
+                        Protocol.TXB_OBJECT(this.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)]
+                this.txb.moveCall({
+                    target:Protocol.Instance().RepositoryFn('reference_remove_with_passport') as FnCallType,
+                    arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object),
+                        this.txb.pure.vector('address', array_unique(references)),
+                        Protocol.TXB_OBJECT(this.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)]
+                this.txb.moveCall({
+                    target:Protocol.Instance().RepositoryFn('reference_remove') as FnCallType,
+                    arguments:[Protocol.TXB_OBJECT(this.txb, this.object),
+                        this.txb.pure.vector('address', array_unique(references)),
+                        Protocol.TXB_OBJECT(this.txb, this.permission)]
                 })
             }
         }
@@ -226,26 +221,25 @@ export class Repository {
             ERROR(Errors.InvalidParam, 'policies')
         }
-        let txb = this.protocol.CurrentSession();
         policies.forEach((policy) => {
-            let permission_index = policy?.permission ? txb.pure(Bcs.getInstance().ser(ValueType.TYPE_OPTION_U64, policy.permission)) : OptionNone(txb);
+            let permission_index = this.txb.pure.option('u64', policy?.permission);
             if (passport) {
-                txb.moveCall({
-                    target:this.protocol.RepositoryFn('policy_add_with_passport') as FnCallType,
-                    arguments:[passport, Protocol.TXB_OBJECT(txb, this.object),
-                        txb.pure(policy.key),
-                        txb.pure(policy.description),
-                        permission_index, txb.pure(policy.data_type, BCS.U8),
-                        Protocol.TXB_OBJECT(txb, this.permission)]
+                this.txb.moveCall({
+                    target:Protocol.Instance().RepositoryFn('policy_add_with_passport') as FnCallType,
+                    arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object),
+                        this.txb.pure.string(policy.key),
+                        this.txb.pure.string(policy.description),
+                        permission_index, this.txb.pure.u8(policy.data_type),
+                        Protocol.TXB_OBJECT(this.txb, this.permission)]
                 })
             } else {
-                txb.moveCall({
-                    target:this.protocol.RepositoryFn('policy_add') as FnCallType,
-                    arguments:[Protocol.TXB_OBJECT(txb, this.object),
-                        txb.pure(policy.key),
-                        txb.pure(policy.description),
-                        permission_index, txb.pure(policy.data_type, BCS.U8),
-                        Protocol.TXB_OBJECT(txb, this.permission)]
+                this.txb.moveCall({
+                    target:Protocol.Instance().RepositoryFn('policy_add') as FnCallType,
+                    arguments:[Protocol.TXB_OBJECT(this.txb, this.object),
+                        this.txb.pure.string(policy.key),
+                        this.txb.pure.string(policy.description),
+                        permission_index, this.txb.pure.u8(policy.data_type),
+                        Protocol.TXB_OBJECT(this.txb, this.permission)]
                 })
             }
         });
@@ -256,21 +250,20 @@ export class Repository {
         if (!IsValidArray(policy_keys, Repository.IsValidName)){
             ERROR(Errors.InvalidParam, 'policy_keys')
         }
-        let txb = this.protocol.CurrentSession();
         if (passport) {
-            txb.moveCall({
-                target:this.protocol.RepositoryFn('policy_remove_with_passport') as FnCallType,
-                arguments:[passport, Protocol.TXB_OBJECT(txb, this.object),
-                    txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_STRING, array_unique(policy_keys))),
-                    Protocol.TXB_OBJECT(txb, this.permission)]
+            this.txb.moveCall({
+                target:Protocol.Instance().RepositoryFn('policy_remove_with_passport') as FnCallType,
+                arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object),
+                    this.txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_STRING, array_unique(policy_keys))),
+                    Protocol.TXB_OBJECT(this.txb, this.permission)]
             })
         } else {
-            txb.moveCall({
-                target:this.protocol.RepositoryFn('policy_remove') as FnCallType,
-                arguments:[Protocol.TXB_OBJECT(txb, this.object),
-                    txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_STRING, array_unique(policy_keys))),
-                    Protocol.TXB_OBJECT(txb, this.permission)]
+            this.txb.moveCall({
+                target:Protocol.Instance().RepositoryFn('policy_remove') as FnCallType,
+                arguments:[Protocol.TXB_OBJECT(this.txb, this.object),
+                    this.txb.pure(Bcs.getInstance().ser(ValueType.TYPE_VEC_STRING, array_unique(policy_keys))),
+                    Protocol.TXB_OBJECT(this.txb, this.permission)]
             })
         }
     }
@@ -278,21 +271,20 @@ export class Repository {
         if (!IsValidName(policy_key) || !IsValidName(new_policy_key)) {
             ERROR(Errors.IsValidName, 'change_policy')
         }
-        let txb = this.protocol.CurrentSession();
         if (passport) {
-            txb.moveCall({
-                target:this.protocol.RepositoryFn('policy_rename_with_passport') as FnCallType,
-                arguments:[passport, Protocol.TXB_OBJECT(txb, this.object),
-                    txb.pure(policy_key), txb.pure(new_policy_key),
-                    Protocol.TXB_OBJECT(txb, this.permission)]
+            this.txb.moveCall({
+                target:Protocol.Instance().RepositoryFn('policy_rename_with_passport') as FnCallType,
+                arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object),
+                    this.txb.pure.string(policy_key), this.txb.pure.string(new_policy_key),
+                    Protocol.TXB_OBJECT(this.txb, this.permission)]
             })
         } else {
-            txb.moveCall({
-                target:this.protocol.RepositoryFn('policy_rename') as FnCallType,
-                arguments:[Protocol.TXB_OBJECT(txb, this.object),
-                    txb.pure(policy_key), txb.pure(new_policy_key),
-                    Protocol.TXB_OBJECT(txb, this.permission)]
+            this.txb.moveCall({
+                target:Protocol.Instance().RepositoryFn('policy_rename') as FnCallType,
+                arguments:[Protocol.TXB_OBJECT(this.txb, this.object),
+                    this.txb.pure.string(policy_key), this.txb.pure.string(new_policy_key),
+                    Protocol.TXB_OBJECT(this.txb, this.permission)]
             })
         }
     }
@@ -302,33 +294,31 @@ export class Repository {
         if (!IsValidDesription(description)){
             ERROR(Errors.IsValidDesription)
         }
-        let txb = this.protocol.CurrentSession();
         if (passport) {
-            txb.moveCall({
-                target:this.protocol.RepositoryFn('description_set_with_passport') as FnCallType,
-                arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), txb.pure(description), Protocol.TXB_OBJECT(txb, this.permission)]
+            this.txb.moveCall({
+                target:Protocol.Instance().RepositoryFn('description_set_with_passport') as FnCallType,
+                arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.string(description), Protocol.TXB_OBJECT(this.txb, this.permission)]
             })
         } else {
-            txb.moveCall({
-                target:this.protocol.RepositoryFn('description_set') as FnCallType,
-                arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(description), Protocol.TXB_OBJECT(txb, this.permission)]
+            this.txb.moveCall({
+                target:Protocol.Instance().RepositoryFn('description_set') as FnCallType,
+                arguments:[Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.string(description), Protocol.TXB_OBJECT(this.txb, this.permission)]
             })
         }
     }
     set_policy_mode(policy_mode:Repository_Policy_Mode, passport?:PassportObject)  {
-        let txb = this.protocol.CurrentSession();
         if (passport) {
-            txb.moveCall({
-                target:this.protocol.RepositoryFn('policy_mode_set_with_passport') as FnCallType,
-                arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), txb.pure(policy_mode), Protocol.TXB_OBJECT(txb, this.permission)]
+            this.txb.moveCall({
+                target:Protocol.Instance().RepositoryFn('policy_mode_set_with_passport') as FnCallType,
+                arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.u8(policy_mode), Protocol.TXB_OBJECT(this.txb, this.permission)]
             })
         } else {
-            txb.moveCall({
-                target:this.protocol.RepositoryFn('policy_mode_set') as FnCallType,
-                arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(policy_mode), Protocol.TXB_OBJECT(txb, this.permission)]
+            this.txb.moveCall({
+                target:Protocol.Instance().RepositoryFn('policy_mode_set') as FnCallType,
+                arguments:[Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.u8(policy_mode), Protocol.TXB_OBJECT(this.txb, this.permission)]
             })
         }
     }
@@ -340,19 +330,18 @@ export class Repository {
         if (!IsValidDesription(description)) {
             ERROR(Errors.IsValidDesription)
         }
-        let txb = this.protocol.CurrentSession();
         if (passport) {
-            txb.moveCall({
-                target:this.protocol.RepositoryFn('policy_description_set_with_passport') as FnCallType,
-                arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), txb.pure(policy), txb.pure(description),
-                    Protocol.TXB_OBJECT(txb, this.permission)]
+            this.txb.moveCall({
+                target:Protocol.Instance().RepositoryFn('policy_description_set_with_passport') as FnCallType,
+                arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.string(policy), this.txb.pure.string(description),
+                    Protocol.TXB_OBJECT(this.txb, this.permission)]
             })
         } else {
-            txb.moveCall({
-                target:this.protocol.RepositoryFn('policy_description_set') as FnCallType,
-                arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(policy), txb.pure(description),
-                    Protocol.TXB_OBJECT(txb, this.permission)]
+            this.txb.moveCall({
+                target:Protocol.Instance().RepositoryFn('policy_description_set') as FnCallType,
+                arguments:[Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.string(policy), this.txb.pure.string(description),
+                    Protocol.TXB_OBJECT(this.txb, this.permission)]
             })
         }
     }
@@ -362,25 +351,23 @@ export class Repository {
             ERROR(Errors.IsValidName, 'policy')
         }
-        let txb = this.protocol.CurrentSession();
-        let index = OptionNone(txb);
-        if (permission_index) {
+        let index = this.txb.pure.option('u64', undefined);
+        if (permission_index !== undefined) {
             if(!Permission.IsValidPermissionIndex(permission_index)) {
                 ERROR(Errors.IsValidPermissionIndex)
             }
-            index = txb.pure(Bcs.getInstance().ser(ValueType.TYPE_OPTION_U64, permission_index));
+            index = this.txb.pure.option('u64', permission_index);
         }
         if (passport) {
-            txb.moveCall({
-                target:this.protocol.RepositoryFn('policy_permission_set_with_passport') as FnCallType,
-                arguments:[passport, Protocol.TXB_OBJECT(txb, this.object), index, Protocol.TXB_OBJECT(txb, this.permission)]
+            this.txb.moveCall({
+                target:Protocol.Instance().RepositoryFn('policy_permission_set_with_passport') as FnCallType,
+                arguments:[passport, Protocol.TXB_OBJECT(this.txb, this.object), index, Protocol.TXB_OBJECT(this.txb, this.permission)]
             })
         } else {
-            txb.moveCall({
-                target:this.protocol.RepositoryFn('policy_permission_set') as FnCallType,
-                arguments:[Protocol.TXB_OBJECT(txb, this.object), index, Protocol.TXB_OBJECT(txb, this.permission)]
+            this.txb.moveCall({
+                target:Protocol.Instance().RepositoryFn('policy_permission_set') as FnCallType,
+                arguments:[Protocol.TXB_OBJECT(this.txb, this.object), index, Protocol.TXB_OBJECT(this.txb, this.permission)]
             })
         }
     }
@@ -389,10 +376,10 @@ export class Repository {
         if (!Protocol.IsValidObjects([new_permission])) {
             ERROR(Errors.IsValidObjects)
         }
-        let txb = this.protocol.CurrentSession();
-        txb.moveCall({
-            target:this.protocol.RepositoryFn('permission_set') as FnCallType,
-            arguments: [Protocol.TXB_OBJECT(txb, this.object), Protocol.TXB_OBJECT(txb, this.permission), Protocol.TXB_OBJECT(txb, new_permission)],
+        this.txb.moveCall({
+            target:Protocol.Instance().RepositoryFn('permission_set') as FnCallType,
+            arguments: [Protocol.TXB_OBJECT(this.txb, this.object), Protocol.TXB_OBJECT(this.txb, this.permission), Protocol.TXB_OBJECT(this.txb, new_permission)],
             typeArguments:[]
         })
         this.permission = new_permission

package/src/resource.ts CHANGED Viewed

@@ -2,6 +2,8 @@ import { BCS } from '@mysten/bcs';
 import { Protocol, FnCallType, TxbObject, ResourceAddress} from './protocol';
 import { IsValidDesription, IsValidAddress, IsValidName, IsValidArray,  } from './utils';
 import { ERROR, Errors } from './exception';
+import { type TransactionResult, Transaction as TransactionBlock } from '@mysten/sui/transactions';
 export interface Tags {
     address: string;
     nick: string;
@@ -22,36 +24,35 @@ export class Resource {
     static FavorName = "favor";
     protected object:TxbObject;
-    protected protocol;
+    protected txb;
     get_object() { return this.object }
-    private constructor(protocol:Protocol) {
-        this.protocol = protocol;
+    private constructor(txb:TransactionBlock) {
+        this.txb = txb;
         this.object = '';
     }
-    static From(protocol:Protocol, object:TxbObject) : Resource {
-        let r = new Resource(protocol);
-        r.object = Protocol.TXB_OBJECT(protocol.CurrentSession(), object);
+    static From(txb:TransactionBlock, object:TxbObject) : Resource {
+        let r = new Resource(txb);
+        r.object = Protocol.TXB_OBJECT(txb, object);
         return r
     }
     launch() {
         if (!this.object) ERROR(Errors.Fail, 'launch object Invalid');
-        let txb = this.protocol.CurrentSession();
-        txb.moveCall({
-            target:this.protocol.ResourceFn('create')  as FnCallType,
-            arguments:[Protocol.TXB_OBJECT(txb, this.object)]
+        this.txb.moveCall({
+            target:Protocol.Instance().ResourceFn('create')  as FnCallType,
+            arguments:[Protocol.TXB_OBJECT(this.txb, this.object)]
         });
     }
     add(name:string, object:string[])  {
         if (!IsValidName(name)) ERROR(Errors.IsValidName, 'add');
         if (!IsValidArray(object, IsValidAddress)) ERROR(Errors.IsValidArray, 'add');
-        let txb = this.protocol.CurrentSession();
-        txb.moveCall({
-            target:this.protocol.ResourceFn('add')  as FnCallType,
-            arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(name), txb.pure(object, 'vector<address>')]
+        this.txb.moveCall({
+            target:Protocol.Instance().ResourceFn('add')  as FnCallType,
+            arguments:[Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.string(name),
+                this.txb.pure.vector('address', object)]
         });
     }
@@ -60,10 +61,10 @@ export class Resource {
         if (!IsValidArray(name, IsValidName)) ERROR(Errors.IsValidArray, 'add2');
         if (!name) return
-        let txb = this.protocol.CurrentSession();
-        txb.moveCall({
-            target:this.protocol.ResourceFn('add2')  as FnCallType,
-            arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(object, BCS.ADDRESS), txb.pure(name, 'vector<string>')]
+        this.txb.moveCall({
+            target:Protocol.Instance().ResourceFn('add2')  as FnCallType,
+            arguments:[Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.address(object),
+                this.txb.pure.vector('string', name)]
         });
     }
@@ -71,18 +72,18 @@ export class Resource {
         if (!IsValidName(name)) ERROR(Errors.IsValidName, 'Resource: remove');
         if (object.length===0 && !removeall) return;
-        let txb = this.protocol.CurrentSession();
         if (removeall) {
-            txb.moveCall({
-                target:this.protocol.ResourceFn('remove_all')  as FnCallType,
-                arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(name)]
+            this.txb.moveCall({
+                target:Protocol.Instance().ResourceFn('remove_all')  as FnCallType,
+                arguments:[Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.string(name)]
             });
         } else if(object) {
             if (!IsValidArray(object, IsValidAddress)) ERROR(Errors.IsValidArray, 'Resource: remove');
-            txb.moveCall({
-                target:this.protocol.ResourceFn('remove')  as FnCallType,
-                arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(name), txb.pure(object, 'vector<address>')]
+            this.txb.moveCall({
+                target:Protocol.Instance().ResourceFn('remove')  as FnCallType,
+                arguments:[Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.string(name),
+                    this.txb.pure.vector('address', object)]
             });
         }
     }
@@ -92,20 +93,20 @@ export class Resource {
         if (!IsValidArray(name, IsValidName)) ERROR(Errors.InvalidParam, 'Resource: remove2');
         if (!name) return
-        let txb = this.protocol.CurrentSession();
-        txb.moveCall({
-            target:this.protocol.ResourceFn('remove2')  as FnCallType,
-            arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(object, BCS.ADDRESS), txb.pure(name, 'vector<string>')]
+        this.txb.moveCall({
+            target:Protocol.Instance().ResourceFn('remove2')  as FnCallType,
+            arguments:[Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.address(object),
+                this.txb.pure.vector('string', name)]
         });
     }
     rename(old_name:string, new_name:string)  {
         if (!IsValidName(new_name)) ERROR(Errors.IsValidName, 'Resource: rename');
-        let txb = this.protocol.CurrentSession();
-        txb.moveCall({
-            target:this.protocol.ResourceFn('rename')  as FnCallType,
-            arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(old_name), txb.pure(new_name)]
+        this.txb.moveCall({
+            target:Protocol.Instance().ResourceFn('rename')  as FnCallType,
+            arguments:[Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.string(old_name),
+                this.txb.pure.string(new_name)]
         });
     }
@@ -116,25 +117,22 @@ export class Resource {
         if (!IsValidArray(tags, IsValidName)) ERROR(Errors.IsValidArray, 'add_tags');
         if (tags.length > Resource.MAX_TAGS) ERROR(Errors.InvalidParam, 'add_tags');
-        const txb = this.protocol.CurrentSession();
         const encode = new TextEncoder();
-        txb.moveCall({
-            target:this.protocol.ResourceFn('tags_add')  as FnCallType,
-            arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(object, BCS.ADDRESS),
-                txb.pure(nick),
-                txb.pure(tags, 'vector<string>')
+        this.txb.moveCall({
+            target:Protocol.Instance().ResourceFn('tags_add')  as FnCallType,
+            arguments:[Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.address(object),
+                this.txb.pure.string(nick),
+                this.txb.pure.vector('string', tags)
             ]
         });
     }
     remove_tags(object:string) {
         if (!IsValidAddress(object)) ERROR(Errors.IsValidAddress, 'Resource: remove_tags');
-        let txb = this.protocol.CurrentSession();
-        txb.moveCall({
-            target:this.protocol.ResourceFn('tags_remove')  as FnCallType,
-            arguments:[Protocol.TXB_OBJECT(txb, this.object), txb.pure(object, BCS.ADDRESS)]
+        this.txb.moveCall({
+            target:Protocol.Instance().ResourceFn('tags_remove')  as FnCallType,
+            arguments:[Protocol.TXB_OBJECT(this.txb, this.object), this.txb.pure.address(object)]
         });
     }
 }