Skip to content

Commit

Permalink
Merge #788
Browse files Browse the repository at this point in the history 
788: Bump version to 1.10.1 and update changelog r=dcoutts a=dcoutts

And update to include a few fixes in ledger and network libs.

Co-authored-by: Duncan Coutts <[email protected]>
  • Loading branch information
@iohk-bors @dcoutts
iohk-bors[bot] and dcoutts authored Apr 13, 2020
2 parents 605589a + a6fe5f3 commit 99e1a85
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 59 deletions.
108 changes: 54 additions & 54 deletions cabal.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,29 +25,29 @@ package ouroboros-consensus-mock
source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-base
tag: 742a789a520387c6cd30a4ca28bc4fc8588a41c7
--sha256: 0zqar90z7hdklxcimfxb2dmk0cq43bywa7p255hynn7ss0nxszz6
tag: 42c57fed487b61c13a68a1600a6675ad987822d0
--sha256: 0iab9bwa7my1qb3nnwml8zv4g4zxi5rrypkfmdjs558yh00ykskq
subdir: binary

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-base
tag: 742a789a520387c6cd30a4ca28bc4fc8588a41c7
--sha256: 0zqar90z7hdklxcimfxb2dmk0cq43bywa7p255hynn7ss0nxszz6
tag: 42c57fed487b61c13a68a1600a6675ad987822d0
--sha256: 0iab9bwa7my1qb3nnwml8zv4g4zxi5rrypkfmdjs558yh00ykskq
subdir: binary/test

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-base
tag: 742a789a520387c6cd30a4ca28bc4fc8588a41c7
--sha256: 0zqar90z7hdklxcimfxb2dmk0cq43bywa7p255hynn7ss0nxszz6
tag: 42c57fed487b61c13a68a1600a6675ad987822d0
--sha256: 0iab9bwa7my1qb3nnwml8zv4g4zxi5rrypkfmdjs558yh00ykskq
subdir: cardano-crypto-class

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-base
tag: 742a789a520387c6cd30a4ca28bc4fc8588a41c7
--sha256: 0zqar90z7hdklxcimfxb2dmk0cq43bywa7p255hynn7ss0nxszz6
tag: 42c57fed487b61c13a68a1600a6675ad987822d0
--sha256: 0iab9bwa7my1qb3nnwml8zv4g4zxi5rrypkfmdjs558yh00ykskq
subdir: slotting

source-repository-package
Expand All @@ -59,64 +59,64 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger
tag: 90b14c056059d0082cb2641f9c77cb1b097be329
--sha256: 029lqlf33a3vvy933fil8qglv3hjaprankllr80h0acspqjzahk0
tag: 357ed656ad81fcddb401ceb656d6c2a6a177a0fa
--sha256: 1fw87n0cvi4asyhv8x2spqhp90a460r47vcahmdl9pvjs913syvv
subdir: cardano-ledger

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger
tag: 90b14c056059d0082cb2641f9c77cb1b097be329
--sha256: 029lqlf33a3vvy933fil8qglv3hjaprankllr80h0acspqjzahk0
tag: 357ed656ad81fcddb401ceb656d6c2a6a177a0fa
--sha256: 1fw87n0cvi4asyhv8x2spqhp90a460r47vcahmdl9pvjs913syvv
subdir: crypto

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger
tag: 90b14c056059d0082cb2641f9c77cb1b097be329
--sha256: 029lqlf33a3vvy933fil8qglv3hjaprankllr80h0acspqjzahk0
tag: 357ed656ad81fcddb401ceb656d6c2a6a177a0fa
--sha256: 1fw87n0cvi4asyhv8x2spqhp90a460r47vcahmdl9pvjs913syvv
subdir: cardano-ledger/test

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger
tag: 90b14c056059d0082cb2641f9c77cb1b097be329
--sha256: 029lqlf33a3vvy933fil8qglv3hjaprankllr80h0acspqjzahk0
tag: 357ed656ad81fcddb401ceb656d6c2a6a177a0fa
--sha256: 1fw87n0cvi4asyhv8x2spqhp90a460r47vcahmdl9pvjs913syvv
subdir: crypto/test

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger-specs
tag: f1d5ddb25531b2512796d34e9cfd803f7af76567
--sha256: 1nxqdi8vbx3mg1qdbvj7v6ngfjbgbf9i7yxc3ijac2mqb4fn5b4f
tag: 5c5854be017f75c703b11c1aad4b765f511ee70e
--sha256: 0bbwjba0jdsvc1w1dzli6yrsrh7k3jh6j9swfv767nwx9j37gmw8
subdir: byron/chain/executable-spec

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger-specs
tag: f1d5ddb25531b2512796d34e9cfd803f7af76567
--sha256: 1nxqdi8vbx3mg1qdbvj7v6ngfjbgbf9i7yxc3ijac2mqb4fn5b4f
tag: 5c5854be017f75c703b11c1aad4b765f511ee70e
--sha256: 0bbwjba0jdsvc1w1dzli6yrsrh7k3jh6j9swfv767nwx9j37gmw8
subdir: byron/ledger/executable-spec

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger-specs
tag: f1d5ddb25531b2512796d34e9cfd803f7af76567
--sha256: 1nxqdi8vbx3mg1qdbvj7v6ngfjbgbf9i7yxc3ijac2mqb4fn5b4f
tag: 5c5854be017f75c703b11c1aad4b765f511ee70e
--sha256: 0bbwjba0jdsvc1w1dzli6yrsrh7k3jh6j9swfv767nwx9j37gmw8
subdir: semantics/executable-spec

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger-specs
tag: f1d5ddb25531b2512796d34e9cfd803f7af76567
--sha256: 1nxqdi8vbx3mg1qdbvj7v6ngfjbgbf9i7yxc3ijac2mqb4fn5b4f
tag: 5c5854be017f75c703b11c1aad4b765f511ee70e
--sha256: 0bbwjba0jdsvc1w1dzli6yrsrh7k3jh6j9swfv767nwx9j37gmw8
subdir: shelley/chain-and-ledger/dependencies/non-integer

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger-specs
tag: f1d5ddb25531b2512796d34e9cfd803f7af76567
--sha256: 1nxqdi8vbx3mg1qdbvj7v6ngfjbgbf9i7yxc3ijac2mqb4fn5b4f
tag: 5c5854be017f75c703b11c1aad4b765f511ee70e
--sha256: 0bbwjba0jdsvc1w1dzli6yrsrh7k3jh6j9swfv767nwx9j37gmw8
subdir: shelley/chain-and-ledger/executable-spec

