Merge pull request #2044 from kadena-io/lars/merge-master-into-pact5

Lars/merge master into pact5

.github/workflows/applications.yml

@@ -359,7 +359,7 @@ jobs:
     - name: Build chainweb library
       run: cabal build --ghc-options=-j2 lib:chainweb
     - name: Build chainweb applications
-      run: | 
+      run: |
         cabal build -j2 --ghc-options=-j2 \
           exe:compact \
           test:chainweb-tests \
@@ -380,7 +380,7 @@ jobs:
         fi
     - name: Run ea and verify consistency of genesis headers
       run: |
-        cabal run cwtool -- ea
+        cabal run ea
         if ! git diff --exit-code -- src/Chainweb/BlockHeader/Genesis/ src/Chainweb/Pact/Transactions/ ; then
           echo "Inconsistent genesis headers detected. Did you forget to run ea?" 1>&2
           exit 1
@@ -390,14 +390,15 @@ jobs:
     - name: Prepare artifacts
       run: |
         mkdir -p artifacts/chainweb
+        cp $(cabal list-bin bench) artifacts/chainweb
         cp $(cabal list-bin chainweb-node) artifacts/chainweb
-        cp $(cabal list-bin compact) artifacts/chainweb
         cp $(cabal list-bin chainweb-tests) artifacts/chainweb
-        cp $(cabal list-bin multi-node-network-tests) artifacts/chainweb
-        cp $(cabal list-bin remote-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 bench) artifacts/chainweb
+        cp $(cabal list-bin ea) artifacts/chainweb
+        cp $(cabal list-bin multi-node-network-tests) artifacts/chainweb
+        cp $(cabal list-bin remote-tests) artifacts/chainweb
         cp README.md artifacts/chainweb
         cp CHANGELOG.md artifacts/chainweb
         cp LICENSE artifacts/chainweb

.github/workflows/macos.yaml

@@ -154,7 +154,7 @@ jobs:
         mv cabal.project.freeze.backup cabal.project.freeze
     - name: Run ea and verify consistency of genesis headers
       run: |
-        cabal run cwtool -- ea
+        cabal run ea
         mv cabal.project.freeze cabal.project.freeze.backup
         git checkout -- cabal.project.freeze || true
         if ! git diff --exit-code; then

cabal.project

@@ -138,12 +138,12 @@ source-repository-package
 
 -- Required for backward compatibility:
 
--- ixset-typed FIX (no PR yet)
+-- ixset-typed add difference operator (https://github.com/well-typed/ixset-typed/pull/24)
 source-repository-package
     type: git
-    location: https://github.com/larskuhtz/ixset-typed
-    tag: d8019c3404d6f3b3c0b0416e9899cfdf614ef425
-    --sha256: 09msayidg23rsdz97fcfqqalm4pbawx3c1qihgab8hnlmjxby103
+    location: https://github.com/kadena-io/ixset-typed
+    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.
@@ -156,9 +156,9 @@ source-repository-package
 -- Required for non-canonical decode in base64-bytestring (remove after 2.20 fork)
 source-repository-package
     type: git
-    location: https://github.com/emilypi/base64-bytestring-kadena
-    tag: 174af3523616c8fe01449da5ccbb9f16df097ac3
-    --sha256: 0grssxgjygi4ijiqaa87diwv6sdqz77hldf3lr4k7p93w35lhlci
+    location: https://github.com/kadena-io/base64-bytestring-kadena
+    tag: 90247042ab3b8662809210af2a78e6dee0f9b4ac
+    --sha256: 0dqsrjxm0cm35xcihm49dhwdvmz79vsv4sd5qs2izc4sbnd0d8n6
 
 source-repository-package
     type: git