Merge pull request #623 from KomodoPlatform/dev

v0.9.0 [Drogon]
KomodoPlatform · Aug 20, 2024 · 0adeeab · 0adeeab
2 parents a89b6e8 + 3c4ae5d
commit 0adeeab
Show file tree

Hide file tree

Showing 237 changed files with 1,601 additions and 59,445 deletions.
diff --git a/.github/workflows/komodo_linux_ci.yml b/.github/workflows/komodo_linux_ci.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install deps (Linux)
 
@@ -54,7 +54,7 @@ jobs:
     needs: linux-build
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install deps (Dice, Token, Faucet, Rewards CC)
         run: |
@@ -91,7 +91,7 @@ jobs:
     needs: linux-build
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install deps (OraclesCC)
         run: |
@@ -128,7 +128,7 @@ jobs:
     needs: linux-build
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install deps (BasicRPC)
         run: |
@@ -165,7 +165,7 @@ jobs:
     needs: linux-build
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install deps (ChannelsCC)
         run: |
@@ -202,7 +202,7 @@ jobs:
     needs: linux-build
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install deps (HeirCC)
         run: |

diff --git a/.github/workflows/komodo_mac_ci.yml b/.github/workflows/komodo_mac_ci.yml
@@ -10,10 +10,10 @@ jobs:
 
   macos-build:
     name: MacOS Build
-    runs-on: macos-latest
+    runs-on: macos-latest-large
 
     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)
@@ -31,29 +31,30 @@ jobs:
       - name: Install deps (macOS)
         run: |
           brew update
-          brew upgrade || true
           brew tap discoteq/discoteq; brew install flock
           brew install autoconf autogen automake
-          brew install gcc@8
           brew install binutils
           brew install protobuf
           brew install coreutils
           brew install wget
           brew install python3
-          brew install gmp
 
+      # https://www.jessesquires.com/blog/2020/01/06/selecting-an-xcode-version-on-github-ci/
+      # https://github.com/actions/runner-images/issues/2619 (bsdtar issues)
+      # flag for some CC tests transactions - so DO NOT USE THIS CI ARTIFACTS IN PRODUCTION!!!
       - name: Build (macOS)
         run: |
-          # flag for some CC tests transactions - so DO NOT USE THIS CI ARTIFACTS IN PRODUCTION!!!
-          export CPATH=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/
           ./zcutil/build-mac-dtest.sh -j4
-          tar -czvf komodo-macos.tar.gz src/komodod src/komodo-cli
+          gtar -czvf komodo-macos.tar.gz src/komodod src/komodo-cli src/wallet-utility src/komodo-tx
+        # env:
+        #   DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
 
       - name: Upload komodo-macos.tar.gz as artifact
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: komodo-macos
-          path: ./komodo-macos.tar.gz
+          path: |
+            ./komodo-macos.tar.gz
 
   macos-test-dice-token-reards-faucet-cc:
     if: ${{ false }}
@@ -63,7 +64,7 @@ jobs:
     needs: macos-build
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Install deps (Dice, Token, Faucet, Rewards CC)
         run: |
@@ -72,7 +73,7 @@ jobs:
           python3 -m pip install slick-bitcoinrpc pytest wget jsonschema
 
       - name: Download komodo-macos.tar.gz
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4
         with:
           name: komodo-macos
 
@@ -93,15 +94,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 komodo-macos.tar.gz
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4
         with:
           name: komodo-macos
 
@@ -122,15 +123,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 komodo-macos.tar.gz
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4
         with:
           name: komodo-macos
 
@@ -151,15 +152,15 @@ jobs:
     needs: macos-build
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Install deps (ChannelsCC)
         run: |
           brew install python3 curl
           python3 -m pip install setuptools wheel
           python3 -m pip install slick-bitcoinrpc pytest wget jsonschema
       - name: Download komodo-macos.tar.gz
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4
         with:
           name: komodo-macos
 
@@ -180,15 +181,15 @@ jobs:
     needs: macos-build
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Install deps (HeirCC)
         run: |
           brew install python3 curl
           python3 -m pip install setuptools wheel
           python3 -m pip install slick-bitcoinrpc pytest wget jsonschema
       - name: Download komodo-macos.tar.gz
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4
         with:
           name: komodo-macos
 

