diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 30baaac568..c107e19bfa 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -3,7 +3,7 @@
2015-2022 The Neo Project
- 3.4.0
+ 3.5.0
The Neo Project
net6.0
https://github.com/neo-project/neo
diff --git a/src/Neo/Neo.csproj b/src/Neo/Neo.csproj
index 256c9a247a..a671c484ad 100644
--- a/src/Neo/Neo.csproj
+++ b/src/Neo/Neo.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/src/Neo/SmartContract/ApplicationEngine.OpCodePrices.cs b/src/Neo/SmartContract/ApplicationEngine.OpCodePrices.cs
index 8681b3df7a..68f9568155 100644
--- a/src/Neo/SmartContract/ApplicationEngine.OpCodePrices.cs
+++ b/src/Neo/SmartContract/ApplicationEngine.OpCodePrices.cs
@@ -26,6 +26,8 @@ partial class ApplicationEngine
[OpCode.PUSHINT64] = 1 << 0,
[OpCode.PUSHINT128] = 1 << 2,
[OpCode.PUSHINT256] = 1 << 2,
+ [OpCode.PUSHT] = 1 << 0,
+ [OpCode.PUSHF] = 1 << 0,
[OpCode.PUSHA] = 1 << 2,
[OpCode.PUSHNULL] = 1 << 0,
[OpCode.PUSHDATA1] = 1 << 3,
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index ba2678873c..734a0f50c6 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -7,11 +7,11 @@
-
-
+
+
-
+
diff --git a/tests/Neo.UnitTests/Neo.UnitTests.csproj b/tests/Neo.UnitTests/Neo.UnitTests.csproj
index b199f84c04..b415956da2 100644
--- a/tests/Neo.UnitTests/Neo.UnitTests.csproj
+++ b/tests/Neo.UnitTests/Neo.UnitTests.csproj
@@ -5,8 +5,8 @@
-
-
+
+
diff --git a/tests/Neo.UnitTests/SmartContract/Native/UT_StdLib.cs b/tests/Neo.UnitTests/SmartContract/Native/UT_StdLib.cs
index 8879c828b5..8342e15824 100644
--- a/tests/Neo.UnitTests/SmartContract/Native/UT_StdLib.cs
+++ b/tests/Neo.UnitTests/SmartContract/Native/UT_StdLib.cs
@@ -290,7 +290,7 @@ public void Json_Serialize()
Assert.IsTrue(engine.ResultStack.Pop().GetString() == "{\"key\":\"value\"}");
Assert.IsTrue(engine.ResultStack.Pop().GetString() == "null");
Assert.IsTrue(engine.ResultStack.Pop().GetString() == "\"test\"");
- Assert.IsTrue(engine.ResultStack.Pop().GetString() == "1");
+ Assert.IsTrue(engine.ResultStack.Pop().GetString() == "true");
Assert.IsTrue(engine.ResultStack.Pop().GetString() == "5");
}
diff --git a/tests/Neo.UnitTests/VM/UT_Helper.cs b/tests/Neo.UnitTests/VM/UT_Helper.cs
index 444584cd8e..539c5df028 100644
--- a/tests/Neo.UnitTests/VM/UT_Helper.cs
+++ b/tests/Neo.UnitTests/VM/UT_Helper.cs
@@ -137,7 +137,7 @@ public void TestEmitAppCall3()
ScriptBuilder sb = new ScriptBuilder();
sb.EmitDynamicCall(UInt160.Zero, "AAAAA", true);
byte[] tempArray = new byte[38];
- tempArray[0] = (byte)OpCode.PUSH1;
+ tempArray[0] = (byte)OpCode.PUSHT;
tempArray[1] = (byte)OpCode.PUSH1;//arg.Length
tempArray[2] = (byte)OpCode.PACK;
tempArray[3] = (byte)OpCode.PUSH15;//(byte)CallFlags.All;
@@ -344,7 +344,7 @@ private void TestEmitPush2Boolean()
ScriptBuilder sb = new ScriptBuilder();
sb.EmitPush(new ContractParameter(ContractParameterType.Boolean));
byte[] tempArray = new byte[1];
- tempArray[0] = (byte)OpCode.PUSH0;
+ tempArray[0] = (byte)OpCode.PUSHF;
CollectionAssert.AreEqual(tempArray, sb.ToArray());
}
@@ -531,7 +531,7 @@ private void TestEmitPush3Bool()
ScriptBuilder sb = new ScriptBuilder();
sb.EmitPush(true);
byte[] tempArray = new byte[1];
- tempArray[0] = (byte)OpCode.PUSH1;
+ tempArray[0] = (byte)OpCode.PUSHT;
CollectionAssert.AreEqual(tempArray, sb.ToArray());
}
@@ -541,7 +541,7 @@ public void TestEmitSysCall()
ScriptBuilder sb = new ScriptBuilder();
sb.EmitSysCall(0, true);
byte[] tempArray = new byte[6];
- tempArray[0] = (byte)OpCode.PUSH1;
+ tempArray[0] = (byte)OpCode.PUSHT;
tempArray[1] = (byte)OpCode.SYSCALL;
tempArray[2] = 0x00;
tempArray[3] = 0x00;