Merge pull request #50 from marmarachain/development

season 8 NN Hardfork changes

.github/workflows/marmara_linux_ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Install deps (Linux)
 
@@ -40,7 +40,7 @@ jobs:
           CONFIGURE_FLAGS='CPPFLAGS=-DTESTMODE' ./zcutil/build.sh -j$(nproc)
           tar -czvf marmara-linux.tar.gz src/marmarad src/marmara-cli
       - name: Upload marmara-linux.tar.gz as artifact
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: marmara-linux
           path: ./marmara-linux.tar.gz
@@ -88,7 +88,7 @@ jobs:
     needs: linux-build
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Install deps (OraclesCC)
         run: |
@@ -104,7 +104,7 @@ jobs:
           python3 -m pip install setuptools wheel
           python3 -m pip install slick-bitcoinrpc pytest wget jsonschema
       - name: Download marmara-linux.tar.gz
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4
         with:
           name: marmara-linux
 
@@ -124,7 +124,7 @@ jobs:
     needs: linux-build
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Install deps (BasicRPC)
         run: |
@@ -140,7 +140,7 @@ jobs:
           python3 -m pip install setuptools wheel
           python3 -m pip install slick-bitcoinrpc pytest wget jsonschema
       - name: Download marmara-linux.tar.gz
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4
         with:
           name: marmara-linux
 

.github/workflows/marmara_mac_ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
        # Workaround for https://github.com/actions/setup-python/issues/577
       - name: Clean up binaries and links (macOS)
@@ -50,7 +50,7 @@ jobs:
           tar -czvf marmara-macos.tar.gz src/marmarad src/marmara-cli
           
       - name: Upload marmara-macos.tar.gz as artifact
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: marmara-macos
           path: ./marmara-macos.tar.gz
@@ -92,15 +92,15 @@ jobs:
     needs: macos-build
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Install deps (OraclesCC)
         run: |
           brew install python3 curl
           python3 -m pip install setuptools wheel
           python3 -m pip install slick-bitcoinrpc pytest wget jsonschema
       - name: Download marmara-macos.tar.gz
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4
         with:
           name: marmara-macos
 
@@ -121,15 +121,15 @@ jobs:
     needs: macos-build
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Install deps (BasicRPC)
         run: |
           brew install python3 curl
           python3 -m pip install setuptools wheel
           python3 -m pip install slick-bitcoinrpc pytest wget jsonschema
       - name: Download marmara-macos.tar.gz
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4
         with:
           name: marmara-macos
 

.github/workflows/marmara_win_ci.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Install deps(mingw)
       env:
         DEBIAN_FRONTEND: noninteractive
@@ -67,7 +67,7 @@ jobs:
         ./zcutil/build-win-dtest.sh -j$(nproc)
         zip --junk-paths marmarad_win src/marmarad.exe src/marmara-cli.exe
     - name: Upload marmarad_win as artifact
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: marmarad_win
         path: ./marmarad_win.zip
@@ -80,10 +80,10 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Download marmarad_win.zip
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4
         with:
           name: marmarad_win
 
@@ -144,10 +144,10 @@ jobs:
     needs: windows-build
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Download marmarad_win.zip
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4
         with:
           name: marmarad_win
 

README.md

