IntersectMBO · iohk-bors · Jun 5, 2020 · Jun 4, 2020 · Jun 4, 2020 · Jun 4, 2020
@@ -113,29 +113,29 @@ package cardano-ledger
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: 8061c5dd00f7aad134b18a4e6818879641f8589f
-  --sha256: 182a2x16mh7gqjfkyrc4vgindxwwlr0i8vhmqyfbmnnvg6m8bzaq
+  tag: 4a457f44e68132ce2bd978ab45a3188e64327abc
+  --sha256: 1yzbhkil119hkcb36ykwrchxk3zqmshpp57an17zjjqh7n2nw392
   subdir: binary
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: 8061c5dd00f7aad134b18a4e6818879641f8589f
-  --sha256: 182a2x16mh7gqjfkyrc4vgindxwwlr0i8vhmqyfbmnnvg6m8bzaq
+  tag: 4a457f44e68132ce2bd978ab45a3188e64327abc
+  --sha256: 1yzbhkil119hkcb36ykwrchxk3zqmshpp57an17zjjqh7n2nw392
   subdir: binary/test
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: 8061c5dd00f7aad134b18a4e6818879641f8589f
-  --sha256: 182a2x16mh7gqjfkyrc4vgindxwwlr0i8vhmqyfbmnnvg6m8bzaq
+  tag: 4a457f44e68132ce2bd978ab45a3188e64327abc
+  --sha256: 1yzbhkil119hkcb36ykwrchxk3zqmshpp57an17zjjqh7n2nw392
   subdir: cardano-crypto-class
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: 8061c5dd00f7aad134b18a4e6818879641f8589f
-  --sha256: 182a2x16mh7gqjfkyrc4vgindxwwlr0i8vhmqyfbmnnvg6m8bzaq
+  tag: 4a457f44e68132ce2bd978ab45a3188e64327abc
+  --sha256: 1yzbhkil119hkcb36ykwrchxk3zqmshpp57an17zjjqh7n2nw392
   subdir: slotting
 
 source-repository-package
@@ -147,71 +147,71 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 37ea0bb59ff2cc7f6690240f8c4d55e15cd30f2c
-  --sha256: 1f9idm15yzdlpl9akzy9mkpalw7naz5p4yw16l9835jbdyqxw3sc
+  tag: 3671fe88f7d62769ed207cda0ee94a0effbb4c7f
+  --sha256: 00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8
   subdir: byron/ledger/impl
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 37ea0bb59ff2cc7f6690240f8c4d55e15cd30f2c
-  --sha256: 1f9idm15yzdlpl9akzy9mkpalw7naz5p4yw16l9835jbdyqxw3sc
+  tag: 3671fe88f7d62769ed207cda0ee94a0effbb4c7f
+  --sha256: 00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8
   subdir: byron/crypto
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 37ea0bb59ff2cc7f6690240f8c4d55e15cd30f2c
-  --sha256: 1f9idm15yzdlpl9akzy9mkpalw7naz5p4yw16l9835jbdyqxw3sc
+  tag: 3671fe88f7d62769ed207cda0ee94a0effbb4c7f
+  --sha256: 00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8
   subdir: byron/ledger/impl/test
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 37ea0bb59ff2cc7f6690240f8c4d55e15cd30f2c
-  --sha256: 1f9idm15yzdlpl9akzy9mkpalw7naz5p4yw16l9835jbdyqxw3sc
+  tag: 3671fe88f7d62769ed207cda0ee94a0effbb4c7f
+  --sha256: 00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8
   subdir: byron/crypto/test
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 37ea0bb59ff2cc7f6690240f8c4d55e15cd30f2c
-  --sha256: 1f9idm15yzdlpl9akzy9mkpalw7naz5p4yw16l9835jbdyqxw3sc
+  tag: 3671fe88f7d62769ed207cda0ee94a0effbb4c7f
+  --sha256: 00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8
   subdir: byron/chain/executable-spec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 37ea0bb59ff2cc7f6690240f8c4d55e15cd30f2c
-  --sha256: 1f9idm15yzdlpl9akzy9mkpalw7naz5p4yw16l9835jbdyqxw3sc
+  tag: 3671fe88f7d62769ed207cda0ee94a0effbb4c7f
+  --sha256: 00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8
   subdir: byron/ledger/executable-spec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 37ea0bb59ff2cc7f6690240f8c4d55e15cd30f2c
-  --sha256: 1f9idm15yzdlpl9akzy9mkpalw7naz5p4yw16l9835jbdyqxw3sc
+  tag: 3671fe88f7d62769ed207cda0ee94a0effbb4c7f
+  --sha256: 00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8
   subdir: semantics/executable-spec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 37ea0bb59ff2cc7f6690240f8c4d55e15cd30f2c