source-repository-package
Expand Down Expand Up @@ -210,99 +210,99 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 3d89fa475bc740473e5ffe947572c19f9b91d26d
--sha256: 0v1mfsamjh3c93m0bqqdflg89iy6wvfq0l1ji66m4xgvrj0ilzds
tag: dbc48d30c5e3a46d28b7c25a15141d3518982c70
--sha256: 1d8959sdmpk9ijji2dqp3wdpl8pff4kbxqwnglafb347wwss7bi7
subdir: ouroboros-network

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 3d89fa475bc740473e5ffe947572c19f9b91d26d
--sha256: 0v1mfsamjh3c93m0bqqdflg89iy6wvfq0l1ji66m4xgvrj0ilzds
tag: dbc48d30c5e3a46d28b7c25a15141d3518982c70
--sha256: 1d8959sdmpk9ijji2dqp3wdpl8pff4kbxqwnglafb347wwss7bi7
subdir: io-sim

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 3d89fa475bc740473e5ffe947572c19f9b91d26d
--sha256: 0v1mfsamjh3c93m0bqqdflg89iy6wvfq0l1ji66m4xgvrj0ilzds
tag: dbc48d30c5e3a46d28b7c25a15141d3518982c70
--sha256: 1d8959sdmpk9ijji2dqp3wdpl8pff4kbxqwnglafb347wwss7bi7
subdir: ouroboros-network-testing

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 3d89fa475bc740473e5ffe947572c19f9b91d26d
--sha256: 0v1mfsamjh3c93m0bqqdflg89iy6wvfq0l1ji66m4xgvrj0ilzds
tag: dbc48d30c5e3a46d28b7c25a15141d3518982c70
--sha256: 1d8959sdmpk9ijji2dqp3wdpl8pff4kbxqwnglafb347wwss7bi7
subdir: ouroboros-consensus

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 3d89fa475bc740473e5ffe947572c19f9b91d26d
--sha256: 0v1mfsamjh3c93m0bqqdflg89iy6wvfq0l1ji66m4xgvrj0ilzds
tag: dbc48d30c5e3a46d28b7c25a15141d3518982c70
--sha256: 1d8959sdmpk9ijji2dqp3wdpl8pff4kbxqwnglafb347wwss7bi7
subdir: ouroboros-consensus/ouroboros-consensus-mock

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 3d89fa475bc740473e5ffe947572c19f9b91d26d
--sha256: 0v1mfsamjh3c93m0bqqdflg89iy6wvfq0l1ji66m4xgvrj0ilzds
tag: dbc48d30c5e3a46d28b7c25a15141d3518982c70
--sha256: 1d8959sdmpk9ijji2dqp3wdpl8pff4kbxqwnglafb347wwss7bi7
subdir: ouroboros-consensus-byron

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 3d89fa475bc740473e5ffe947572c19f9b91d26d
--sha256: 0v1mfsamjh3c93m0bqqdflg89iy6wvfq0l1ji66m4xgvrj0ilzds
tag: dbc48d30c5e3a46d28b7c25a15141d3518982c70
--sha256: 1d8959sdmpk9ijji2dqp3wdpl8pff4kbxqwnglafb347wwss7bi7
subdir: ouroboros-consensus-shelley

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 3d89fa475bc740473e5ffe947572c19f9b91d26d
--sha256: 0v1mfsamjh3c93m0bqqdflg89iy6wvfq0l1ji66m4xgvrj0ilzds
tag: dbc48d30c5e3a46d28b7c25a15141d3518982c70
--sha256: 1d8959sdmpk9ijji2dqp3wdpl8pff4kbxqwnglafb347wwss7bi7
subdir: ouroboros-consensus-cardano

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 3d89fa475bc740473e5ffe947572c19f9b91d26d
--sha256: 0v1mfsamjh3c93m0bqqdflg89iy6wvfq0l1ji66m4xgvrj0ilzds
tag: dbc48d30c5e3a46d28b7c25a15141d3518982c70
--sha256: 1d8959sdmpk9ijji2dqp3wdpl8pff4kbxqwnglafb347wwss7bi7
subdir: typed-protocols

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 3d89fa475bc740473e5ffe947572c19f9b91d26d
--sha256: 0v1mfsamjh3c93m0bqqdflg89iy6wvfq0l1ji66m4xgvrj0ilzds
tag: dbc48d30c5e3a46d28b7c25a15141d3518982c70
--sha256: 1d8959sdmpk9ijji2dqp3wdpl8pff4kbxqwnglafb347wwss7bi7
subdir: typed-protocols-examples

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 3d89fa475bc740473e5ffe947572c19f9b91d26d
--sha256: 0v1mfsamjh3c93m0bqqdflg89iy6wvfq0l1ji66m4xgvrj0ilzds
tag: dbc48d30c5e3a46d28b7c25a15141d3518982c70
--sha256: 1d8959sdmpk9ijji2dqp3wdpl8pff4kbxqwnglafb347wwss7bi7
subdir: ouroboros-network-framework

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 3d89fa475bc740473e5ffe947572c19f9b91d26d
--sha256: 0v1mfsamjh3c93m0bqqdflg89iy6wvfq0l1ji66m4xgvrj0ilzds
tag: dbc48d30c5e3a46d28b7c25a15141d3518982c70
--sha256: 1d8959sdmpk9ijji2dqp3wdpl8pff4kbxqwnglafb347wwss7bi7
subdir: network-mux

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 3d89fa475bc740473e5ffe947572c19f9b91d26d
--sha256: 0v1mfsamjh3c93m0bqqdflg89iy6wvfq0l1ji66m4xgvrj0ilzds
tag: dbc48d30c5e3a46d28b7c25a15141d3518982c70
--sha256: 1d8959sdmpk9ijji2dqp3wdpl8pff4kbxqwnglafb347wwss7bi7
subdir: io-sim-classes

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 3d89fa475bc740473e5ffe947572c19f9b91d26d
--sha256: 0v1mfsamjh3c93m0bqqdflg89iy6wvfq0l1ji66m4xgvrj0ilzds
tag: dbc48d30c5e3a46d28b7c25a15141d3518982c70
--sha256: 1d8959sdmpk9ijji2dqp3wdpl8pff4kbxqwnglafb347wwss7bi7
subdir: Win32-network

