Merge branch 'master' into fixes/syscalls

neo-project · Apr 8, 2020 · 063357e · 063357e
2 parents 8d2d524 + c0a4114
commit 063357e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/src/neo/Network/P2P/Payloads/Transaction.cs b/src/neo/Network/P2P/Payloads/Transaction.cs
@@ -172,7 +172,6 @@ public void DeserializeUnsigned(BinaryReader reader)
             Sender = reader.ReadSerializable<UInt160>();
             SystemFee = reader.ReadInt64();
             if (SystemFee < 0) throw new FormatException();
-            if (SystemFee % NativeContract.GAS.Factor != 0) throw new FormatException();
             NetworkFee = reader.ReadInt64();
             if (NetworkFee < 0) throw new FormatException();
             if (SystemFee + NetworkFee < SystemFee) throw new FormatException();

diff --git a/src/neo/Wallets/Wallet.cs b/src/neo/Wallets/Wallet.cs
@@ -319,15 +319,6 @@ private Transaction MakeTransaction(StoreView snapshot, byte[] script, Transacti
                     if (engine.State.HasFlag(VMState.FAULT))
                         throw new InvalidOperationException($"Failed execution for '{script.ToHexString()}'");
                     tx.SystemFee = Math.Max(engine.GasConsumed - ApplicationEngine.GasFree, 0);
-                    if (tx.SystemFee > 0)
-                    {
-                        long d = (long)NativeContract.GAS.Factor;
-                        long remainder = tx.SystemFee % d;
-                        if (remainder > 0)
-                            tx.SystemFee += d - remainder;
-                        else if (remainder < 0)
-                            tx.SystemFee -= remainder;
-                    }
                 }
 
                 UInt160[] hashes = tx.GetScriptHashesForVerifying(snapshot);