Merge #3972

3972: Cherry-picks from release/2.0.0 branch to develop r=rvl a=rvl

These are cherry-picks of the PRs: #3811 #3816 #3817 #3831 #3846 #3867 #3879 #3883 #3919 #3934 #3936 #3946 #3962.

Co-authored-by: Rodney Lorrimar <[email protected]>
Co-authored-by: Karl Knutsson <[email protected]>
Co-authored-by: Michael Hueschen <[email protected]>
Co-authored-by: Alexander Diemand <[email protected]>
Co-authored-by: KtorZ <[email protected]>
Co-authored-by: Rupert Horlick <[email protected]>
Co-authored-by: Luke Nadur <[email protected]>
Co-authored-by: Jordan Millar <[email protected]>
Co-authored-by: Marcin Szamotulski <[email protected]>
Co-authored-by: Samuel Leathers <[email protected]>
Co-authored-by: Jean-Christophe Mincke <[email protected]>

Author: 12 people

CHANGELOG.md

@@ -286,7 +286,8 @@ let
           cardano-sl-tools-post-mortem
           cardano-sl-util
           cardano-sl-x509
-          cardano-wallet;
+          cardano-wallet
+          cardano-wallet-static;
         inherit (self.haskellPackages)
           cardano-report-server; }
   # nix-tools setup

default.nix

@@ -66,12 +66,14 @@ NOTE: the various other Cardano components can be obtained through other attribu
 -  `cardano-sl-tools`:
    - `cardano-analyzer`, `cardano-dht-keygen`, `cardano-genupdate`, `cardano-keygen`, `cardano-launcher`, `cardano-addr-convert`, `cardano-cli-docs`, `cardano-block-gen`, `cardano-post-mortem`
 -  `cardano-wallet-static`:
-   - `cardano-node`, `cardano-swagger`
+   - `cardano-node`, `cardano-generate-swagger-file`
 
 In general, for any given cabal `PACKAGE` provided by Cardano, there is a
-corresponding Nix attribute for it -- `PACKAGE`, and sometimes, in case of
-packages providing executables, the `PACKAGE-static` also provides a
-statically-linked variation.
+corresponding Nix attribute for it -- `PACKAGE`.
+In the case of packages with executables, the `PACKAGE-static`
+attribute provides a variation with only the executables, with Haskell
+dependencies statically linked (system dependencies dynamically
+linked).
 
 ## Stack with Nix for system libraries (mixed mode)
 

docs/how-to/build-cardano-sl-and-daedalus-from-source-code.md

@@ -13,7 +13,7 @@ import Explorer.I18n.Lenses (footer, fooCardanoOpenSource, fooCardanoHub
   , fooDaedalusPlatform, fooWhyCardano, fooCardanoRoadmap, fooCardanoReddit, fooCardanoCommunity
   , fooIOHK, fooIOHKBlog, fooIOHKYoutube, fooTwitter, fooProject, fooFoundation
   , fooLearnMore, fooProtocol) as I18nL
-import Explorer.Lenses.State (lang)
+import Explorer.Lenses.State (lang, testnet)
 import Explorer.Types.Actions (Action(..))
 import Explorer.Types.State (State)
 import Explorer.Util.Config (commitHash, version)
@@ -27,8 +27,10 @@ import Text.Smolder.Markup (text) as S
 
 footerView :: State -> P.HTML Action
 footerView state =
-    let lang' = state ^. lang in
-    S.div ! S.className "explorer-footer" $ do
+    let lang' = state ^. lang
+        footerHiddenClazz = if (state ^. testnet) then " hide" else ""
+    in
+    S.div ! S.className ("explorer-footer" <> footerHiddenClazz) $ do
         S.div ! S.className "explorer-footer__top" $ do
             S.div ! S.className "explorer-footer__container" $ do
                 S.div ! S.className "explorer-footer__top--content" $ do
