Skip to content
This repository has been archived by the owner on Dec 7, 2023. It is now read-only.

Commit

Permalink
update dependency: Neo v2.7.6
Browse files Browse the repository at this point in the history
Fix #168
Close #165
Close #176
Close #177
  • Loading branch information
erikzhang committed Jun 19, 2018
1 parent 4298f87 commit dded813
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 9 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,20 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

## [2.7.6] - 2018-06-19
### Added
- New CLI command: `import multisigaddress`.
- New CLI commands: `sign` and `relay`.
- New RPC command: `getvalidators`.
- New smart contract APIs: `Neo.Enumerator.*`.
- New smart contract API: `System.Blockchain.GetTransactionHeight`.
- New smart contract API: `System.Storage.GetReadOnlyContext` and `Neo.StorageContext.AsReadOnly`.

### Changed
- Support for NeoContract Standary Namespace.
- Improved Plugins System: filter transactions in plugin.
- Improve the speed of creating addresses.

## [2.7.5] - 2018-05-18
### Added
- Importing/exporting blocks with sharding.
Expand Down
12 changes: 6 additions & 6 deletions neo-cli/Shell/MainService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ internal class MainService : ConsoleServiceBase
protected override string Prompt => "neo";
public override string ServiceName => "NEO-CLI";

private void ImportBlocks(Stream stream, bool read_start = false)
private void ImportBlocks(Stream stream, bool read_start = false)
{
LevelDBBlockchain blockchain = (LevelDBBlockchain)Blockchain.Default;
using (BinaryReader r = new BinaryReader(stream))
Expand Down Expand Up @@ -514,7 +514,7 @@ private bool OnImportMultisigAddress(string[] args)
if (m < 1 || m > n || n > 1024)
{
Console.WriteLine("Error. Invalid parameters.");
return true;
return true;
}

ECPoint[] publicKeys = args.Skip(3).Select(p => ECPoint.Parse(p, ECCurve.Secp256r1)).ToArray();
Expand Down Expand Up @@ -1094,10 +1094,10 @@ private void LevelDBBlockchain_ApplicationExecuted(object sender, ApplicationExe
{
JObject json = new JObject();
json["txid"] = e.Transaction.Hash.ToString();
json["vmstate"] = e.VMState;
json["gas_consumed"] = e.GasConsumed.ToString();
json["stack"] = e.Stack.Select(p => p.ToParameter().ToJson()).ToArray();
json["notifications"] = e.Notifications.Select(p =>
json["vmstate"] = e.ExecutionResults[0].VMState;
json["gas_consumed"] = e.ExecutionResults[0].GasConsumed.ToString();
json["stack"] = e.ExecutionResults[0].Stack.Select(p => p.ToParameter().ToJson()).ToArray();
json["notifications"] = e.ExecutionResults[0].Notifications.Select(p =>
{
JObject notification = new JObject();
notification["contract"] = p.ScriptHash.ToString();
Expand Down
6 changes: 3 additions & 3 deletions neo-cli/neo-cli.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Copyright>2016-2017 The Neo Project</Copyright>
<Copyright>2016-2018 The Neo Project</Copyright>
<AssemblyTitle>Neo.CLI</AssemblyTitle>
<Version>2.7.5</Version>
<Version>2.7.6</Version>
<Authors>The Neo Project</Authors>
<TargetFramework>netcoreapp2.0</TargetFramework>
<AssemblyName>neo-cli</AssemblyName>
Expand All @@ -28,7 +28,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Neo" Version="2.7.5" />
<PackageReference Include="Neo" Version="2.7.6" />
</ItemGroup>

</Project>

0 comments on commit dded813

Please sign in to comment.