Merge #569

569: Update to latest version of ouroboros-network and other deps r=deepfire a=dcoutts Most code changes due to ouroboros-network and cardano-ledger Closes #566 Co-authored-by: Duncan Coutts <[email protected]> Co-authored-by: Luke Nadur <[email protected]> Co-authored-by: Samuel Leathers <[email protected]> Co-authored-by: Jordan Millar <[email protected]> Co-authored-by: Marcin Szamotulski <[email protected]> Co-authored-by: Kosyrev Serge <[email protected]>
IntersectMBO · Feb 17, 2020 · 4a30295 · 4a30295
2 parents 8ae55fb + a376106
commit 4a30295
Show file tree

Hide file tree

Showing 26 changed files with 315 additions and 240 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -28,7 +28,7 @@ steps:
 #      system: x86_64-linux
 
   - label: 'stack-cabal-sync'
-    command: 'nix-shell scripts/buildkite/stack-cabal-sync.nix --run scripts/buildkite/stack-cabal-sync.sh'
+    command: 'nix-shell ./nix -A iohkNix.stack-cabal-sync-shell --run scripts/buildkite/stack-cabal-sync.sh'
     agents:
       system: x86_64-linux
 

diff --git a/Makefile b/Makefile
@@ -30,4 +30,7 @@ test-ghcid: ## Run ghcid on test suites
 test-ghcid-nix: ## Run ghcid on test suites with Nix
 	@ghcid --command="stack ghci --test --main-is $(PROJECT_NAME):test:$(PROJECT_NAME)-test --nix -j$(NUM_PROC)"
 
+test-chairmans-cluster:
+	@scripts/cluster-test.sh
+
 .PHONY: stylish-haskell cabal-hashes ghcid ghcid-test run-test test-ghci test-ghcid help
diff --git a/benchmarking/cluster3nodes/genesis.sh b/benchmarking/cluster3nodes/genesis.sh
@@ -13,7 +13,7 @@ protocol_magic=459045235
 n_poors=128
 n_delegates=3
 total_balance=8000000000000000
-delegate_share=900000000000000
+delegate_share=0.9
 avvm_entries=128
 avvm_entry_balance=10000000000000
 not_so_secret=2718281828

diff --git a/cabal.project b/cabal.project
@@ -13,29 +13,29 @@ package cardano-node
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: eed4fc484366214831576eef0c7fe90d1d08c78b
-  --sha256: 0h9vbs2bsx6pvb300vl66znwpkqn169pmvsl4pv8mn0sz8iw4pk6
+  tag: 3c2791584d3f43aa18e9cc13c490239b4c3dcbd2
+  --sha256: 1gk55jb9gk6c6h3bwwgbfyj8czx253p9kswcrcgmbiy99d8y9lx4
   subdir: binary
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: eed4fc484366214831576eef0c7fe90d1d08c78b
-  --sha256: 0h9vbs2bsx6pvb300vl66znwpkqn169pmvsl4pv8mn0sz8iw4pk6
+  tag: 3c2791584d3f43aa18e9cc13c490239b4c3dcbd2
+  --sha256: 1gk55jb9gk6c6h3bwwgbfyj8czx253p9kswcrcgmbiy99d8y9lx4
   subdir: binary/test
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: eed4fc484366214831576eef0c7fe90d1d08c78b
-  --sha256: 0h9vbs2bsx6pvb300vl66znwpkqn169pmvsl4pv8mn0sz8iw4pk6
+  tag: 3c2791584d3f43aa18e9cc13c490239b4c3dcbd2
+  --sha256: 1gk55jb9gk6c6h3bwwgbfyj8czx253p9kswcrcgmbiy99d8y9lx4
   subdir: cardano-crypto-class
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: eed4fc484366214831576eef0c7fe90d1d08c78b
-  --sha256: 0h9vbs2bsx6pvb300vl66znwpkqn169pmvsl4pv8mn0sz8iw4pk6
+  tag: 3c2791584d3f43aa18e9cc13c490239b4c3dcbd2
+  --sha256: 1gk55jb9gk6c6h3bwwgbfyj8czx253p9kswcrcgmbiy99d8y9lx4
   subdir: slotting
 
 source-repository-package