@@ -9,7 +9,6 @@
 [![gitstars](https://img.shields.io/github/stars/komodoplatform/komodo?style=social)](https://github.com/KomodoPlatform/komodo/stargazers)
 [![twitter](https://img.shields.io/twitter/follow/marmarachain?style=social)](https://twitter.com/marmarachain)
 [![discord](https://img.shields.io/discord/412898016371015680)](https://discord.gg/QZNMw73)
-[![https://img.shields.io/badge/LANGUAGE-TR-blue](https://img.shields.io/badge/LANGUAGE-TR-blue)](https://github.com/marmarachain/marmara/blob/master/TR/Marmara_Kredi_D%C3%B6ng%C3%BCleri.md)
 
 ![MarmaraCreditLoops Logo](https://raw.githubusercontent.com/marmarachain/marmara/master/MCL-Logo.png "Marmara Credit Loops Logo")
 
@@ -48,16 +47,83 @@ More details are available under http://marmara.io/
 - To install/download Marmara Credit Loops, follow the [Marmara Credit Loops Instructions](https://github.com/marmarachain/marmara/wiki).
 - To get started with Marmara Credit Loops, follow the [Marmara Credit Loops Usage Guidelines](https://github.com/marmarachain/marmara/wiki/Getting-Started-with-Marmara) and to make Marmara Credit Loops, follow the [Making Marmara Credit Loops](https://github.com/marmarachain/marmara/wiki/How-to-make-Marmara-Credit-Loops?) guide.
 
-## Marmara Evolvement
-### Marmara v.1.0.1 Hardfork Change log
+### Linux
+
+#### Requirements
+
+    Linux (easiest with a Debian-based distribution, such as Ubuntu)
+        For Ubuntu, we recommend using the 18.04 or 20.02 releases
+    64-bit Processor
+    Minimum 2 CPUs
+    Minimum 4GB of free RAM
+
+#### Build Marmara from Source
+
+Note: For Ubuntu 20.04, please change the python-zmq library to python3-zmq below.
+
+Install the dependency packages:
+```	
+sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python python-zmq zlib1g-dev wget curl bsdmainutils automake cmake clang ntp ntpdate nano -y
+```
+Build marmara from source:
+```	
+cd ~
+git clone https://github.com/marmarachain/marmara --branch master --single-branch
+cd marmara
+./zcutil/fetch-params.sh
+./zcutil/build.sh -j$(expr $(nproc) - 1)
+#This can take some time.
+```
+
+### OSX
+
+Ensure you have brew and Command Line Tools installed.
+
+```	
+# Install brew
+/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+# Install Xcode, opens a pop-up window to install CLT without installing the entire Xcode package
+xcode-select --install 
+# Update brew and install dependencies
+brew update
+brew upgrade
+brew tap discoteq/discoteq; brew install flock
+brew install autoconf autogen automake
+brew update && brew install gcc@8
+brew install binutils
+brew install protobuf
+brew install coreutils
+brew install wget
+# Clone the Marmara repo
+git clone https://github.com/marmarachain/marmara --branch master --single-branch
+cd marmara
+./zcutil/fetch-params.sh
+./zcutil/build-mac.sh -j$(expr $(sysctl -n hw.ncpu) - 1)
+# This can take some time.
 ```
-- fixed incorrect coin cache usage causing chain forks
-- staking utxo processing performance improvements
-- loop transaction validation fixes
-- chain security fixes and improvements
-- fixed settlement failure on the loop holder node
-- fixed memory leaks
-- fixed daemon crash if multiple setgenerate true 0 calls are done
+
+### Windows
+
+Use a debian cross-compilation setup with mingw for windows and run:
+
+Note: For Ubuntu 20.04, please change the python-zmq library to python3-zmq below.
+
+```	
+sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python python-zmq zlib1g-dev wget libcurl4-gnutls-dev bsdmainutils automake curl libsodium-dev cmake mingw-w64
+
+# install rust
+curl https://sh.rustup.rs -sSf | sh
+source $HOME/.cargo/env
+rustup target add x86_64-pc-windows-gnu
+sudo update-alternatives --config x86_64-w64-mingw32-gcc
+# (configure to use POSIX variant)
+sudo update-alternatives --config x86_64-w64-mingw32-g++
+# (configure to use POSIX variant)
+
+git clone https://github.com/marmarachain/marmara --branch master --single-branch
+cd marmara
+./zcutil/fetch-params.sh
+./zcutil/build-win.sh -j$(nproc)
 ```
 
 ### Contact

configure.ac

@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 2)
-define(_CLIENT_VERSION_REVISION, 0)
+define(_CLIENT_VERSION_REVISION, 1)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
 define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))

doc/README.md

@@ -32,9 +32,9 @@ More details are available under http://marmara.io/
 
 ## Getting Started
 
-- To build Marmara from source, follow the [Marmara Credit Loops Build Instructions](/doc/marmara-build-from-source).
-- To install Marmara from pre-compiled binaries, follow the [Marmara Credit Loops Install Instructions](/doc/marmara-install-from-precompiled-binaries.md).
-- To get started with Marmara Credit Loops, follow the [Making Marmara Credit Loops](/doc/getting-started-with-marmara.md) guide.
+- To build Marmara from source, follow the [Marmara Credit Loops Build Instructions](/marmara-build-from-source.md).
+- To install Marmara from pre-compiled binaries, follow [Marmara Credit Loops Install Instructions](/marmara-install-from-precompiled-binaries.md).
+- To get started with Marmara Credit Loops, follow [Making Marmara Credit Loops](/getting-started-with-marmara.md) guide.
 
 
 ## Contact

src/clientversion.h

@@ -32,7 +32,7 @@
 //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 1
 #define CLIENT_VERSION_MINOR 2
-#define CLIENT_VERSION_REVISION 0
+#define CLIENT_VERSION_REVISION 1
 #define CLIENT_VERSION_BUILD 0
 
 //! Set to true for release, false for prerelease or test build