wowok_agent 1.2.38 → 1.2.41
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.
- package/dist/call/arbitration.d.ts +1 -1
- package/dist/call/arbitration.d.ts.map +1 -1
- package/dist/call/arbitration.js +76 -50
- package/dist/call/arbitration.js.map +1 -1
- package/dist/call/base.d.ts +3 -1
- package/dist/call/base.d.ts.map +1 -1
- package/dist/call/base.js +24 -16
- package/dist/call/base.js.map +1 -1
- package/dist/call/call.d.ts +18 -18
- package/dist/call/call.d.ts.map +1 -1
- package/dist/call/call.js +12 -12
- package/dist/call/call.js.map +1 -1
- package/dist/call/demand.d.ts +3 -1
- package/dist/call/demand.d.ts.map +1 -1
- package/dist/call/demand.js +55 -28
- package/dist/call/demand.js.map +1 -1
- package/dist/call/guard.d.ts.map +1 -1
- package/dist/call/guard.js +29 -18
- package/dist/call/guard.js.map +1 -1
- package/dist/call/machine.d.ts +1 -1
- package/dist/call/machine.d.ts.map +1 -1
- package/dist/call/machine.js +82 -38
- package/dist/call/machine.js.map +1 -1
- package/dist/call/object_permission.d.ts +1 -0
- package/dist/call/object_permission.d.ts.map +1 -1
- package/dist/call/object_permission.js +12 -9
- package/dist/call/object_permission.js.map +1 -1
- package/dist/call/permission.d.ts +1 -0
- package/dist/call/permission.d.ts.map +1 -1
- package/dist/call/permission.js +48 -18
- package/dist/call/permission.js.map +1 -1
- package/dist/call/personal.d.ts +1 -1
- package/dist/call/personal.d.ts.map +1 -1
- package/dist/call/personal.js +40 -13
- package/dist/call/personal.js.map +1 -1
- package/dist/call/repository.d.ts.map +1 -1
- package/dist/call/repository.js +24 -14
- package/dist/call/repository.js.map +1 -1
- package/dist/call/service.d.ts +1 -1
- package/dist/call/service.d.ts.map +1 -1
- package/dist/call/service.js +149 -71
- package/dist/call/service.js.map +1 -1
- package/dist/call/treasury.d.ts +1 -1
- package/dist/call/treasury.d.ts.map +1 -1
- package/dist/call/treasury.js +65 -49
- package/dist/call/treasury.js.map +1 -1
- package/dist/common.d.ts +1 -0
- package/dist/common.d.ts.map +1 -1
- package/dist/common.js +9 -0
- package/dist/common.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/local/account.d.ts +26 -12
- package/dist/local/account.d.ts.map +1 -1
- package/dist/local/account.js +199 -93
- package/dist/local/account.js.map +1 -1
- package/dist/local/index.d.ts +44 -23
- package/dist/local/index.d.ts.map +1 -1
- package/dist/local/index.js +57 -50
- package/dist/local/index.js.map +1 -1
- package/dist/local/local.d.ts +4 -2
- package/dist/local/local.d.ts.map +1 -1
- package/dist/local/local.js +35 -27
- package/dist/local/local.js.map +1 -1
- package/dist/query/objects.d.ts.map +1 -1
- package/dist/query/objects.js +15 -7
- package/dist/query/objects.js.map +1 -1
- package/package.json +2 -2
- package/src/call/arbitration.ts +87 -54
- package/src/call/base.ts +28 -19
- package/src/call/call.ts +31 -31
- package/src/call/demand.ts +62 -30
- package/src/call/guard.ts +25 -16
- package/src/call/machine.ts +89 -42
- package/src/call/object_permission.ts +12 -8
- package/src/call/permission.ts +45 -18
- package/src/call/personal.ts +39 -13
- package/src/call/repository.ts +27 -13
- package/src/call/service.ts +152 -73
- package/src/call/treasury.ts +70 -50
- package/src/common.ts +9 -0
- package/src/index.ts +1 -0
- package/src/local/account.ts +212 -92
- package/src/local/index.ts +75 -68
- package/src/local/local.ts +44 -30
- package/src/query/objects.ts +14 -6
- package/tsconfig.tsbuildinfo +1 -1
package/dist/call/personal.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Entity, Resource } from 'wowok';
|
|
2
2
|
import { CallBase } from "./base.js";
|
|
3
|
+
import { LocalMark } from '../local/local.js';
|
|
3
4
|
export class CallPersonal extends CallBase {
|
|
4
5
|
constructor(data) {
|
|
5
6
|
super();
|
|
@@ -17,8 +18,8 @@ export class CallPersonal extends CallBase {
|
|
|
17
18
|
if (this.data?.mark === undefined) {
|
|
18
19
|
return;
|
|
19
20
|
}
|
|
20
|
-
const object_address = this.data?.mark_object?.address;
|
|
21
|
-
if (!object_address
|
|
21
|
+
const object_address = await LocalMark.Instance().get_address(this.data?.mark_object?.address);
|
|
22
|
+
if (!object_address) {
|
|
22
23
|
obj = Resource.From(txb, entity.create_resource2());
|
|
23
24
|
}
|
|
24
25
|
else {
|
|
@@ -30,27 +31,53 @@ export class CallPersonal extends CallBase {
|
|
|
30
31
|
}
|
|
31
32
|
if (obj && obj?.get_object()) {
|
|
32
33
|
switch (this.data.mark.op) {
|
|
33
|
-
case 'add
|
|
34
|
-
|
|
34
|
+
case 'add':
|
|
35
|
+
const add = [];
|
|
36
|
+
for (let i = 0; i < this.data.mark.data.length; ++i) {
|
|
37
|
+
const v = this.data.mark.data[i];
|
|
38
|
+
const addr = await LocalMark.Instance().get_address(v.address);
|
|
39
|
+
if (addr) {
|
|
40
|
+
v.address = addr;
|
|
41
|
+
add.push(v);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
add.forEach(v => {
|
|
35
45
|
obj?.add(v.address, v.tags ?? [], v.name);
|
|
36
46
|
});
|
|
37
47
|
break;
|
|
38
48
|
case 'remove':
|
|
39
|
-
|
|
49
|
+
const remove = [];
|
|
50
|
+
for (let i = 0; i < this.data.mark.data.length; ++i) {
|
|
51
|
+
const v = this.data.mark.data[i];
|
|
52
|
+
const addr = await LocalMark.Instance().get_address(v.address);
|
|
53
|
+
if (addr) {
|
|
54
|
+
v.address = addr;
|
|
55
|
+
remove.push(v);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
remove.forEach(v => {
|
|
40
59
|
obj?.remove(v.address, v.tags ?? []);
|
|
41
60
|
});
|
|
42
61
|
break;
|
|
43
62
|
case 'removeall':
|
|
44
|
-
this.data.mark.addresses.
|
|
45
|
-
|
|
46
|
-
|
|
63
|
+
for (let i = 0; i < this.data.mark.addresses.length; ++i) {
|
|
64
|
+
const v = this.data.mark.addresses[i];
|
|
65
|
+
const addr = await LocalMark.Instance().get_address(v);
|
|
66
|
+
if (addr) {
|
|
67
|
+
obj?.removeall(v);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
47
70
|
break;
|
|
48
71
|
}
|
|
49
|
-
if (this.data?.mark?.op === 'transfer' && obj
|
|
50
|
-
|
|
72
|
+
if (this.data?.mark?.op === 'transfer' && obj) {
|
|
73
|
+
const addr = await LocalMark.Instance().get_address(this.data.mark.address);
|
|
74
|
+
if (addr)
|
|
75
|
+
entity.transfer_resource(obj, addr);
|
|
51
76
|
}
|
|
52
|
-
if (this.data?.mark?.op === 'replace'
|
|
53
|
-
|
|
77
|
+
if (this.data?.mark?.op === 'replace') {
|
|
78
|
+
const addr = await LocalMark.Instance().get_address(this.data.mark.address);
|
|
79
|
+
if (addr)
|
|
80
|
+
entity.use_resource(Resource.From(txb, addr));
|
|
54
81
|
}
|
|
55
82
|
if (!object_address) {
|
|
56
83
|
await this.new_with_mark('PersonalMark', txb, obj.launch(), this.data?.mark_object?.namedNew, account);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"personal.js","sourceRoot":"","sources":["../../src/call/personal.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"personal.js","sourceRoot":"","sources":["../../src/call/personal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmE,MAAM,EAAe,QAAQ,EAAC,MAAM,OAAO,CAAC;AACtH,OAAO,EAAE,QAAQ,EAA0B,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAc9C,MAAM,OAAO,YAAa,SAAQ,QAAQ;IAEtC,YAAY,IAAuB;QAC/B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,OAAe;QACtB,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACnC,CAAC;IACS,KAAK,CAAC,OAAO,CAAE,GAAoB,EAAE,QAAwB,EAAE,OAAgB;QACrF,IAAI,GAA0B,CAAE;QAAC,IAAI,MAAM,GAAW,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEvE,IAAI,IAAI,CAAC,IAAI,EAAE,WAAW,KAAK,SAAS,EAAG,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QACxC,CAAC;QAED,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,KAAK,SAAS,EAAE,CAAC;YAChC,OAAQ;QACZ,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAE,IAAI,CAAC,IAAI,EAAE,WAAmB,EAAE,OAAO,CAAC,CAAC;QACxG,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACxD,CAAC;aAAM,CAAC;YACJ,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAA;QAC5C,CAAC;QAED,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,KAAK,SAAS,EAAE,CAAC;YACpC,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAA;YAC5B,OAAQ,CAAC,WAAW;QACxB,CAAC;QAED,IAAI,GAAG,IAAI,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC;YAC3B,QAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;gBACvB,KAAK,KAAK;oBACN,MAAM,GAAG,GAAG,EAAE,CAAC;oBACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;wBAClD,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBACjC,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;wBAC/D,IAAI,IAAI,EAAE,CAAC;4BACP,CAAC,CAAC,OAAO,GAAI,IAAI,CAAC;4BAClB,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;wBACf,CAAC;oBACL,CAAC;oBAED,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;wBACZ,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAA;oBAC7C,CAAC,CAAC,CAAA;oBACF,MAAM;gBACV,KAAK,QAAQ;oBACT,MAAM,MAAM,GAAG,EAAE,CAAC;oBAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;wBAClD,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBACjC,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;wBAC/D,IAAI,IAAI,EAAE,CAAC;4BACP,CAAC,CAAC,OAAO,GAAI,IAAI,CAAC;4BAClB,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;wBAClB,CAAC;oBACL,CAAC;oBACD,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;wBACf,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAA;oBACxC,CAAC,CAAC,CAAA;oBACF,MAAM;gBACV,KAAK,WAAW;oBACZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;wBACvD,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;wBACtC,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;wBACvD,IAAI,IAAI,EAAE,CAAC;4BACP,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC,CAAA;wBACrB,CAAC;oBACL,CAAC;oBACD,MAAM;YACd,CAAC;YAED,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,KAAK,UAAU,IAAI,GAAG,EAAE,CAAC;gBAC5C,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC5E,IAAI,IAAI;oBAAE,MAAM,CAAC,iBAAiB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAClD,CAAC;YACD,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,KAAK,SAAS,EAAE,CAAC;gBACpC,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC5E,IAAI,IAAI;oBAAE,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;YAC5D,CAAC;YAED,IAAI,CAAC,cAAc,EAAE,CAAC;gBAClB,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,EAAG,IAAI,CAAC,IAAI,EAAE,WAAmB,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;YACpH,CAAC;QACL,CAAC;IACL,CAAC;CACJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.d.ts","sourceRoot":"","sources":["../../src/call/repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EACJ,iBAAiB,EAAE,sBAAsB,EAAE,uBAAuB,EACnG,6BAA6B,EAAE,sBAAsB,EACxD,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAC,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"repository.d.ts","sourceRoot":"","sources":["../../src/call/repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EACJ,iBAAiB,EAAE,sBAAsB,EAAE,uBAAuB,EACnG,6BAA6B,EAAE,sBAAsB,EACxD,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAC,MAAM,WAAW,CAAC;AAM5D,MAAM,WAAW,mBAAmB;IAChC,MAAM,CAAC,EAAE;QAAC,OAAO,EAAC,MAAM,CAAA;KAAC,GAAG;QAAC,QAAQ,CAAC,EAAE,UAAU,CAAA;KAAC,CAAC;IACpD,UAAU,CAAC,EAAE;QAAC,OAAO,EAAC,MAAM,CAAA;KAAC,GAAG;QAAC,QAAQ,CAAC,EAAE,UAAU,CAAC;QAAC,WAAW,CAAC,EAAC,MAAM,CAAA;KAAC,CAAC;IAC7E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE;QAAC,EAAE,EAAC,KAAK,GAAG,KAAK,GAAG,QAAQ,CAAE;QAAC,SAAS,EAAC,MAAM,EAAE,CAAA;KAAC,GAAG;QAAC,EAAE,EAAC,WAAW,CAAA;KAAC,CAAC;IAClF,IAAI,CAAC,EAAE,sBAAsB,CAAC;IAC9B,MAAM,CAAC,EAAE;QAAC,EAAE,EAAC,KAAK,GAAG,KAAK,CAAC;QAAC,IAAI,EAAC,iBAAiB,EAAE,CAAA;KAAC,GAAG;QAAC,EAAE,EAAC,QAAQ,CAAC;QAAC,IAAI,EAAC,MAAM,EAAE,CAAA;KAAC,GAAG;QAAC,EAAE,EAAC,WAAW,CAAA;KAAC,GAAG;QAAC,EAAE,EAAC,QAAQ,CAAC;QAAC,IAAI,EAAC;YAAC,GAAG,EAAC,MAAM,CAAC;YAAC,GAAG,EAAC,MAAM,CAAA;SAAC,EAAE,CAAA;KAAC,CAAC;IACzJ,IAAI,CAAC,EAAE;QAAC,EAAE,EAAC,KAAK,CAAC;QAAC,IAAI,EAAE,sBAAsB,GAAG,uBAAuB,CAAA;KAAC,GAAG;QAAC,EAAE,EAAC,QAAQ,CAAC;QAAC,IAAI,EAAE,6BAA6B,EAAE,CAAA;KAAC,CAAC;CACpI;AACD,qBAAa,cAAe,SAAQ,QAAQ;IACxC,IAAI,EAAE,mBAAmB,CAAC;gBACd,IAAI,EAAC,mBAAmB;IAK9B,IAAI,CAAC,OAAO,CAAC,EAAC,MAAM,GAAI,OAAO,CAAC,UAAU,CAAC;cAsCjC,OAAO,CAAC,GAAG,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAC,cAAc,EAAE,OAAO,CAAC,EAAC,MAAM;CA2F1F"}
|
package/dist/call/repository.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Errors, ERROR, Permission, PermissionIndex, Repository, } from 'wowok';
|
|
2
2
|
import { CallBase } from "./base.js";
|
|
3
|
+
import { LocalMark } from '../local/local.js';
|
|
3
4
|
export class CallRepository extends CallBase {
|
|
4
5
|
constructor(data) {
|
|
5
6
|
super();
|
|
@@ -8,9 +9,17 @@ export class CallRepository extends CallBase {
|
|
|
8
9
|
async call(account) {
|
|
9
10
|
var checkOwner = false;
|
|
10
11
|
const perms = [];
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
if (
|
|
12
|
+
var [permission_address, object_address] = await LocalMark.Instance().get_many_address([this.data?.permission?.address,
|
|
13
|
+
this.data?.object?.address]);
|
|
14
|
+
if (object_address) {
|
|
15
|
+
if (!permission_address) {
|
|
16
|
+
await this.update_content(object_address, 'Repository');
|
|
17
|
+
if (this.content) {
|
|
18
|
+
permission_address = this.content.permission;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
if (permission_address) {
|
|
14
23
|
if (!this.data?.object) {
|
|
15
24
|
perms.push(PermissionIndex.repository);
|
|
16
25
|
}
|
|
@@ -33,21 +42,23 @@ export class CallRepository extends CallBase {
|
|
|
33
42
|
async operate(txb, passport, account) {
|
|
34
43
|
let obj;
|
|
35
44
|
let permission;
|
|
36
|
-
|
|
37
|
-
|
|
45
|
+
var [permission_address, object_address] = this?.content ?
|
|
46
|
+
[this.content.permission, this.content.object] :
|
|
47
|
+
await LocalMark.Instance().get_many_address([this.data?.permission?.address,
|
|
48
|
+
this.data?.object?.address]);
|
|
38
49
|
if (!object_address) {
|
|
39
|
-
if (!permission_address
|
|
50
|
+
if (!permission_address) {
|
|
40
51
|
const d = this.data?.permission?.description ?? '';
|
|
41
52
|
permission = Permission.New(txb, d);
|
|
42
53
|
}
|
|
43
54
|
obj = Repository.New(txb, permission ? permission.get_object() : permission_address, this.data?.description ?? '', this.data?.mode, permission ? undefined : passport);
|
|
44
55
|
}
|
|
45
56
|
else {
|
|
46
|
-
if (
|
|
57
|
+
if (permission_address) {
|
|
47
58
|
obj = Repository.From(txb, permission_address, object_address);
|
|
48
59
|
}
|
|
49
60
|
else {
|
|
50
|
-
ERROR(Errors.InvalidParam, '
|
|
61
|
+
ERROR(Errors.InvalidParam, 'CallRepository_Data.data.permission');
|
|
51
62
|
}
|
|
52
63
|
}
|
|
53
64
|
if (obj) {
|
|
@@ -58,14 +69,13 @@ export class CallRepository extends CallBase {
|
|
|
58
69
|
if (this.data?.reference !== undefined) {
|
|
59
70
|
switch (this.data.reference.op) {
|
|
60
71
|
case 'set':
|
|
61
|
-
obj?.remove_reference([], true, pst);
|
|
62
|
-
obj?.add_reference(this.data.reference.addresses, pst);
|
|
63
|
-
break;
|
|
64
72
|
case 'add':
|
|
65
|
-
|
|
73
|
+
if (this.data.reference.op === 'set')
|
|
74
|
+
obj?.remove_reference([], true, pst);
|
|
75
|
+
obj?.add_reference(await LocalMark.Instance().get_many_address2(this.data.reference.addresses), pst);
|
|
66
76
|
break;
|
|
67
77
|
case 'remove':
|
|
68
|
-
obj?.remove_reference(this.data.reference.addresses, false, pst);
|
|
78
|
+
obj?.remove_reference(await LocalMark.Instance().get_many_address2(this.data.reference.addresses), false, pst);
|
|
69
79
|
break;
|
|
70
80
|
case 'removeall':
|
|
71
81
|
obj?.remove_reference([], true, pst);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../src/call/repository.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../src/call/repository.ts"],"names":[],"mappings":"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"}
|
package/dist/call/service.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/call/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAwC,cAAc,EACpC,eAAe,EAAE,qBAAqB,EAAE,eAAe,EAAW,WAAW,EACpH,qBAAqB,EAAE,YAAY,EAAE,aAAa,EACrD,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/call/service.ts"],"names":[],"mappings":"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"}
|
package/dist/call/service.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { IsValidArgType, TagName, IsValidAddress, Errors, ERROR, Permission, PermissionIndex, Service, Treasury, } from 'wowok';
|
|
2
|
-
import { query_objects } from '../query/objects.js';
|
|
3
2
|
import { CallBase } from "./base.js";
|
|
4
3
|
import { Account } from '../local/account.js';
|
|
4
|
+
import { LocalMark } from '../local/local.js';
|
|
5
|
+
import { get_object_address } from '../common.js';
|
|
5
6
|
export class CallService extends CallBase {
|
|
6
7
|
constructor(data) {
|
|
7
8
|
super();
|
|
@@ -15,10 +16,24 @@ export class CallService extends CallBase {
|
|
|
15
16
|
const guards = [];
|
|
16
17
|
const perms = [];
|
|
17
18
|
var obj;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
if (
|
|
19
|
+
var [permission_address, object_address, treasury_address] = await LocalMark.Instance().get_many_address([this.data?.permission?.address,
|
|
20
|
+
this.data?.object?.address,
|
|
21
|
+
this.data?.payee_treasury?.address]);
|
|
22
|
+
if (object_address) {
|
|
23
|
+
if (!this.data.type_parameter || !permission_address) {
|
|
24
|
+
await this.update_content(object_address, 'Service');
|
|
25
|
+
if (this.content) {
|
|
26
|
+
permission_address = this.content.permission;
|
|
27
|
+
this.data.type_parameter = this.content.type_raw;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
else {
|
|
32
|
+
if (!this.data?.type_parameter || !IsValidArgType(this.data.type_parameter)) {
|
|
33
|
+
ERROR(Errors.IsValidArgType, 'CallService_Data.data.type_parameter');
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
if (permission_address) {
|
|
22
37
|
if (!this.data?.object) {
|
|
23
38
|
perms.push(PermissionIndex.service);
|
|
24
39
|
}
|
|
@@ -73,37 +88,40 @@ export class CallService extends CallBase {
|
|
|
73
88
|
if (this.data?.sales !== undefined) {
|
|
74
89
|
perms.push(PermissionIndex.service_sales);
|
|
75
90
|
}
|
|
76
|
-
if (this.data?.order_new
|
|
77
|
-
if (
|
|
78
|
-
|
|
91
|
+
if (this.data?.order_new !== undefined) {
|
|
92
|
+
if (this.data.order_new.guard) {
|
|
93
|
+
const guard = await LocalMark.Instance().get_address(this.data.order_new.guard);
|
|
94
|
+
if (guard) {
|
|
95
|
+
guards.push(guard);
|
|
96
|
+
}
|
|
79
97
|
}
|
|
80
98
|
else {
|
|
81
|
-
if (!
|
|
82
|
-
|
|
83
|
-
|
|
99
|
+
if (!object_address) {
|
|
100
|
+
const buy_guard = await LocalMark.Instance().get_address(this.data?.buy_guard);
|
|
101
|
+
if (buy_guard) {
|
|
102
|
+
guards.push(buy_guard);
|
|
84
103
|
}
|
|
85
104
|
}
|
|
86
105
|
else {
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
obj = r.objects[0];
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
|
-
if (obj?.buy_guard) {
|
|
94
|
-
guards.push(obj?.buy_guard);
|
|
106
|
+
await this.update_content(object_address, 'Service');
|
|
107
|
+
if (this.content?.buy_guard) {
|
|
108
|
+
guards.push(this.content.buy_guard);
|
|
95
109
|
}
|
|
96
110
|
}
|
|
97
111
|
}
|
|
98
112
|
}
|
|
99
|
-
if (
|
|
100
|
-
|
|
113
|
+
if (this.data.order_refund !== undefined) {
|
|
114
|
+
const guard = await LocalMark.Instance().get_address(this.data?.order_refund?.guard);
|
|
115
|
+
if (guard)
|
|
116
|
+
guards.push(guard);
|
|
101
117
|
}
|
|
102
118
|
if (this.data.order_withdrawl !== undefined) { // permission(may be guard) + withdraw_guard
|
|
103
119
|
perms.push(PermissionIndex.service_withdraw);
|
|
104
120
|
}
|
|
105
|
-
if (typeof (this.data?.order_withdrawl?.data?.withdraw_guard) === 'string'
|
|
106
|
-
|
|
121
|
+
if (typeof (this.data?.order_withdrawl?.data?.withdraw_guard) === 'string') {
|
|
122
|
+
const guard = await LocalMark.Instance().get_address(this.data?.order_withdrawl?.data?.withdraw_guard);
|
|
123
|
+
if (guard)
|
|
124
|
+
guards.push(guard);
|
|
107
125
|
}
|
|
108
126
|
return await this.check_permission_and_call(permission_address, perms, guards, checkOwner, undefined, account);
|
|
109
127
|
}
|
|
@@ -113,9 +131,11 @@ export class CallService extends CallBase {
|
|
|
113
131
|
let obj;
|
|
114
132
|
let permission;
|
|
115
133
|
let payee;
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
134
|
+
var [permission_address, object_address] = this?.content ?
|
|
135
|
+
[this.content.permission, this.content.object] :
|
|
136
|
+
await LocalMark.Instance().get_many_address([this.data?.permission?.address,
|
|
137
|
+
this.data?.object?.address]);
|
|
138
|
+
const treasury_address = await LocalMark.Instance().get_address(this.data?.payee_treasury?.address);
|
|
119
139
|
if (!object_address) {
|
|
120
140
|
if (!permission_address || !IsValidAddress(permission_address)) {
|
|
121
141
|
const d = this.data?.permission?.description ?? '';
|
|
@@ -128,11 +148,11 @@ export class CallService extends CallBase {
|
|
|
128
148
|
obj = Service.New(txb, this.data.type_parameter, permission ? permission.get_object() : permission_address, this.data?.description ?? '', payee ? payee.get_object() : treasury_address, permission ? undefined : passport);
|
|
129
149
|
}
|
|
130
150
|
else {
|
|
131
|
-
if (
|
|
151
|
+
if (this.data.type_parameter && permission_address) {
|
|
132
152
|
obj = Service.From(txb, this.data.type_parameter, permission_address, object_address);
|
|
133
153
|
}
|
|
134
154
|
else {
|
|
135
|
-
ERROR(Errors.InvalidParam, '
|
|
155
|
+
ERROR(Errors.InvalidParam, 'CallService_Data.data.type_parameter or permission');
|
|
136
156
|
}
|
|
137
157
|
}
|
|
138
158
|
if (obj) {
|
|
@@ -144,23 +164,37 @@ export class CallService extends CallBase {
|
|
|
144
164
|
if (this.data?.endpoint !== undefined) {
|
|
145
165
|
obj?.set_endpoint(this.data.endpoint, pst);
|
|
146
166
|
}
|
|
147
|
-
if (
|
|
167
|
+
if (treasury_address !== undefined && object_address) {
|
|
148
168
|
obj?.set_payee(treasury_address, pst);
|
|
149
169
|
}
|
|
150
170
|
if (this.data?.gen_discount !== undefined) {
|
|
151
|
-
|
|
171
|
+
const add = [];
|
|
172
|
+
for (let i = 0; i < this.data.gen_discount.length; ++i) {
|
|
173
|
+
let v = this.data.gen_discount[i];
|
|
174
|
+
const addr = await LocalMark.Instance().get_address(v.receiver);
|
|
175
|
+
if (addr) {
|
|
176
|
+
v.receiver = addr;
|
|
177
|
+
add.push(v);
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
obj?.discount_transfer(add, pst);
|
|
152
181
|
}
|
|
153
182
|
if (this.data?.repository !== undefined) {
|
|
154
183
|
switch (this.data.repository.op) {
|
|
155
184
|
case 'add':
|
|
156
|
-
|
|
185
|
+
case 'set':
|
|
186
|
+
if (this.data.repository.op === 'set')
|
|
187
|
+
obj?.remove_repository([], true, pst);
|
|
188
|
+
for (let i = 0; i < this.data.repository.repositories.length; ++i) {
|
|
189
|
+
let v = this.data.repository.repositories[i];
|
|
190
|
+
const addr = await LocalMark.Instance().get_address(v);
|
|
191
|
+
if (addr) {
|
|
192
|
+
obj?.add_repository(v, pst);
|
|
193
|
+
}
|
|
194
|
+
}
|
|
157
195
|
break;
|
|
158
196
|
case 'remove':
|
|
159
|
-
obj?.remove_repository(this.data.repository.repositories, false, pst);
|
|
160
|
-
break;
|
|
161
|
-
case 'set':
|
|
162
|
-
obj?.remove_repository([], true, pst);
|
|
163
|
-
this.data.repository.repositories.forEach(v => obj?.add_repository(v, pst));
|
|
197
|
+
obj?.remove_repository(await LocalMark.Instance().get_many_address2(this.data.repository.repositories), false, pst);
|
|
164
198
|
break;
|
|
165
199
|
case 'removeall':
|
|
166
200
|
obj?.remove_repository([], true, pst);
|
|
@@ -170,14 +204,19 @@ export class CallService extends CallBase {
|
|
|
170
204
|
if (this.data?.extern_withdraw_treasury !== undefined) {
|
|
171
205
|
switch (this.data.extern_withdraw_treasury.op) {
|
|
172
206
|
case 'add':
|
|
173
|
-
this.data.extern_withdraw_treasury.treasuries.forEach(v => obj?.add_treasury(v.token_type, v.address, pst));
|
|
174
|
-
break;
|
|
175
207
|
case 'set':
|
|
176
|
-
|
|
177
|
-
|
|
208
|
+
if (this.data.extern_withdraw_treasury.op === 'set')
|
|
209
|
+
obj?.remove_treasury([], true, pst);
|
|
210
|
+
for (let i = 0; i < this.data.extern_withdraw_treasury.treasuries.length; ++i) {
|
|
211
|
+
let v = this.data.extern_withdraw_treasury.treasuries[i];
|
|
212
|
+
const addr = await LocalMark.Instance().get_address(v.address);
|
|
213
|
+
if (addr && v.token_type) {
|
|
214
|
+
obj?.add_treasury(v.token_type, v.address, pst);
|
|
215
|
+
}
|
|
216
|
+
}
|
|
178
217
|
break;
|
|
179
218
|
case 'remove':
|
|
180
|
-
obj?.remove_treasury(this.data.extern_withdraw_treasury.addresses, false, pst);
|
|
219
|
+
obj?.remove_treasury(await LocalMark.Instance().get_many_address2(this.data.extern_withdraw_treasury.addresses), false, pst);
|
|
181
220
|
break;
|
|
182
221
|
case 'removeall':
|
|
183
222
|
obj?.remove_treasury([], false, pst);
|
|
@@ -185,19 +224,25 @@ export class CallService extends CallBase {
|
|
|
185
224
|
}
|
|
186
225
|
}
|
|
187
226
|
if (this.data?.machine !== undefined) {
|
|
188
|
-
|
|
227
|
+
const machine = await LocalMark.Instance().get_address(this.data.machine);
|
|
228
|
+
obj?.set_machine(machine, pst);
|
|
189
229
|
}
|
|
190
230
|
if (this.data?.arbitration !== undefined) {
|
|
191
231
|
switch (this.data.arbitration.op) {
|
|
192
232
|
case 'add':
|
|
193
|
-
this.data.arbitration.arbitrations.forEach(v => obj?.add_arbitration(v.address, v.token_type, pst));
|
|
194
|
-
break;
|
|
195
233
|
case 'set':
|
|
196
|
-
|
|
197
|
-
|
|
234
|
+
if (this.data.arbitration.op === 'set')
|
|
235
|
+
obj?.remove_arbitration([], true, pst);
|
|
236
|
+
for (let i = 0; i < this.data.arbitration.arbitrations.length; ++i) {
|
|
237
|
+
let v = this.data.arbitration.arbitrations[i];
|
|
238
|
+
const addr = await LocalMark.Instance().get_address(v.address);
|
|
239
|
+
if (addr && v.token_type) {
|
|
240
|
+
obj?.add_arbitration(v.address, v.token_type, pst);
|
|
241
|
+
}
|
|
242
|
+
}
|
|
198
243
|
break;
|
|
199
244
|
case 'remove':
|
|
200
|
-
obj?.remove_arbitration(this.data.arbitration.addresses, false, pst);
|
|
245
|
+
obj?.remove_arbitration(await LocalMark.Instance().get_many_address2(this.data.arbitration.addresses), false, pst);
|
|
201
246
|
break;
|
|
202
247
|
case 'removeall':
|
|
203
248
|
obj?.remove_arbitration([], false, pst);
|
|
@@ -225,14 +270,22 @@ export class CallService extends CallBase {
|
|
|
225
270
|
if (this.data?.withdraw_guard !== undefined) {
|
|
226
271
|
switch (this.data.withdraw_guard.op) {
|
|
227
272
|
case 'add':
|
|
228
|
-
obj?.add_withdraw_guards(this.data.withdraw_guard.guards, pst);
|
|
229
|
-
break;
|
|
230
273
|
case 'set':
|
|
231
|
-
|
|
232
|
-
|
|
274
|
+
if (this.data.withdraw_guard.op === 'set')
|
|
275
|
+
obj?.remove_withdraw_guards([], true, pst);
|
|
276
|
+
const add = [];
|
|
277
|
+
for (let i = 0; i < this.data.withdraw_guard.guards.length; ++i) {
|
|
278
|
+
let v = this.data.withdraw_guard.guards[i];
|
|
279
|
+
const addr = typeof (v.guard) === 'string' ? await LocalMark.Instance().get_address(v.guard) : v.guard;
|
|
280
|
+
if (addr) {
|
|
281
|
+
v.guard = addr;
|
|
282
|
+
add.push(v);
|
|
283
|
+
}
|
|
284
|
+
}
|
|
285
|
+
obj?.add_withdraw_guards(add, pst);
|
|
233
286
|
break;
|
|
234
287
|
case 'remove':
|
|
235
|
-
obj?.remove_withdraw_guards(this.data.withdraw_guard.addresses, false, pst);
|
|
288
|
+
obj?.remove_withdraw_guards(await LocalMark.Instance().get_many_address2(this.data.withdraw_guard.addresses), false, pst);
|
|
236
289
|
break;
|
|
237
290
|
case 'removeall':
|
|
238
291
|
obj?.remove_withdraw_guards([], true, pst);
|
|
@@ -242,14 +295,22 @@ export class CallService extends CallBase {
|
|
|
242
295
|
if (this.data?.refund_guard !== undefined) {
|
|
243
296
|
switch (this.data.refund_guard.op) {
|
|
244
297
|
case 'add':
|
|
245
|
-
obj?.add_refund_guards(this.data.refund_guard.guards, pst);
|
|
246
|
-
break;
|
|
247
298
|
case 'set':
|
|
248
|
-
|
|
249
|
-
|
|
299
|
+
if (this.data.refund_guard.op === 'set')
|
|
300
|
+
obj?.remove_refund_guards([], true, pst);
|
|
301
|
+
const add = [];
|
|
302
|
+
for (let i = 0; i < this.data.refund_guard.guards.length; ++i) {
|
|
303
|
+
let v = this.data.refund_guard.guards[i];
|
|
304
|
+
const addr = typeof (v.guard) === 'string' ? await LocalMark.Instance().get_address(v.guard) : v.guard;
|
|
305
|
+
if (addr) {
|
|
306
|
+
v.guard = addr;
|
|
307
|
+
add.push(v);
|
|
308
|
+
}
|
|
309
|
+
}
|
|
310
|
+
obj?.add_refund_guards(add, pst);
|
|
250
311
|
break;
|
|
251
312
|
case 'remove':
|
|
252
|
-
obj?.remove_refund_guards(this.data.refund_guard.addresses, false, pst);
|
|
313
|
+
obj?.remove_refund_guards(await LocalMark.Instance().get_many_address2(this.data.refund_guard.addresses), false, pst);
|
|
253
314
|
break;
|
|
254
315
|
case 'removeall':
|
|
255
316
|
obj?.remove_refund_guards([], true, pst);
|
|
@@ -275,39 +336,56 @@ export class CallService extends CallBase {
|
|
|
275
336
|
}
|
|
276
337
|
}
|
|
277
338
|
if (this.data?.order_agent !== undefined) {
|
|
278
|
-
const o = this.data.order_agent.order
|
|
339
|
+
const o = this.data.order_agent.order ? await LocalMark.Instance().get_address(this.data.order_agent.order) : order_new?.order;
|
|
279
340
|
if (!o)
|
|
280
|
-
ERROR(Errors.
|
|
281
|
-
|
|
341
|
+
ERROR(Errors.InvalidParam, `CallService_Data.data.order_agent.order:${this.data.order_agent.order}`);
|
|
342
|
+
const p = this.data.order_agent.progress ? await LocalMark.Instance().get_address(this.data.order_agent.progress) : order_new?.progress;
|
|
343
|
+
if (!p)
|
|
344
|
+
ERROR(Errors.InvalidParam, `CallService_Data.data.order_agent.progress:${this.data.order_agent.progress}`);
|
|
345
|
+
obj?.set_order_agent(o, await LocalMark.Instance().get_many_address2(this.data.order_agent.agents), p);
|
|
282
346
|
}
|
|
283
347
|
if (this.data?.order_required_info !== undefined && this.data.order_required_info.info !== undefined) {
|
|
284
|
-
const o = this.data.order_required_info.order
|
|
348
|
+
const o = this.data.order_required_info.order ? await LocalMark.Instance().get_address(this.data.order_required_info.order) : order_new?.order;
|
|
285
349
|
if (!o)
|
|
286
|
-
ERROR(Errors.
|
|
350
|
+
ERROR(Errors.InvalidParam, `CallService_Data.data.order_agent.order:${this.data.order_required_info.order}`);
|
|
287
351
|
obj?.update_order_required_info(o, this.data.order_required_info.info);
|
|
288
352
|
}
|
|
289
353
|
if (this.data?.order_refund !== undefined) {
|
|
290
|
-
const o = this.data.order_refund.order
|
|
354
|
+
const o = this.data.order_refund.order ? await LocalMark.Instance().get_address(this.data.order_refund.order) : order_new?.order;
|
|
291
355
|
if (!o)
|
|
292
|
-
ERROR(Errors.
|
|
356
|
+
ERROR(Errors.InvalidParam, `CallService_Data.data.order_agent.order:${this.data.order_refund.order}`);
|
|
293
357
|
if (this.data?.order_refund?.arb && this.data?.order_refund?.arb_token_type) {
|
|
294
|
-
|
|
358
|
+
const arb = await LocalMark.Instance().get_address(this.data?.order_refund?.arb);
|
|
359
|
+
if (arb) {
|
|
360
|
+
obj?.refund_withArb(o, arb, this.data?.order_refund?.arb_token_type);
|
|
361
|
+
}
|
|
295
362
|
}
|
|
296
363
|
else {
|
|
297
|
-
|
|
364
|
+
const guard = await LocalMark.Instance().get_address(this.data?.order_refund?.guard);
|
|
365
|
+
if (guard)
|
|
366
|
+
obj?.refund(o, guard, pst);
|
|
298
367
|
}
|
|
299
368
|
}
|
|
300
369
|
if (this.data?.order_withdrawl !== undefined && pst) { //@ need withdrawal pst
|
|
301
|
-
const o = this.data.order_withdrawl.order
|
|
370
|
+
const o = this.data.order_withdrawl.order ? await LocalMark.Instance().get_address(this.data.order_withdrawl.order) : order_new?.order;
|
|
302
371
|
if (!o)
|
|
303
|
-
ERROR(Errors.
|
|
372
|
+
ERROR(Errors.InvalidParam, `CallService_Data.data.order_agent.order:${this.data.order_withdrawl.order}`);
|
|
373
|
+
this.data.order_withdrawl.data.for_guard = await get_object_address(this.data.order_withdrawl.data.for_guard);
|
|
374
|
+
this.data.order_withdrawl.data.for_object = await get_object_address(this.data.order_withdrawl.data.for_object);
|
|
375
|
+
this.data.order_withdrawl.data.treasury = await get_object_address(this.data.order_withdrawl.data.treasury);
|
|
376
|
+
this.data.order_withdrawl.data.withdraw_guard = await get_object_address(this.data.order_withdrawl.data.withdraw_guard);
|
|
304
377
|
obj?.withdraw(o, this.data.order_withdrawl.data, pst);
|
|
305
378
|
}
|
|
306
379
|
if (this.data?.order_payer !== undefined && obj) {
|
|
307
|
-
const o = this.data.order_payer.order
|
|
380
|
+
const o = this.data.order_payer.order ? await LocalMark.Instance().get_address(this.data.order_payer.order) : order_new?.order;
|
|
308
381
|
if (!o)
|
|
309
|
-
ERROR(Errors.
|
|
310
|
-
|
|
382
|
+
ERROR(Errors.InvalidParam, `CallService_Data.data.order_agent.order:${this.data.order_payer.order}`);
|
|
383
|
+
const p = this.data.order_payer.progress ? await LocalMark.Instance().get_address(this.data.order_payer.progress) : order_new?.progress;
|
|
384
|
+
if (!p)
|
|
385
|
+
ERROR(Errors.InvalidParam, `CallService_Data.data.order_agent.progress:${this.data.order_payer.progress}`);
|
|
386
|
+
const payer = await LocalMark.Instance().get_address(this.data.order_payer.payer_new);
|
|
387
|
+
if (payer)
|
|
388
|
+
obj?.change_order_payer(o, payer, p);
|
|
311
389
|
}
|
|
312
390
|
if (order_new && this?.data?.order_new) {
|
|
313
391
|
const buy = obj.order_launch(order_new);
|