Merge #221

221: Release 3.1.0 r=disassembler a=dcoutts

Update to the same deps as for cardano-node-1.18.0 

Bump to version 3.1.0 and update changelogs 

Co-authored-by: Duncan Coutts <duncan@well-typed.com>

Author: iohk-bors[bot]

cabal.project

@@ -166,216 +166,216 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: a790fb38cced04d8d8a9aeacc2a761717f11f94e
-  --sha256: 0j5sgx7wqf46f30r8dgmxk85y99pvn7dzrj99xi7779lllqn4ddg
+  tag: 183a70c001587d9b1977541deae28c3e44713907
+  --sha256: 15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf
   subdir: byron/chain/executable-spec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: a790fb38cced04d8d8a9aeacc2a761717f11f94e
-  --sha256: 0j5sgx7wqf46f30r8dgmxk85y99pvn7dzrj99xi7779lllqn4ddg
+  tag: 183a70c001587d9b1977541deae28c3e44713907
+  --sha256: 15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf
   subdir: byron/ledger/executable-spec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: a790fb38cced04d8d8a9aeacc2a761717f11f94e
-  --sha256: 0j5sgx7wqf46f30r8dgmxk85y99pvn7dzrj99xi7779lllqn4ddg
+  tag: 183a70c001587d9b1977541deae28c3e44713907
+  --sha256: 15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf
   subdir: semantics/executable-spec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: a790fb38cced04d8d8a9aeacc2a761717f11f94e
-  --sha256: 0j5sgx7wqf46f30r8dgmxk85y99pvn7dzrj99xi7779lllqn4ddg
+  tag: 183a70c001587d9b1977541deae28c3e44713907
+  --sha256: 15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf
   subdir: shelley/chain-and-ledger/dependencies/non-integer
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: a790fb38cced04d8d8a9aeacc2a761717f11f94e
-  --sha256: 0j5sgx7wqf46f30r8dgmxk85y99pvn7dzrj99xi7779lllqn4ddg
+  tag: 183a70c001587d9b1977541deae28c3e44713907
+  --sha256: 15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf
   subdir: shelley/chain-and-ledger/executable-spec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: a790fb38cced04d8d8a9aeacc2a761717f11f94e
-  --sha256: 0j5sgx7wqf46f30r8dgmxk85y99pvn7dzrj99xi7779lllqn4ddg
+  tag: 183a70c001587d9b1977541deae28c3e44713907
+  --sha256: 15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf
   subdir: shelley/chain-and-ledger/executable-spec/test/
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: a790fb38cced04d8d8a9aeacc2a761717f11f94e
-  --sha256: 0j5sgx7wqf46f30r8dgmxk85y99pvn7dzrj99xi7779lllqn4ddg
+  tag: 183a70c001587d9b1977541deae28c3e44713907
+  --sha256: 15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf
   subdir: byron/crypto
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: a790fb38cced04d8d8a9aeacc2a761717f11f94e
-  --sha256: 0j5sgx7wqf46f30r8dgmxk85y99pvn7dzrj99xi7779lllqn4ddg
+  tag: 183a70c001587d9b1977541deae28c3e44713907
+  --sha256: 15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf
   subdir: byron/crypto/test
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: a790fb38cced04d8d8a9aeacc2a761717f11f94e
-  --sha256: 0j5sgx7wqf46f30r8dgmxk85y99pvn7dzrj99xi7779lllqn4ddg
+  tag: 183a70c001587d9b1977541deae28c3e44713907
+  --sha256: 15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf
   subdir: byron/ledger/impl
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: a790fb38cced04d8d8a9aeacc2a761717f11f94e
-  --sha256: 0j5sgx7wqf46f30r8dgmxk85y99pvn7dzrj99xi7779lllqn4ddg
+  tag: 183a70c001587d9b1977541deae28c3e44713907
+  --sha256: 15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf
   subdir: byron/chain/executable-spec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: a790fb38cced04d8d8a9aeacc2a761717f11f94e
