Merge pull request #3866 from input-output-hk/release/1.3.2

input-output-hk · Nov 19, 2018 · 0d4617b · 0d4617b
2 parents 8f750bb + af722c4
commit 0d4617b
Show file tree

Hide file tree

Showing 39 changed files with 172 additions and 237 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -4,6 +4,11 @@ steps:
     agents:
       system: x86_64-linux
 
+  - label: 'Windows'
+    command: 'PowerShell.exe -executionpolicy remotesigned -File .\.buildkite\windows.ps1'
+    agents:
+      system: x86_64-win2016
+
   - label: 'stack2nix'
     command: 'scripts/ci/nix-shell.sh -p cabal2nix stack cabal-install ghc moreutils expect -Q -j 4 --run scripts/check-stack2nix.sh'
     agents:

diff --git a/.buildkite/windows.ps1 b/.buildkite/windows.ps1
@@ -0,0 +1,92 @@
+Set-PSDebug -Trace 1
+
+# Avoid long paths on Windows
+$env:STACK_ROOT="D:\s"
+$env:STACK_WORK=".w"
+$env:WORK_DIR="D:\w"
+# Override the temp directory to avoid sed escaping issues
+# See https://github.com/haskell/cabal/issues/5386
+$env:TMP="D:\\tmp"
+
+# Store the original checkout directory
+$env:CHECKOUT_PATH=(Get-Item -Path ".\").FullName
+
+# Temp directory needs to exist
+New-Item -ItemType Directory -Force -Path $env:TMP
+
+#  Setup stuff (commented out)
+#mkdir d:\ghc
+#
+#Invoke-WebRequest "https://s3.eu-central-1.amazonaws.com/ci-static/ghc-8.2.2-x86_64-unknown-mingw32.tar.xz" -OutFile "D:\ghc\ghc.tar.xz" -UserAgent "Curl"
+#
+#7z x D:\ghc\ghc.tar.xz -oD:\ghc
+#
+#7z x D:\ghc\ghc.tar -oD:\ghc
+
+# OpenSSL
+#
+#$env:USERPROFILE
+#(New-Object Net.WebClient).DownloadFile('https://slproweb.com/download/Win64OpenSSL-1_0_2p.exe', "D:\Downloads\Win64OpenSSL.exe")
+#cmd /c start /wait "D:\Downloads\Win64OpenSSL.exe" /silent /verysilent /sp- /suppressmsgboxes /DIR=D:\OpenSSL-Win64-v102
+## Install stack
+#Start-FileDownload http://www.stackage.org/stack/windows-x86_64 -FileName D:\Downloads\stack.zip
+#curl.exe http://www.stackage.org/stack/windows-x86_64 -o d:\Downloads\stack.zip -L
+#7z -oD:\stack x D:\Downloads\stack.zip
+
+$env:PATH="$env:PATH;D:\ghc\ghc-8.2.2\bin;D:\stack;$Env:Programfiles\7-Zip;D:\w"
+
+# Install liblzma/xz
+#curl -L https://tukaani.org/xz/xz-5.2.3-windows.zip -o xz-5.2.3-windows.zip
+#7z -oD:\xz_extracted x xz-5.2.3-windows.zip
+
+rd -r -fo $env:WORK_DIR
+mkdir $env:WORK_DIR
+copy-item $env:CHECKOUT_PATH\* $env:WORK_DIR -force -recurse
+cd $env:WORK_DIR
+
+git.exe clone https://github.com/facebook/rocksdb.git --branch v4.13.5
+# curl.exe -L 'https://s3.eu-central-1.amazonaws.com/ci-static/serokell-rocksdb-haskell-325427fc709183c8fdf777ad5ea09f8d92bf8585.zip' -o D:\Downloads\rocksdb.zip
+7z x D:\Downloads\rocksdb.zip
+
+# CSL-1509: After moving the 'cardano-sl' project itself into a separate folder ('lib/'), the 'cardano-text.exe' executable fails on AppVeyor CI.
+# After some investigation, it was discovered that this was because 'rocksdb.dll' has to be located in this folder as well, or else the test executable doesn't work.
+copy rocksdb.dll node
+copy rocksdb.dll lib
+copy rocksdb.dll wallet-new
+
+# Start doing stuff
+
+stack.exe config --system-ghc set system-ghc --global true
+# stack.exe config --system-ghc set programs c:\s\programs --global true
+stack.exe path
+stack.exe exec -- ghc-pkg recache
+stack.exe --verbosity warn setup --no-reinstall
+# Install happy separately: https://github.com/commercialhaskell/stack/issues/3151#issuecomment-310642487. Also install cpphs because it's a build-tool and Stack can't figure out by itself that it should be installed
+stack.exe --verbosity warn install happy cpphs -j 2 --no-terminal --local-bin-path $env:SYSTEMROOT\system32 --extra-include-dirs="D:\OpenSSL-Win64-v102\include" --extra-lib-dirs="D:\OpenSSL-Win64-v102" --extra-include-dirs="D:\xz_extracted\include" --extra-lib-dirs="D:\xz_extracted\bin_x86-64" --extra-include-dirs="$env:WORK_DIR\rocksdb\include" --extra-lib-dirs="$env:WORK_DIR"
+# TODO: CSL-1133. To be reenabled.
+# stack.exe test --coverage
+# stack.exe hpc report cardano-sl cardano-sl-txp cardano-sl-core cardano-sl-db cardano-sl-update cardano-sl-infra cardano-sl-lrc cardano-sl-ssc
+
+#We intentionally don't build auxx here, because this build is for installer.
+stack.exe --dump-logs install cardano-sl cardano-sl-tools cardano-sl-wallet-new -j 3 --no-terminal --local-bin-path $env:WORK_DIR --no-haddock-deps --flag cardano-sl-core:-asserts --flag cardano-sl-tools:for-installer --extra-include-dirs="D:\OpenSSL-Win64-v102\include" --extra-lib-dirs="D:\OpenSSL-Win64-v102" --extra-include-dirs="D:\xz_extracted\include" --extra-lib-dirs="D:\xz_extracted\bin_x86-64" --extra-include-dirs="$env:WORK_DIR\rocksdb\include" --extra-lib-dirs="$env:WORK_DIR"
+
+# from here onwards, errors terminate the script
+$ErrorActionPreference = "Stop"
+
+#Cardano pieces, modulo the frontend
+mkdir daedalus
+## log config is called `log-config-prod.yaml` just in case, it's the old name
+copy log-configs\daedalus.yaml daedalus\log-config-prod.yaml
+copy lib\configuration.yaml daedalus\
+copy lib\*genesis*.json daedalus\
+copy cardano-launcher.exe daedalus\
+copy cardano-node.exe daedalus\
+copy cardano-x509-certificates.exe daedalus\
+cd daedalus
+$env:BUILDKITE_BUILD_NUMBER | Out-File build-id
+$env:BUILDKITE_COMMIT | Out-File commit-id
+cd ..
+
+$daedaluszip = "$env:BUILDKITE_COMMIT.zip"
+7z.exe a $daedaluszip .\daedalus\*
+buildkite-agent artifact upload $daedaluszip
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## Cardano SL 1.3.2
+
+- Upgrade block version to 0.2.0 to limit max block size to 32 KB.
+
+- Override max block size for genesis block to have a limit of 1.953 MB.
+
 ## Cardano SL 1.3.1
 
 ### Features

diff --git a/appveyor.yml b/appveyor.yml
diff --git a/auxx/cardano-sl-auxx.cabal b/auxx/cardano-sl-auxx.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-auxx
-version:             1.3.1
+version:             1.3.2
 synopsis:            Cardano SL - Auxx
 description:         Cardano SL - Auxx
 license:             MIT

diff --git a/binary/cardano-sl-binary.cabal b/binary/cardano-sl-binary.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-binary
-version:             1.3.1
+version:             1.3.2
 synopsis:            Cardano SL - binary serialization
 description:         This package defines a type class for binary serialization,
                      helpers and instances.

diff --git a/binary/test/cardano-sl-binary-test.cabal b/binary/test/cardano-sl-binary-test.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-binary-test
-version:             1.3.1
+version:             1.3.2
 synopsis:            Cardano SL - binary serializarion (tests)
 description:         This package contains test helpers for cardano-sl-binary.
 license:             MIT

diff --git a/block/bench/cardano-sl-block-bench.cabal b/block/bench/cardano-sl-block-bench.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-block-bench
-version:             1.3.1
+version:             1.3.2
 synopsis:            Cardano SL - block benchmark
 description:         Cardano SL - block benchmark
 license:             MIT

diff --git a/block/cardano-sl-block.cabal b/block/cardano-sl-block.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-block
-version:             1.3.1
+version:             1.3.2
 synopsis:            Cardano SL - block processing
 description:         Cardano SL - block processing
 license:             MIT

diff --git a/block/src/Pos/Block/Logic/Integrity.hs b/block/src/Pos/Block/Logic/Integrity.hs
@@ -324,6 +324,9 @@ verifyBlocks pm curSlotId verifyNoUnknown bvd initLeaders = view _3 . foldl' ste
         let newLeaders = case blk of
                 Left genesisBlock -> genesisBlock ^. genBlockLeaders
                 Right _           -> leaders
+            blockMaxSize = case blk of
+                Left _  -> 2000000
+                Right _ -> bvdMaxBlockSize bvd
             vhp =
                 VerifyHeaderParams
                 { vhpPrevHeader = prevHeader
@@ -335,7 +338,7 @@ verifyBlocks pm curSlotId verifyNoUnknown bvd initLeaders = view _3 . foldl' ste
             vbp =
                 VerifyBlockParams
                 { vbpVerifyHeader = vhp
-                , vbpMaxSize = bvdMaxBlockSize bvd
+                , vbpMaxSize = blockMaxSize
                 , vbpVerifyNoUnknown = verifyNoUnknown
                 }
         in (newLeaders, Just $ getBlockHeader blk, res <> verifyBlock pm vbp blk)
diff --git a/block/test/cardano-sl-block-test.cabal b/block/test/cardano-sl-block-test.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-block-test
-version:             1.3.1
+version:             1.3.2
 synopsis:            Cardano SL - block processing (tests)
 description:         QuickCheck Arbitrary instances for Cardano SL block
                      processing.

diff --git a/client/cardano-sl-client.cabal b/client/cardano-sl-client.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-client
-version:             1.3.1
+version:             1.3.2
 synopsis:            Cardano SL client modules
 description:         Cardano SL client modules
 license:             MIT

diff --git a/core/cardano-sl-core.cabal b/core/cardano-sl-core.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-core
-version:             1.3.1
+version:             1.3.2
 synopsis:            Cardano SL - core
 description:         Cardano SL - core
 license:             MIT

diff --git a/crypto/cardano-sl-crypto.cabal b/crypto/cardano-sl-crypto.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-crypto
-version:             1.3.1
+version:             1.3.2
 synopsis:            Cardano SL - cryptography primitives
 description:         This package contains cryptography primitives used in Cardano SL.
 license:             MIT

diff --git a/crypto/test/cardano-sl-crypto-test.cabal b/crypto/test/cardano-sl-crypto-test.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-crypto-test
-version:             1.3.1
+version:             1.3.2
 synopsis:            Cardano SL - arbitrary instances for cardano-sl-crypto
 description:         This package contains arbitrary instances for the cryptography primitives used in Cardano SL.
 license:             MIT

diff --git a/db/cardano-sl-db.cabal b/db/cardano-sl-db.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-db
-version:             1.3.1
+version:             1.3.2
 synopsis:            Cardano SL - basic DB interfaces
 description:         Cardano SL - basic DB interfaces
 license:             MIT

diff --git a/delegation/cardano-sl-delegation.cabal b/delegation/cardano-sl-delegation.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-delegation
-version:             1.3.1
+version:             1.3.2
 synopsis:            Cardano SL - delegation
 description:         Cardano SL - delegation
 license:             MIT

diff --git a/delegation/test/cardano-sl-delegation-test.cabal b/delegation/test/cardano-sl-delegation-test.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-delegation-test
-version:             1.3.1
+version:             1.3.2
 synopsis:            Cardano SL - delegation (tests)
 description:         Cardano SL - delegation (tests)
 license:             MIT