Merge pull request #277 from phantasma-io/dev

Merge Dev into Master

.gitattributes

@@ -0,0 +1,2 @@
+* text=auto
+* text eol=lf

.gitignore

@@ -416,6 +416,8 @@ tendermint
 Phantasma.Node/Properties/launchSettings.json
 DOCKER/Storage/
 Phantasma.Node/testnet/
+Phantasma.Node/src/testnet/
+
 
 testnet/temp/
 
@@ -431,3 +433,6 @@ testnet/temp/
 .vscode/
 
 Phantasma.Core/tests/MyTests.cs
+NodeExample/tendermint/tendermint
+DOCKER/_Storage/*
+DOCKER/Storage/

CHANGELOG.md

@@ -1,6 +1,35 @@
 # Phantasma Blockchain Changelog
 All notable changes to this project will be documented in this file.
 
+## Version 17 - 13 October, 2023
+### Added
+
+### Changed
+- Bumped version to 17.
+- All of the changes of version 16 moved to version 17.
+### Fixed
+
+## Version 16 - 12 October, 2023
+### Added
+- Added `docker-compose.yml` file to run the Phantasma Blockchain in a Docker container.
+- Added `docker-entrypoint.sh` file to run the Phantasma Blockchain in a Docker container.
+- Added `DockerfileTestnetDebug` file to help debug the Phantasma Blockchain in a Docker container.
+- Added `DockerfileTestnetNodeBuilder` file to run the Phantasma Blockchain in a Docker container.
+- Added `DockerfileNodeWin` file to build the Phantasma Blockchain.
+- Added `wrapper-testnet-debug.sh` file to help debug the Phantasma Blockchain in a Docker container.
+- Added a way to provide the `config.json` file as a parameter on startup.
+
+### Changed
+- Bumped version to 16.
+- Upgrade to Simnet to increase the amount of SOUL and KCAL the user receives (Development only).
+- Updated `Readme.md` file to include instructions on how to debug the Phantasma Blockchain.
+- Updated `ABCIConnector.cs` file to check the CurrentBlock is null.
+
+### Fixed
+- Bug fixes to the ConsensusContract.
+- Changed `Oracle.cs` to access directly the storage.
+- Fixed `NexusValidator.cs` to get the validators from the storage.
+
 ## Version 15 - March 30, 2023
 ### Added
 

DOCKER/Dockerfile

@@ -1,16 +1,14 @@
 #--platform=linux/x86_64
-FROM debian:stable-slim
+#FROM debian:stable-slim
+FROM  mcr.microsoft.com/dotnet/aspnet:6.0 as runtime
 WORKDIR /app
 
 # Copy everything
 COPY DOCKER/wrapper.sh /app/wrapper.sh
 COPY DOCKER/testnet /app/testnet
 COPY DOCKER/bin /app/bin
 
-RUN apt-get update && apt-get install -y curl inotify-tools libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev libzstd-dev libc6-dev libicu-dev libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev libzstd-dev librocksdb-dev libc6-dev libsnappy-dev libicu-dev screen bash vim net-tools ca-certificates openssl libssl-dev librocksdb-dev nano
-
-#RUN curl -sSL https://dot.net/v1/dotnet-install.sh | /bin/bash /dev/stdin -Channel 6.0 -Runtime dotnet -InstallDir /usr/share/dotnet \
-#    && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
+RUN apt-get update && apt-get install -y curl inotify-tools libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev libzstd-dev libc6-dev libicu-dev libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev libzstd-dev librocksdb-dev libc6-dev libsnappy-dev libicu-dev screen bash vim net-tools ca-certificates openssl libssl-dev nano
 
 EXPOSE 7077 7078 7079 7080 26056 26156 26256 26356 26057 26157 26257 26357
 

DOCKER/DockerfileNodeBuilder

@@ -0,0 +1,10 @@
+FROM mcr.microsoft.com/dotnet/sdk:6.0 as build-env
+WORKDIR /app/src
+COPY ./../ /app/src
+RUN dotnet restore Phantasma.Node/src/Phantasma.Node.csproj
+RUN dotnet publish Phantasma.Node/src/Phantasma.Node.csproj -c Release -o /app/build/
+
+#FROM mcr.microsoft.com/dotnet/aspnet:6.0 as runtime
+#WORKDIR /app
+#COPY --from=build-env /publish/ /app/build/
+#ENTRYPOINT ["/bin/bash", "-c", "tail -f /dev/null"]

DOCKER/DockerfileNodeWin

@@ -0,0 +1,12 @@
+FROM  mcr.microsoft.com/dotnet/aspnet:6.0 as runtime
+WORKDIR /app
+COPY DOCKER/bin /app/bin
+COPY DOCKER/wrapper-node.sh /app/wrapper.sh
+COPY DOCKER/config /app/config
+
+RUN chmod +x /app/wrapper.sh
+RUN apt-get update && apt-get install -y curl inotify-tools libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev libzstd-dev libc6-dev libicu-dev libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev libzstd-dev librocksdb-dev libc6-dev libsnappy-dev libicu-dev screen bash vim net-tools ca-certificates openssl libssl-dev nano
+
+EXPOSE 7077 7078 7079 7080 26056 26156 26256 26356 26057 26157 26257 26357 26058 26158 26258 26358
+#ENTRYPOINT ["/bin/bash", "-c", "tail -f /dev/null"]
+#ENTRYPOINT ["dotnet", "phantasma-node.dll"]

DOCKER/DockerfileTestnet

@@ -1,12 +1,13 @@
 #--platform=linux/x86_64
-FROM debian:stable-slim
+#FROM debian:stable-slim
+FROM  mcr.microsoft.com/dotnet/aspnet:6.0 as runtime
 WORKDIR /app
 
 # Copy everything
 COPY DOCKER/wrapper-testnet.sh /app/wrapper-testnet.sh 
 COPY DOCKER/bin /app/bin
 
-RUN apt-get update; apt-get install -y libc6-dev libsnappy-dev libicu-dev screen bash vim net-tools ca-certificates openssl libssl-dev librocksdb-dev nano
+RUN apt-get update; apt-get install -y inotify-tools libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev libzstd-dev libc6-dev libicu-dev libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev libzstd-dev librocksdb-dev libc6-dev libsnappy-dev libicu-dev screen bash vim net-tools ca-certificates openssl libssl-dev libgdiplus libx11-dev nano
 
 EXPOSE 7077 7078 7079 7080 26056 26156 26256 26356 26057 26157 26257 26357
 

DOCKER/DockerfileTestnetDebug

@@ -0,0 +1,14 @@
+#--platform=linux/x86_64
+FROM  mcr.microsoft.com/dotnet/aspnet:6.0 as runtime
+WORKDIR /app
+
+# Copy everything
+COPY DOCKER/wrapper-testnet-debug.sh /app/wrapper-testnet-debug.sh 
+COPY DOCKER/bin /app/bin
+
+RUN apt-get update; apt-get install -y libc6-dev libsnappy-dev libicu-dev screen bash vim net-tools ca-certificates openssl libssl-dev librocksdb-dev nano
+
+EXPOSE 7078 7079 7080 26156 26256 26356 26157 26257 26357
+
+RUN chmod +x /app/wrapper-testnet-debug.sh
+ENTRYPOINT ["/app/wrapper-testnet-debug.sh"]

DOCKER/Dockerfilenode

@@ -0,0 +1,18 @@
+#FROM --platform=linux/amd64 debian:stable-slim
+FROM  mcr.microsoft.com/dotnet/aspnet:6.0 as runtime
+WORKDIR /app
+
+# Copy everything
+COPY DOCKER/wrapper-node.sh /app/wrapper.sh
+COPY DOCKER/NodePublish /app/node/data
+COPY DOCKER/config /app/config
+COPY DOCKER/bin /app/bin
+
+RUN apt-get update && apt-get install -y curl inotify-tools libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev libzstd-dev libc6-dev libicu-dev libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev libzstd-dev librocksdb-dev libc6-dev libsnappy-dev libicu-dev screen bash vim net-tools ca-certificates openssl libssl-dev nano
+
+EXPOSE 7077 7078 7079 7080 26056 26156 26256 26356 26057 26157 26257 26357
+
+RUN chmod +x /app/wrapper.sh
+ENTRYPOINT ["/bin/bash", "-c", "tail -f /dev/null"]
+#ENTRYPOINT ["/bin/bash", "-c", "/app/wrapper.sh"]
+