Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow setting Additional GAS to be used in RpcInvoke for RpcServer. Expose overloaded ApplicationEngine.Run allowing a passed Snapshot. #397

Merged
merged 11 commits into from
Oct 17, 2018
Merged

Allow setting Additional GAS to be used in RpcInvoke for RpcServer. Expose overloaded ApplicationEngine.Run allowing a passed Snapshot. #397

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a3c2d7a
Allow up to 300 GAS to be used in RpcInvoke. Expose Application.Run o…
Sep 25, 2018
b88db05
Switch to limiting to 1000 GAS for rpc invokes.
Sep 26, 2018
ac04236
Update RpcServer.cs
shargon Sep 27, 2018
371dcb0
Support starting the RpcServer with a custom maximum gas amount for c…
Oct 1, 2018
27c2780
Address PR comment regarding re-use of Snapshot PersistingBlock.
Oct 13, 2018
fef618c
Merge branch 'master' into MoreGasForRpcInvoke
Oct 14, 2018
41ad210
Revert back to default of 10 gas for RpcInvokes.
Oct 17, 2018
874606e
Merge branch 'master' into MoreGasForRpcInvoke
Oct 17, 2018
2562cf1
Update neo/Network/RPC/RpcServer.cs
erikzhang Oct 17, 2018
5b73afd
Switch to Fixed8 for maxGasInvoke in constructor.
Oct 17, 2018
4af92d9
Fix setting maxGasInvoke now that the param is Fixed8.
Oct 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions neo/NeoSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,10 @@ public void StartNode(int port = 0, int ws_port = 0)
});
}

public void StartRpc(IPAddress bindAddress, int port, Wallet wallet = null, string sslCert = null, string password = null, string[] trustedAuthorities = null)
public void StartRpc(IPAddress bindAddress, int port, Wallet wallet = null, string sslCert = null, string password = null,
string[] trustedAuthorities = null, long maxGasInvoke = 99000000000L)
{
rpcServer = new RpcServer(this, wallet);
rpcServer = new RpcServer(this, wallet, maxGasInvoke);
rpcServer.Start(bindAddress, port, sslCert, password, trustedAuthorities);
}
}
Expand Down
8 changes: 5 additions & 3 deletions neo/Network/RPC/RpcServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,13 @@ public sealed class RpcServer : IDisposable
private readonly NeoSystem system;
private readonly Wallet wallet;
private IWebHost host;
private Fixed8 maxGasInvoke;

public RpcServer(NeoSystem system, Wallet wallet = null)
public RpcServer(NeoSystem system, Wallet wallet = null, long maxGasInvoke = 99000000000L)
{
this.system = system;
this.wallet = wallet;
this.maxGasInvoke = new Fixed8(maxGasInvoke);
}

private static JObject CreateErrorResponse(JObject id, int code, string message, JObject data = null)
Expand Down Expand Up @@ -71,7 +73,7 @@ public void Dispose()

private JObject GetInvokeResult(byte[] script)
{
ApplicationEngine engine = ApplicationEngine.Run(script);
ApplicationEngine engine = ApplicationEngine.Run(script, null, null, false, maxGasInvoke);
JObject json = new JObject();
json["script"] = script.ToHexString();
json["state"] = engine.State;
Expand Down Expand Up @@ -695,4 +697,4 @@ public void Start(IPAddress bindAddress, int port, string sslCert = null, string
host.Start();
}
}
}
}
48 changes: 27 additions & 21 deletions neo/SmartContract/ApplicationEngine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,30 +610,36 @@ private bool PreStepInto(OpCode nextOpcode)
return true;
}

public static ApplicationEngine Run(byte[] script, IScriptContainer container = null, Block persisting_block = null, bool testMode = false)
public static ApplicationEngine Run(byte[] script, Snapshot snapshot,
IScriptContainer container = null, Block persistingBlock = null, bool testMode = false, Fixed8 extraGAS = default(Fixed8))
{
using (Snapshot snapshot = Blockchain.Singleton.GetSnapshot())
snapshot.PersistingBlock = persistingBlock ?? snapshot.PersistingBlock ?? new Block
{
snapshot.PersistingBlock = persisting_block ?? new Block
Version = 0,
PrevHash = snapshot.CurrentBlockHash,
MerkleRoot = new UInt256(),
Timestamp = snapshot.Blocks[snapshot.CurrentBlockHash].TrimmedBlock.Timestamp + Blockchain.SecondsPerBlock,
Index = snapshot.Height + 1,
ConsensusData = 0,
NextConsensus = snapshot.Blocks[snapshot.CurrentBlockHash].TrimmedBlock.NextConsensus,
Witness = new Witness
{
Version = 0,
PrevHash = snapshot.CurrentBlockHash,
MerkleRoot = new UInt256(),
Timestamp = snapshot.Blocks[snapshot.CurrentBlockHash].TrimmedBlock.Timestamp + Blockchain.SecondsPerBlock,
Index = snapshot.Height + 1,
ConsensusData = 0,
NextConsensus = snapshot.Blocks[snapshot.CurrentBlockHash].TrimmedBlock.NextConsensus,
Witness = new Witness
{
InvocationScript = new byte[0],
VerificationScript = new byte[0]
},
Transactions = new Transaction[0]
};
ApplicationEngine engine = new ApplicationEngine(TriggerType.Application, container, snapshot, Fixed8.Zero, testMode);
engine.LoadScript(script);
engine.Execute();
return engine;
InvocationScript = new byte[0],
VerificationScript = new byte[0]
},
Transactions = new Transaction[0]
};
ApplicationEngine engine = new ApplicationEngine(TriggerType.Application, container, snapshot, extraGAS, testMode);
engine.LoadScript(script);
engine.Execute();
return engine;
}

public static ApplicationEngine Run(byte[] script, IScriptContainer container = null, Block persistingBlock = null, bool testMode = false, Fixed8 extraGAS = default(Fixed8))
{
using (Snapshot snapshot = Blockchain.Singleton.GetSnapshot())
{
return Run(script, snapshot, container, persistingBlock, testMode, extraGAS);
}
}
}
Expand Down