-  --sha256: 1f9idm15yzdlpl9akzy9mkpalw7naz5p4yw16l9835jbdyqxw3sc
+  tag: 3671fe88f7d62769ed207cda0ee94a0effbb4c7f
+  --sha256: 00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8
   subdir: shelley/chain-and-ledger/dependencies/non-integer
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 37ea0bb59ff2cc7f6690240f8c4d55e15cd30f2c
-  --sha256: 1f9idm15yzdlpl9akzy9mkpalw7naz5p4yw16l9835jbdyqxw3sc
+  tag: 3671fe88f7d62769ed207cda0ee94a0effbb4c7f
+  --sha256: 00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8
   subdir: shelley/chain-and-ledger/executable-spec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 37ea0bb59ff2cc7f6690240f8c4d55e15cd30f2c
-  --sha256: 1f9idm15yzdlpl9akzy9mkpalw7naz5p4yw16l9835jbdyqxw3sc
+  tag: 3671fe88f7d62769ed207cda0ee94a0effbb4c7f
+  --sha256: 00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8
   subdir: shelley/chain-and-ledger/executable-spec/test
 
 source-repository-package
@@ -305,92 +305,92 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 7fa7f8182d20290e6a4b22168a1f9f61317307cf
-  --sha256: 0z0pf9jrf5cqyvzhinp3p6n5c0c9x0wp6vdzb7q481scimv0z9a7
+  tag: 16bca08140fb37746538edff9fe77220acf91d55
+  --sha256: 1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca
   subdir: ouroboros-network
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 7fa7f8182d20290e6a4b22168a1f9f61317307cf
-  --sha256: 0z0pf9jrf5cqyvzhinp3p6n5c0c9x0wp6vdzb7q481scimv0z9a7
+  tag: 16bca08140fb37746538edff9fe77220acf91d55
+  --sha256: 1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca
   subdir: io-sim
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 7fa7f8182d20290e6a4b22168a1f9f61317307cf
-  --sha256: 0z0pf9jrf5cqyvzhinp3p6n5c0c9x0wp6vdzb7q481scimv0z9a7
+  tag: 16bca08140fb37746538edff9fe77220acf91d55
+  --sha256: 1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca
   subdir: ouroboros-consensus
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 7fa7f8182d20290e6a4b22168a1f9f61317307cf
-  --sha256: 0z0pf9jrf5cqyvzhinp3p6n5c0c9x0wp6vdzb7q481scimv0z9a7
+  tag: 16bca08140fb37746538edff9fe77220acf91d55
+  --sha256: 1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca
   subdir: ouroboros-consensus/ouroboros-consensus-mock
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 7fa7f8182d20290e6a4b22168a1f9f61317307cf
-  --sha256: 0z0pf9jrf5cqyvzhinp3p6n5c0c9x0wp6vdzb7q481scimv0z9a7
+  tag: 16bca08140fb37746538edff9fe77220acf91d55
+  --sha256: 1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca
   subdir: ouroboros-consensus-byron
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 7fa7f8182d20290e6a4b22168a1f9f61317307cf
-  --sha256: 0z0pf9jrf5cqyvzhinp3p6n5c0c9x0wp6vdzb7q481scimv0z9a7
+  tag: 16bca08140fb37746538edff9fe77220acf91d55
+  --sha256: 1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca
   subdir: ouroboros-consensus-shelley
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 7fa7f8182d20290e6a4b22168a1f9f61317307cf
-  --sha256: 0z0pf9jrf5cqyvzhinp3p6n5c0c9x0wp6vdzb7q481scimv0z9a7
+  tag: 16bca08140fb37746538edff9fe77220acf91d55
+  --sha256: 1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca
   subdir: ouroboros-consensus-cardano
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 7fa7f8182d20290e6a4b22168a1f9f61317307cf
-  --sha256: 0z0pf9jrf5cqyvzhinp3p6n5c0c9x0wp6vdzb7q481scimv0z9a7
+  tag: 16bca08140fb37746538edff9fe77220acf91d55
+  --sha256: 1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca
   subdir: typed-protocols
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 7fa7f8182d20290e6a4b22168a1f9f61317307cf
-  --sha256: 0z0pf9jrf5cqyvzhinp3p6n5c0c9x0wp6vdzb7q481scimv0z9a7
+  tag: 16bca08140fb37746538edff9fe77220acf91d55
+  --sha256: 1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca
   subdir: typed-protocols-examples
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 7fa7f8182d20290e6a4b22168a1f9f61317307cf
-  --sha256: 0z0pf9jrf5cqyvzhinp3p6n5c0c9x0wp6vdzb7q481scimv0z9a7
+  tag: 16bca08140fb37746538edff9fe77220acf91d55
+  --sha256: 1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca
   subdir: ouroboros-network-framework
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 7fa7f8182d20290e6a4b22168a1f9f61317307cf
-  --sha256: 0z0pf9jrf5cqyvzhinp3p6n5c0c9x0wp6vdzb7q481scimv0z9a7
+  tag: 16bca08140fb37746538edff9fe77220acf91d55
+  --sha256: 1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca
   subdir: network-mux
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 7fa7f8182d20290e6a4b22168a1f9f61317307cf
-  --sha256: 0z0pf9jrf5cqyvzhinp3p6n5c0c9x0wp6vdzb7q481scimv0z9a7
+  tag: 16bca08140fb37746538edff9fe77220acf91d55
+  --sha256: 1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca
   subdir: io-sim-classes
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 7fa7f8182d20290e6a4b22168a1f9f61317307cf
-  --sha256: 0z0pf9jrf5cqyvzhinp3p6n5c0c9x0wp6vdzb7q481scimv0z9a7
+  tag: 16bca08140fb37746538edff9fe77220acf91d55
+  --sha256: 1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca
   subdir: Win32-network
 
 source-repository-package

