Merge branch 'dev-merge'

Author: merl111

Phantasma.API/NexusAPI.cs

@@ -404,6 +404,7 @@ public class NexusAPI
         public ITokenSwapper TokenSwapper;
         public Mempool Mempool;
         public Node Node;
+
         public IEnumerable<APIEntry> Methods => _methods.Values;
 
         private readonly Dictionary<string, APIEntry> _methods = new Dictionary<string, APIEntry>(StringComparer.InvariantCultureIgnoreCase);
@@ -608,9 +609,19 @@ private TokenDataResult FillNFT(string symbol, BigInteger ID, bool extended)
                             }
                             else
                             {
-                                Blockchain.Tokens.TokenUtils.FetchProperty(Nexus.RootStorage, chain, method.name, series, ID, (propName, propValue) =>
+                                TokenUtils.FetchProperty(Nexus.RootStorage, chain, method.name, series, ID, (propName, propValue) =>
                                 {
-                                    properties.Add(new TokenPropertyResult() { Key = propName, Value = propValue.AsString() });
+                                    string temp;
+                                    if (propValue.Type == VMType.Bytes)
+                                    {
+                                        temp = "0x" + Base16.Encode(propValue.AsByteArray());
+                                    }
+                                    else
+                                    {
+                                        temp = propValue.AsString();
+                                    }
+
+                                    properties.Add(new TokenPropertyResult() { Key = propName, Value = temp });
                                 });
                             }
                         }
@@ -2116,9 +2127,22 @@ public IAPIResult GetPeers()
                 allPeers = allPeers.Where(x => !x.Endpoint.Host.Contains("localhost"));
             }
 
-            var peers = allPeers.Select(x => new PeerResult() { url = x.Endpoint.ToString(), version = x.Version, flags = x.Capabilities.ToString(), fee = x.MinimumFee.ToString(), pow = (uint)x.MinimumPoW }).ToList();
-
-            peers.Add(new PeerResult() { url = $"{Node.PublicEndpoint}", version = Node.Version, flags = Node.Capabilities.ToString(), fee = Node.MinimumFee.ToString(), pow = (uint)Node.MinimumPoW });
+            var peers = allPeers.Select(x => new PeerResult() { 
+                url = x.Endpoint.ToString(), 
+                version = x.Version, 
+                flags = x.Capabilities.ToString(), 
+                fee = x.MinimumFee.ToString(), 
+                pow = (uint)x.MinimumPoW, 
+                ports = x.Ports.Select(y => new PortResult() { name = y.Name, port = y.Port}).ToArray() 
+            }) .ToList();
+
+            peers.Add(new PeerResult() { 
+                url = $"{Node.PublicEndpoint}", 
+                version = Node.Version, 
+                flags = Node.Capabilities.ToString(), 
+                fee = Node.MinimumFee.ToString(), 
+                pow = (uint)Node.MinimumPoW, 
+                ports = this.Node.AvailablePorts.Select(y => new PortResult() { name = y.Name, port = y.Port }).ToArray() });
 
             peers.Shuffle();
 

Phantasma.API/Structs.cs

@@ -592,6 +592,15 @@ public struct ReceiptResult : IAPIResult
         public string script;
     }
 
+    public struct PortResult: IAPIResult
+    {
+        [APIDescription("Port description")]
+        public string name;
+
+        [APIDescription("Port number")]
+        public int port;
+    }
+
     public struct PeerResult: IAPIResult
     {
         [APIDescription("URL of peer")]
@@ -608,6 +617,9 @@ public struct PeerResult: IAPIResult
 
         [APIDescription("Minimum proof of work required by node")]
         public uint pow;
+
+        [APIDescription("List of exposed ports")]
+        public PortResult[] ports;
     }
 
     public struct ValidatorResult : IAPIResult

Phantasma.Blockchain/ExtCalls.cs

