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

add cancel command for conflict attribute #903

Merged
merged 5 commits into from
Oct 11, 2023
Merged

add cancel command for conflict attribute #903

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a01c8aa
add cancel command for conflict attribute
superboyiii Oct 10, 2023
aae720e
fix some comment
superboyiii Oct 10, 2023
20a1013
fix no-wallet
superboyiii Oct 10, 2023
e07906a
format
superboyiii Oct 11, 2023
c0c438e
Clean and use cheaper OpCode
shargon Oct 11, 2023
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
4 changes: 1 addition & 3 deletions neo-cli/CLI/MainService.Wallet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,9 +605,8 @@ private void OnCancelCommand(UInt256 txid, UInt160 sender = null, UInt160[] sign
try
{
using ScriptBuilder scriptBuilder = new();
scriptBuilder.Emit(OpCode.NOP);
scriptBuilder.Emit(OpCode.RET);
Jim8y marked this conversation as resolved.
Show resolved Hide resolved
tx = CurrentWallet.MakeTransaction(NeoSystem.StoreView, scriptBuilder.ToArray(), sender, signers, conflict);

}
catch (InvalidOperationException e)
{
Expand All @@ -630,7 +629,6 @@ private void OnCancelCommand(UInt256 txid, UInt160 sender = null, UInt160[] sign
return;
}
tx.NetworkFee += (long)decimalExtraFee.Value;

};

ConsoleHelper.Info("Network fee: ",
Expand Down