Skip to content

Commit a7b6abe

Browse files
committed
[Node] Add for new abi files and non-struct abi feature
1 parent 5d95193 commit a7b6abe

18 files changed

Lines changed: 229 additions & 228 deletions

service/node/config/assetmng.abi

Lines changed: 25 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,46 @@
11
{
22
"types": [],
33
"structs": [{
4-
"name": "asset_info",
4+
"name": "AssetInfo",
55
"base": "",
66
"fields": {
7-
"user_name": "string",
8-
"asset_name": "string",
9-
"asset_type": "string",
10-
"feature_tag": "string",
11-
"sample_path": "string",
12-
"sample_hash": "string",
13-
"storage_path": "string",
14-
"storage_hash": "string",
15-
"expire_time": "uint32",
16-
"price": "uint64",
17-
"description": "string",
18-
"upload_date": "uint32",
19-
"signature": "string"
20-
}
21-
},{
22-
"name": "reg_asset_req",
7+
"userName": "string",
8+
"assetName": "string",
9+
"assetType": "uint64",
10+
"featureTag": "string",
11+
"sampleHash": "string",
12+
"storageHash": "string",
13+
"expireTime": "uint32",
14+
"opType": "uint32",
15+
"tokenType": "string",
16+
"price": "uint64",
17+
"description": "string"
18+
}
19+
},
20+
{
21+
"name": "RegAssetReq",
2322
"base": "",
2423
"fields": {
25-
"asset_id": "string",
26-
"info": "asset_info"
27-
}
28-
},{
29-
"name": "regassettbl",
30-
"base": "",
31-
"fields": {
32-
"asset_id": "string",
33-
"info": "asset_info"
34-
}
24+
"assetId": "string",
25+
"info": "AssetInfo"
26+
}
3527
}
3628
],
3729
"actions": [{
38-
"action_name": "regassetreq",
39-
"type": "reg_asset_req"
30+
"action_name": "assetreg",
31+
"type": "RegAssetReq"
4032
}
4133
],
4234
"tables": [{
43-
"table_name": "regassettbl",
35+
"table_name":"assetreginfo",
4436
"index_type": "string",
4537
"key_names": [
46-
"asset_id"
38+
"assetId"
4739
],
4840
"key_types": [
4941
"string"
5042
],
51-
"type": "regassettbl"
43+
"type": "AssetInfo"
5244
}
5345
]
54-
}
46+
}

service/node/config/assetmng.wasm

