Merge pull request #2670 from input-output-hk/release-with-master

Merge release/4.3.0 and release/4.3.1 into master

Author: nikolaglumac

.babelrc

@@ -13,6 +13,7 @@
         "loose": true
       }
     ],
+    ["@babel/plugin-proposal-optional-chaining"],
     ["@babel/plugin-proposal-object-rest-spread", {}],
     ["@babel/plugin-transform-runtime", {}],
     ["@babel/plugin-proposal-unicode-property-regex", { "useUnicodeFlag": false }],

.flowconfig

@@ -23,5 +23,6 @@ flow/declarations/
 
 [options]
 esproposal.decorators=ignore
+esproposal.optional_chaining=enable
 module.ignore_non_literal_requires=true
 module.name_mapper.extension='scss' -> '<PROJECT_ROOT>/flow/mappers/CSSModule.js.flow'

CHANGELOG.md

@@ -1 +1 @@
-mainnet mainnet_flight testnet shelley_qa staging
+mainnet mainnet_flight testnet shelley_qa staging alonzo_purple

README.md

@@ -282,6 +282,7 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
       , "int64-buffer"
       , "call-bind"
       , "get-intrinsic"
+      , "cbor-web"
       ]
   mapM_ (\lib -> do
       cptree ("../node_modules" </> lib) ((fromText pathtoapp) </> "Contents/Resources/app/node_modules" </> lib)
@@ -327,7 +328,7 @@ makeComponentRoot Options{oBackend,oCluster} appRoot darwinConfig@DarwinConfig{d
       -- Executables (from daedalus-bridge)
       forM_ ["cardano-wallet", "cardano-node", "cardano-cli", "cardano-address" ] $ \f ->
         cp (bridge </> "bin" </> f) (dir </> f)
-      forM_ ["config.yaml", "genesis.json", "genesis-byron.json", "genesis-shelley.json", "topology.yaml" ] $ \f ->
+      forM_ ["config.yaml", "genesis.json", "genesis-byron.json", "genesis-shelley.json", "genesis-alonzo.json", "topology.yaml" ] $ \f ->
         cp f (dataDir </> f)
 
       when (oCluster == Selfnode) $ do

installer-clusters.cfg

@@ -56,6 +56,7 @@ data Cluster
   | Staging
   | Shelley_QA
   | Testnet
+  | Alonzo_Purple
   deriving (Bounded, Enum, Eq, Read, Show)
 
 -- | The wallet backend to include in the installer.
@@ -106,6 +107,7 @@ clusterNetwork Mainnet_Flight = "mainnet_flight"
 clusterNetwork Staging = "staging"
 clusterNetwork Shelley_QA = "shelley_qa"
 clusterNetwork Testnet = "testnet"
+clusterNetwork Alonzo_Purple = "alonzo_purple"
 
 packageFileName :: OS -> Cluster -> Version -> Backend -> Text -> Maybe BuildJob -> FilePath
 packageFileName _os cluster ver backend _backendVer build = fromText name <.> ext

installers/common/MacInstaller.hs

@@ -201,6 +201,7 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
                     file [] "genesis.json"
                     file [] "genesis-byron.json"
                     file [] "genesis-shelley.json"
+                    file [] "genesis-alonzo.json"
                     file [] "libsodium-23.dll"
                     when (clusterName == Selfnode) $ do
                       file [] "signing.key"