Merge branch 'master' into lars/merge-master-into-pact5

kadena-io · Nov 27, 2024 · 8aedac3 · 8aedac3
2 parents 534a433 + 8d00677
commit 8aedac3
Show file tree

Hide file tree

Showing 31 changed files with 826 additions and 614 deletions.
diff --git a/.github/workflows/applications.yml b/.github/workflows/applications.yml
@@ -361,13 +361,22 @@ jobs:
     - name: Build chainweb applications
       run: |
         cabal build -j2 --ghc-options=-j2 \
+          chainweb:bench:bench \
+          exe:b64 \
+          exe:calculate-release \
           exe:compact \
+          exe:db-checksum \
+          exe:ea \
+          exe:genconf \
+          exe:header-dump \
+          exe:known-graphs \
+          exe:pact-diff \
+          exe:run-nodes \
+          exe:tx-list \
           test:chainweb-tests \
-          test:multi-node-network-tests \
           test:compaction-tests \
-          test:remote-tests \
-          exe:cwtool \
-          chainweb:bench:bench
+          test:multi-node-network-tests \
+          test:remote-tests
     - name: Build chainweb-node application
       run: cabal build -j2 --ghc-options=-j2 chainweb-node:exe:chainweb-node
 
@@ -390,15 +399,23 @@ jobs:
     - name: Prepare artifacts
       run: |
         mkdir -p artifacts/chainweb
+        cp $(cabal list-bin b64) artifacts/chainweb
         cp $(cabal list-bin bench) artifacts/chainweb
+        cp $(cabal list-bin calculate-release) artifacts/chainweb
         cp $(cabal list-bin chainweb-node) artifacts/chainweb
         cp $(cabal list-bin chainweb-tests) artifacts/chainweb
         cp $(cabal list-bin compact) artifacts/chainweb
         cp $(cabal list-bin compaction-tests) artifacts/chainweb
-        cp $(cabal list-bin cwtool) artifacts/chainweb
+        cp $(cabal list-bin db-checksum) artifacts/chainweb
         cp $(cabal list-bin ea) artifacts/chainweb
+        cp $(cabal list-bin genconf) artifacts/chainweb
+        cp $(cabal list-bin header-dump) artifacts/chainweb
+        cp $(cabal list-bin known-graphs) artifacts/chainweb
         cp $(cabal list-bin multi-node-network-tests) artifacts/chainweb
+        cp $(cabal list-bin pact-diff) artifacts/chainweb
         cp $(cabal list-bin remote-tests) artifacts/chainweb
+        cp $(cabal list-bin run-nodes) artifacts/chainweb
+        cp $(cabal list-bin tx-list) artifacts/chainweb
         cp README.md artifacts/chainweb
         cp CHANGELOG.md artifacts/chainweb
         cp LICENSE artifacts/chainweb

diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml
@@ -116,15 +116,24 @@ jobs:
     - name: Build chainweb library
       run: cabal build lib:chainweb
     - name: Build chainweb applications
-      run: | 
+      run: |
         cabal build -j \
+          chainweb:bench:bench \
+          exe:b64 \
+          exe:calculate-release \
           exe:compact \
+          exe:db-checksum \
+          exe:ea \
+          exe:genconf \
+          exe:header-dump \
+          exe:known-graphs \
+          exe:pact-diff \
+          exe:run-nodes \
+          exe:tx-list \
           test:chainweb-tests \
-          test:multi-node-network-tests \
           test:compaction-tests \
-          test:remote-tests \
-          exe:cwtool \
-          chainweb:bench:bench
+          test:multi-node-network-tests \
+          test:remote-tests
     - name: Build chainweb-node application
       run: cabal build -j chainweb-node:exe:chainweb-node
     - uses: actions/cache/save@v4

diff --git a/cabal.project b/cabal.project
@@ -1,6 +1,7 @@
 packages:
     chainweb.cabal
     node/chainweb-node.cabal
+    cwtools/cwtools.cabal
 
 debug-info: True
 
@@ -40,6 +41,9 @@ package chainweb
 package chainweb-node
     ghc-options: -Wno-missed-extra-shared-lib
 
+package cwtools
+    ghc-options: -Wno-missed-extra-shared-lib
+
 if impl(ghc >= 9.8.1)
     package chainweb
         ghc-options: -Wno-x-partial
@@ -145,14 +149,6 @@ source-repository-package
     tag: 8b3227c59305f7e5ca6af7c0b9bc5435e78875a0
     --sha256: 08xpx3vwl8w7gn6z9s5smc383b962mxal3nav0fd5qh55yxqsp97
 
--- Patch merged into master (upcoming verison 10.0). We are currently using 9.2.
--- This fork contains additional fixes for using 9.2 with recent compilers.
-source-repository-package
-    type: git
-    location: https://github.com/larskuhtz/sbv
-    tag: 1f2d042718fcf9a140398bd3dedac77c207cce27
-    --sha256: 0l3nhsdxsyx17i29dw691d6bbqz26af6lg6pi1c2kb34v59m2rk3
-
 -- Required for non-canonical decode in base64-bytestring (remove after 2.20 fork)
 source-repository-package
     type: git

diff --git a/chainweb.cabal b/chainweb.cabal
@@ -489,6 +489,7 @@ library
 library chainweb-test-utils
     import: warning-flags, debugging-flags
     default-language: Haskell2010
+    visibility: public
     ghc-options:
         -Wno-x-partial -Wno-unrecognised-warning-flags
     hs-source-dirs: test/lib
