Skip to content

Commit 95a8086

Browse files
Celia18305Celia18305
authored
Merge pull request #111 from neo-project/dev
Merge dev changes to master
2 parents 1a8f91f + 5cb341f commit 95a8086

File tree

190 files changed

+959
-853
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+959
-853
lines changed

‎docs/n3/Advances/Neo VM instructions.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,11 +365,13 @@ It's used to control the running process of NeoVM, including jump, call and othe
365365
| Bytecode | 0x41 |
366366
| Fee | 0 GAS |
367367
| Function | Calls to an interop service. |
368+
368369
### Stack Operation
369370

370371
Copy, remove and swap the elements of the stack.
371372

372373
#### DEPTH
374+
373375
| Instruction | DEPTH |
374376
|----------|------------------------------------------|
375377
| Bytecode | 0x43 |
@@ -849,7 +851,6 @@ Copy, remove and swap the elements of the stack.
849851
| Fee | 0.00000004 GAS |
850852
| Function | Returns 0 if the input is 0. 1 otherwise. |
851853

852-
853854
#### NUMEQUAL
854855

855856
| Instruction | NUMEQUAL |
@@ -906,7 +907,6 @@ Copy, remove and swap the elements of the stack.
906907
| Fee | 0.00000008 GAS |
907908
| Function | Returns the smaller of a and b. |
908909

909-
910910
#### MAX
911911

912912
| Instruction | MAX |
@@ -1125,3 +1125,4 @@ It has implemented common operations for array, map, struct, etc.
11251125

11261126
The operation code with \* indicates that the result of the operation is not pushed back to the `EvaluationStack` using `PUSH()`.
11271127
:::
1128+

‎docs/n3/Advances/Oracles.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Neo Oracle Service is an out-of-chain data access service built into Neo N3. It
1212

1313
The commit-reveal mechanism is a sequential protocol that prevents data plagiarism for multiple Oracle nodes.
1414

15-
**Process**
15+
#### Process
1616

1717
1. Oracle node submits ciphertext information (hash, signature, etc.) about data to other Oracle nodes and collects ciphertext information submitted by other Oracle nodes.
1818

@@ -32,7 +32,7 @@ Neo Oracle Service adopts the request-response processing mechanism, which is an
3232

3333
![](assets/oralce_response.png)
3434

35-
**Process**
35+
#### Process
3636

3737
1. The user writes the smart contract to call the `Request` method of the Oracle contract.
3838

@@ -54,11 +54,11 @@ Oracle service currently supports two URL schemes, `https` and `neofs`. `https`
5454

5555
## Fees and rewards
5656

57-
- **Fees**
57+
- ### Fees
5858

5959
Neo Oracle Service charges the user by the number of requests, 0.5 GAS by default for each. Besides, the user has to pay additional fees for the callback function. All the fees will be paid when the Request is created.
6060

61-
- **Rewards**
61+
- ### Rewards
6262

6363
The fee paid by the user for the Request is distributed to the Oracle node in turn when executing the `PostPersist` logic.
6464

@@ -240,3 +240,4 @@ The Code field defines the status Code for Oracle responses, including the follo
240240
| `0x1a` | `ResponseTooLarge` | result size is out of limit | `byte` |
241241
| `0x1c` | `InsufficientFunds` | the fee is insufficient | `byte` |
242242
| `0xff` | `Error` | error occurs in the execution | `byte` |
243+

‎docs/n3/Advances/neofs/topics/acl-permissions.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Note, there are multiple types of attribute filter you can apply, such as filter
108108
Firstly we need two records. One for the `others` and one for our privileged key
109109