@@ -1015,7 +1015,17 @@ private static ExecutionState Runtime_MintToken(RuntimeVM vm)
                 seriesID = 0;
             }
 
-            var tokenID = vm.MintToken(symbol, source, destination, rom, ram, seriesID);
+            Address creator;
+            if (vm.ProtocolVersion >= 7)
+            {
+                creator = source;
+            }
+            else
+            {
+                creator = destination;
+            }
+
+            var tokenID = vm.MintToken(symbol, creator, destination, rom, ram, seriesID);
 
             var result = new VMObject();
             result.SetValue(tokenID);

Phantasma.Blockchain/Nexus.cs

@@ -738,7 +738,8 @@ internal void MintToken(RuntimeVM Runtime, IToken token, Address source, Address
 
             var nft = ReadNFT(Runtime, token.Symbol, tokenID);
             using (var m = new ProfileMarker("Nexus.WriteNFT"))
-                WriteNFT(Runtime, token.Symbol, tokenID, Runtime.Chain.Name, destination, nft.ROM, nft.RAM, nft.SeriesID, nft.Timestamp, nft.Infusion, !isSettlement);
+                WriteNFT(Runtime, token.Symbol, tokenID, Runtime.Chain.Name, source, destination, nft.ROM, nft.RAM,
+                        nft.SeriesID, nft.Timestamp, nft.Infusion, !isSettlement);
 
             using (var m = new ProfileMarker("Runtime.Notify"))
             if (isSettlement)
@@ -934,7 +935,8 @@ internal void InfuseToken(RuntimeVM Runtime, IToken token, Address from, BigInte
                 infusion[index] = new TokenInfusion(infuseToken.Symbol, value + temp.Value);
             }
 
-            WriteNFT(Runtime, token.Symbol, tokenID, nft.CurrentChain, nft.CurrentOwner, nft.ROM, nft.RAM, nft.SeriesID, nft.Timestamp, infusion, true);
+            WriteNFT(Runtime, token.Symbol, tokenID, nft.CurrentChain, nft.Creator, nft.CurrentOwner, nft.ROM, nft.RAM,
+                    nft.SeriesID, nft.Timestamp, infusion, true);
 
             Runtime.Notify(EventKind.Infusion, nft.CurrentOwner, new InfusionEventData(token.Symbol, tokenID, infuseToken.Symbol, value, nft.CurrentChain));
         }