-  --sha256: 0j5sgx7wqf46f30r8dgmxk85y99pvn7dzrj99xi7779lllqn4ddg
+  tag: 183a70c001587d9b1977541deae28c3e44713907
+  --sha256: 15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf
   subdir: byron/ledger/impl/test
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: a790fb38cced04d8d8a9aeacc2a761717f11f94e
-  --sha256: 0j5sgx7wqf46f30r8dgmxk85y99pvn7dzrj99xi7779lllqn4ddg
+  tag: 183a70c001587d9b1977541deae28c3e44713907
+  --sha256: 15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf
   subdir: semantics/small-steps-test
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 34e380f54ed24772479763ba6d67f4893d82aac2
-  --sha256: 03gnxiq6rl6j1wnbw1nj5rix1iga406yyp1v9xxz4684qsxj5b24
+  tag: ec74d1c463b6d18bdca2b714abe730c1d237cc32
+  --sha256: 0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p
   subdir: cardano-client
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 34e380f54ed24772479763ba6d67f4893d82aac2
-  --sha256: 03gnxiq6rl6j1wnbw1nj5rix1iga406yyp1v9xxz4684qsxj5b24
+  tag: ec74d1c463b6d18bdca2b714abe730c1d237cc32
+  --sha256: 0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p
   subdir: io-sim
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 34e380f54ed24772479763ba6d67f4893d82aac2
-  --sha256: 03gnxiq6rl6j1wnbw1nj5rix1iga406yyp1v9xxz4684qsxj5b24
+  tag: ec74d1c463b6d18bdca2b714abe730c1d237cc32
+  --sha256: 0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p
   subdir: io-sim-classes
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 34e380f54ed24772479763ba6d67f4893d82aac2
-  --sha256: 03gnxiq6rl6j1wnbw1nj5rix1iga406yyp1v9xxz4684qsxj5b24
+  tag: ec74d1c463b6d18bdca2b714abe730c1d237cc32
+  --sha256: 0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p
   subdir: network-mux
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 34e380f54ed24772479763ba6d67f4893d82aac2
-  --sha256: 03gnxiq6rl6j1wnbw1nj5rix1iga406yyp1v9xxz4684qsxj5b24
+  tag: ec74d1c463b6d18bdca2b714abe730c1d237cc32
+  --sha256: 0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p
   subdir: ouroboros-network
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 34e380f54ed24772479763ba6d67f4893d82aac2
-  --sha256: 03gnxiq6rl6j1wnbw1nj5rix1iga406yyp1v9xxz4684qsxj5b24
+  tag: ec74d1c463b6d18bdca2b714abe730c1d237cc32
+  --sha256: 0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p
   subdir: ouroboros-network-framework
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 34e380f54ed24772479763ba6d67f4893d82aac2
-  --sha256: 03gnxiq6rl6j1wnbw1nj5rix1iga406yyp1v9xxz4684qsxj5b24
+  tag: ec74d1c463b6d18bdca2b714abe730c1d237cc32
+  --sha256: 0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p
   subdir: Win32-network
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 34e380f54ed24772479763ba6d67f4893d82aac2
-  --sha256: 03gnxiq6rl6j1wnbw1nj5rix1iga406yyp1v9xxz4684qsxj5b24
+  tag: ec74d1c463b6d18bdca2b714abe730c1d237cc32
+  --sha256: 0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p
   subdir: ouroboros-consensus
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 34e380f54ed24772479763ba6d67f4893d82aac2
-  --sha256: 03gnxiq6rl6j1wnbw1nj5rix1iga406yyp1v9xxz4684qsxj5b24
+  tag: ec74d1c463b6d18bdca2b714abe730c1d237cc32
+  --sha256: 0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p
   subdir: ouroboros-consensus-byron
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 34e380f54ed24772479763ba6d67f4893d82aac2
-  --sha256: 03gnxiq6rl6j1wnbw1nj5rix1iga406yyp1v9xxz4684qsxj5b24
+  tag: ec74d1c463b6d18bdca2b714abe730c1d237cc32
+  --sha256: 0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p
   subdir: ouroboros-consensus-byronspec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 34e380f54ed24772479763ba6d67f4893d82aac2
-  --sha256: 03gnxiq6rl6j1wnbw1nj5rix1iga406yyp1v9xxz4684qsxj5b24
+  tag: ec74d1c463b6d18bdca2b714abe730c1d237cc32
+  --sha256: 0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p
   subdir: ouroboros-consensus-shelley
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 34e380f54ed24772479763ba6d67f4893d82aac2
-  --sha256: 03gnxiq6rl6j1wnbw1nj5rix1iga406yyp1v9xxz4684qsxj5b24
+  tag: ec74d1c463b6d18bdca2b714abe730c1d237cc32
+  --sha256: 0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p
   subdir: ouroboros-consensus-cardano
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 34e380f54ed24772479763ba6d67f4893d82aac2
-  --sha256: 03gnxiq6rl6j1wnbw1nj5rix1iga406yyp1v9xxz4684qsxj5b24
+  tag: ec74d1c463b6d18bdca2b714abe730c1d237cc32
+  --sha256: 0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p
   subdir: typed-protocols
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 34e380f54ed24772479763ba6d67f4893d82aac2
-  --sha256: 03gnxiq6rl6j1wnbw1nj5rix1iga406yyp1v9xxz4684qsxj5b24
+  tag: ec74d1c463b6d18bdca2b714abe730c1d237cc32
+  --sha256: 0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p
   subdir: typed-protocols-examples
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 34e380f54ed24772479763ba6d67f4893d82aac2
-  --sha256: 03gnxiq6rl6j1wnbw1nj5rix1iga406yyp1v9xxz4684qsxj5b24
+  tag: ec74d1c463b6d18bdca2b714abe730c1d237cc32
+  --sha256: 0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p
   subdir: ouroboros-network-testing
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 34e380f54ed24772479763ba6d67f4893d82aac2
-  --sha256: 03gnxiq6rl6j1wnbw1nj5rix1iga406yyp1v9xxz4684qsxj5b24
+  tag: ec74d1c463b6d18bdca2b714abe730c1d237cc32
+  --sha256: 0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p
   subdir: ouroboros-consensus/ouroboros-consensus-mock
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 34e380f54ed24772479763ba6d67f4893d82aac2
-  --sha256: 03gnxiq6rl6j1wnbw1nj5rix1iga406yyp1v9xxz4684qsxj5b24
+  tag: ec74d1c463b6d18bdca2b714abe730c1d237cc32
+  --sha256: 0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p
   subdir: ouroboros-consensus/ouroboros-consensus-test-infra
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-node
-  tag: 0191ff56d194b6ac074af0d51e67493c14e08ffa
-  --sha256: 1mwx751w6f59bhf8r4n72s0gy0fz5w4ss5jcds0fs8nvjlk7y3c6
+  tag: 3258fdbb2ce8c56ca175401630aa71d75a4d6ab2
+  --sha256: 1la5nkw6nhfsc7izi28g39phfm4bnfza3srm49c16b9vgwqxl4wm
   subdir: cardano-api
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-node
-  tag: 0191ff56d194b6ac074af0d51e67493c14e08ffa
-  --sha256: 1mwx751w6f59bhf8r4n72s0gy0fz5w4ss5jcds0fs8nvjlk7y3c6
+  tag: 3258fdbb2ce8c56ca175401630aa71d75a4d6ab2
+  --sha256: 1la5nkw6nhfsc7izi28g39phfm4bnfza3srm49c16b9vgwqxl4wm
   subdir: cardano-config

