Fix: Global Xpub were not properly serialized for PSBT2

Author: NicolasDorier

NBitcoin/BIP174/PartiallySignedTransaction.cs

@@ -210,6 +210,11 @@ public static PSBT Load(byte[] rawBytes, Network network)
 
 
 			var maps = Maps.Load(stream);
+			return Load(maps, network);
+		}
+
+		private static PSBT Load(Maps maps, Network network)
+		{
 			if (maps.Global.TryRemove<int>(PSBTConstants.PSBT_GLOBAL_VERSION, out var psbtVersion) && psbtVersion == 0)
 				throw new FormatException("PSBTv0 should not include PSBT_GLOBAL_VERSION");
 			return psbtVersion switch
@@ -964,10 +969,9 @@ public byte[] ToBytes()
 		/// <returns>A cloned PSBT</returns>
 		public PSBT Clone()
 		{
-			var bytes = ToBytes();
-			var psbt = PSBT.Load(bytes, Network);
-			psbt.Settings = Settings.Clone();
-			return psbt;
+			var maps = new Maps();
+			FillMaps(maps);
+			return PSBT.Load(maps, Network);
 		}
 
 		public string ToBase64() => Encoders.Base64.EncodeData(this.ToBytes());

NBitcoin/BIP370/PSBT2.cs

@@ -220,6 +220,7 @@ protected override void WriteCore(JsonTextWriter jsonWriter)
 
 	internal override void FillMap(Map map)
 	{
+		base.FillMap(map);
 		map.Add([PSBTConstants.PSBT_GLOBAL_VERSION],  PSBT2Constants.PSBT2Version.ToBytes());
 		map.Add([PSBT2Constants.PSBT_GLOBAL_TX_VERSION],  TransactionVersion.ToBytes());
 		if (FallbackLockTime != null)