Skip to content

Commit 89c125b

Browse files
Jim8yJim8y
authored
Merge branch 'master' into Add-error-codes-and-response-errors
2 parents a744755 + 7faf535 commit 89c125b

10 files changed

+150
-86
lines changed

‎.github/workflows/codeql.yml

-76
This file was deleted.

‎.github/workflows/main.yml

+12-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,12 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
18+
with:
19+
fetch-depth: 0
20+
submodules: recursive
1821
- name: Setup .NET Core
19-
uses: actions/setup-dotnet@v1
22+
uses: actions/setup-dotnet@v4
2023
with:
2124
dotnet-version: ${{ env.DOTNET_VERSION }}
2225
- name: Check format
@@ -56,7 +59,10 @@ jobs:
5659
runs-on: ubuntu-latest
5760
steps:
5861
- name: Checkout
59-
uses: actions/checkout@v2
62+
uses: actions/checkout@v4
63+
with:
64+
fetch-depth: 0
65+
submodules: recursive
6066
- name: Get version
6167
id: get_version
6268
run: |
@@ -69,9 +75,12 @@ jobs:
6975
if: steps.check_tag.outputs.statusCode == '404'
7076
id: create_release
7177
uses: actions/create-release@v1
78+
7279
env:
7380
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7481
with:
82+
fetch-depth: 0
83+
submodules: recursive
7584
tag_name: ${{ steps.get_version.outputs.version }}
7685
release_name: ${{ steps.get_version.outputs.version }}
7786
prerelease: ${{ contains(steps.get_version.outputs.version, '-') }}

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "neo"]
2+
path = neo
3+
url = https://github.com/neo-project/neo.git

‎Directory.Build.props

+6-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
<RepositoryType>git</RepositoryType>
1212
<RepositoryUrl>https://github.com/neo-project/neo-modules.git</RepositoryUrl>
1313
</PropertyGroup>
14-
<ItemGroup>
15-
<PackageReference Include="Neo" Version="3.6.2" ExcludeAssets="runtime" />
16-
</ItemGroup>
17-
</Project>
14+
15+
<ItemGroup>
16+
<ProjectReference Include="..\..\neo\src\Neo\Neo.csproj" />
17+
</ItemGroup>
18+
19+
</Project>

‎neo

Submodule neo added at fd3d68d

‎neo-modules.sln