cardano-db-sync-extended/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Revision history for cardano-db-sync-extended
 
+## 3.1.0 -- July 2020
+
+* Schema additions in the base db-sync, see cardano-db 2.0.0 CHANGELOG.md
+
 ## 3.0.0 -- July 2020
 
 * Note that this release requires the database to be dropped and recreated.

cardano-db-sync-extended/cardano-db-sync-extended.cabal

@@ -3,7 +3,7 @@ cabal-version:          >= 1.10
 -- http://haskell.org/cabal/users-guide/
 
 name:                   cardano-db-sync-extended
-version:                3.0.0
+version:                3.1.0
 synopsis:               The Extended Cardano DB Sync node
 description:            A Cardano node that follows the Cardano chain and inserts data from the
                         chain into a PostgresQL database. It is "extended" because it maintains an

cardano-db-sync/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Revision history for cardano-db-sync node
 
+## 3.1.0 -- July 2020
+
+* * Updates to support the schema additions, see cardano-db 2.0.0 CHANGELOG.md
+
 ## 3.0.0 -- July 2020
 
 * Note that this release requires the database to be dropped and recreated.

cardano-db-sync/cardano-db-sync.cabal

@@ -3,7 +3,7 @@ cabal-version:          >= 1.10
 -- http://haskell.org/cabal/users-guide/
 
 name:                   cardano-db-sync
-version:                3.0.0
+version:                3.1.0
 synopsis:               The Cardano DB Sync node
 description:            A Cardano node that follows the Cardano chain and inserts data from the
                         chain into a PostgresQL database.

cardano-db/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Revision history for cardano-db
 
+## 3.1.0 -- July 2020
+
+* Add a `payment_cred` column to the tx_out table for the benefit of wallet
+  implementations (#208)
+* Add a `slot_in_epoch` column to the block table. Slot numbers become more
+  complicated to calculate once there are multiple eras with different slot
+  lengths, so we now store it instead. (#214)
+* Support for storing the on-chain parameter update proposals (#217)
+* MIR certs now go into their own table(s) rather than the reward table (#218)
+
 ## 3.0.0 -- July 2020
 
 * Note that this release requires the database to be dropped and recreated

cardano-db/cardano-db.cabal

@@ -3,7 +3,7 @@ cabal-version:          >= 1.10
 -- http://haskell.org/cabal/users-guide/
 
 name:                   cardano-db
-version:                3.0.0
+version:                3.1.0
 synopsis:               A base PostgreSQL component for the cardano-db-sync node.
 description:            Code for the Cardano DB Sync node that is shared between the
                         cardano-db-node and other components.

stack.yaml

@@ -100,7 +100,7 @@ extra-deps:
     commit: 26d35ad52fe9ade3391532dbfeb2f416f07650bc
 
   - git: https://github.com/input-output-hk/cardano-ledger-specs
-    commit: a790fb38cced04d8d8a9aeacc2a761717f11f94e
+    commit: 183a70c001587d9b1977541deae28c3e44713907
     subdirs:
       - byron/crypto
       - byron/crypto/test
@@ -114,7 +114,7 @@ extra-deps:
       - shelley/chain-and-ledger/executable-spec/test
 
   - git: https://github.com/input-output-hk/ouroboros-network
-    commit: 34e380f54ed24772479763ba6d67f4893d82aac2
+    commit: ec74d1c463b6d18bdca2b714abe730c1d237cc32
     subdirs:
       - cardano-client
       - io-sim
@@ -135,7 +135,7 @@ extra-deps:
       - ouroboros-consensus/ouroboros-consensus-test-infra
 
   - git: https://github.com/input-output-hk/cardano-node
-    commit: 0191ff56d194b6ac074af0d51e67493c14e08ffa
+    commit: 3258fdbb2ce8c56ca175401630aa71d75a4d6ab2
     subdirs:
       - cardano-config