110110
```go
111-
import "github.com/nspcc-dev/neofs-sdk-go/eacl"
111+
import "github.com/nspcc-dev/neofs-sdk-go/eacl"
112112

113113
othersRecord := eacl.NewRecord()
114114
privRecord := eacl.NewRecord()

‎docs/n3/Advances/neofs/topics/objects.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fileNameAttr.SetValue(path.Base(filepath)) //path.Base(filepath) returns the las
3737

3838
expirationEpochAttr := new(object.Attribute)
3939
expirationEpochAttr.SetKey("__NEOFS__EXPIRATION_EPOCH") // Reserved case for when the life of the object should expire
40-
expirationEpochAttr.SetValue(strconv.Itoa(epoch))) //The epoch at which the object will expire
40+
expirationEpochAttr.SetValue(strconv.Itoa(epoch)) //The epoch at which the object will expire
4141

4242
attributes = append(attributes, []*object.Attribute{timeStampAttr, fileNameAttr, expirationEpochAttr}...)
4343

‎docs/n3/Advances/neons/api/getAllRecords.md‎

Lines changed: 105 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ curl --request POST \
2222
"jsonrpc": "2.0",
2323
"method": "invokefunction",
2424
"params": [ "0x538355b776538a5da0b2a08c139b9900b9c0cbb6", "getAllRecords",
25-
[
26-
{
27-
"type":"String","value":"flamincome.neo"
28-
}
29-
],
30-
[]
25+
[
26+
{
27+
"type":"String","value":"flamincome.neo"
28+
}
29+
],
30+
[]
3131
],
3232
"id": 1
3333
}
@@ -38,90 +38,90 @@ Response body #1
3838

3939
```json5
4040
{
41-
"jsonrpc": "2.0",
42-
"id": 1,
43-
"result": {
44-
"script": "DA5mbGFtaW5jb21lLm5lbxHAHwwNZ2V0QWxsUmVjb3JkcwwUtsvAuQCZmxOMoLKgXYpTdrdVg1NBYn1bUg==",
45-
"state": "HALT",
46-
"gasconsumed": "725394",
47-
"exception": null,
48-
"stack": [
49-
{
50-
"type": "InteropInterface",
51-
"iterator": [
52-
{
53-
"type": "Array",
54-
"value": [
55-
{
56-
"type": "ByteString",
57-
"value": "c3ViMS5mbGFtaW5jb21lLm5lbw=="
58-
},
59-
{
60-
"type": "Integer",
61-
"value": "1"
62-
},
63-
{
64-
"type": "ByteString",
65-
"value": "MTY1LjIzLjM0LjU0"
66-
}
67-
]
68-
},
69-
{
70-
"type": "Array",
71-
"value": [
72-
{
73-
"type": "ByteString",
74-
"value": "ZmxhbWluY29tZS5uZW8="
75-
},
76-
{
77-
"type": "Integer",
78-
"value": "5"
79-
},
80-
{
81-
"type": "ByteString",
82-
"value": "YWxpYXMubmVv"
83-
}
84-
]
85-
},
86-
{
87-
"type": "Array",
88-
"value": [
89-
{
90-
"type": "ByteString",
91-
"value": "ZmxhbWluY29tZS5uZW8="
92-
},
93-
{
94-
"type": "Integer",
95-
"value": "16"
96-
},
97-
{
98-
"type": "ByteString",
99-
"value": "TlpIZjFOSnZ6MXR2RUxHTFdaamhwYjNOcVpKRkZVWXB4VA=="
100-
}
101-
]
102-
},
103-
{
104-
"type": "Array",
105-
"value": [
106-
{
107-
"type": "ByteString",
108-
"value": "ZmxhbWluY29tZS5uZW8="
109-
},
110-
{
111-
"type": "Integer",
112-
"value": "28"
113-
},
114-
{
115-
"type": "ByteString",
116-
"value": "MjAwMToxZGI4OjA6Og=="
117-
}
118-
]
119-
}
120-
],
121-
"truncated": false
122-
}
123-
]
124-
}
41+
"jsonrpc": "2.0",
42+
"id": 1,
43+
"result": {
44+
"script": "DA5mbGFtaW5jb21lLm5lbxHAHwwNZ2V0QWxsUmVjb3JkcwwUtsvAuQCZmxOMoLKgXYpTdrdVg1NBYn1bUg==",
45+
"state": "HALT",
46+
"gasconsumed": "725394",
47+
"exception": null,
48+
"stack": [
49+
{
50+
"type": "InteropInterface",
51+
"iterator": [
52+
{
53+
"type": "Array",
54+
"value": [
55+
{
56+
"type": "ByteString",
57+
"value": "c3ViMS5mbGFtaW5jb21lLm5lbw=="
58+
},
59+
{
60+
"type": "Integer",
61+
"value": "1"
62+
},
63+
{
64+
"type": "ByteString",
65+
"value": "MTY1LjIzLjM0LjU0"
66+
}
67+
]
68+
},
69+
{
70+
"type": "Array",
71+
"value": [
72+
{
73+
"type": "ByteString",
74+
"value": "ZmxhbWluY29tZS5uZW8="
75+
},
76+
{
77+
"type": "Integer",
78+
"value": "5"
79+
},
80+
{
81+
"type": "ByteString",
82+
"value": "YWxpYXMubmVv"
83+
}
84+
]
85+
},
86+
{
87+
"type": "Array",
88+
"value": [
89+
{
90+
"type": "ByteString",
91+
"value": "ZmxhbWluY29tZS5uZW8="
92+
},
93+
{
94+
"type": "Integer",
95+
"value": "16"
96+
},
97+
{
98+
"type": "ByteString",
99+
"value": "TlpIZjFOSnZ6MXR2RUxHTFdaamhwYjNOcVpKRkZVWXB4VA=="
100+
}
101+
]
102+
},
103+
{
104+
"type": "Array",
105+
"value": [
106+
{
107+
"type": "ByteString",
108+
"value": "ZmxhbWluY29tZS5uZW8="
109+
},
110+
{
111+
"type": "Integer",
112+
"value": "28"
113+
},
114+
{
115+
"type": "ByteString",
116+
"value": "MjAwMToxZGI4OjA6Og=="
117+
}
118+
]
119+
}
120+
],
121+
"truncated": false
122+
}
123+
]
124+
}
125125
}
126126
```
127127

@@ -137,12 +137,12 @@ curl --request POST \
137137
"jsonrpc": "2.0",
138138
"method": "invokefunction",
139139
"params": [ "0x538355b776538a5da0b2a08c139b9900b9c0cbb6", "getAllRecords",
140-
[
141-
{
142-
"type":"String","value":"expired.neo"
143-
}
144-
],
145-
[]
140+
[
141+
{
142+
"type":"String","value":"expired.neo"
143+
}
144+
],
145+
[]
146146
],
147147
"id": 1
148148
}
@@ -153,14 +153,14 @@ Response body #2
153153

154154
```json5
155155
{
156-
"jsonrpc": "2.0",
157-
"id": 1,
158-
"result": {
159-
"script": "DAtleHBpcmVkLm5lbxHAHwwNZ2V0QWxsUmVjb3JkcwwUtsvAuQCZmxOMoLKgXYpTdrdVg1NBYn1bUg==",
160-
"state": "FAULT",
161-
"gasconsumed": "622077",
162-
"exception": "An unhandled exception was thrown. The name has expired.",
163-
"stack": []
164-
}
156+
"jsonrpc": "2.0",
157+
"id": 1,
158+
"result": {
159+
"script": "DAtleHBpcmVkLm5lbxHAHwwNZ2V0QWxsUmVjb3JkcwwUtsvAuQCZmxOMoLKgXYpTdrdVg1NBYn1bUg==",
160+
"state": "FAULT",
161+
"gasconsumed": "622077",
162+
"exception": "An unhandled exception was thrown. The name has expired.",
163+
"stack": []
164+
}
165165
}
166166
```

‎docs/n3/Advances/neons/api/getRecord.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -246,14 +246,14 @@ Response body #5
246246

247247
```json5
248248
{
249-
"jsonrpc": "2.0",
250-
"id": 1,
251-
"result": {
252-
"script": "IAwLZXhwaXJlZC5uZW8SwB8MCWdldFJlY29yZAwUtsvAuQCZmxOMoLKgXYpTdrdVg1NBYn1bUg==",
253-
"state": "FAULT",
254-
"gasconsumed": "1083138",
255-
"exception": "An unhandled exception was thrown. The name has expired.",
256-
"stack": []
257-
}
249+
"jsonrpc": "2.0",
250+
"id": 1,
251+
"result": {
252+
"script": "IAwLZXhwaXJlZC5uZW8SwB8MCWdldFJlY29yZAwUtsvAuQCZmxOMoLKgXYpTdrdVg1NBYn1bUg==",
253+
"state": "FAULT",
254+
"gasconsumed": "1083138",
255+
"exception": "An unhandled exception was thrown. The name has expired.",
256+
"stack": []
257+
}
258258
}
259259
```

‎docs/n3/Advances/neons/api/roots.md‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,25 @@ Response body
3030

3131
```json5
3232
{
33-
"jsonrpc": "2.0",
34-
"id": 1,
35-
"result": {
36-
"script": "wh8MBXJvb3RzDBQaidSNifjBpm09PQ70gyzrzqkvFUFifVtS",
37-
"state": "HALT",
38-
"gasconsumed": "228888",
39-
"exception": null,
40-
"stack": [
41-
{
42-
"type": "InteropInterface",
43-
"iterator": [
44-
{
45-
"type": "ByteString",
46-
"value": "bmVv"
47-
}
48-
],
49-
"truncated": false
50-
}
51-
]
52-
}
33+
"jsonrpc": "2.0",
34+
"id": 1,
35+
"result": {
36+
"script": "wh8MBXJvb3RzDBQaidSNifjBpm09PQ70gyzrzqkvFUFifVtS",
37+
"state": "HALT",
38+
"gasconsumed": "228888",
39+
"exception": null,
40+
"stack": [
41+
{
42+
"type": "InteropInterface",
43+
"iterator": [
44+
{
45+
"type": "ByteString",
46+
"value": "bmVv"
47+
}
48+
],
49+
"truncated": false
50+
}
51+
]
52+
}
5353
}
5454
```

0 commit comments

Comments
 (0)