@@ -47,63 +47,63 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger
-  tag: c62e2eeba5756898cbf59732fccd6a83a4065c18
-  --sha256: 04s2dp5dyikm2pxfphiyh429pckkg06dqx3sl4bbzvg6x5qfqvbn
+  tag: 86f0cb4705f46307e4c89e7ef4c90142882cce54
+  --sha256: 0sxklkwawyrsdvbb7hrg7r8sdiqc8ab2c5wdl1nb91zrvzs08z9m
   subdir: cardano-ledger
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger
-  tag: c62e2eeba5756898cbf59732fccd6a83a4065c18
-  --sha256: 04s2dp5dyikm2pxfphiyh429pckkg06dqx3sl4bbzvg6x5qfqvbn
+  tag: 86f0cb4705f46307e4c89e7ef4c90142882cce54
+  --sha256: 0sxklkwawyrsdvbb7hrg7r8sdiqc8ab2c5wdl1nb91zrvzs08z9m
   subdir: crypto
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger
-  tag: c62e2eeba5756898cbf59732fccd6a83a4065c18
-  --sha256: 04s2dp5dyikm2pxfphiyh429pckkg06dqx3sl4bbzvg6x5qfqvbn
+  tag: 86f0cb4705f46307e4c89e7ef4c90142882cce54
+  --sha256: 0sxklkwawyrsdvbb7hrg7r8sdiqc8ab2c5wdl1nb91zrvzs08z9m
   subdir: cardano-ledger/test
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger
-  tag: c62e2eeba5756898cbf59732fccd6a83a4065c18
-  --sha256: 04s2dp5dyikm2pxfphiyh429pckkg06dqx3sl4bbzvg6x5qfqvbn
+  tag: 86f0cb4705f46307e4c89e7ef4c90142882cce54
+  --sha256: 0sxklkwawyrsdvbb7hrg7r8sdiqc8ab2c5wdl1nb91zrvzs08z9m
   subdir: crypto/test
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: f27e8b66a393f0b7da1893889dcea07da0fe4dec
-  --sha256: 1f1r1vidnlyka800jpm9z2myrggasqyzw0aw97q8vw81sh72l51s
+  tag: 318f5a1594a23aedadb3977ddd5a32230c8be4fe
+  --sha256: 09zmg09v6r9jr1jl2xim29nc8g4ys2pjisbm66xj2409znn5n19q
   subdir: byron/chain/executable-spec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: f27e8b66a393f0b7da1893889dcea07da0fe4dec
-  --sha256: 1f1r1vidnlyka800jpm9z2myrggasqyzw0aw97q8vw81sh72l51s
+  tag: 318f5a1594a23aedadb3977ddd5a32230c8be4fe
+  --sha256: 09zmg09v6r9jr1jl2xim29nc8g4ys2pjisbm66xj2409znn5n19q
   subdir: byron/ledger/executable-spec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: f27e8b66a393f0b7da1893889dcea07da0fe4dec
-  --sha256: 1f1r1vidnlyka800jpm9z2myrggasqyzw0aw97q8vw81sh72l51s
+  tag: 318f5a1594a23aedadb3977ddd5a32230c8be4fe
+  --sha256: 09zmg09v6r9jr1jl2xim29nc8g4ys2pjisbm66xj2409znn5n19q
   subdir: byron/semantics/executable-spec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-prelude
-  tag: 00487726c4bc21b4744e59d913334ebfeac7d68e
-  --sha256: 0v4fcq5kdd2r5dgwys8kv46ff33qp756n26ycxrca10wq14zkwm5
+  tag: fa7a16291d3e93b068d9b13620fc81c88b5600f0
+  --sha256: 1gaj8k5kjdkmnc0l569asc0fwxi0413v1r0piccg8kyscwvhvcwz
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-prelude
-  tag: 00487726c4bc21b4744e59d913334ebfeac7d68e
-  --sha256: 0v4fcq5kdd2r5dgwys8kv46ff33qp756n26ycxrca10wq14zkwm5
+  tag: fa7a16291d3e93b068d9b13620fc81c88b5600f0
+  --sha256: 1gaj8k5kjdkmnc0l569asc0fwxi0413v1r0piccg8kyscwvhvcwz
   subdir: test
 
 source-repository-package