@@ -262,16 +262,19 @@ mkShelleyStakingCredential vKey =
 shelleyGenesisDelegateStake
   :: ShelleyGenesisVerificationHash
   -> ShelleyGenesisDelegateVerKeyHash
+  -> ShelleyVRFVerificationKeyHash
   -> Certificate
-shelleyGenesisDelegateStake genDelegatorHash genDelegateeHash = do
-  ShelleyGenesisDelegationCertificate . Shelley.DCertGenesis $ Shelley.GenesisDelegCert genDelegatorHash genDelegateeHash
+shelleyGenesisDelegateStake genDelegatorHash genDelegateeHash vrfVkeyHash =
+  ShelleyGenesisDelegationCertificate . Shelley.DCertGenesis $
+    Shelley.GenesisDelegCert genDelegatorHash genDelegateeHash vrfVkeyHash
 
 -- | Move instantaneous rewards.
 shelleyMIRCertificate
-  :: ShelleyMIRMap
+  :: Shelley.MIRPot -- ^ Reserves or treasury
+  -> ShelleyMIRMap
   -> Certificate
-shelleyMIRCertificate mirMap =
-  ShelleyMIRCertificate . Shelley.DCertMir $ Shelley.MIRCert mirMap
+shelleyMIRCertificate mirPot mirMap =
+  ShelleyMIRCertificate . Shelley.DCertMir $ Shelley.MIRCert mirPot mirMap
 
 ---
 -- Shelley update related

@@ -23,7 +23,7 @@ import           Control.Tracer (nullTracer)
 
 import           Network.Mux (MuxError, MuxMode(..))
 
