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

sync neo #743

Merged
merged 17 commits into from
Feb 17, 2021
Merged

sync neo #743

merged 17 commits into from
Feb 17, 2021

Conversation

bettybao1209
Copy link
Contributor

@bettybao1209 bettybao1209 commented Feb 11, 2021

Close #742

shargon
shargon previously approved these changes Feb 12, 2021
@erikzhang
Copy link
Member

this.Path = string.Format(section.GetValue("Path", "Logs_{0}"), ProtocolSettings.Default.Magic.ToString("X8"));

Here we shouldn't use ProtocolSettings.Default anymore.

@bettybao1209
Copy link
Contributor Author

bettybao1209 commented Feb 13, 2021

wait for neo-project/neo#2336

shargon
shargon previously approved these changes Feb 15, 2021
neo-cli/CLI/Logger.cs Outdated Show resolved Hide resolved
@cloud8little
Copy link
Contributor

SendTransaction/OnInvokeResult method, should add protocolsettings for parameters.

try
{
Transaction tx = CurrentWallet.MakeTransaction(snapshot, script, account, signers, maxGas: gas);
Console.WriteLine($"Invoking script with: '{tx.Script.ToBase64String()}'");
using (ApplicationEngine engine = ApplicationEngine.Run(tx.Script, snapshot, container: tx, gas: gas))
{
PrintExecutionOutput(engine, true);
if (engine.State == VMState.FAULT) return;
}

if (verificable is Transaction tx)
{
tx.Script = script;
}
using ApplicationEngine engine = ApplicationEngine.Run(script, NeoSystem.StoreView, container: verificable, gas: gas);
PrintExecutionOutput(engine, showStack);
result = engine.State == VMState.FAULT ? null : engine.ResultStack.Peek();
return engine.State != VMState.FAULT;

@bettybao1209
Copy link
Contributor Author

SendTransaction/OnInvokeResult method, should add protocolsettings for parameters.

Fixed.

@bettybao1209 bettybao1209 changed the title allow multiple neosystems sync neo Feb 16, 2021
shargon
shargon previously approved these changes Feb 17, 2021
@shargon shargon merged commit c784a6c into neo-project:master Feb 17, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

neo changes need to be synchronized
4 participants