Add WrappedToken.sol

src/Stratis.Bitcoin.Features.Interop/ETHClient/ContractSource/WrappedToken.sol

@@ -0,0 +1,60 @@
+// contracts/WrappedToken.sol
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.6.0;
+
+import "https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.3.0/contracts/access/Ownable.sol";
+import "https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.3.0/contracts/token/ERC20/ERC20.sol";
+
+contract WrappedToken is ERC20, Ownable {
+    mapping (address => string) public withdrawalAddresses;
+
+    constructor(string tokenName, string tokenSymbol, uint256 initialSupply) public ERC20(tokenName, tokenSymbol) {
+        _mint(msg.sender, initialSupply);
+    }
+
+    /**
+     * @dev Creates `amount` new tokens and assigns them to `account`.
+     *
+     * See {ERC20-_mint}.
+     */
+    function mint(address account, uint256 amount) public onlyOwner {
+        _mint(account, amount);
+    }
+
+    /**
+     * @dev Destroys `amount` tokens from the caller.
+     *
+     * See {ERC20-_burn}.
+     */
+    function burn(uint256 amount, string memory address) public {
+        _burn(_msgSender(), amount);
+
+        // When the tokens are burnt we need to know where to credit the equivalent value on the Stratis chain.
+        // Currently it is only possible to assign a single address here, so if multiple recipients are required
+        // the burner will have to wait until each burn is processed before proceeding with the next.
+        withdrawalAddresses[msg.sender] = address;
+    }
+
+    /**
+     * @dev Destroys `amount` tokens from `account`, deducting from the caller's
+     * allowance.
+     *
+     * See {ERC20-_burn} and {ERC20-allowance}.
+     *
+     * Requirements:
+     *
+     * - the caller must have allowance for ``accounts``'s tokens of at least
+     * `amount`.
+     */
+    function burnFrom(address account, uint256 amount, string memory address) public {
+        uint256 decreasedAllowance = allowance(account, _msgSender()).sub(amount, "ERC20: burn amount exceeds allowance");
+
+        _approve(account, _msgSender(), decreasedAllowance);
+        _burn(account, amount);
+
+        // When the tokens are burnt we need to know where to credit the equivalent value on the Stratis chain.
+        // Currently it is only possible to assign a single address here, so if multiple recipients are required
+        // the burner will have to wait until each burn is processed before proceeding with the next.
+        withdrawalAddresses[msg.sender] = address;
+    }
+}

src/Stratis.Bitcoin.Features.PoA/Events/MiningStatisticsEvent.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Stratis.Bitcoin.EventBus;
+using Stratis.Bitcoin.EventBus;
 
 namespace Stratis.Bitcoin.Features.PoA.Events
 {

src/Stratis.Bitcoin.Features.PoA/PoAConsensusOptions.cs

@@ -58,6 +58,14 @@ public class PoAConsensusOptions : ConsensusOptions
         /// </summary>
         public int Release1300ActivationHeight { get; set; }
 
+        /// <summary>
+        /// The height at which Release 1.4.0.0 became active.
+        /// <para>
+        /// This was primarily used for activating ScriptPubkey sorting for paying multisig recipients.
+        /// </para>
+        /// </summary>
+        public int Release1400ActivationHeight { get; set; }
+
         /// <summary>
         /// The height at which inituitive mining slots become active.
         /// Legacy mining slots are determined by mining_slot = block_height % number_of_federation_members.

src/Stratis.Bitcoin.Features.PoA/PoAMiner.cs

@@ -222,6 +222,8 @@ private void GatherMiningStatistics()
 
                 this.miningStatisticsLog = log.ToString();
 
+                this.signals?.Publish(new MiningStatisticsEvent(this.miningStatistics, 0));
+
                 return;
             }
 
@@ -233,6 +235,8 @@ private void GatherMiningStatistics()
 
                 this.miningStatisticsLog = log.ToString();
 
+                this.signals?.Publish(new MiningStatisticsEvent(this.miningStatistics, 0));
+
                 return;
             }
 
@@ -249,7 +253,7 @@ private void GatherMiningStatistics()
             // TODO: Make this a command line option.
             bool includeHeight = false;
 