@@ -1020,7 +1022,8 @@ internal void TransferToken(RuntimeVM Runtime, IToken token, Address source, Add
 
             Runtime.Expect(Runtime.InvokeTriggerOnAccount(true, destination, AccountTrigger.OnReceive, source, destination, token.Symbol, tokenID) != TriggerResult.Failure, "account received trigger failed");
 
-            WriteNFT(Runtime, token.Symbol, tokenID, Runtime.Chain.Name, destination, nft.ROM, nft.RAM, nft.SeriesID, Runtime.Time, nft.Infusion, true);
+            WriteNFT(Runtime, token.Symbol, tokenID, Runtime.Chain.Name, nft.Creator, destination, nft.ROM, nft.RAM,
+                    nft.SeriesID, Runtime.Time, nft.Infusion, true);
 
             if (destination.IsSystem && (destination == Runtime.CurrentContext.Address || isInfusion))
             {
@@ -1220,7 +1223,9 @@ internal void DestroyNFT(RuntimeVM Runtime, string symbol, BigInteger tokenID, A
             Runtime.CallNativeContext(NativeContractKind.Storage, nameof(StorageContract.DeleteData), contractAddress, tokenKey);
         }
 
-        internal void WriteNFT(RuntimeVM Runtime, string symbol, BigInteger tokenID, string chainName, Address owner, byte[] rom, byte[] ram, BigInteger seriesID, Timestamp timestamp, IEnumerable<TokenInfusion> infusion, bool mustExist)
+        internal void WriteNFT(RuntimeVM Runtime, string symbol, BigInteger tokenID, string chainName, Address creator,
+                Address owner, byte[] rom, byte[] ram, BigInteger seriesID, Timestamp timestamp,
+                IEnumerable<TokenInfusion> infusion, bool mustExist)
         {
             Runtime.Expect(ram != null && ram.Length < TokenContent.MaxRAMSize, "invalid nft ram update");
 
@@ -1260,7 +1265,17 @@ internal void WriteNFT(RuntimeVM Runtime, string symbol, BigInteger tokenID, str
             else
             {
                 Runtime.Expect(!mustExist, $"nft {symbol} {tokenID} does not exist");
-                var genID = GenerateNFT(Runtime, symbol, chainName, owner, rom, ram, seriesID);
+                Address _creator;
+                if (this.GetProtocolVersion(Runtime.RootStorage) >= 7)
+                {
+                    _creator = creator;
+                }
+                else
+                {
+                    _creator = owner;
+                }
+                
+                var genID = GenerateNFT(Runtime, symbol, chainName, _creator, rom, ram, seriesID);
                 Runtime.Expect(genID == tokenID, "failed to regenerate NFT");
             }
         }

Phantasma.Blockchain/Runtime.cs

@@ -1352,9 +1352,19 @@ public BigInteger MintToken(string symbol, Address from, Address target, byte[]
             Runtime.Expect(rom.Length <= TokenContent.MaxROMSize, "ROM size exceeds maximum allowed, received: " + rom.Length + ", maximum: " + TokenContent.MaxROMSize);
             Runtime.Expect(ram.Length <= TokenContent.MaxRAMSize, "RAM size exceeds maximum allowed, received: " + ram.Length + ", maximum: " + TokenContent.MaxRAMSize);
 
+            Address creator;
+            if (ProtocolVersion >= 7)
+            {
+                creator = from;
+            }
+            else
+            {
+                creator = target;
+            }
+
             BigInteger tokenID;
             using (var m = new ProfileMarker("Nexus.CreateNFT"))
-                tokenID = Nexus.GenerateNFT(this, symbol, Runtime.Chain.Name, target, rom, ram, seriesID);
+                tokenID = Nexus.GenerateNFT(this, symbol, Runtime.Chain.Name, creator, rom, ram, seriesID);
             Runtime.Expect(tokenID > 0, "invalid tokenID");
 
             using (var m = new ProfileMarker("Nexus.MintToken"))
@@ -1580,7 +1590,8 @@ public void WriteToken(Address from, string tokenSymbol, BigInteger tokenID, byt
                 Runtime.Expect(Runtime.InvokeTriggerOnToken(true, token, TokenTrigger.OnWrite, from, ram, tokenID) != TriggerResult.Failure, "token write trigger failed");
             }
 
-            Nexus.WriteNFT(this, tokenSymbol, tokenID, nft.CurrentChain, nft.CurrentOwner, nft.ROM, ram, nft.SeriesID, nft.Timestamp, nft.Infusion, true);
+            Nexus.WriteNFT(this, tokenSymbol, tokenID, nft.CurrentChain, nft.Creator, nft.CurrentOwner, nft.ROM, ram,
+                    nft.SeriesID, nft.Timestamp, nft.Infusion, true);
         }
 
         public TokenContent ReadToken(string tokenSymbol, BigInteger tokenID)

Phantasma.Domain/DomainSettings.cs

@@ -56,7 +56,7 @@ public StakeReward(Address staker, Timestamp date)
 
     public static class DomainSettings
     {
-        public const int LatestKnownProtocol = 6;
+        public const int LatestKnownProtocol = 7;
 
         public const int MaxTxPerBlock = 1024;
 

Phantasma.Domain/IToken.cs

@@ -86,7 +86,8 @@ public struct TokenContent : ISerializable
         public static readonly int MaxROMSize = 1024;
         public static readonly int MaxRAMSize = 1024;
 
-        public TokenContent(BigInteger seriesID, BigInteger mintID, string currentChain, Address creator, Address currentOwner, byte[] ROM, byte[] RAM, Timestamp timestamp, IEnumerable<TokenInfusion> infusion, TokenSeriesMode mode) : this()
+        public TokenContent(BigInteger seriesID, BigInteger mintID, string currentChain, Address creator, Address currentOwner,
+                byte[] ROM, byte[] RAM, Timestamp timestamp, IEnumerable<TokenInfusion> infusion, TokenSeriesMode mode) : this()
         {
             this.SeriesID = seriesID;
             this.MintID = mintID;

Phantasma.P2P/Messages/ListMessage.cs

@@ -39,6 +39,15 @@ public static ChainInfo Unserialize(BinaryReader reader)
         }
     }
 
+    public class PeerInfo
+    {
+        public string version;
+        public PeerCaps caps;
+        public BigInteger minimumFee;
+        public uint minimumPow;
+        public PeerPort[] ports;
+    }
+
     public struct BlockRange
     {
         public readonly Block[] blocks;
@@ -64,6 +73,8 @@ public class ListMessage : Message
         private ChainInfo[] _chains = null;
         public IEnumerable<ChainInfo> Chains => _chains;
 
+        public PeerInfo _peerInfo = null;
+
         public const int MaxPeers = 255;
         public const int MaxChains = 128;
         public const int MaxTransactions = 1024; // for mempool
@@ -169,6 +180,22 @@ internal static ListMessage FromReader(Address address, string host, BinaryReade
                 }
             }
 
+            if (kind.HasFlag(RequestKind.Info))
+            {
+                var version = reader.ReadVarString();
+                var caps = (PeerCaps)reader.ReadInt32();
+                var minimumFee = reader.ReadBigInteger();
+                var minimumPow = (int)reader.ReadVarInt();
+                var portCount = (int)reader.ReadVarInt();
+                var ports = new PeerPort[portCount];
+                for (int i=0; i<portCount; i++)
+                {
+                    var portName = reader.ReadVarString();
+                    var portNumber = (int)reader.ReadVarInt();
+                    ports[i] = new PeerPort(portName, portNumber);
+                }
+            }
+
             return result;
         }
 
@@ -233,6 +260,20 @@ protected override void OnSerialize(BinaryWriter writer)
                     }
                 }
             }