@@ -841,147 +842,6 @@ test-suite remote-tests
     if flag(ed25519)
         cpp-options: -DWITH_ED25519=1
 
--- -------------------------------------------------------------------------- --
--- Misc Applications
--- -------------------------------------------------------------------------- --
-
-executable ea
-    import: warning-flags, debugging-flags
-    default-language: Haskell2010
-    ghc-options:
-        -threaded
-        -rtsopts
-        "-with-rtsopts=-N -H1G -A64M"
-        -Wno-x-partial -Wno-unrecognised-warning-flags
-    hs-source-dirs:
-        tools/ea
-    main-is:
-        Ea.hs
-    other-modules:
-        Ea.Genesis
-    build-depends:
-        , chainweb
-        , chainweb:chainweb-test-utils
-
-        , aeson
-        , async
-        , base
-        , chainweb-storage
-        , lens
-        , loglevel
-        , pact
-        , temporary
-        , text
-        , vector
-
-executable cwtool
-    import: warning-flags, debugging-flags
-    default-language: Haskell2010
-    ghc-options:
-        -threaded
-        -rtsopts
-        "-with-rtsopts=-N -H1G -A64M"
-        -Wno-x-partial -Wno-unrecognised-warning-flags
-    hs-source-dirs:
-        tools/cwtool
-        tools/encode-decode
-        tools/genconf
-        tools/run-nodes
-        tools/txstream
-        tools/header-dump
-        tools/db-checksum
-        tools/known-graphs
-        tools/calculate-release
-    main-is: CwTool.hs
-    other-modules:
-        CheckpointerDBChecksum
-        EncodeDecodeB64Util
-        GenConf
-        HeaderDump
-        KnownGraphs
-        RunNodes
-        TxStream
-        CalculateRelease
-
-    build-depends:
-        -- internal
-        , chainweb
-        , chainweb:chainweb-test-utils
-
-        -- external
-        , aeson >= 2.2
-        , aeson-pretty >= 0.8
-        , async >= 2.2
-        , base >= 4.12 && < 5
-        , bytestring >= 0.10.12
-        , case-insensitive >= 1.2
-        , cereal >= 0.5
-        , chainweb-storage >= 0.1
-        , configuration-tools >= 0.6
-        , containers >= 0.5
-        , crypton >= 0.31
-        , digraph >= 0.2.3
-        , direct-sqlite >= 2.3.27
-        , directory >= 1.3
-        , exceptions >= 0.8
-        , http-client >= 0.5
-        , http-client-tls >=0.3
-        , lens >= 4.17
-        , lens-aeson >= 1.2.2
-        , loglevel >= 0.1
-        , memory >=0.14
-        , mtl >= 2.3
-        , optparse-applicative >= 0.14
-        , pact
-        , pact-json
-        , process >= 1.5
-        , rocksdb-haskell-kadena >= 1.1.0
-        , safe-exceptions >= 0.1
-        , servant-client >= 0.18.2
-        , streaming >= 0.2.2
-        , text >= 2.0
-        , time >= 1.12.2
-        , unordered-containers >= 0.2.16
-        , vector >= 0.12.2
-        , wreq >= 0.5
-        , yaml >= 0.8
-        , yet-another-logger >= 0.4.1
-
-    if flag(ed25519)
-        cpp-options: -DWITH_ED25519=1
-
-executable compact
-    import: warning-flags, debugging-flags
-    default-language: Haskell2010
-    ghc-options:
-        -threaded
-        -rtsopts
-        "-with-rtsopts=-N -A4M --disable-delayed-os-memory-return -qn1"
-    hs-source-dirs: compact
-    main-is: Main.hs
-    build-depends:
-        -- internal
-        , chainweb
-
-        -- external
-        , base >= 4.12 && < 5
-
-executable pact-diff
-    import: warning-flags, debugging-flags
-    default-language: Haskell2010
-    ghc-options:
-        -threaded
-        -rtsopts
-        "-with-rtsopts=-N -A4M --disable-delayed-os-memory-return -qn1"
-    hs-source-dirs: pact-diff
-    main-is: Main.hs
-    build-depends:
-        -- internal
-        , chainweb
-
-        -- external
-        , base >= 4.12 && < 5
-
 -- -------------------------------------------------------------------------- --
 -- Benchmarks
 -- -------------------------------------------------------------------------- --

diff --git a/cwtools/LICENSE b/cwtools/LICENSE
@@ -0,0 +1,29 @@
+Copyright (c) 2018 - 2024 Kadena LLC
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/cwtools/README.md b/cwtools/README.md
@@ -0,0 +1,4 @@
+# Chainweb Tooling
+
+For details please see the documentation of the
+[chainweb project](https://github.com/kadena-io/chainweb-node/README.md).
diff --git a/tools/calculate-release/CalculateRelease.hs → cwtools/calculate-release/Main.hs b/tools/calculate-release/CalculateRelease.hs → cwtools/calculate-release/Main.hs
@@ -1,10 +1,9 @@
 {-# LANGUAGE BangPatterns #-}
-{-# LANGUAGE ImportQualifiedPost #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
 
-module CalculateRelease(main) where
+module Main (main) where
 
 import Chainweb.BlockHeight
 import Chainweb.Version (ChainwebVersion(..))

diff --git a/compact/Main.hs → cwtools/compact/Main.hs b/compact/Main.hs → cwtools/compact/Main.hs