This repository has been archived by the owner on Aug 18, 2020. It is now read-only.
Jc/merge/release 2.0.0/develop #3982
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[CBR-466] fix address reported as unused during restoration
…de-600-x509 [CBR-470] Ensure 600 file permission on generated x509 certificates and keys
(cherry picked from commit 0f41c67)
…g-GeneratedSecrets [RCD-38] Fix "GeneratedSecrets missing" error
…ng-scribes [CBR-477] Close scribes before terminating.
[DEVOPS-1099] make the wallet documentation optional, and default it to off
…rkMagic` in `wallet-new` API V1
…-level [RCD-42] log-configs/cluster.yaml: Include debug messages in json log
…/RCD-40 [release/2.0.0] [RCD-40] Address discrimination not enforced when sending transactions
…rs-origin [DEVOPS-1121] explorer: add testnet URL to CORS origin whitelist
…elease [DDW-480] Fix error message show user for x509 regeneration failures
[CSL-2526] update changes after covering remaining fees
….0.0 - List of placeholders generated from merge commits in the git log. - Updated links in existing ChangeLog entries. - Filled in ChangeLog entries for DEVOPS tickets.
(cherry picked from commit 6b6e22b)
This reverts commit 04bee97.
This reverts commit fcbec30.
3934: [DEVOPS-1172] faucet: Use OptimizeForHighThroughput grouping policy r=rvl a=rvl ## Description Fix faucet withdrawals which occasionally fail due to unavailable UTxO. ## Linked issue https://iohk.myjetbrains.com/youtrack/issue/DEVOPS-1172 Co-authored-by: Rodney Lorrimar <rodney.lorrimar@iohk.io>
3936: [DEVOPS-1112] Staging application version r=cleverca22 a=rvl ## Description Update the applicationVersion for the staging installers, but revert the part which changes the `lastKnownBlockVersion` for the staging cluster. This must be `0.2.0` not `0.1.0`. ## Linked issue https://iohk.myjetbrains.com/youtrack/issue/DEVOPS-1112 Co-authored-by: Rodney Lorrimar <rodney.lorrimar@iohk.io> Co-authored-by: Samuel Leathers <samuel.leathers@iohk.io>
This fix is actually two folds: - It discards incoherent transactions fetched from the DB, if any, and shout a warning in the log. This is in order to make the system more resilient to conconcurrent calls while a wallet or account is being deleted (since metadata and accounts / wallets are stored in separated databases, we can't easily run both delete in a single transaction). - It also deletes corresponding metadata when an account or a wallet is removed. This may cause extra damage? What if there are pending transactions when we delete the account or wallet.
The sqlite db is actually stored in a file and not a directory
…with no Txs-Accounts relations in SQlite
3943: [CBR-495] Fix inconsistent metadata store after deletion r=jmitchell a=KtorZ ## Description We store some information related to transaction in the metadata store (sqlite). However, when looking up transaction with metadata referring to wallet we don't know about, we fail with a not so friendly error "WalletNotFound" despite no wallet being given as part of the query. This fix is actually two folds: - It discards incoherent transactions fetched from the DB, if any, and shout a warning in the log. This is in order to make the system more resilient to conconcurrent calls while a wallet or account is being deleted (since metadata and accounts / wallets are stored in separated databases, we can't easily run both delete in a single transaction). - It also deletes corresponding metadata when an account or a wallet is removed. This may cause extra damage? What if there are pending transactions when we delete the account or wallet. ## Linked issue [CBR-495](https://iohk.myjetbrains.com/youtrack/issue/CBR-495) 3947: [CBR-496] Fix --rebuild-db not rebuilding sqlite r=jmitchell a=KtorZ ## Description <!--- A brief description of this PR and the problem is trying to solve --> Turns out we aren't actually removing the sqlite database when passing --rebuild-db becaue the SQLite db is actually stored in a file and not a directory. ## Linked issue <!--- Put here the relevant issue from YouTrack --> [[CBR-496]](https://iohk.myjetbrains.com/youtrack/issue/CO-445) Co-authored-by: KtorZ <matthias.benkort@gmail.com> Co-authored-by: kderme <kostas.dermentzis@iohk.io>
…-version-staging [DEVOPS-1112] Bump staging applicationVersion 17 → 18
# Conflicts: # appveyor.yml # bors.toml # default.nix # docs/how-to/build-cardano-sl-and-daedalus-from-source-code.md # nix/stack2nix.nix # pkgs/default.nix # release.nix # stack.yaml # wallet-new/cardano-sl-wallet-new.cabal # wallet-new/src/Cardano/Wallet/API/Internal/LegacyHandlers.hs # wallet-new/src/Cardano/Wallet/Kernel/CoinSelection/Generic/Fees.hs # wallet-new/src/Cardano/Wallet/Kernel/DB/TxMeta.hs # wallet-new/src/Cardano/Wallet/Kernel/Migration.hs # wallet-new/src/Cardano/Wallet/Server/LegacyPlugins.hs # wallet/src/Cardano/Wallet/API/Internal.hs # wallet/src/Cardano/Wallet/API/Internal/Handlers.hs # wallet/src/Cardano/Wallet/Kernel/PrefilterTx.hs # wallet/src/Cardano/Wallet/WalletLayer.hs # wallet/src/Pos/Wallet/Web/State/Storage.hs # wallet/test/unit/Test/Spec/GetTransactions.hs # wallet/test/unit/Test/Spec/TxMetaStorage.hs Initial status: Changes to be committed: modified: .buildkite/pipeline.yml new file: .buildkite/windows.ps1 modified: db/cardano-sl-db.cabal modified: db/src/Pos/DB/Block/Epoch.hs modified: db/src/Pos/DB/Rocks/Functions.hs modified: lib/src/Pos/Diffusion/Full/Block.hs modified: log-configs/connect-to-cluster.yaml modified: tools/cardano-sl-tools.cabal modified: tools/src/launcher/Main.hs Unmerged paths: (use "git add/rm <file>..." as appropriate to mark resolution) both modified: appveyor.yml both added: bors.toml both modified: default.nix both modified: docs/how-to/build-cardano-sl-and-daedalus-from-source-code.md both modified: nix/stack2nix.nix both modified: pkgs/default.nix both modified: release.nix both modified: stack.yaml deleted by us: wallet-new/cardano-sl-wallet-new.cabal deleted by us: wallet-new/src/Cardano/Wallet/API/Internal/LegacyHandlers.hs deleted by us: wallet-new/src/Cardano/Wallet/Kernel/CoinSelection/Generic/Fees.hs deleted by us: wallet-new/src/Cardano/Wallet/Kernel/DB/TxMeta.hs deleted by us: wallet-new/src/Cardano/Wallet/Kernel/Migration.hs deleted by us: wallet-new/src/Cardano/Wallet/Server/LegacyPlugins.hs both modified: wallet/src/Cardano/Wallet/API/Internal.hs both modified: wallet/src/Cardano/Wallet/API/Internal/Handlers.hs both modified: wallet/src/Cardano/Wallet/Kernel/PrefilterTx.hs both modified: wallet/src/Cardano/Wallet/WalletLayer.hs deleted by us: wallet/src/Pos/Wallet/Web/State/Storage.hs both modified: wallet/test/unit/Test/Spec/GetTransactions.hs both modified: wallet/test/unit/Test/Spec/TxMetaStorage.hs
KtorZ
reviewed
Dec 21, 2018
default.nix
Outdated
| ======= | ||
| cardano-sl-wallet | ||
| cardano-sl-wallet-new | ||
| cardano-sl-wallet-new-static |
There was a problem hiding this comment.
There's no more "wallet-new"
KtorZ
reviewed
Dec 21, 2018
| - `cardano-wallet-static`: | ||
| ======= | ||
| - `cardano-sl-wallet-new-static`: | ||
| >>>>>>> release/2.0.0 |
There was a problem hiding this comment.
same here, no more "wallet-new"
erikd
suggested changes
Jan 2, 2019
There was a problem hiding this comment.
Why are we doing this?
This is a large PR which is difficult to review and contains lots of completely unrelated changes.
If there are specific commits on the release-2.0.0 branch that we want on develop then we should individually cherry pick those commits. Also we should avoid as much as possible doing development on release branches.
|
I resolved the remaining conflicts as requested. If you view the diff of a merge commit in There wasn't any development done on this release branch. It was only bug fixes and build fixes. |
KtorZ
suggested changes
Jan 4, 2019
There was a problem hiding this comment.
We are missing:
- run EKG server if --ekg-server IP:PORT is passed wallet-new: run EKG server if --ekg-server IP:PORT is passed #3888
- add required jobset to release.nix [DEVOPS-1126] add required jobset to release.nix #3852
| # 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 |
There was a problem hiding this comment.
This is incorrect. It should be wallet
|
|
||
| Write-Output "+++ Stack build and test" | ||
|
|
||
| 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="Z:\OpenSSL-Win64-v102\include" --extra-lib-dirs="Z:\OpenSSL-Win64-v102" --extra-include-dirs="Z:\xz_extracted\include" --extra-lib-dirs="Z:\xz_extracted\bin_x86-64" --extra-include-dirs="$env:WORK_DIR\rocksdb\include" --extra-lib-dirs="$env:WORK_DIR" |
There was a problem hiding this comment.
cardano-sl-wallet-new should be cardano-wallet
| , filepath: "node" | ||
| , logsafety: SecretLogLevel | ||
| , severity: Info+ | ||
| , backend: FileTextBE } |
There was a problem hiding this comment.
tools/src/launcher/Main.hs
Outdated
| writeFile (toString runnerPath) $ unlines | ||
| [ "TaskKill /IM cardano-launcher.exe /F" | ||
| [ "TaskKill /PID "<>show selfPid<>" /F" |
There was a problem hiding this comment.
👍 Those are the missing changes from #3926
tools/cardano-sl-tools.cabal
Outdated
| @@ -156,6 +156,8 @@ executable cardano-launcher | |||
| , yaml | |||
| if !os(windows) | |||
| build-depends: unix | |||
| else | |||
| build-depends: Win32 | |||
| default-language: Haskell2010 | |||
| ghc-options: -threaded | |||
| -Wall | |||
There was a problem hiding this comment.
👍 Those are the missing changes from #3926
| @@ -47,6 +47,7 @@ import Data.Binary (decode, encode) | |||
| import qualified Data.ByteString.Char8 as BS | |||
| import qualified Data.ByteString.Lazy as LBS | |||
| import Data.Either (partitionEithers) | |||
| import Data.List.Extra (chunksOf) | |||
There was a problem hiding this comment.
This is already on develop!
https://github.com/input-output-hk/cardano-sl/blob/develop/db/src/Pos/DB/Block/Epoch.hs#L50
| => Handle -> (Int, SlotIndexHash) -> m (Either ConsolidateError SlotIndexLength) | ||
| consolidate hdl (indx, SlotIndexHash lsi hh) = do | ||
| when (indx `mod` 1000 == 0) $ | ||
| sleepSeconds 2 |
There was a problem hiding this comment.
This is already on develop!
https://github.com/input-output-hk/cardano-sl/blob/develop/db/src/Pos/DB/Block/Epoch.hs#L386-L397
| @@ -141,6 +141,7 @@ library | |||
| , ekg-core | |||
| , ether >= 0.5 | |||
| , exceptions | |||
| , extra | |||
There was a problem hiding this comment.
This is already on develop!
https://github.com/input-output-hk/cardano-sl/blob/develop/db/cardano-sl-db.cabal#L144
|
Here below, the complete list of PR made against
|
deepfire
suggested changes
Jan 11, 2019
tools/src/launcher/Main.hs
Outdated
| writeFile (toString runnerPath) $ unlines | ||
| [ "TaskKill /PID "<>show selfPid<>" /F" | ||
| [ "TaskKill /IM cardano-launcher.exe /F" |
There was a problem hiding this comment.
|
Closing in favor of manual cherry picks in https://iohk.myjetbrains.com/youtrack/issue/DEVOPS-1211 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Merge from release/2.0.0 to develop.
I already solved the conflicts in wallet code. Please @KtorZ , double check it.
@iohk-devops : please solve the remaining conflicts:
Here is the list of the remaining conflicts:
Linked issue
N/A
Type of change
Developer checklist
Testing checklist
QA Steps
Screenshots (if available)
How to merge
Send the message
bors r+to merge this PR. For more information, seedocs/how-to/bors.md.