Merge branch 'dev'

phantasma-io-archive · Jul 14, 2023 · ee20d6c · ee20d6c
2 parents 5b0c88e + 0dfc107
commit ee20d6c
Show file tree

Hide file tree

Showing 219 changed files with 7,892 additions and 2,445 deletions.
diff --git a/.github/workflows/comment-on-pr.yml b/.github/workflows/comment-on-pr.yml
@@ -0,0 +1,39 @@
+name: Comment on the pull request
+
+# read-write repo token
+# access to secrets
+on:
+  workflow_run:
+    workflows: [".NET Core"]
+    types:
+      - completed
+permissions:
+  pull-requests: write
+  actions: write
+  issues: write
+  contents: write
+
+env:
+  GITHUB_TOKEN: ${{ secrets.PR_KEY }}
+
+jobs:
+  build:
+    name: Comment on PR
+    runs-on: ubuntu-latest
+    if: >
+      github.event.workflow_run.event == 'pull_request' &&
+      github.event.workflow_run.conclusion == 'success'
+    permissions: write-all
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: my-artifact
+
+      - name: Add Coverage PR Comment
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          recreate: true
+          path: code-coverage-results.md
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -4,29 +4,60 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, dev]
+
+permissions:
+  pull-requests: write
+  issues: write
+  contents: write
+  actions: write
+  id-token: write
+  packages: write
+  deployments: write
+  discussions: write
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
   build:
-
+    name: Build TOMB
     runs-on: ubuntu-latest
-
+    permissions: write-all
+
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+    - uses: actions/checkout@v3
+    - name: Setup .NET 
+      uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 3.1.301
-    - name: Get PhantasmaChain
-      run: |
-        sudo apt-get update
-        sudo apt-get -y install git libicu-dev
-        git clone https://github.com/phantasma-io/PhantasmaChain.git ../PhantasmaChain
-        cd ../PhantasmaChain
-        git checkout development
+        dotnet-version: 6.0.x
+
     - name: Install dependencies
-      run: dotnet restore
+      run: |
+          sudo apt-get install libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev libzstd-dev
+          sudo apt-get install libc6-dev libicu-dev libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev libzstd-dev librocksdb-dev
+          sudo apt-get install librocksdb-dev
+          dotnet tool install --global dotnet-reportgenerator-globaltool
+          dotnet restore
+      
     - name: Build
-      run: dotnet build --configuration Release --no-restore
+      run: dotnet build --configuration Release  --no-restore
+
     - name: Test
-      run: dotnet test --no-restore --verbosity normal
+      run: dotnet test --no-build --configuration Release --verbosity normal --collect:"XPlat Code Coverage" --results-directory ./coverage
+
+    - name: Combine Coverage Output
+      run: reportgenerator "-reports:coverage/**/coverage.cobertura.xml" -targetdir:"coverage" -reporttypes:Cobertura -assemblyfilters:"-TOMBLib.Tests"
+
+    - name: Code Coverage Summary Report
+      uses: irongut/[email protected]
+      with:
+        filename: coverage/Cobertura.xml
+        badge: true
+        fail_below_min: false
+        format: markdown
+        hide_branch_rate: false
+        hide_complexity: false
+        indicators: true
+        output: both
+        thresholds: '60 80'
diff --git a/.github/workflows/dotnet-publish.yml b/.github/workflows/dotnet-publish.yml
@@ -0,0 +1,52 @@
+name: .NET Nuget Publish
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  pull-requests: write
+  actions: write
+  issues: write
+  contents: write
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  build:
+    name: Build and Publish Nuget
+    runs-on: ubuntu-latest
+    permissions: write-all
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v2
+        with:
+          dotnet-version: 6.0.x
+
+      - name: Install dependencies
+        run: |
+          dotnet restore
+
+      - name: Build
+        run: dotnet build --configuration Release --no-restore
+
+      - name: Pack Nuget
+        run: dotnet pack --configuration Release  --no-restore
+
+      - name: Publish Nuget
+        run: |
+          dotnet nuget push ./Library/src/bin/Release/TOMBLib.*.nupkg --skip-duplicate -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json
+          
+      - name: Publish Nuget Github
+        run: |
+          dotnet nuget add ./Library/src/bin/Release/TOMBLib.*.nupkg --skip-duplicate --username USERNAME --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/phantasma-io/index.json"
+          dotnet nuget push ./Library/src/bin/Release/TOMBLib.*.nupkg --skip-duplicate --api-key ${{secrets.PR_KEY}} --source "github"
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,6 @@ Publish/
 
 Compiler/Properties/launchSettings.json
 .idea/