+
+            if (Kind.HasFlag(RequestKind.Info))
+            {
+                writer.WriteVarString(_peerInfo.version);
+                writer.Write((int)_peerInfo.caps);
+                writer.WriteBigInteger(_peerInfo.minimumFee);
+                writer.WriteVarInt(_peerInfo.minimumPow);
+                writer.WriteVarInt(_peerInfo.ports.Length);
+                foreach (var entry in _peerInfo.ports)
+                {
+                    writer.WriteVarString(entry.Name);
+                    writer.WriteVarInt(entry.Port);
+                }
+            }
         }
 
         public override IEnumerable<string> GetDescription()
@@ -312,5 +353,19 @@ public void AddBlockRange(Chain chain, BigInteger startHeight, uint count)
 
             AddBlockRange(chain.Name, blocks.ToArray(), transactions);
         }
+
+        public void SetInfo(string version, PeerCaps caps, BigInteger minimumFee, uint minimumPow, IEnumerable<PeerPort> ports)
+        {
+            var info = new PeerInfo()
+            {
+                version = version,
+                caps = caps,
+                minimumFee = minimumFee,
+                minimumPow = minimumPow,
+                ports = ports.ToArray()
+            };
+
+            this._peerInfo = info;
+        }
     }
 }

Phantasma.P2P/Messages/RequestMessage.cs

@@ -17,6 +17,7 @@ public enum RequestKind
         Mempool = 0x4,
         Blocks = 0x8,
         Transactions = 0x16,
+        Info = 0x32,
     }
 
     public struct RequestRange