Skip to content

Commit

Permalink
upgrade 3.6.0, v1.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Ashuaidehao committed Sep 11, 2023
1 parent 9f65266 commit 1610b84
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion neo
Submodule neo updated 55 files
+1 −1 .github/workflows/main.yml
+0 −3 README.md
+1 −1 benchmarks/Neo.Benchmarks/Neo.Benchmarks.csproj
+3 −3 src/Directory.Build.props
+2 −1 src/Neo/Hardfork.cs
+6 −2 src/Neo/Ledger/Blockchain.cs
+155 −14 src/Neo/Ledger/MemoryPool.cs
+7 −2 src/Neo/Ledger/TransactionRemovalReason.cs
+7 −3 src/Neo/Ledger/TransactionVerificationContext.cs
+5 −0 src/Neo/Ledger/VerifyResult.cs
+5 −4 src/Neo/Neo.csproj
+13 −1 src/Neo/NeoSystem.cs
+47 −0 src/Neo/Network/P2P/Payloads/Conflicts.cs
+46 −0 src/Neo/Network/P2P/Payloads/NotValidBefore.cs
+6 −4 src/Neo/Network/P2P/Payloads/Transaction.cs
+13 −1 src/Neo/Network/P2P/Payloads/TransactionAttributeType.cs
+1 −1 src/Neo/Network/P2P/Payloads/WitnessScope.cs
+1 −1 src/Neo/Network/P2P/RemoteNode.ProtocolHandler.cs
+32 −3 src/Neo/Persistence/DataCache.cs
+31 −1 src/Neo/ProtocolSettings.cs
+2 −0 src/Neo/SmartContract/ApplicationEngine.OpCodePrices.cs
+88 −5 src/Neo/SmartContract/ApplicationEngine.Runtime.cs
+3 −1 src/Neo/SmartContract/ApplicationEngine.Storage.cs
+24 −6 src/Neo/SmartContract/ApplicationEngine.cs
+6 −1 src/Neo/SmartContract/FindOptions.cs
+11 −6 src/Neo/SmartContract/JsonSerializer.cs
+3 −2 src/Neo/SmartContract/Manifest/ContractManifest.cs
+3 −2 src/Neo/SmartContract/Native/ContractManagement.cs
+134 −0 src/Neo/SmartContract/Native/CryptoLib.BLS12_381.cs
+1 −1 src/Neo/SmartContract/Native/CryptoLib.cs
+27 −2 src/Neo/SmartContract/Native/LedgerContract.cs
+43 −32 src/Neo/SmartContract/Native/NeoToken.cs
+1 −1 src/Neo/SmartContract/Native/StdLib.cs
+12 −1 src/Neo/SmartContract/Native/TransactionState.cs
+6 −6 tests/Directory.Build.props
+42 −1 tests/Neo.UnitTests/IO/Caching/UT_DataCache.cs
+71 −0 tests/Neo.UnitTests/Ledger/UT_Blockchain.cs
+287 −8 tests/Neo.UnitTests/Ledger/UT_MemoryPool.cs
+28 −1 tests/Neo.UnitTests/Ledger/UT_TransactionState.cs
+35 −8 tests/Neo.UnitTests/Ledger/UT_TransactionVerificationContext.cs
+4 −4 tests/Neo.UnitTests/Neo.UnitTests.csproj
+89 −0 tests/Neo.UnitTests/Network/P2P/Payloads/UT_Conflicts.cs
+75 −0 tests/Neo.UnitTests/Network/P2P/Payloads/UT_NotValidBefore.cs
+6 −4 tests/Neo.UnitTests/Network/P2P/Payloads/UT_Transaction.cs
+21 −3 tests/Neo.UnitTests/SmartContract/Manifest/UT_ContractManifest.cs
+328 −0 tests/Neo.UnitTests/SmartContract/Native/UT_CryptoLib.cs
+8 −7 tests/Neo.UnitTests/SmartContract/Native/UT_GasToken.cs
+41 −14 tests/Neo.UnitTests/SmartContract/Native/UT_NeoToken.cs
+31 −5 tests/Neo.UnitTests/SmartContract/UT_ApplicationEngine.Runtime.cs
+37 −1 tests/Neo.UnitTests/SmartContract/UT_ApplicationEngine.cs
+50 −3 tests/Neo.UnitTests/SmartContract/UT_InteropService.cs
+16 −9 tests/Neo.UnitTests/SmartContract/UT_JsonSerializer.cs
+4 −4 tests/Neo.UnitTests/SmartContract/UT_KeyBuilder.cs
+1 −2 tests/Neo.UnitTests/Wallets/NEP6/UT_NEP6Wallet.cs
+3 −2 tests/Neo.UnitTests/Wallets/UT_KeyPair.cs
2 changes: 1 addition & 1 deletion neo3-gui/neo3-gui/ClientApp/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "new-gui",
"version": "1.5.1",
"version": "1.5.2",
"private": true,
"main": "main.js",
"homepage": "./",
Expand Down
3 changes: 2 additions & 1 deletion neo3-gui/neo3-gui/config.mainnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"MemoryPoolMaxTransactions": 50000,
"MaxTraceableBlocks": 2102400,
"Hardforks": {
"HF_Aspidochelone": 1730000
"HF_Aspidochelone": 1730000,
"HF_Basilisk": 4120000
},
"InitialGasDistribution": 5200000000000000,
"ValidatorsCount": 7,
Expand Down
5 changes: 3 additions & 2 deletions neo3-gui/neo3-gui/config.testnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"MemoryPoolMaxTransactions": 50000,
"MaxTraceableBlocks": 2102400,
"Hardforks": {
"HF_Aspidochelone": 210000
"HF_Aspidochelone": 210000,
"HF_Basilisk": 2680000
},
"InitialGasDistribution": 5200000000000000,
"ValidatorsCount": 7,
Expand Down Expand Up @@ -65,4 +66,4 @@
"seed5t5.neo.org:20333"
]
}
}
}
4 changes: 2 additions & 2 deletions neo3-gui/neo3-gui/neo3-gui.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<RootNamespace>Neo</RootNamespace>
<SpaRoot>ClientApp\</SpaRoot>
<DefaultItemExcludes>$(SpaRoot)node_modules\**;Data*\**</DefaultItemExcludes>
Expand All @@ -24,7 +24,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.1" />
<PackageReference Include="Neo" Version="3.5.0" />
<PackageReference Include="Neo" Version="3.6.0" />
<PackageReference Include="Neo.LevelDb.Dev" Version="3.0.0-pre4" />
</ItemGroup>

Expand Down

0 comments on commit 1610b84

Please sign in to comment.