sync neo (#495)

neo-project · Jan 31, 2021 · 3f99dad · 3f99dad
1 parent dc1ea40
commit 3f99dad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -15,7 +15,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Neo" Version="3.0.0-CI01171" />
+ <PackageReference Include="Neo" Version="3.0.0-CI01181" />
  </ItemGroup>
 
 </Project>
diff --git a/src/RpcServer/RpcServer.Blockchain.cs b/src/RpcServer/RpcServer.Blockchain.cs
@@ -18,7 +18,7 @@ partial class RpcServer
  [RpcMethod]
  protected virtual JObject GetBestBlockHash(JArray _params)
  {
- return Blockchain.Singleton.CurrentBlockHash.ToString();
+ return NativeContract.Ledger.CurrentHash(Blockchain.Singleton.View).ToString();
  }
 
  [RpcMethod]
@@ -55,7 +55,7 @@ protected virtual JObject GetBlock(JArray _params)
  [RpcMethod]
  protected virtual JObject GetBlockCount(JArray _params)
  {
- return Blockchain.Singleton.Height + 1;
+ return NativeContract.Ledger.CurrentIndex(Blockchain.Singleton.View) + 1;
  }
 
  [RpcMethod]
@@ -131,7 +131,7 @@ protected virtual JObject GetRawMemPool(JArray _params)
  return new JArray(Blockchain.Singleton.MemPool.GetVerifiedTransactions().Select(p => (JObject)p.Hash.ToString()));
 
  JObject json = new JObject();
- json["height"] = Blockchain.Singleton.Height;
+ json["height"] = NativeContract.Ledger.CurrentIndex(Blockchain.Singleton.View);
  Blockchain.Singleton.MemPool.GetVerifiedAndUnverifiedTransactions(
  out IEnumerable<Transaction> verifiedTransactions,
  out IEnumerable<Transaction> unverifiedTransactions);