Merge pull request #816 from stratisproject/release/1.1.1.0

fassadlr · web-flow · commit 87a8473070fb · 2021-12-09T11:17:31.000Z
Merge hotfix release/1.1.1.0 into release/1.2.0.0
diff --git a/src/Stratis.Bitcoin.Features.PoA/PoAConsensusOptions.cs b/src/Stratis.Bitcoin.Features.PoA/PoAConsensusOptions.cs
@@ -64,6 +64,12 @@ public class PoAConsensusOptions : ConsensusOptions
         /// </summary>
         public int PollExpiryBlocks { get; set; }
 
+        /// <summary>
+        /// Defines when V2 of the contract serializer will be used.
+        /// I.e if tip <= ContractSerializerV2ActivationHeight, V1 will be used.
+        /// </summary>
+        public int ContractSerializerV2ActivationHeight { get; set; }
+
         /// <summary>Initializes values for networks that use block size rules.</summary>
         /// <param name="maxBlockBaseSize">See <see cref="ConsensusOptions.MaxBlockBaseSize"/>.</param>
         /// <param name="maxStandardVersion">See <see cref="ConsensusOptions.MaxStandardVersion"/>.</param>
diff --git a/src/Stratis.Bitcoin.Features.SmartContracts.Tests/ApiLogDeserializerTests.cs b/src/Stratis.Bitcoin.Features.SmartContracts.Tests/ApiLogDeserializerTests.cs
@@ -35,7 +35,7 @@ public struct TestLog
         public void Deserialize_Basic_Log_Success()
         {
             var network = new SmartContractsRegTest();
-            var primitiveSerializer = new ContractPrimitiveSerializer(network);
+            var primitiveSerializer = new ContractPrimitiveSerializerV2(network);
 
             var testStruct = new TestLog
             {
@@ -68,7 +68,7 @@ public void Deserialize_Basic_Log_Success()
         public void Deserialize_Logs_With_Different_Addresses_From_Cache()
         {
             var network = new SmartContractsRegTest();
-            var primitiveSerializer = new ContractPrimitiveSerializer(network);
+            var primitiveSerializer = new ContractPrimitiveSerializerV2(network);
 
             var testStruct0 = new TestLog
             {
@@ -119,7 +119,7 @@ public void Deserialize_Logs_With_Different_Addresses_From_Cache()
         public void MapTransferInfo_Success()
         {
             var network = new SmartContractsRegTest();
-            var primitiveSerializer = new ContractPrimitiveSerializer(network);
+            var primitiveSerializer = new ContractPrimitiveSerializerV2(network);
 
             var stateRoot = new Mock<IStateRepositoryRoot>();
             stateRoot.Setup(r => r.GetCodeHash(It.IsAny<uint160>())).Returns(uint256.Zero.ToBytes());
diff --git a/src/Stratis.Bitcoin.Features.SmartContracts.Tests/Consensus/Rules/ContractValidationRuleTest.cs b/src/Stratis.Bitcoin.Features.SmartContracts.Tests/Consensus/Rules/ContractValidationRuleTest.cs
@@ -21,7 +21,7 @@ public class ContractValidationRuleTest
         public ContractValidationRuleTest()
         {
             this.network = new SmartContractsRegTest();
-            this.callDataSerializer = new CallDataSerializer(new ContractPrimitiveSerializer(this.network));
+            this.callDataSerializer = new CallDataSerializer(new ContractPrimitiveSerializerV2(this.network));
         }
 
         private UnspentOutputSet GetMockOutputSet()
diff --git a/src/Stratis.Bitcoin.Features.SmartContracts.Tests/Consensus/Rules/TestRulesContext.cs b/src/Stratis.Bitcoin.Features.SmartContracts.Tests/Consensus/Rules/TestRulesContext.cs
@@ -108,7 +108,7 @@ public static TestRulesContext CreateAsync(Network network, [CallerMemberName] s
                 testRulesContext.ChainIndexer, deployments, consensusSettings, testRulesContext.Checkpoints, null, testRulesContext.ChainState,
                 new InvalidBlockHashStore(new DateTimeProvider()), new NodeStats(testRulesContext.DateTimeProvider, testRulesContext.NodeSettings, new Mock<IVersionProvider>().Object), testRulesContext.AsyncProvider, new ConsensusRulesContainer()).SetupRulesEngineParent();
 
-            testRulesContext.CallDataSerializer = new CallDataSerializer(new ContractPrimitiveSerializer(network));
+            testRulesContext.CallDataSerializer = new CallDataSerializer(new ContractPrimitiveSerializerV2(network));
             return testRulesContext;
         }
 
diff --git a/src/Stratis.Sidechains.Networks/CirrusMain.cs b/src/Stratis.Sidechains.Networks/CirrusMain.cs
@@ -179,7 +179,8 @@ public CirrusMain()
                 InterFluxV2MainChainActivationHeight = 460_000,
                 VotingManagerV2ActivationHeight = 1_683_000, // Tuesday, 12 January 2021 9:00:00 AM (Estimated)
                 Release1100ActivationHeight = 3_426_950, // Monday, 20 December 2021 10:00:00 AM (Estimated)
-                PollExpiryBlocks = 50_000 // Roughly 9 days
+                PollExpiryBlocks = 50_000, // Roughly 9 days
+                ContractSerializerV2ActivationHeight = 3364000
             };
 
             var buriedDeployments = new BuriedDeploymentsArray
diff --git a/src/Stratis.Sidechains.Networks/CirrusTest.cs b/src/Stratis.Sidechains.Networks/CirrusTest.cs
@@ -130,7 +130,8 @@ public CirrusTest()
                 EnforcedMinProtocolVersion = ProtocolVersion.CIRRUS_VERSION, // minimum protocol version which will be enforced at block height defined in EnforceMinProtocolVersionAtBlockHeight
                 VotingManagerV2ActivationHeight = 1_999_500,
                 Release1100ActivationHeight = 2_796_000,
-                PollExpiryBlocks = 450 // 2 hours
+                PollExpiryBlocks = 450, // 2 hours
+                ContractSerializerV2ActivationHeight = 2842681
             };
 
             var buriedDeployments = new BuriedDeploymentsArray
diff --git a/src/Stratis.SmartContracts.CLR.Tests/AuctionTests.cs b/src/Stratis.SmartContracts.CLR.Tests/AuctionTests.cs
@@ -34,7 +34,7 @@ public AuctionTests()
             };
             var getBalance = new Func<ulong>(() => Balance);
             var persistentState = new TestPersistentState();
-            var serializer = new Serializer(new ContractPrimitiveSerializer(network));
+            var serializer = new Serializer(new ContractPrimitiveSerializerV2(network));
             this.smartContractState = new TestSmartContractState(
                 block,
                 message,
diff --git a/src/Stratis.SmartContracts.CLR.Tests/CallDataSerializerTests.cs b/src/Stratis.SmartContracts.CLR.Tests/CallDataSerializerTests.cs
@@ -11,7 +11,7 @@ namespace Stratis.SmartContracts.CLR.Tests
 {
     public sealed class CallDataSerializerTests
     {
-        public ICallDataSerializer Serializer = new CallDataSerializer(new ContractPrimitiveSerializer(new SmartContractsRegTest()));
+        public ICallDataSerializer Serializer = new CallDataSerializer(new ContractPrimitiveSerializerV2(new SmartContractsRegTest()));
 
         [Fact]
         public void SmartContract_CanSerialize_OP_CREATECONTRACT_WithoutMethodParameters()
diff --git a/src/Stratis.SmartContracts.CLR.Tests/ContractExecutorTestContext.cs b/src/Stratis.SmartContracts.CLR.Tests/ContractExecutorTestContext.cs
@@ -40,7 +40,7 @@ public ContractExecutorTestContext()
             this.KeyEncodingStrategy = BasicKeyEncodingStrategy.Default;
             this.LoggerFactory = ExtendedLoggerFactory.Create();
             this.State = new StateRepositoryRoot(new NoDeleteSource<byte[], byte[]>(new MemoryDictionarySource()));
-            this.ContractPrimitiveSerializer = new ContractPrimitiveSerializer(this.Network);
+            this.ContractPrimitiveSerializer = new ContractPrimitiveSerializerV2(this.Network);
             this.Serializer = new Serializer(this.ContractPrimitiveSerializer);
             this.AddressGenerator = new AddressGenerator();
             this.Validator = new SmartContractValidator();
diff --git a/src/Stratis.SmartContracts.CLR.Tests/ContractExecutorTests.cs b/src/Stratis.SmartContracts.CLR.Tests/ContractExecutorTests.cs
@@ -54,7 +54,7 @@ public ContractExecutorTests()
             this.addressGenerator = new AddressGenerator();
             this.assemblyLoader = new ContractAssemblyLoader();
             this.moduleDefinitionReader = new ContractModuleDefinitionReader();
-            this.contractPrimitiveSerializer = new ContractPrimitiveSerializer(this.network);
+            this.contractPrimitiveSerializer = new ContractPrimitiveSerializerV2(this.network);
             this.serializer = new Serializer(this.contractPrimitiveSerializer);
             this.contractCache = new ContractAssemblyCache();
             this.vm = new ReflectionVirtualMachine(this.validator, this.loggerFactory, this.assemblyLoader, this.moduleDefinitionReader, this.contractCache);
diff --git a/src/Stratis.SmartContracts.CLR.Tests/ContractLogHolderTests.cs b/src/Stratis.SmartContracts.CLR.Tests/ContractLogHolderTests.cs
@@ -19,7 +19,7 @@ public class ContractLogHolderTests
         public ContractLogHolderTests()
         {
             this.network = new SmartContractsRegTest();
-            this.serializer = new ContractPrimitiveSerializer(this.network);
+            this.serializer = new ContractPrimitiveSerializerV2(this.network);
             this.logHolder = new ContractLogHolder();
         }
 
diff --git a/src/Stratis.SmartContracts.CLR.Tests/ContractPrimitiveSerializerV1Tests.cs b/src/Stratis.SmartContracts.CLR.Tests/ContractPrimitiveSerializerV1Tests.cs
@@ -0,0 +1,26 @@
+﻿using NBitcoin;
+using Stratis.SmartContracts.CLR.Serialization;
+using Stratis.SmartContracts.Networks;
+using Xunit;
+
+namespace Stratis.SmartContracts.CLR.Tests
+{
+    public class ContractPrimitiveSerializerV1Tests
+    {
+        private readonly IContractPrimitiveSerializer serializer;
+        private readonly Network network;
+
+        public ContractPrimitiveSerializerV1Tests()
+        {
+            this.network = new SmartContractsRegTest();
+            this.serializer = new ContractPrimitiveSerializerV1(this.network);
+        }
+
+        [Fact]
+        public void Test_ReferenceType_Serialization()
+        {
+            Assert.Null(this.serializer.Deserialize(typeof(string), this.serializer.Serialize("")));
+            Assert.Null(this.serializer.Deserialize(typeof(byte[]), this.serializer.Serialize(new byte[0])));
+        }
+    }
+}
diff --git a/src/Stratis.SmartContracts.CLR.Tests/ContractPrimitiveSerializerV2Tests.cs b/src/Stratis.SmartContracts.CLR.Tests/ContractPrimitiveSerializerV2Tests.cs
@@ -10,15 +10,15 @@
 
 namespace Stratis.SmartContracts.CLR.Tests
 {
-    public class ContractPrimitiveSerializerTests
+    public class ContractPrimitiveSerializerV2Tests
     {
-        private readonly ContractPrimitiveSerializer serializer;
+        private readonly IContractPrimitiveSerializer serializer;
         private readonly Network network;
 
-        public ContractPrimitiveSerializerTests()
+        public ContractPrimitiveSerializerV2Tests()
         {
             this.network = new SmartContractsRegTest();
-            this.serializer = new ContractPrimitiveSerializer(this.network);
+            this.serializer = new ContractPrimitiveSerializerV2(this.network);
         }
 
         [Fact]
@@ -173,6 +173,13 @@ public void Deserialize_Empty_Byte_Array()
             Assert.True(emptyByte.SequenceEqual(this.serializer.Deserialize<byte[]>(empty)));
         }
 
+        [Fact]
+        public void Test_ReferenceType_Serialization()
+        {
+            Assert.Equal("", this.serializer.Deserialize(typeof(string), this.serializer.Serialize("")));
+            Assert.Equal(new byte[0], this.serializer.Deserialize(typeof(byte[]), this.serializer.Serialize(new byte[0])));
+        }
+
         private TestValueType NewTestValueType()
         {
             var instance = new TestValueType();
diff --git a/src/Stratis.SmartContracts.CLR.Tests/Logs/RawLogTests.cs b/src/Stratis.SmartContracts.CLR.Tests/Logs/RawLogTests.cs
@@ -28,7 +28,7 @@ public Example(string name, uint amount)
         [Fact]
         public void RawLog_With_Null_Value_Serializes()
         {
-            var serializer = new ContractPrimitiveSerializer(new SmartContractsPoARegTest());
+            var serializer = new ContractPrimitiveSerializerV2(new SmartContractsPoARegTest());
             var exampleLog = new Example(null, 0);
 
             var rawLog = new RawLog(uint160.One, exampleLog);
diff --git a/src/Stratis.SmartContracts.CLR.Tests/MethodParameterByteSerializerTests.cs b/src/Stratis.SmartContracts.CLR.Tests/MethodParameterByteSerializerTests.cs
@@ -12,7 +12,7 @@ namespace Stratis.SmartContracts.CLR.Tests
     public class MethodParameterByteSerializerTests
     {
         public static Network Network = new SmartContractsPoARegTest();
-        public IMethodParameterSerializer Serializer = new MethodParameterByteSerializer(new ContractPrimitiveSerializer(Network));
+        public IMethodParameterSerializer Serializer = new MethodParameterByteSerializer(new ContractPrimitiveSerializerV2(Network));
 
         [Theory]
         [MemberData(nameof(GetData), parameters: 1)]
diff --git a/src/Stratis.SmartContracts.CLR.Tests/ObserverInstanceRewriterTests.cs b/src/Stratis.SmartContracts.CLR.Tests/ObserverInstanceRewriterTests.cs
@@ -118,7 +118,7 @@ public ObserverInstanceRewriterTests()
             var getBalance = new Func<ulong>(() => Balance);
             var persistentState = new TestPersistentState();
             var network = new SmartContractsRegTest();
-            var serializer = new ContractPrimitiveSerializer(network);
+            var serializer = new ContractPrimitiveSerializerV2(network);
             this.state = new SmartContractState(
                 new Block(1, this.TestAddress),
                 new Message(this.TestAddress, this.TestAddress, 0),
diff --git a/src/Stratis.SmartContracts.CLR.Tests/ObserverTests.cs b/src/Stratis.SmartContracts.CLR.Tests/ObserverTests.cs
@@ -117,7 +117,7 @@ public ObserverTests()
             var getBalance = new Func<ulong>(() => Balance);
             var persistentState = new TestPersistentState();
             var network = new SmartContractsRegTest();
-            var serializer = new ContractPrimitiveSerializer(network);
+            var serializer = new ContractPrimitiveSerializerV2(network);
             this.state = new SmartContractState(
                 new Block(1, this.TestAddress),
                 new Message(this.TestAddress, this.TestAddress, 0),
diff --git a/src/Stratis.SmartContracts.CLR.Tests/SerializerTests.cs b/src/Stratis.SmartContracts.CLR.Tests/SerializerTests.cs
@@ -259,7 +259,7 @@ public void SingleByteStringSerializesCorrectly()
         {
             const string test = "1";
 
-            var testSerializer = new Serializer(new ContractPrimitiveSerializer(new SmartContractsPoARegTest()));
+            var testSerializer = new Serializer(new ContractPrimitiveSerializerV2(new SmartContractsPoARegTest()));
 
             byte[] bytes = testSerializer.Serialize(test);
 
diff --git a/src/Stratis.SmartContracts.CLR/Serialization/ContractPrimitiveSerializer.cs b/src/Stratis.SmartContracts.CLR/Serialization/ContractPrimitiveSerializer.cs
diff --git a/src/Stratis.SmartContracts.CLR/Serialization/ContractPrimitiveSerializerV1.cs b/src/Stratis.SmartContracts.CLR/Serialization/ContractPrimitiveSerializerV1.cs
diff --git a/src/Stratis.SmartContracts.CLR/Serialization/ContractPrimitiveSerializerV2.cs b/src/Stratis.SmartContracts.CLR/Serialization/ContractPrimitiveSerializerV2.cs
diff --git a/src/Stratis.SmartContracts.CLR/Stratis.SmartContracts.CLR.csproj b/src/Stratis.SmartContracts.CLR/Stratis.SmartContracts.CLR.csproj
diff --git a/src/Stratis.SmartContracts.IntegrationTests/ContractExecutionFailureTests.cs b/src/Stratis.SmartContracts.IntegrationTests/ContractExecutionFailureTests.cs
diff --git a/src/Stratis.SmartContracts.IntegrationTests/ContractParameterSerializationTests.cs b/src/Stratis.SmartContracts.IntegrationTests/ContractParameterSerializationTests.cs
diff --git a/src/Stratis.SmartContracts.IntegrationTests/PoW/SmartContractMemoryPoolTests.cs b/src/Stratis.SmartContracts.IntegrationTests/PoW/SmartContractMemoryPoolTests.cs
diff --git a/src/Stratis.SmartContracts.IntegrationTests/PoW/SmartContractMinerTests.cs b/src/Stratis.SmartContracts.IntegrationTests/PoW/SmartContractMinerTests.cs
diff --git a/src/Stratis.SmartContracts.IntegrationTests/PoW/SmartContractWalletTests.cs b/src/Stratis.SmartContracts.IntegrationTests/PoW/SmartContractWalletTests.cs

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public struct TestLog`
`35`	`35`	`public void Deserialize_Basic_Log_Success()`
`36`	`36`	`{`
`37`	`37`	`var network = new SmartContractsRegTest();`
`38`		`- var primitiveSerializer = new ContractPrimitiveSerializer(network);`
	`38`	`+ var primitiveSerializer = new ContractPrimitiveSerializerV2(network);`
`39`	`39`
`40`	`40`	`var testStruct = new TestLog`
`41`	`41`	`{`
`@@ -68,7 +68,7 @@ public void Deserialize_Basic_Log_Success()`
`68`	`68`	`public void Deserialize_Logs_With_Different_Addresses_From_Cache()`
`69`	`69`	`{`
`70`	`70`	`var network = new SmartContractsRegTest();`
`71`		`- var primitiveSerializer = new ContractPrimitiveSerializer(network);`
	`71`	`+ var primitiveSerializer = new ContractPrimitiveSerializerV2(network);`
`72`	`72`
`73`	`73`	`var testStruct0 = new TestLog`
`74`	`74`	`{`
`@@ -119,7 +119,7 @@ public void Deserialize_Logs_With_Different_Addresses_From_Cache()`
`119`	`119`	`public void MapTransferInfo_Success()`
`120`	`120`	`{`
`121`	`121`	`var network = new SmartContractsRegTest();`
`122`		`- var primitiveSerializer = new ContractPrimitiveSerializer(network);`
	`122`	`+ var primitiveSerializer = new ContractPrimitiveSerializerV2(network);`
`123`	`123`
`124`	`124`	`var stateRoot = new Mock<IStateRepositoryRoot>();`
`125`	`125`	`stateRoot.Setup(r => r.GetCodeHash(It.IsAny<uint160>())).Returns(uint256.Zero.ToBytes());`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public class ContractValidationRuleTest`
`21`	`21`	`public ContractValidationRuleTest()`
`22`	`22`	`{`
`23`	`23`	`this.network = new SmartContractsRegTest();`
`24`		`- this.callDataSerializer = new CallDataSerializer(new ContractPrimitiveSerializer(this.network));`
	`24`	`+ this.callDataSerializer = new CallDataSerializer(new ContractPrimitiveSerializerV2(this.network));`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`private UnspentOutputSet GetMockOutputSet()`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public static TestRulesContext CreateAsync(Network network, [CallerMemberName] s`
`108`	`108`	`testRulesContext.ChainIndexer, deployments, consensusSettings, testRulesContext.Checkpoints, null, testRulesContext.ChainState,`
`109`	`109`	`new InvalidBlockHashStore(new DateTimeProvider()), new NodeStats(testRulesContext.DateTimeProvider, testRulesContext.NodeSettings, new Mock<IVersionProvider>().Object), testRulesContext.AsyncProvider, new ConsensusRulesContainer()).SetupRulesEngineParent();`
`110`	`110`
`111`		`- testRulesContext.CallDataSerializer = new CallDataSerializer(new ContractPrimitiveSerializer(network));`
	`111`	`+ testRulesContext.CallDataSerializer = new CallDataSerializer(new ContractPrimitiveSerializerV2(network));`
`112`	`112`	`return testRulesContext;`
`113`	`113`	`}`
`114`	`114`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace Stratis.SmartContracts.CLR.Tests`
`11`	`11`	`{`
`12`	`12`	`public sealed class CallDataSerializerTests`
`13`	`13`	`{`
`14`		`- public ICallDataSerializer Serializer = new CallDataSerializer(new ContractPrimitiveSerializer(new SmartContractsRegTest()));`
	`14`	`+ public ICallDataSerializer Serializer = new CallDataSerializer(new ContractPrimitiveSerializerV2(new SmartContractsRegTest()));`
`15`	`15`
`16`	`16`	`[Fact]`
`17`	`17`	`public void SmartContract_CanSerialize_OP_CREATECONTRACT_WithoutMethodParameters()`