From 46d38107a35a4302bbd855b0f65e49b8b0b2e081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Novo?= <34069419+TeknoPT@users.noreply.github.com> Date: Tue, 26 Sep 2023 17:55:07 +0100 Subject: [PATCH] Upgrade Library to support ABI. --- Library/src/CodeGen/Libraries.cs | 40 +++++++++++++++++++++-- Library/src/Compilers/TombLangCompiler.cs | 8 +++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/Library/src/CodeGen/Libraries.cs b/Library/src/CodeGen/Libraries.cs index c680f51..82a3f31 100644 --- a/Library/src/CodeGen/Libraries.cs +++ b/Library/src/CodeGen/Libraries.cs @@ -1,6 +1,8 @@ using Phantasma.Business.Blockchain.Contracts.Native; using Phantasma.Core.Domain.Contract; using Phantasma.Core.Domain.Contract.Enums; +using Phantasma.Core.Domain.Serializer; +using Phantasma.Core.Domain.VM; using Phantasma.Core.Domain.VM.Enums; using Phantasma.Core.Numerics; using Phantasma.Tomb.AST; @@ -32,7 +34,7 @@ public void ImportLibrary(string name) public static string[] AvailableLibraries = new[] { "Call", "Runtime", "Math","Token", "NFT", "Organization", "Oracle", "Storage", "Contract", "Array", "Leaderboard", "Market", "Account", "Crowdsale", "Stake", "Governance", "Relay", "Mail", - "Time", "Task", "UID", "Map", "List", "String", "Bytes", "Decimal", "Enum", "Address", "Module", FormatLibraryName }; + "Time", "Task", "UID", "Map", "List", "String", "Bytes", "Decimal", "Enum", "Address", "Module", "ABI", FormatLibraryName }; public const string FormatLibraryName = "Format"; @@ -102,6 +104,39 @@ public static LibraryDeclaration LoadLibrary(string name, Scope scope, ModuleKin switch (name) { + case "ABI": + { + libDecl.AddMethod("getMethod", MethodImplementationType.Custom, VarKind.Bytes, new[] { new MethodParameter("target", VarKind.Module), new MethodParameter("method", VarKind.String) }). + SetPreCallback((output, scope, expr) => + { + var reg = Compiler.Instance.AllocRegister(output, expr); + var module = expr.arguments[0].AsLiteral(); + var methodName = expr.arguments[1].AsLiteral(); + var method = module.abi.FindMethod(methodName); + if (method == null) + { + throw new CompilerException($"Cannot find method '{methodName}' in module '{module.Name}'"); + } + var vmObj = VMObject.FromStruct(method); + var hexString = vmObj.Serialize(); + output.AppendLine(expr, $"LOAD {reg} 0x{hexString}"); + output.AppendLine(expr, $"UNPACK {reg} {reg}"); + return reg; + }); + + libDecl.AddMethod("hasMethod", MethodImplementationType.Custom, VarKind.Bool, new[] { new MethodParameter("target", VarKind.Module), new MethodParameter("method", VarKind.String) }). + SetPreCallback((output, scope, expr) => + { + var reg = Compiler.Instance.AllocRegister(output, expr); + var module = expr.arguments[0].AsLiteral(); + var methodName = expr.arguments[1].AsLiteral(); + + var hasMethod = module.abi.HasMethod(methodName); + output.AppendLine(expr, $"LOAD {reg} {hasMethod}"); + return reg; + }); + break; + } case "Module": libDecl.AddMethod("getScript", MethodImplementationType.Custom, VarKind.Bytes, new[] { new MethodParameter("target", VarKind.Module) }). SetPreCallback((output, scope, expr) => @@ -466,7 +501,7 @@ public static LibraryDeclaration LoadLibrary(string name, Scope scope, ModuleKin break; case "Token": - libDecl.AddMethod("create", MethodImplementationType.ExtCall, VarKind.None, new[] { new MethodParameter("from", VarKind.Address), new MethodParameter("symbol", VarKind.String), new MethodParameter("name", VarKind.String), new MethodParameter("maxSupply", VarKind.Number), new MethodParameter("decimals", VarKind.Number), new MethodParameter("flags", VarType.Find(VarKind.Enum, "TokenFlags")), new MethodParameter("script", VarKind.Bytes), new MethodParameter("abi", VarKind.Bytes) }).SetAlias("Nexus.CreateToken"); + libDecl.AddMethod("create", MethodImplementationType.ExtCall, VarKind.None, new[] { new MethodParameter("from", VarKind.Address), new MethodParameter("script", VarKind.Bytes), new MethodParameter("abi bytes", VarKind.Bytes) }).SetAlias("Nexus.CreateToken"); libDecl.AddMethod("exists", MethodImplementationType.ExtCall, VarKind.Bool, new[] { new MethodParameter("symbol", VarKind.String) }).SetAlias("Runtime.TokenExists"); libDecl.AddMethod("getDecimals", MethodImplementationType.ExtCall, VarKind.Number, new[] { new MethodParameter("symbol", VarKind.String) }).SetAlias("Runtime.GetTokenDecimals"); libDecl.AddMethod("getFlags", MethodImplementationType.ExtCall, VarType.Find(VarKind.Enum, "TokenFlag"), new[] { new MethodParameter("symbol", VarKind.String) }).SetAlias("Runtime.GetTokenFlags"); @@ -766,6 +801,7 @@ public static LibraryDeclaration LoadLibrary(string name, Scope scope, ModuleKin libDecl.AddMethod("getUserDomain", MethodImplementationType.ContractCall, VarKind.String, new[] { new MethodParameter("target", VarKind.Address) }).SetContract(contract).SetAlias(nameof(MailContract.GetUserDomain)); break; } + default: return FindExternalLibrary(name, scope, moduleKind); } diff --git a/Library/src/Compilers/TombLangCompiler.cs b/Library/src/Compilers/TombLangCompiler.cs index e004bb9..788e65a 100644 --- a/Library/src/Compilers/TombLangCompiler.cs +++ b/Library/src/Compilers/TombLangCompiler.cs @@ -59,6 +59,14 @@ private void InitStructs() new StructField("Symbol", VarKind.String), new StructField("Value", VarKind.Number) }); + + CreateStruct("ContractMethod", new [] + { + new StructField("name", VarKind.String), + new StructField("returnType", VarKind.Enum), + //new StructField("parameters", VarKind.Array), + new StructField("offset", VarKind.Number), + }); }