@@ -128,113 +128,120 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: e67dcb9a97b688e90aa93481839f2d162ab34b53
+  tag: 49b347d892d82dce23eb692722649cd8a1149406
   --sha256: 0m6sa0lrqzfxhq7v5ncimlkd869pnq53khgpkivk0izsy46kfrq6
   subdir: iohk-monitoring
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: e67dcb9a97b688e90aa93481839f2d162ab34b53
+  tag: 49b347d892d82dce23eb692722649cd8a1149406
   --sha256: 0m6sa0lrqzfxhq7v5ncimlkd869pnq53khgpkivk0izsy46kfrq6
   subdir:   contra-tracer
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: e67dcb9a97b688e90aa93481839f2d162ab34b53
+  tag: 49b347d892d82dce23eb692722649cd8a1149406
   --sha256: 0m6sa0lrqzfxhq7v5ncimlkd869pnq53khgpkivk0izsy46kfrq6
   subdir:   plugins/scribe-systemd
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: e67dcb9a97b688e90aa93481839f2d162ab34b53
+  tag: 49b347d892d82dce23eb692722649cd8a1149406
   --sha256: 0m6sa0lrqzfxhq7v5ncimlkd869pnq53khgpkivk0izsy46kfrq6
   subdir:   plugins/backend-aggregation
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: e67dcb9a97b688e90aa93481839f2d162ab34b53
+  tag: 49b347d892d82dce23eb692722649cd8a1149406
   --sha256: 0m6sa0lrqzfxhq7v5ncimlkd869pnq53khgpkivk0izsy46kfrq6
   subdir:   plugins/backend-editor
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: e67dcb9a97b688e90aa93481839f2d162ab34b53
+  tag: 49b347d892d82dce23eb692722649cd8a1149406
   --sha256: 0m6sa0lrqzfxhq7v5ncimlkd869pnq53khgpkivk0izsy46kfrq6
   subdir:   plugins/backend-ekg
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: e67dcb9a97b688e90aa93481839f2d162ab34b53
+  tag: 49b347d892d82dce23eb692722649cd8a1149406
   --sha256: 0m6sa0lrqzfxhq7v5ncimlkd869pnq53khgpkivk0izsy46kfrq6
   subdir:   plugins/backend-monitoring
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: e67dcb9a97b688e90aa93481839f2d162ab34b53
+  tag: 49b347d892d82dce23eb692722649cd8a1149406
   --sha256: 0m6sa0lrqzfxhq7v5ncimlkd869pnq53khgpkivk0izsy46kfrq6
   subdir:   tracer-transformers
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 398004e1403367cc2a25c639eb6349d473e51b2d
-  --sha256: 1x940w0sma3mhl4hfd937sp25hdl3migkl8zsyl92p59468218i9
+  tag: 5f77e24c2263560ad58b9ba092c8cfed174675ae
+  --sha256: 00bm1fa83lc6jgh36mwr4zymzg9hvmq68y2hm4klk8c8gn7vwqqb
   subdir: ouroboros-network
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 398004e1403367cc2a25c639eb6349d473e51b2d
-  --sha256: 1x940w0sma3mhl4hfd937sp25hdl3migkl8zsyl92p59468218i9
+  tag: 5f77e24c2263560ad58b9ba092c8cfed174675ae
+  --sha256: 00bm1fa83lc6jgh36mwr4zymzg9hvmq68y2hm4klk8c8gn7vwqqb
   subdir: io-sim
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 398004e1403367cc2a25c639eb6349d473e51b2d
-  --sha256: 1x940w0sma3mhl4hfd937sp25hdl3migkl8zsyl92p59468218i9
+  tag: 5f77e24c2263560ad58b9ba092c8cfed174675ae
+  --sha256: 00bm1fa83lc6jgh36mwr4zymzg9hvmq68y2hm4klk8c8gn7vwqqb
   subdir: ouroboros-network-testing
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 398004e1403367cc2a25c639eb6349d473e51b2d
-  --sha256: 1x940w0sma3mhl4hfd937sp25hdl3migkl8zsyl92p59468218i9
+  tag: 5f77e24c2263560ad58b9ba092c8cfed174675ae
+  --sha256: 00bm1fa83lc6jgh36mwr4zymzg9hvmq68y2hm4klk8c8gn7vwqqb
   subdir: ouroboros-consensus
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 398004e1403367cc2a25c639eb6349d473e51b2d
-  --sha256: 1x940w0sma3mhl4hfd937sp25hdl3migkl8zsyl92p59468218i9
+  tag: 5f77e24c2263560ad58b9ba092c8cfed174675ae
+  --sha256: 00bm1fa83lc6jgh36mwr4zymzg9hvmq68y2hm4klk8c8gn7vwqqb
   subdir: typed-protocols
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 398004e1403367cc2a25c639eb6349d473e51b2d
-  --sha256: 1x940w0sma3mhl4hfd937sp25hdl3migkl8zsyl92p59468218i9
-  subdir: typed-protocols-cbor
+  tag: 5f77e24c2263560ad58b9ba092c8cfed174675ae
+  --sha256: 00bm1fa83lc6jgh36mwr4zymzg9hvmq68y2hm4klk8c8gn7vwqqb
+  subdir: typed-protocols-examples
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 398004e1403367cc2a25c639eb6349d473e51b2d
-  --sha256: 1x940w0sma3mhl4hfd937sp25hdl3migkl8zsyl92p59468218i9
+  tag: 5f77e24c2263560ad58b9ba092c8cfed174675ae
+  --sha256: 00bm1fa83lc6jgh36mwr4zymzg9hvmq68y2hm4klk8c8gn7vwqqb
+  subdir: ouroboros-network-framework
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/ouroboros-network
+  tag: 5f77e24c2263560ad58b9ba092c8cfed174675ae
+  --sha256: 00bm1fa83lc6jgh36mwr4zymzg9hvmq68y2hm4klk8c8gn7vwqqb
   subdir: network-mux
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 398004e1403367cc2a25c639eb6349d473e51b2d
-  --sha256: 1x940w0sma3mhl4hfd937sp25hdl3migkl8zsyl92p59468218i9
+  tag: 5f77e24c2263560ad58b9ba092c8cfed174675ae
+  --sha256: 00bm1fa83lc6jgh36mwr4zymzg9hvmq68y2hm4klk8c8gn7vwqqb
   subdir: io-sim-classes
 
 source-repository-package