diff --git a/.github/workflows/komodo_win_ci.yml b/.github/workflows/komodo_win_ci.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install deps(mingw)
       env:
         DEBIAN_FRONTEND: noninteractive
@@ -80,7 +80,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Download komodo_win.zip
         uses: actions/download-artifact@v1
@@ -111,7 +111,7 @@ jobs:
     needs: windows-build
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Download komodo_win.zip
         uses: actions/download-artifact@v1
@@ -142,7 +142,7 @@ jobs:
     needs: windows-build
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Download komodo_win.zip
         uses: actions/download-artifact@v1
@@ -173,7 +173,7 @@ jobs:
     needs: windows-build
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Download komodo_win.zip
         uses: actions/download-artifact@v1
@@ -204,7 +204,7 @@ jobs:
     needs: windows-build
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Download komodo_win.zip
         uses: actions/download-artifact@v1

diff --git a/.github/workflows/komodod_cd.yml b/.github/workflows/komodod_cd.yml
@@ -2,14 +2,14 @@
 
 name: Komodo CD test releases
 
-
 on:
   push:
     branches:
     - beta
     - dev
     - research
     - master
+  workflow_dispatch:
 
 jobs:
 
@@ -30,7 +30,7 @@ jobs:
         id: shortify_commit
 
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install deps (Linux)
         env:
@@ -76,28 +76,41 @@ jobs:
 
   osx-build:
     name: OSX Build
-    runs-on: macos-latest
+    if: ${{ github.event_name != 'workflow_dispatch' }}
+    runs-on: macos-latest-large
+
     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)
+        run: |
+          rm -f /usr/local/bin/2to3-3.*
+          rm -f /usr/local/bin/idle3.*
+          rm -f /usr/local/bin/pydoc3.*
+          rm -f /usr/local/bin/python3.*
+          rm -f /usr/local/bin/2to3
+          rm -f /usr/local/bin/idle3
+          rm -f /usr/local/bin/pydoc3
+          rm -f /usr/local/bin/python3
+          rm -f /usr/local/bin/python3-config
+
       - name: Install deps (macOS)
         run: |
-          rm '/usr/local/bin/2to3'
-          brew unlink node
           brew update
-          brew upgrade || true
           brew tap discoteq/discoteq; brew install flock
           brew install autoconf autogen automake
-          brew install gcc@8
           brew install binutils
           brew install protobuf
           brew install coreutils
           brew install wget
           brew install python3
-          brew install gmp
+
       - name: Build (macOS)
         run: |
           ./zcutil/build-mac.sh -j4
           zip --junk-paths komodo-osx src/komodod src/komodo-cli
+
       - name: Upload komodo-osx.zip as artifact
         uses: actions/upload-artifact@v1
         with:
@@ -106,10 +119,11 @@ jobs:
 
   windows-build:
     name: Windows Build (mingw)
+    if: ${{ github.event_name != 'workflow_dispatch' }}
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install deps (Windows)
         env:
           DEBIAN_FRONTEND: noninteractive
@@ -140,6 +154,7 @@ jobs:
 
   publish-release:
       name: Publishing CD releases
+      if: ${{ github.event_name != 'workflow_dispatch' }}
       runs-on: ubuntu-20.04
       needs: [linux-build, osx-build, windows-build]
       steps:

diff --git a/.gitignore b/.gitignore
@@ -35,6 +35,7 @@ src/config/bitcoin-config.h
 src/config/bitcoin-config.h.in
 src/config/stamp-h1
 share/setup.nsi
+src/cryptoconditions/src/cryptoconditions-config.h.in
 
 cache/
 venv-mnf/
@@ -45,7 +46,7 @@ src/univalue/gen
 .idea
 .libs
 .*.swp
-*.*~*
+*~
 *.bak
 *.rej
 *.orig
@@ -124,6 +125,9 @@ src/komodo-tx.exe
 #output during builds, symbol tables?
 *.dSYM
 
+src/*_7776
+*_7776
+
 
 src/cryptoconditions/compile