From c7997a93e0b878c75bddf24dd41e57efb003c337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=BF=97=E5=90=8C?= Date: Wed, 21 Oct 2020 14:59:01 +0800 Subject: [PATCH 1/4] fixed-bug-1021 --- src/RpcServer/RpcServer.SmartContract.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RpcServer/RpcServer.SmartContract.cs b/src/RpcServer/RpcServer.SmartContract.cs index f5cf6cbfc..3de9c924f 100644 --- a/src/RpcServer/RpcServer.SmartContract.cs +++ b/src/RpcServer/RpcServer.SmartContract.cs @@ -79,7 +79,7 @@ private JObject GetInvokeResult(byte[] script, Signers signers = null) } if (engine.State != VMState.FAULT) { - ProcessInvokeWithWallet(json, signers); + ProcessInvokeWithWallet(json, null, signers); } return json; } From 7c9f02bb4bb73841a3cc2cd85dc67b59d643edc9 Mon Sep 17 00:00:00 2001 From: Shargon Date: Wed, 21 Oct 2020 09:22:58 +0200 Subject: [PATCH 2/4] Update src/RpcServer/RpcServer.SmartContract.cs --- src/RpcServer/RpcServer.SmartContract.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RpcServer/RpcServer.SmartContract.cs b/src/RpcServer/RpcServer.SmartContract.cs index 3de9c924f..8203bd7c6 100644 --- a/src/RpcServer/RpcServer.SmartContract.cs +++ b/src/RpcServer/RpcServer.SmartContract.cs @@ -79,7 +79,7 @@ private JObject GetInvokeResult(byte[] script, Signers signers = null) } if (engine.State != VMState.FAULT) { - ProcessInvokeWithWallet(json, null, signers); + ProcessInvokeWithWallet(json, signers: signers); } return json; } From 1079aa36eb031f2d2672033ecd3cdb2e689672ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=BF=97=E5=90=8C?= Date: Wed, 21 Oct 2020 17:48:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=98=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/RpcServer/RpcServer.SmartContract.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RpcServer/RpcServer.SmartContract.cs b/src/RpcServer/RpcServer.SmartContract.cs index 8203bd7c6..f5cf6cbfc 100644 --- a/src/RpcServer/RpcServer.SmartContract.cs +++ b/src/RpcServer/RpcServer.SmartContract.cs @@ -79,7 +79,7 @@ private JObject GetInvokeResult(byte[] script, Signers signers = null) } if (engine.State != VMState.FAULT) { - ProcessInvokeWithWallet(json, signers: signers); + ProcessInvokeWithWallet(json, signers); } return json; } From aa8e120d3e7f81fd1cfaf6c495b15eed3eb66a21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=BF=97=E5=90=8C?= Date: Thu, 29 Oct 2020 15:09:06 +0800 Subject: [PATCH 4/4] Keeping up to date with neo --- src/RpcClient/TransactionManagerFactory.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/RpcClient/TransactionManagerFactory.cs b/src/RpcClient/TransactionManagerFactory.cs index 0f7277a2c..c9a3d77ad 100644 --- a/src/RpcClient/TransactionManagerFactory.cs +++ b/src/RpcClient/TransactionManagerFactory.cs @@ -1,5 +1,6 @@ using Neo.Network.P2P.Payloads; using Neo.Network.RPC.Models; +using Neo.SmartContract; using System; using System.Threading.Tasks; @@ -46,7 +47,7 @@ public async Task MakeTransactionAsync(byte[] script, Signer Nonce = (uint)new Random().Next(), Script = script, Signers = signers ?? Array.Empty(), - ValidUntilBlock = blockCount - 1 + Transaction.MaxValidUntilBlockIncrement, + ValidUntilBlock = blockCount - 1 + ApplicationEngine.MaxTraceableBlocks, SystemFee = long.Parse(invokeResult.GasConsumed), Attributes = attributes ?? Array.Empty(), };