+coverage/
+
+Releases/
diff --git a/Compiler/Program.cs b/Compiler/Program.cs
@@ -162,6 +162,12 @@ static void Main(string[] args)
                             break;
                         }
 
+                    case "debug":
+                        {
+                            Compiler.DebugMode = true;
+                            break;
+                        }
+
                     default:
                         ShowWarning("Unknown option: " + tag);
                         break;
@@ -177,9 +183,9 @@ static void Main(string[] args)
                 sourceFileName = @"..\..\..\builtins.tomb";
             }
 #else
-            if (string.IsNullOrEmpty(sourceFilePath))
+            if (string.IsNullOrEmpty(sourceFileName))
             {
-                sourceFilePath = @"my_contract.tomb";
+                sourceFileName = @"my_contract.tomb";
             }
 #endif
 

diff --git a/Compiler/TombCompiler.csproj b/Compiler/TombCompiler.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Phantasma.Tomb</RootNamespace>
     <ImplicitUsings>disable</ImplicitUsings>
   </PropertyGroup>
@@ -12,8 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\CompilerLib\CompilerLib.csproj" />
-    <ProjectReference Include="..\Library\TOMBLib.csproj" />
+    <ProjectReference Include="..\Library\src\TOMBLib.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Library/AST/Declaration.cs → Library/src/AST/Declaration.cs b/Library/AST/Declaration.cs → Library/src/AST/Declaration.cs
diff --git a/Library/AST/Declarations/ConstDeclaration.cs → .../src/AST/Declarations/ConstDeclaration.cs b/Library/AST/Declarations/ConstDeclaration.cs → .../src/AST/Declarations/ConstDeclaration.cs
diff --git a/...ry/AST/Declarations/DecimalDeclaration.cs → ...rc/AST/Declarations/DecimalDeclaration.cs b/...ry/AST/Declarations/DecimalDeclaration.cs → ...rc/AST/Declarations/DecimalDeclaration.cs
@@ -4,7 +4,7 @@ public class DecimalDeclaration : VarDeclaration
     {
         public readonly int Decimals;
 
-        public DecimalDeclaration(Scope parentScope, string name, int decimals, VarStorage storage) : base(parentScope, name, VarType.Find(VarKind.Decimal), storage)
+        public DecimalDeclaration(Scope parentScope, string name, int decimals, VarStorage storage) : base(parentScope, name, VarType.Find(VarKind.Decimal, decimals), storage)
         {
             this.Decimals = decimals;
         }

diff --git a/Library/AST/Declarations/EnumDeclaration.cs → ...y/src/AST/Declarations/EnumDeclaration.cs b/Library/AST/Declarations/EnumDeclaration.cs → ...y/src/AST/Declarations/EnumDeclaration.cs
diff --git a/Library/AST/Declarations/EventDeclaration.cs → .../src/AST/Declarations/EventDeclaration.cs b/Library/AST/Declarations/EventDeclaration.cs → .../src/AST/Declarations/EventDeclaration.cs
diff --git a/...ry/AST/Declarations/LibraryDeclaration.cs → ...rc/AST/Declarations/LibraryDeclaration.cs b/...ry/AST/Declarations/LibraryDeclaration.cs → ...rc/AST/Declarations/LibraryDeclaration.cs
diff --git a/Library/AST/Declarations/ListDeclaration.cs → ...y/src/AST/Declarations/ListDeclaration.cs b/Library/AST/Declarations/ListDeclaration.cs → ...y/src/AST/Declarations/ListDeclaration.cs
diff --git a/Library/AST/Declarations/MapDeclaration.cs → ...ry/src/AST/Declarations/MapDeclaration.cs b/Library/AST/Declarations/MapDeclaration.cs → ...ry/src/AST/Declarations/MapDeclaration.cs
diff --git a/...ary/AST/Declarations/MethodDeclaration.cs → ...src/AST/Declarations/MethodDeclaration.cs b/...ary/AST/Declarations/MethodDeclaration.cs → ...src/AST/Declarations/MethodDeclaration.cs
diff --git a/Library/AST/Declarations/SetDeclaration.cs → ...ry/src/AST/Declarations/SetDeclaration.cs b/Library/AST/Declarations/SetDeclaration.cs → ...ry/src/AST/Declarations/SetDeclaration.cs
diff --git a/...ary/AST/Declarations/StructDeclaration.cs → ...src/AST/Declarations/StructDeclaration.cs b/...ary/AST/Declarations/StructDeclaration.cs → ...src/AST/Declarations/StructDeclaration.cs
diff --git a/Library/AST/Declarations/VarDeclaration.cs → ...ry/src/AST/Declarations/VarDeclaration.cs b/Library/AST/Declarations/VarDeclaration.cs → ...ry/src/AST/Declarations/VarDeclaration.cs
diff --git a/Library/AST/Enums.cs → Library/src/AST/Enums.cs b/Library/AST/Enums.cs → Library/src/AST/Enums.cs
diff --git a/Library/AST/Expression.cs → Library/src/AST/Expression.cs b/Library/AST/Expression.cs → Library/src/AST/Expression.cs
diff --git a/...AST/Expressions/ArrayElementExpression.cs → ...AST/Expressions/ArrayElementExpression.cs b/...AST/Expressions/ArrayElementExpression.cs → ...AST/Expressions/ArrayElementExpression.cs
diff --git a/Library/AST/Expressions/ArrayExpression.cs → ...ry/src/AST/Expressions/ArrayExpression.cs b/Library/AST/Expressions/ArrayExpression.cs → ...ry/src/AST/Expressions/ArrayExpression.cs
diff --git a/Library/AST/Expressions/BinaryExpression.cs → ...y/src/AST/Expressions/BinaryExpression.cs b/Library/AST/Expressions/BinaryExpression.cs → ...y/src/AST/Expressions/BinaryExpression.cs
diff --git a/Library/AST/Expressions/CastExpression.cs → ...ary/src/AST/Expressions/CastExpression.cs b/Library/AST/Expressions/CastExpression.cs → ...ary/src/AST/Expressions/CastExpression.cs
diff --git a/Library/AST/Expressions/ConstExpression.cs → ...ry/src/AST/Expressions/ConstExpression.cs b/Library/AST/Expressions/ConstExpression.cs → ...ry/src/AST/Expressions/ConstExpression.cs
diff --git a/Library/AST/Expressions/LiteralExpression.cs → .../src/AST/Expressions/LiteralExpression.cs b/Library/AST/Expressions/LiteralExpression.cs → .../src/AST/Expressions/LiteralExpression.cs
diff --git a/Library/AST/Expressions/MacroExpression.cs → ...ry/src/AST/Expressions/MacroExpression.cs b/Library/AST/Expressions/MacroExpression.cs → ...ry/src/AST/Expressions/MacroExpression.cs
diff --git a/...y/AST/Expressions/MethodCallExpression.cs → ...c/AST/Expressions/MethodCallExpression.cs b/...y/AST/Expressions/MethodCallExpression.cs → ...c/AST/Expressions/MethodCallExpression.cs
diff --git a/...ary/AST/Expressions/NegationExpression.cs → ...src/AST/Expressions/NegationExpression.cs b/...ary/AST/Expressions/NegationExpression.cs → ...src/AST/Expressions/NegationExpression.cs
diff --git a/.../AST/Expressions/StructFieldExpression.cs → .../AST/Expressions/StructFieldExpression.cs b/.../AST/Expressions/StructFieldExpression.cs → .../AST/Expressions/StructFieldExpression.cs
diff --git a/Library/AST/Expressions/VarExpression.cs → Library/src/AST/Expressions/VarExpression.cs b/Library/AST/Expressions/VarExpression.cs → Library/src/AST/Expressions/VarExpression.cs
diff --git a/Library/AST/MethodInterface.cs → Library/src/AST/MethodInterface.cs b/Library/AST/MethodInterface.cs → Library/src/AST/MethodInterface.cs
diff --git a/Library/AST/Node.cs → Library/src/AST/Node.cs b/Library/AST/Node.cs → Library/src/AST/Node.cs
diff --git a/Library/AST/Scope.cs → Library/src/AST/Scope.cs b/Library/AST/Scope.cs → Library/src/AST/Scope.cs
diff --git a/Library/AST/Statement.cs → Library/src/AST/Statement.cs b/Library/AST/Statement.cs → Library/src/AST/Statement.cs
diff --git a/Library/AST/Statements/AsmBlockStatement.cs → ...y/src/AST/Statements/AsmBlockStatement.cs b/Library/AST/Statements/AsmBlockStatement.cs → ...y/src/AST/Statements/AsmBlockStatement.cs
diff --git a/Library/AST/Statements/AssignStatement.cs → ...ary/src/AST/Statements/AssignStatement.cs b/Library/AST/Statements/AssignStatement.cs → ...ary/src/AST/Statements/AssignStatement.cs
diff --git a/Library/AST/Statements/BreakStatement.cs → Library/src/AST/Statements/BreakStatement.cs b/Library/AST/Statements/BreakStatement.cs → Library/src/AST/Statements/BreakStatement.cs
diff --git a/Library/AST/Statements/CaseStatement.cs → Library/src/AST/Statements/CaseStatement.cs b/Library/AST/Statements/CaseStatement.cs → Library/src/AST/Statements/CaseStatement.cs
diff --git a/Library/AST/Statements/ContinueStatement.cs → ...y/src/AST/Statements/ContinueStatement.cs b/Library/AST/Statements/ContinueStatement.cs → ...y/src/AST/Statements/ContinueStatement.cs
diff --git a/Library/AST/Statements/DoWhileStatement.cs → ...ry/src/AST/Statements/DoWhileStatement.cs b/Library/AST/Statements/DoWhileStatement.cs → ...ry/src/AST/Statements/DoWhileStatement.cs
diff --git a/Library/AST/Statements/EmitStatement.cs → Library/src/AST/Statements/EmitStatement.cs b/Library/AST/Statements/EmitStatement.cs → Library/src/AST/Statements/EmitStatement.cs
diff --git a/Library/AST/Statements/ForStatement.cs → Library/src/AST/Statements/ForStatement.cs b/Library/AST/Statements/ForStatement.cs → Library/src/AST/Statements/ForStatement.cs
diff --git a/Library/AST/Statements/IfStatement.cs → Library/src/AST/Statements/IfStatement.cs b/Library/AST/Statements/IfStatement.cs → Library/src/AST/Statements/IfStatement.cs
diff --git a/...ary/AST/Statements/MethodCallStatement.cs → ...src/AST/Statements/MethodCallStatement.cs b/...ary/AST/Statements/MethodCallStatement.cs → ...src/AST/Statements/MethodCallStatement.cs
diff --git a/Library/AST/Statements/ReturnStatement.cs → ...ary/src/AST/Statements/ReturnStatement.cs b/Library/AST/Statements/ReturnStatement.cs → ...ary/src/AST/Statements/ReturnStatement.cs
diff --git a/Library/AST/Statements/SwitchStatement.cs → ...ary/src/AST/Statements/SwitchStatement.cs b/Library/AST/Statements/SwitchStatement.cs → ...ary/src/AST/Statements/SwitchStatement.cs
diff --git a/Library/AST/Statements/ThrowStatement.cs → Library/src/AST/Statements/ThrowStatement.cs b/Library/AST/Statements/ThrowStatement.cs → Library/src/AST/Statements/ThrowStatement.cs
diff --git a/Library/AST/Statements/WhileStatement.cs → Library/src/AST/Statements/WhileStatement.cs b/Library/AST/Statements/WhileStatement.cs → Library/src/AST/Statements/WhileStatement.cs
diff --git a/Library/CodeGen/Builtins.cs → Library/src/CodeGen/Builtins.cs b/Library/CodeGen/Builtins.cs → Library/src/CodeGen/Builtins.cs
@@ -171,11 +171,12 @@ private static void Initialize()
 						i++;
 					} while (true);
 