diff --git a/cardano-config/src/Cardano/Config/Types.hs b/cardano-config/src/Cardano/Config/Types.hs
@@ -107,7 +107,7 @@ newtype DelegationCertFile = DelegationCertFile
 
 data SocketPath = SocketFile
   { unSocket :: FilePath }
-  deriving Show
+  deriving (Eq, Ord, Show)
 
 newtype SigningKeyFile = SigningKeyFile
   { unSigningKey ::  FilePath }

diff --git a/cardano-node/ChangeLog.md b/cardano-node/ChangeLog.md
@@ -1,5 +1,48 @@
 # Changelog for cardano-node
 
+## 1.6.0 -- February 2020
+
+### node changes
+- Improve node CLI for real protocol vs mock protocols (#297, #314, #318, #335)
+- Improve log output for normal block forging and errors (#537)
+- Improve log output for normal mempool events (#527, #538)
+- Remove redundant `--genesis-hash` flag from `cardano-cli` (#540)
+- Move benchmarking CLI commands to their own sub-group (#540)
+- Extend tx generator to be able to use the tx submission HTTP API (#549)
+- The "live view" now displays the node id (#534)
+- Report program version via logging and monitoring system (#542)
+- Disable SMP on ARM CPUs due to an RTS ARM SMP bug in GHC 8.6.x (#560)
+
+### consensus changes
+- Fix bugs found by tests related to block number handling (#1578, #1584, #1589)
+- Better handling of the block number at the genesis (#1585, #1594, #1595, #1597)
+- Fix bugs found by other tests (#1543, #1547, #1559, #1562, #1511, #1544)
+- Fix bugs found by dual ledger tests (#1608, #1571, #1617, #1577)
+- Fix a number of EBB-related bugs (#1620, #1621, #1624, #1625)
+- Introduce more sophisticated mempool tests and fix bugs (#1301, #1565, #1599)
+- Add tests for unusual changes in wall clock time (#759, #1554, #1601)
+- Handle restarting after wall clock time has been moved back (#1550, #1563)
+- Use specific program exit codes for node chain db errors (#1201, #1541)
+- Revalidate chain db files after unclean shutdown (#1551, #1623, #1304, #1568)
+- Add ability to report mempool capacity in tracing (#1509, #1510)
+- Add better support for versioned network protocols (#1632)
+- Fix minor space leaks (#1602, #1605)
+
+### ledger changes
+- Fix rare bug in validation of delegation certs in the mempool (#715, #716)
+- Fix a space leak (#717)
+- API refactoring (#722)
+- Move code from consensus that should be in the ledger library (#676)
+- Clean up LovelacePortion representation and API
+- Add generic derived JSON instances for downstream users
+- Switch to Apache 2.0 license
+
+### network changes
+- New NTP client time check library for the wallet (#1327)
+- Rearrange and move modules between network libraries (#1561)
+- Minor bug fixes in Win32 async I/O code (#1573, #1576)
+- Improve `io-sim-classes` support for monad stacks (#1539)
+
 ## 1.5.0 -- January 2020
 
 ### node changes