+44
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SQLiteWallet", "src\SQLiteW
4343
EndProject
4444
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StorageDumper", "src\StorageDumper\StorageDumper.csproj", "{938D86EA-0F48-436B-9255-4AD9A8E6B9AC}"
4545
EndProject
46+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Neo", "neo\src\Neo\Neo.csproj", "{A00FC746-1351-4275-B2D9-489477B409C0}"
47+
EndProject
48+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Neo.IO", "neo\src\Neo.IO\Neo.IO.csproj", "{FEC96A32-38AB-426B-A93E-D37583BEE901}"
49+
EndProject
50+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Neo.Json", "neo\src\Neo.Json\Neo.Json.csproj", "{188D043E-393D-4E5B-A216-4274BF9AFB23}"
51+
EndProject
52+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Neo.VM", "neo\src\Neo.VM\Neo.VM.csproj", "{EDDE78BC-2064-4517-B9B2-25BA012A93C1}"
53+
EndProject
54+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Neo.Extensions", "neo\src\Neo.Extensions\Neo.Extensions.csproj", "{9FF233D7-84C2-4947-96F6-88EE3594C66A}"
55+
EndProject
56+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Neo.Cryptography.BLS12_381", "neo\src\Neo.Cryptography.BLS12_381\Neo.Cryptography.BLS12_381.csproj", "{7437514A-290D-4F84-B315-32ED95F710C1}"
57+
EndProject
58+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependency", "Dependency", "{997874E0-C2A7-4EB2-85AA-180AF592DC6D}"
59+
EndProject
4660
Global
4761
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4862
Debug|Any CPU = Debug|Any CPU
@@ -121,6 +135,30 @@ Global
121135
{938D86EA-0F48-436B-9255-4AD9A8E6B9AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
122136
{938D86EA-0F48-436B-9255-4AD9A8E6B9AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
123137
{938D86EA-0F48-436B-9255-4AD9A8E6B9AC}.Release|Any CPU.Build.0 = Release|Any CPU
138+
{A00FC746-1351-4275-B2D9-489477B409C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
139+
{A00FC746-1351-4275-B2D9-489477B409C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
140+
{A00FC746-1351-4275-B2D9-489477B409C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
141+
{A00FC746-1351-4275-B2D9-489477B409C0}.Release|Any CPU.Build.0 = Release|Any CPU
142+
{FEC96A32-38AB-426B-A93E-D37583BEE901}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
143+
{FEC96A32-38AB-426B-A93E-D37583BEE901}.Debug|Any CPU.Build.0 = Debug|Any CPU
144+
{FEC96A32-38AB-426B-A93E-D37583BEE901}.Release|Any CPU.ActiveCfg = Release|Any CPU
145+
{FEC96A32-38AB-426B-A93E-D37583BEE901}.Release|Any CPU.Build.0 = Release|Any CPU
146+
{188D043E-393D-4E5B-A216-4274BF9AFB23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
147+
{188D043E-393D-4E5B-A216-4274BF9AFB23}.Debug|Any CPU.Build.0 = Debug|Any CPU
148+
{188D043E-393D-4E5B-A216-4274BF9AFB23}.Release|Any CPU.ActiveCfg = Release|Any CPU
149+
{188D043E-393D-4E5B-A216-4274BF9AFB23}.Release|Any CPU.Build.0 = Release|Any CPU
150+
{EDDE78BC-2064-4517-B9B2-25BA012A93C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
151+
{EDDE78BC-2064-4517-B9B2-25BA012A93C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
152+
{EDDE78BC-2064-4517-B9B2-25BA012A93C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
153+
{EDDE78BC-2064-4517-B9B2-25BA012A93C1}.Release|Any CPU.Build.0 = Release|Any CPU
154+
{9FF233D7-84C2-4947-96F6-88EE3594C66A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
155+
{9FF233D7-84C2-4947-96F6-88EE3594C66A}.Debug|Any CPU.Build.0 = Debug|Any CPU
156+
{9FF233D7-84C2-4947-96F6-88EE3594C66A}.Release|Any CPU.ActiveCfg = Release|Any CPU
157+
{9FF233D7-84C2-4947-96F6-88EE3594C66A}.Release|Any CPU.Build.0 = Release|Any CPU
158+
{7437514A-290D-4F84-B315-32ED95F710C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
159+
{7437514A-290D-4F84-B315-32ED95F710C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
160+
{7437514A-290D-4F84-B315-32ED95F710C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
161+
{7437514A-290D-4F84-B315-32ED95F710C1}.Release|Any CPU.Build.0 = Release|Any CPU
124162
EndGlobalSection
125163
GlobalSection(SolutionProperties) = preSolution
126164
HideSolutionNode = FALSE
@@ -144,6 +182,12 @@ Global
144182
{8D2EE375-2E2D-45FE-A4E9-0254D12C7554} = {59D802AB-C552-422A-B9C3-64D329FBCDCC}
145183
{D121D57A-512E-4F74-ADA1-24482BF5C42B} = {97E81C78-1637-481F-9485-DA1225E94C23}
146184
{938D86EA-0F48-436B-9255-4AD9A8E6B9AC} = {97E81C78-1637-481F-9485-DA1225E94C23}
185+
{A00FC746-1351-4275-B2D9-489477B409C0} = {997874E0-C2A7-4EB2-85AA-180AF592DC6D}
186+
{7437514A-290D-4F84-B315-32ED95F710C1} = {997874E0-C2A7-4EB2-85AA-180AF592DC6D}
187+
{9FF233D7-84C2-4947-96F6-88EE3594C66A} = {997874E0-C2A7-4EB2-85AA-180AF592DC6D}
188+
{FEC96A32-38AB-426B-A93E-D37583BEE901} = {997874E0-C2A7-4EB2-85AA-180AF592DC6D}
189+
{188D043E-393D-4E5B-A216-4274BF9AFB23} = {997874E0-C2A7-4EB2-85AA-180AF592DC6D}
190+
{EDDE78BC-2064-4517-B9B2-25BA012A93C1} = {997874E0-C2A7-4EB2-85AA-180AF592DC6D}
147191
EndGlobalSection
148192
GlobalSection(ExtensibilityGlobals) = postSolution
149193
SolutionGuid = {61D3ADE6-BBFC-402D-AB42-1C71C9F9EDE3}

‎src/Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
88
</None>
99
</ItemGroup>
10-
</Project>
10+
</Project>

‎tests/Neo.Plugins.OracleService.Tests/Neo.Plugins.OracleService.Tests.csproj

+8-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,11 @@
1414
<ExcludeAssets>runtime</ExcludeAssets>
1515
</ProjectReference>
1616
</ItemGroup>
17-
</Project>
17+
18+
<ItemGroup>
19+
<None Update="config*.json">
20+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
21+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
22+
</None>
23+
</ItemGroup>
24+
</Project>

‎tests/Neo.Plugins.OracleService.Tests/TestBlockchain.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static class TestBlockchain
2121
static TestBlockchain()
2222
{
2323
Console.WriteLine("initialize NeoSystem");
24-
TheNeoSystem = new NeoSystem(ProtocolSettings.Default, null, null);
24+
TheNeoSystem = new NeoSystem(ProtocolSettings.Load("config.json"), null, null);
2525
}
2626

2727
public static void InitializeMockNeoSystem()

‎tests/Neo.Plugins.OracleService.Tests/config.json

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
{
2+
"ApplicationConfiguration": {
3+
"Logger": {
4+
"Path": "Logs",
5+
"ConsoleOutput": false,
6+
"Active": false
7+
},
8+
"Storage": {
9+
"Engine": "LevelDBStore", // Candidates [MemoryStore, LevelDBStore, RocksDBStore]
10+
"Path": "Data_LevelDB_{0}" // {0} is a placeholder for the network id
11+
},
12+
"P2P": {
13+
"Port": 10333,
14+
"MinDesiredConnections": 10,
15+
"MaxConnections": 40,
16+
"MaxConnectionsPerAddress": 3
17+
},
18+
"UnlockWallet": {
19+
"Path": "",
20+
"Password": "",
21+
"IsActive": false
22+
},
23+
"Contracts": {
24+
"NeoNameService": "0x50ac1c37690cc2cfc594472833cf57505d5f46de"
25+
},
26+
"Plugins": {
27+
"DownloadUrl": "https://api.github.com/repos/neo-project/neo-modules/releases"
28+
}
29+
},
30+
"ProtocolConfiguration": {
31+
"Network": 860833102,
32+
"AddressVersion": 53,
33+
"MillisecondsPerBlock": 15000,
34+
"MaxTransactionsPerBlock": 512,
35+
"MemoryPoolMaxTransactions": 50000,
36+
"MaxTraceableBlocks": 2102400,
37+
"Hardforks": {
38+
"HF_Aspidochelone": 1730000,
39+
"HF_Basilisk": 4120000
40+
},
41+
"InitialGasDistribution": 5200000000000000,
42+
"ValidatorsCount": 7,
43+
"StandbyCommittee": [
44+
"03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c",
45+
"02df48f60e8f3e01c48ff40b9b7f1310d7a8b2a193188befe1c2e3df740e895093",
46+
"03b8d9d5771d8f513aa0869b9cc8d50986403b78c6da36890638c3d46a5adce04a",
47+
"02ca0e27697b9c248f6f16e085fd0061e26f44da85b58ee835c110caa5ec3ba554",
48+
"024c7b7fb6c310fccf1ba33b082519d82964ea93868d676662d4a59ad548df0e7d",
49+
"02aaec38470f6aad0042c6e877cfd8087d2676b0f516fddd362801b9bd3936399e",
50+
"02486fd15702c4490a26703112a5cc1d0923fd697a33406bd5a1c00e0013b09a70",
51+
"023a36c72844610b4d34d1968662424011bf783ca9d984efa19a20babf5582f3fe",
52+
"03708b860c1de5d87f5b151a12c2a99feebd2e8b315ee8e7cf8aa19692a9e18379",
53+
"03c6aa6e12638b36e88adc1ccdceac4db9929575c3e03576c617c49cce7114a050",
54+
"03204223f8c86b8cd5c89ef12e4f0dbb314172e9241e30c9ef2293790793537cf0",
55+
"02a62c915cf19c7f19a50ec217e79fac2439bbaad658493de0c7d8ffa92ab0aa62",
56+
"03409f31f0d66bdc2f70a9730b66fe186658f84a8018204db01c106edc36553cd0",
57+
"0288342b141c30dc8ffcde0204929bb46aed5756b41ef4a56778d15ada8f0c6654",
58+
"020f2887f41474cfeb11fd262e982051c1541418137c02a0f4961af911045de639",
59+
"0222038884bbd1d8ff109ed3bdef3542e768eef76c1247aea8bc8171f532928c30",
60+
"03d281b42002647f0113f36c7b8efb30db66078dfaaa9ab3ff76d043a98d512fde",
61+
"02504acbc1f4b3bdad1d86d6e1a08603771db135a73e61c9d565ae06a1938cd2ad",
62+
"0226933336f1b75baa42d42b71d9091508b638046d19abd67f4e119bf64a7cfb4d",
63+
"03cdcea66032b82f5c30450e381e5295cae85c5e6943af716cc6b646352a6067dc",
64+
"02cd5a5547119e24feaa7c2a0f37b8c9366216bab7054de0065c9be42084003c8a"
65+
],
66+
"SeedList": [
67+
"seed1.neo.org:10333",
68+
"seed2.neo.org:10333",
69+
"seed3.neo.org:10333",
70+
"seed4.neo.org:10333",
71+
"seed5.neo.org:10333"
72+
]
73+
}
74+
}

0 commit comments

Comments
 (0)