-import           Ouroboros.Consensus.Cardano (CodecConfig)
+import           Ouroboros.Consensus.Block (CodecConfig)
 import           Ouroboros.Consensus.Network.NodeToClient
                    (Codecs'(..), defaultCodecs)
 import           Ouroboros.Consensus.Node.NetworkProtocolVersion

@@ -49,7 +49,8 @@ import           Data.Void (Void)
 
 import           Network.Mux (MuxMode(..), MuxTrace, WithMuxBearer)
 
-import           Ouroboros.Consensus.Cardano (CodecConfig, protocolClientInfo)
+import           Ouroboros.Consensus.Block (CodecConfig)
+import           Ouroboros.Consensus.Cardano (protocolClientInfo)
 import           Ouroboros.Consensus.Ledger.Abstract (Query)
 import           Ouroboros.Consensus.Network.NodeToClient
 import           Ouroboros.Consensus.Node.NetworkProtocolVersion

@@ -19,7 +19,7 @@ import           Control.Concurrent.STM
 
 import           Cardano.Api.Types
 
-import           Ouroboros.Consensus.Cardano (protocolClientInfo)
+import           Ouroboros.Consensus.Cardano (protocolClientInfo, SecurityParam(..))
 import           Ouroboros.Consensus.Ledger.SupportsMempool (ApplyTxErr, GenTx)
 import           Ouroboros.Consensus.Network.NodeToClient
 import           Ouroboros.Consensus.Node.ProtocolInfo (ProtocolClientInfo(..))
@@ -68,7 +68,9 @@ submitTx network socketPath tx =
           result <- submitGenTx
                       nullTracer
                       iocp
-                      (protocolClientInfo $ mkNodeClientProtocolRealPBFT $ EpochSlots 21600)
+                      (protocolClientInfo (mkNodeClientProtocolRealPBFT
+                                             (EpochSlots 21600)
+                                             (SecurityParam 2160)))
                       network
                       socketPath
                       genTx

@@ -16,7 +16,8 @@ import           Control.Monad.Trans.Except.Extra (firstExceptT)
 import qualified Data.Text as T
 
 import           Cardano.Chain.Slotting (EpochSlots(..))
-import           Ouroboros.Consensus.Cardano (protocolClientInfo)
+import           Ouroboros.Consensus.Cardano
+                   (protocolClientInfo, SecurityParam(..))
 import           Ouroboros.Consensus.Node.ProtocolInfo (pClientInfoCodecConfig)
 import           Ouroboros.Consensus.Util.Condense (Condense(..))
 import           Ouroboros.Network.Block
@@ -45,7 +46,9 @@ runGetLocalNodeTip :: Network -> ExceptT ByronQueryError IO ()
 runGetLocalNodeTip network = do
     sockPath <- firstExceptT ByronQueryEnvVarSocketErr $ readEnvSocketPath
     let ptclClientInfo = pClientInfoCodecConfig . protocolClientInfo $
-          mkNodeClientProtocolRealPBFT (EpochSlots 21600)
+          mkNodeClientProtocolRealPBFT
+            (EpochSlots 21600)
+            (SecurityParam 2160)
 
     liftIO $ do
       tip <- withIOManager $ \iomgr ->

@@ -57,7 +57,8 @@ import           Ouroboros.Consensus.Byron.Ledger (GenTx(..), ByronBlock)
 import qualified Ouroboros.Consensus.Cardano as Consensus
 import           Ouroboros.Consensus.Ledger.SupportsMempool (txId)
 import           Ouroboros.Consensus.Util.Condense (condense)
-import           Ouroboros.Consensus.Cardano (protocolClientInfo)
+import           Ouroboros.Consensus.Cardano
+                   (protocolClientInfo, SecurityParam(..))
 
 import           Cardano.Config.Byron.Protocol (mkNodeClientProtocolRealPBFT)
 import           Cardano.Config.Protocol (RealPBFTError(..), withRealPBFT)
@@ -246,7 +247,9 @@ nodeSubmitTx iomgr network gentx = do
       --TODO: print failures
       return ()
   where
-    ptcl = mkNodeClientProtocolRealPBFT (EpochSlots 21600)
+    ptcl = mkNodeClientProtocolRealPBFT
+             (EpochSlots 21600)
+             (SecurityParam 2160)
 
 
 --TODO: remove these local definitions when the updated ledger lib is available

@@ -43,7 +43,7 @@ import           Ouroboros.Consensus.BlockchainTime (SystemStart (..))
 import           Cardano.Config.Types
                   (NodeAddress, SigningKeyFile(..), CertificateFile (..), UpdateProposalFile(..))
 import           Cardano.Config.Shelley.OCert (KESPeriod(..))
-
+import           Shelley.Spec.Ledger.TxData (MIRPot)
 
 --
 -- Shelley CLI command data types
@@ -166,7 +166,7 @@ data BlockCmd
 
 
 data GovernanceCmd
-  = GovernanceMIRCertificate [VerificationKeyFile] [ShelleyCoin] OutputFile
+  = GovernanceMIRCertificate MIRPot [VerificationKeyFile] [ShelleyCoin] OutputFile
   | GovernanceProtocolUpdate SigningKeyFile -- { parameters :: ProtocolParams, nodeAddr :: NodeAddress }
   | GovernanceUpdateProposal OutputFile EpochNo [VerificationKeyFile] ShelleyPParamsUpdate
   | GovernanceColdKeys SigningKeyFile     -- { genesis :: GenesisKeyFile, keys :: [PubKey], nodeAddr :: NodeAddress }

@@ -468,10 +468,22 @@ pGovernanceCmd =
   where
     pMIRCertificate :: Parser GovernanceCmd
     pMIRCertificate = GovernanceMIRCertificate
-                        <$> some pStakeVerificationKeyFile
+                        <$> pMIRPot
+                        <*> some pStakeVerificationKeyFile
                         <*> some pRewardAmt
                         <*> pOutputFile
 
+    pMIRPot :: Parser Shelley.MIRPot
+    pMIRPot =
+          Opt.flag' Shelley.ReservesMIR
+            (  Opt.long "reserves"
+            <> Opt.help "Use the reserves pot."
+            )
+      <|> Opt.flag' Shelley.ReservesMIR
+            (  Opt.long "treasury"
+            <> Opt.help "Use the treasury pot."
+            )
+
     pUpdateProposal :: Parser GovernanceCmd
     pUpdateProposal = GovernanceUpdateProposal
                         <$> pOutputFile