source-repository-package
Expand Down
16 changes: 16 additions & 0 deletions cardano-node/ChangeLog.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# Changelog for cardano-node

## 1.10.1 -- April 2020

### node changes
- None

### consensus changes
- Improve chain DB concurrency during syncing by batching GC actions (#1932)

### ledger changes
- Exemptions for historical null update proposals on staging blockchain (#768)
- Document Byron-era protections against network address confusion (#727, #755)

### network changes
- Windows sync performance improvements with new timeouts implementation (#1931)
- Fix handling of negative timeouts in the IO simulator (#1939)

## 1.10.0 -- April 2020

### node changes
Expand Down
2 changes: 1 addition & 1 deletion cardano-node/cardano-node.cabal
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: cardano-node
version: 1.10.0
version: 1.10.1
description: The cardano full node
author: IOHK
maintainer: [email protected]
Expand Down
8 changes: 4 additions & 4 deletions stack.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ extra-deps:

# Cardano-ledger dependencies
- git: https://github.com/input-output-hk/cardano-ledger
commit: 90b14c056059d0082cb2641f9c77cb1b097be329
commit: 357ed656ad81fcddb401ceb656d6c2a6a177a0fa
subdirs:
- cardano-ledger
- cardano-ledger/test
- crypto
- crypto/test

- git: https://github.com/input-output-hk/cardano-ledger-specs
commit: f1d5ddb25531b2512796d34e9cfd803f7af76567
commit: 5c5854be017f75c703b11c1aad4b765f511ee70e
subdirs:
# small-steps
- semantics/executable-spec
Expand All @@ -81,7 +81,7 @@ extra-deps:
- test

- git: https://github.com/input-output-hk/cardano-base
commit: 742a789a520387c6cd30a4ca28bc4fc8588a41c7
commit: 42c57fed487b61c13a68a1600a6675ad987822d0
subdirs:
- binary
- binary/test
Expand Down Expand Up @@ -123,7 +123,7 @@ extra-deps:
#Ouroboros-network dependencies

- git: https://github.com/input-output-hk/ouroboros-network
commit: 3d89fa475bc740473e5ffe947572c19f9b91d26d
commit: dbc48d30c5e3a46d28b7c25a15141d3518982c70
subdirs:
- io-sim
- io-sim-classes
Expand Down

0 comments on commit 99e1a85

Please sign in to comment.