-            log.AppendLine($"Mining information for the last { maxDepth } blocks.");
+            log.AppendLine($"Mining information for the last {maxDepth} blocks.");
             if (includeHeight)
                 log.AppendLine("Note 'MISS' indicates a slot where a miner didn't produce a block.");
             else
@@ -288,7 +292,7 @@ private void GatherMiningStatistics()
                 if (includeHeight)
                 {
                     string strHeight = minedInThisSlot ? currentHeader.Height.ToString().PadLeft(7) : "---MISS";
-                    log.Append($"{strHeight}:{ pubKeyRepresentation } ");
+                    log.Append($"{strHeight}:{pubKeyRepresentation} ");
                 }
                 else
                 {
@@ -304,15 +308,12 @@ private void GatherMiningStatistics()
 
             this.miningStatistics.MinerHits = hitCount;
 
-            if (this.signals != null)
-            {
-                this.signals.Publish(new MiningStatisticsEvent(this.miningStatistics, maxDepth));
-            }
+            this.signals?.Publish(new MiningStatisticsEvent(this.miningStatistics, maxDepth));
 
             log.Append("...");
             log.AppendLine();
             log.AppendLine($"Miner hits".PadRight(LoggingConfiguration.ColumnLength) + $": {hitCount} of {maxDepth}({(((float)hitCount / (float)maxDepth)).ToString("P2")})");
-            log.AppendLine($"Miner idle time".PadRight(LoggingConfiguration.ColumnLength) + $": { TimeSpan.FromSeconds(this.network.ConsensusOptions.TargetSpacingSeconds * (maxDepth - hitCount)).ToString(@"hh\:mm\:ss")}");
+            log.AppendLine($"Miner idle time".PadRight(LoggingConfiguration.ColumnLength) + $": {TimeSpan.FromSeconds(this.network.ConsensusOptions.TargetSpacingSeconds * (maxDepth - hitCount)).ToString(@"hh\:mm\:ss")}");
             log.AppendLine();
 
             this.miningStatisticsLog = log.ToString();

src/Stratis.Bitcoin.Features.SignalR/Events/MiningStatisticsClientEvent.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using Stratis.Bitcoin.EventBus;
 using Stratis.Bitcoin.Features.PoA.Events;
 
@@ -16,7 +14,7 @@ public class MiningStatisticsClientEvent : IClientEvent
         public void BuildFrom(EventBase @event)
         {
             if (@event is MiningStatisticsEvent miningStatisticsEvent)
-            {                
+            {
                 this.IsMining = miningStatisticsEvent.MiningStatistics.ProducedBlockInLastRound;
                 this.BlockProducerHit = miningStatisticsEvent.MiningStatistics.MinerHits;
                 this.FederationMemberSize = miningStatisticsEvent.FederationMemberSize;

src/Stratis.Bitcoin/Properties/AssemblyInfo.cs

@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.7")]
-[assembly: AssemblyFileVersion("1.4.0.7")]
+[assembly: AssemblyVersion("1.4.0.2")]
+[assembly: AssemblyFileVersion("1.4.0.2")]
 [assembly: InternalsVisibleTo("Stratis.Bitcoin.Tests")]

src/Stratis.Bitcoin/Stratis.Bitcoin.csproj

@@ -14,7 +14,7 @@
     <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <Version>1.4.0.7</Version>
+    <Version>1.4.0.2-rc</Version>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <CodeAnalysisRuleSet>..\Stratis.ruleset</CodeAnalysisRuleSet>
     <Authors>Stratis Group Ltd.</Authors>

src/Stratis.Features.FederatedPeg.IntegrationTests/NodeInitialisationTests.cs

@@ -167,17 +167,20 @@ public void GatewayPairStarts()
         {
             using (var nodeBuilder = SidechainNodeBuilder.CreateSidechainNodeBuilder(this))
             {
-                CoreNode side = nodeBuilder.CreateSidechainFederationNode(this.sidechainNetwork, this.mainNetwork, this.sidechainNetwork.FederationKeys[0]);
+                CirrusRegTest collateralSidechainNetwork = new CirrusSingleCollateralRegTest();
+
+                CoreNode side = nodeBuilder.CreateSidechainFederationNode(collateralSidechainNetwork, this.mainNetwork, collateralSidechainNetwork.FederationKeys[0]);
                 side.AppendToConfig("sidechain=1");
                 side.AppendToConfig($"redeemscript={this.scriptAndAddresses.payToMultiSig}");
-                side.AppendToConfig($"publickey={this.sidechainNetwork.FederationMnemonics[0].DeriveExtKey().PrivateKey.PubKey}");
+                side.AppendToConfig($"publickey={collateralSidechainNetwork.FederationMnemonics[0].DeriveExtKey().PrivateKey.PubKey}");
                 side.AppendToConfig("federationips=0.0.0.0,0.0.0.1"); // Placeholders
                 side.AppendToConfig($"mindepositconfirmations={DepositConfirmations}");
 
-                CoreNode main = nodeBuilder.CreateMainChainFederationNode(this.mainNetwork, this.sidechainNetwork).WithWallet();
+                CoreNode main = nodeBuilder.CreateMainChainFederationNode(this.mainNetwork, collateralSidechainNetwork).WithWallet();
+                main.AppendToConfig("addressindex=1");
                 main.AppendToConfig("mainchain=1");
                 main.AppendToConfig($"redeemscript={this.scriptAndAddresses.payToMultiSig}");
-                main.AppendToConfig($"publickey={this.sidechainNetwork.FederationMnemonics[0].DeriveExtKey().PrivateKey.PubKey}");
+                main.AppendToConfig($"publickey={collateralSidechainNetwork.FederationMnemonics[0].DeriveExtKey().PrivateKey.PubKey}");
                 main.AppendToConfig("federationips=0.0.0.0,0.0.0.1"); // Placeholders
                 main.AppendToConfig($"mindepositconfirmations={DepositConfirmations}");
 

src/Stratis.Features.FederatedPeg/Distribution/RewardDistributionManager.cs

@@ -142,9 +142,11 @@ public List<Recipient> DistributeToMultisigNodes(uint256 depositId, Money fee)
                     multiSigRecipients.Add(new Recipient() { Amount = feeReward, ScriptPubKey = multiSigMinerScript });
                     this.logger.LogDebug($"Paying multisig member '{multiSigMinerScript.ToHex()}' (hex) {feeReward} STRAX.");
                 }
-
             }
 
+            if (this.chainIndexer.Tip.Height >= (this.network.Consensus.Options as PoAConsensusOptions).Release1400ActivationHeight)
+                return multiSigRecipients.OrderBy(m => m.ScriptPubKey.ToHex()).ToList();
+
             return multiSigRecipients;
         }
 

src/Stratis.Sidechains.Networks/CirrusMain.cs

@@ -185,7 +185,8 @@ public CirrusMain()
                 GetMiningTimestampV2ActivationHeight = 3_709_000, // Monday 14 February 00:00:00 (Estimated)
                 GetMiningTimestampV2ActivationStrictHeight = 3_783_000, // Monday 28 February 07:00:00 (London Time) (Estimated)
                 ContractSerializerV2ActivationHeight = 3_386_335, // Monday 13 December 16:00:00 (Estimated)
-                Release1300ActivationHeight = 4_334_400
+                Release1300ActivationHeight = 4_334_400,
+                Release1400ActivationHeight = 5_345_325, // 7 December 2022 (Estimated)
             };
 
             var buriedDeployments = new BuriedDeploymentsArray

src/Stratis.Sidechains.Networks/CirrusTest.cs

@@ -136,7 +136,8 @@ public CirrusTest()
                 GetMiningTimestampV2ActivationHeight = 3_000_000, // 15 January 2022
                 GetMiningTimestampV2ActivationStrictHeight = 3_121_500, // 17 January 2022
                 ContractSerializerV2ActivationHeight = 2_842_681,
-                Release1300ActivationHeight = 3_280_032
+                Release1300ActivationHeight = 3_280_032,
+                Release1400ActivationHeight = 4_074_250,
             };
 
             var buriedDeployments = new BuriedDeploymentsArray