-#if DEBUG
-					Console.WriteLine($"Detected builtin: {libName}.{methodName}");
-#endif
+					if (Compiler.DebugMode)
+					{
+                        Console.WriteLine($"Detected builtin: {libName}.{methodName}");
+                    }
 
-					var alias = ("tomb_" + libName + "_" + methodName).ToLowerInvariant();
+                    var alias = ("tomb_" + libName + "_" + methodName).ToLowerInvariant();
 
 					var builtinCode = code.ToString();
 

diff --git a/Library/CodeGen/CodeGenerator.cs → Library/src/CodeGen/CodeGenerator.cs b/Library/CodeGen/CodeGenerator.cs → Library/src/CodeGen/CodeGenerator.cs
diff --git a/Library/CodeGen/Contract.cs → Library/src/CodeGen/Contract.cs b/Library/CodeGen/Contract.cs → Library/src/CodeGen/Contract.cs
@@ -1,12 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using Phantasma.Business.VM;
 using Phantasma.Core.Domain;
 using Phantasma.Tomb.AST;
 using Phantasma.Tomb.AST.Declarations;
 using Phantasma.Tomb.AST.Expressions;
-using static Grpc.Core.Metadata;
+using Phantasma.Tomb.AST.Statements;
 
 namespace Phantasma.Tomb.CodeGen
 {
@@ -90,6 +87,7 @@ public override ContractInterface GenerateCode(CodeGenerator output)
 
             if (this.Kind == ModuleKind.Token)
             {
+                bool hasSymbol = false;
                 bool hasName = false;
 
                 foreach (var method in this.Methods.Values)
@@ -116,8 +114,14 @@ public override ContractInterface GenerateCode(CodeGenerator output)
                                 break;
 
                             case "Symbol":
+                                hasSymbol = true;
+                                checkForGlobals = true;
+                                ExpectMethodType(method, VarKind.String);
+                                break;
+
                             case "Decimals":
                                 checkForGlobals = true;
+                                ExpectMethodType(method, VarKind.Number);
                                 break;
                         }
                     }
@@ -159,6 +163,19 @@ public override ContractInterface GenerateCode(CodeGenerator output)
                 {
                     throw new CompilerException($"token {this.Name} is missing property 'name'");
                 }
+
+                if (!hasSymbol)
+                {
+                    var type = VarType.Find(VarKind.String);
+                    var symbolScope = new Scope(this.Scope, "getSymbol");
+
+                    var symbolProperty = AddMethod(this.LineNumber, "getSymbol", true, MethodKind.Property, type, new MethodParameter[0], symbolScope, false);
+
+                    var body = new StatementBlock(symbolScope);
+                    body.Commands.Add(new ReturnStatement(symbolProperty, new LiteralExpression(symbolScope, $"\"{Name}\"", type)));
+
+                    this.SetMethodBody(symbolProperty.Name, body);
+                }
             }
 
             this.Scope.Enter(output);
@@ -300,4 +317,4 @@ protected override void ProcessABI(ContractInterface abi, DebugInfo debugInfo)
             }
         }
     }
-}
+}