@@ -141,7 +143,7 @@ navItemsLeft lang =
       , link: "https://cardanoroadmap.com"
       }
     , { label: translate (I18nL.footer <<< I18nL.fooCardanoTestnet) lang
-      , link: "https://tada.iohk.io"
+      , link: "https://testnet.iohkdev.io"
       }
     , { label: translate (I18nL.footer <<< I18nL.fooCardanoSource) lang
       , link: "https://github.com/input-output-hk/cardano-sl"

explorer/frontend/src/Explorer/View/Footer.purs

@@ -1,7 +1,3 @@
--- This file has been generated from package.yaml by hpack version 0.18.1.
---
--- see: https://github.com/sol/hpack
-
 name:           cardano-sl-faucet
 version:        2.0.0
 description:    Cardano SL - faucet
@@ -20,6 +16,7 @@ library
                     , QuickCheck
                     , aeson
                     , bytestring
+                    , cardano-sl-client
                     , cardano-sl-core
                     , cardano-sl-crypto
                     , cardano-sl-util

faucet/cardano-sl-faucet.cabal

@@ -21,6 +21,7 @@ import qualified Data.ByteArray as BA
 import           Data.ByteString (ByteString)
 import           Data.List.NonEmpty (NonEmpty (..))
 import           Data.Text.Strict.Lens (utf8)
+import           Pos.Client.Txp.Util (InputSelectionPolicy (..))
 import           Pos.Core (Address (..), Coin (..))
 import           Pos.Crypto.Signing (PassPhrase)
 import           System.Random
@@ -49,7 +50,8 @@ withdraw addr = withSublogger "WalletClient.withdraw" $ do
     q <- view feWithdrawalQ
     let paymentDist = (V1.PaymentDistribution addr coin :| [])
         sp =  spendingPassword <&> view (re utf8 . to hashPwd . to V1)
-        payment = Payment paymentSource paymentDist Nothing sp
+        gp = Just (V1 OptimizeForHighThroughput)
+        payment = Payment paymentSource paymentDist gp sp
     eRes <- liftIO $ sendToQueue q payment
     case eRes of
         Left e -> do

faucet/src/Cardano/WalletClient.hs

@@ -14929,7 +14929,7 @@ testnet_wallet: &testnet_wallet
   <<: *testnet_full
   update: &testnet_wallet_update
     applicationName: csl-daedalus
-    applicationVersion: 1
+    applicationVersion: 4
     lastKnownBlockVersion:
       bvMajor: 0
       bvMinor: 0
@@ -14973,30 +14973,30 @@ mainnet_dryrun_wallet_win64: &mainnet_dryrun_wallet_win64
   <<: *mainnet_dryrun_full
   update:
     applicationName: csl-daedalus
-    applicationVersion: 16
+    applicationVersion: 18
     lastKnownBlockVersion:
       bvMajor: 0
-      bvMinor: 1
+      bvMinor: 2
       bvAlt: 0
 
 mainnet_dryrun_wallet_macos64: &mainnet_dryrun_wallet_macos64
   <<: *mainnet_dryrun_full
   update:
     applicationName: csl-daedalus
-    applicationVersion: 16
+    applicationVersion: 18
     lastKnownBlockVersion:
       bvMajor: 0
-      bvMinor: 1
+      bvMinor: 2
       bvAlt: 0
 
 mainnet_dryrun_wallet_linux64: &mainnet_dryrun_wallet_linux64
   <<: *mainnet_dryrun_full
   update:
     applicationName: csl-daedalus
-    applicationVersion: 16
+    applicationVersion: 18
     lastKnownBlockVersion:
       bvMajor: 0
-      bvMinor: 1
+      bvMinor: 2
       bvAlt: 0
 
 ##############################################################################

lib/configuration.yaml

@@ -6,13 +6,11 @@ rotation:
 
 loggerTree:
   severity: Debug+
-  files:
-    - node.log
 
   handlers:
     - { name: "JSON"
       , filepath: "node.json"
       , logsafety: SecretLogLevel
-      , severity: Info
+      , severity: Debug+
       , backend: FileJsonBE }
 

log-configs/cluster.yaml

@@ -15360,6 +15360,7 @@ license = stdenv.lib.licenses.mit;
 , aeson
 , base
 , bytestring
+, cardano-sl-client
 , cardano-sl-core
 , cardano-sl-crypto
 , cardano-sl-infra
@@ -15419,6 +15420,7 @@ libraryHaskellDepends = [
 aeson
 base
 bytestring
+cardano-sl-client
 cardano-sl-core
 cardano-sl-crypto
 cardano-sl-mnemonic