597 Bytes
Binary file not shown.
20.9 KB
Binary file not shown.
Lines changed: 38 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,71 @@
11
{
22
"types": [],
33
"structs": [{
4-
"name": "DataExchangeBaseInfo",
4+
"name":"DataDealnfo",
55
"base": "",
66
"fields": {
7-
"userName": "string",
8-
"sessionId": "string",
9-
"assetId": "string",
10-
"random_num": "uint64",
11-
"signature": "string"
12-
}
13-
},{
14-
"name": "DataExchgReq",
7+
"userName": "string",
8+
"assetId": "string"
9+
}
10+
},
11+
{
12+
"name":"DataDealReq",
1513
"base": "",
1614
"fields": {
17-
"dataExchangeId": "string",
18-
"info": "DataExchangeBaseInfo"
19-
}
20-
},{
21-
"name": "DataPresaleInfo",
15+
"dataExchangeId": "string",
16+
"info": "DataDealnfo"
17+
}
18+
},
19+
{
20+
"name":"PresaleInfo",
2221
"base": "",
2322
"fields": {
24-
"userName": "string",
25-
"sessionId": "string",
26-
"assetId": "string",
27-
"assetName": "string",
28-
"dataReqId": "string",
29-
"dataReqName": "string",
30-
"consumer": "string",
31-
"random_num": "uint64",
32-
"signature": "string"
33-
}
34-
},{
35-
"name": "PresaleReq",
23+
"userName": "string",
24+
"assetId": "string",
25+
"dataReqId":"string",
26+
"consumer": "string",
27+
"opType": "uint32"
28+
}
29+
},
30+
{
31+
"name":"PresaleReq",
3632
"base": "",
3733
"fields": {
38-
"dataPresaleId": "string",
39-
"info": "DataPresaleInfo"
40-
}
41-
},{
42-
"name": "ExgReqTbl",
43-
"base": "",
44-
"fields": {
45-
"dataExchangeId": "string",
46-
"info": "DataExchangeBaseInfo"
47-
}
48-
},{
49-
"name": "PresaleTbl",
50-
"base": "",
51-
"fields": {
52-
"dataPresaleId": "string",
53-
"info": "DataPresaleInfo"
54-
}
34+
"dataPresaleId": "string",
35+
"info": "PresaleInfo"
36+
}
5537
}
5638
],
5739
"actions": [{
58-
"action_name": "dataexchgreq",
59-
"type": "DataExchgReq"
60-
},{
61-
"action_name": "presalereq",
62-
"type": "PresaleReq"
40+
"action_name": "buydata",
41+
"type": "DataDealReq"
42+
},
43+
{
44+
"action_name": "presale",
45+
"type": "PresaleReq"
6346
}
6447
],
6548
"tables": [{
66-
"table_name": "exgreqtbl",
49+
"table_name": "datadealinfo",
6750
"index_type": "string",
6851
"key_names": [
6952
"dataExchangeId"
7053
],
7154
"key_types": [
7255
"string"
7356
],
74-
"type": "ExgReqTbl"
75-
},{
76-
"table_name": "presaletbl",
57+
"type": "DataDealnfo"
58+
},
59+
{
60+
"table_name": "presaleinfo",
7761
"index_type": "string",
7862
"key_names": [
7963
"dataPresaleId"
8064
],
8165
"key_types": [
8266
"string"
8367
],
84-
"type": "PresaleTbl"
68+
"type": "PresaleInfo"
8569
}
8670
]
87-
}
71+
}
-5.68 KB
Binary file not shown.
Lines changed: 45 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,64 @@
11
{
22
"types": [],
33
"structs": [{
4-
"name": "FileInfo",
4+
"name": "DataFileInfo",
55
"base": "",
66
"fields": {
7-
"userName": "string",
8-
"sessionId": "string",
9-
"fileSize": "uint64",
10-
"fileName": "string",
11-
"filePolicy": "string",
12-
"authPath": "string",
13-
"fileNumber": "uint64",
14-
"signature": "string"
15-
}
16-
},{
17-
"name": "FileRegReq",
7+
"userName": "string",
8+
"fileSize": "uint64",
9+
"fileName": "string",
10+
"filePolicy": "string",
11+
"fileNumber": "uint64",
12+
"simorass": "uint32",
13+
"opType": "uint32",
14+
"storeAddr": "string"
15+
}
16+
},
17+
{
18+
"name": "DataFileRegReq",
1819
"base": "",
1920
"fields": {
20-
"fileHash": "string",
21-
"info": "FileInfo"
22-
}
23-
},{
24-
"name": "FileAuthReq",
21+
"fileHash":"string",
22+
"info": "DataFileInfo"
23+
}
24+
},
25+
{
26+
"name": "DataFileAuthReq",
2527
"base": "",
2628
"fields": {
27-
"storgeHash": "string",
28-
"userName": "string"
29-
}
30-
},{
29+
"storgeHash": "string",
30+
"userName": "string"
31+
}
32+
},
33+
{
3134
"name": "AuthBasicInfo",
3235
"base": "",
3336
"fields": {
34-
"authType": "string",
35-
"authPath": "string"
36-
}
37-
},{
38-
"name": "FileAuthInfo",
39-
"base": "",
40-
"fields": {
41-
"hashUserName": "string",
42-
"info": "AuthBasicInfo"
43-
}
37+
"authType": "string"
38+
}
4439
}
4540
],
4641
"actions": [{
47-
"action_name": "fileregreq",
48-
"type": "FileRegReq"
49-
},{
50-
"action_name": "fileauthreq",
51-
"type": "FileAuthReq"
42+
"action_name": "datafilereg",
43+
"type": "DataFileRegReq"
44+
},
45+
{
46+
"action_name": "fileauthreg",
47+
"type": "DataFileAuthReq"
5248
}
5349
],
5450
"tables": [{
51+
"table_name": "datafileinfo",
52+
"index_type": "string",
53+
"key_names": [
54+
"fileHash"
55+
],
56+
"key_types": [
57+
"string"
58+
],
59+
"type": "DataFileInfo"
60+
},
61+
{
5562
"table_name": "fileauthinfo",
5663
"index_type": "string",
5764
"key_names": [
@@ -60,7 +67,7 @@
6067
"key_types": [
6168
"string"
6269
],
63-
"type": "FileAuthInfo"
70+
"type": "AuthBasicInfo"
6471
}
6572
]
66-
}
73+
}
-7 Bytes
Binary file not shown.

service/node/config/datareqmng.abi

Lines changed: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,46 @@
11
{
22
"types": [],
33
"structs": [{
4-
"name": "data_requirement_info",
4+
"name": "DataReqInfo",
55
"base": "",
66
"fields": {
7-
"user_name": "string",
8-
"session_id": "string",
9-
"requirement_name": "string",
10-
"feature_tag": "uint64",
11-
"sample_path": "string",
12-
"sample_hash": "string",
13-
"expire_time": "uint32",
14-
"price": "uint64",
15-
"description": "string",
16-
"publish_date": "uint32",
17-
"signature": "string"
18-
}
19-
},{
20-
"name": "requirereq",
7+
"userName": "string",
8+
"reqName": "string",
9+
"reqType": "uint64",
10+
"featureTag": "uint64",
11+
"sampleHash": "string",
12+
"expireTime": "uint64",
13+
"opType": "uint32",
14+
"tokenType":"string",
15+
"price": "uint64",
16+
"favoriFlag": "uint32",
17+
"description": "string"
18+
}
19+
},
20+
{
21+
"name": "RegDataReqReq",
2122
"base": "",
2223
"fields": {
23-
"require_id": "string",
24-
"info": "data_requirement_info"
25-
}
26-
},{
27-
"name": "requiretbl",
28-
"base": "",
29-
"fields": {
30-
"require_id": "string",
31-
"info": "data_requirement_info"
32-
}
24+
"dataReqId": "string",
25+
"info": "DataReqInfo"
26+
}
3327
}
3428
],
3529
"actions": [{
36-
"action_name": "requirereq",
37-
"type": "requirereq"
30+
"action_name": "datareqreg",
31+
"type": "RegDataReqReq"
3832
}
3933
],
4034
"tables": [{
41-
"table_name": "requiretbl",
35+
"table_name": "datareqreginfo",
4236
"index_type": "string",
4337
"key_names": [
44-
"require_id"
38+
"dataReqId"
4539
],
4640
"key_types": [
4741
"string"
4842
],
49-
"type": "requiretbl"
43+
"type": "DataReqInfo"
5044
}
5145
]
52-
}
46+
}
694 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)