Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump cardano-node to 1.26.2 #2612

Merged
merged 15 commits into from
Apr 21, 2021
Merged

Bump cardano-node to 1.26.2 #2612

merged 15 commits into from
Apr 21, 2021

Conversation

Anviking
Copy link
Member

@Anviking Anviking commented Apr 14, 2021 •
edited by rvl
Loading

Issue Number

ADP-845

Overview

Updates from 1.25.1 to 1.26.2.

  • Get things compiling.
  • Remove TRANS_EXTERNAL tests to drop cardano-transaction dependency
  • Fix any warnings etc in CI
  • Move to Stackage LTS 17.9
  • Update nix voodoo
  • Fix new failing tests.
  • Sync stack.yaml to cabal.project

Comments

@Anviking Anviking self-assigned this Apr 14, 2021
@Anviking Anviking force-pushed the anviking/ADP-845/cardano-node-1.26.1 branch from c0ff2a7 to 3f239f1 Compare April 14, 2021 21:11
@rvl rvl force-pushed the anviking/ADP-845/cardano-node-1.26.1 branch from 506b5ac to 3e2ef78 Compare April 15, 2021 06:46
@Anviking Anviking force-pushed the anviking/ADP-845/cardano-node-1.26.1 branch from 6c57ccf to 0f48cb6 Compare April 15, 2021 17:08
@rvl rvl force-pushed the anviking/ADP-845/cardano-node-1.26.1 branch 3 times, most recently from 4359f9d to 206015a Compare April 19, 2021 00:40
@Anviking Anviking force-pushed the anviking/ADP-845/cardano-node-1.26.1 branch 2 times, most recently from ee44467 to 044dcd0 Compare April 19, 2021 18:13
@Anviking Anviking marked this pull request as ready for review April 19, 2021 18:13
@Anviking Anviking changed the title Bump cardano-node to 1.26.1 Bump cardano-node to 1.26.2 Apr 19, 2021
@Anviking
Copy link
Member Author

bors try

iohk-bors bot added a commit that referenced this pull request Apr 19, 2021
@iohk-bors
Try #2612:
4ec437d
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Apr 19, 2021

try

Build failed:

@Anviking Anviking force-pushed the anviking/ADP-845/cardano-node-1.26.1 branch from 1bffc51 to 1f6f635 Compare April 20, 2021 11:16
@Anviking
Copy link
Member Author

bors try

iohk-bors bot added a commit that referenced this pull request Apr 20, 2021
@iohk-bors
Try #2612:
9f74725
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Apr 20, 2021

try

Build failed:

@Anviking Anviking force-pushed the anviking/ADP-845/cardano-node-1.26.1 branch from 1f6f635 to 61274ac Compare April 20, 2021 11:27
@Anviking
Copy link
Member Author

bors try

iohk-bors bot added a commit that referenced this pull request Apr 20, 2021
@iohk-bors
Try #2612:
f3c685d
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Apr 20, 2021

try

Build failed:

@Anviking Anviking requested a review from rvl April 20, 2021 17:04
@Anviking
Copy link
Member Author

bors try

iohk-bors bot added a commit that referenced this pull request Apr 20, 2021
@iohk-bors
Try #2612:
0156da6
@Anviking
Copy link
Member Author

bors try-

@Anviking
Copy link
Member Author

bors try

iohk-bors bot added a commit that referenced this pull request Apr 20, 2021
@iohk-bors
Try #2612:
3d5da2a
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Apr 20, 2021

try

Build failed:

Anviking and others added 15 commits April 21, 2021 09:35
@Anviking @rvl
Bump cardano-node to 1.26.1
5788157 
Fix HLint warning
@Anviking @rvl
Update version matrix in README.md
608e7d4
@rvl
stack.yaml: Drop some deps which are now in the resolver yaml
01a63a1
@rvl
Update cardano-addresses to tagged revision
4d561f0
@rvl
Bump Haskell.nix to get latest Stackage and Hackage
d83ecfb
@rvl
nix/build-tools-overlay.nix: Fix a bug
28976d4
@Anviking @rvl
Remove cardano-transactions dependency and tests
6596f92 
Co-Authored-By: Rodney Lorrimar <[email protected]>
@rvl
stack: Bump snapshot to cardano-node-1.26.2
1942a7c
@rvl
Regenerate nix
29c63fb
@rvl
CLISpec: Update "cardano-wallet address key" help text
38538ab
@Anviking @rvl
Remove cardanoCliEra from cluster setup
3231b9b
@Anviking @rvl
Fix stake address for test cluster setup
6624638
@rvl
Sync cabal.project with stack.yaml
d887719 
Updated by running stack2cabal and discarding all changes except git
revs.
@Anviking @rvl
Try allow-newer for cardano-api and aeson
3225387 
To workaround

$ nix-shell nix/cabal-shell.nix --run "cabal v2-configure -frelease --enable-tests --enable-benchmarks"

HEAD is now at 41971b6 Merge pull request #124 from input-output-hk/dependabot/bundler/test/e2e/rake-12.3.3
'cabal.project.local' file already exists. Now overwriting it.
Warning: The package list for 'hackage.haskell.org' is 34 days old.
Run 'cabal update' to get the latest list of available packages.
Warning: Requested index-state2021-03-11T00:00:00Z is newer than
'hackage.haskell.org'! Falling back to older state (2021-03-10T23:06:54Z).
Resolving dependencies...
cabal: Could not resolve dependencies:
[__0] trying: Win32-network-0.1.0.0 (user goal)
[__1] trying: base-4.14.1.0/installed-4.14.1.0 (dependency of Win32-network)
[__2] trying: cardano-addresses-3.3.0 (user goal)
[__3] rejecting: cardano-addresses:!test (constraint from config file, command
line flag, or user target requires opposite flag selection)
[__3] trying: cardano-addresses:*test
[__4] next goal: aeson (dependency of cardano-addresses)
[__4] rejecting: aeson-1.5.6.0, aeson-1.5.5.1, aeson-1.5.5.0, aeson-1.5.4.1,
aeson-1.5.4.0, aeson-1.5.3.0, aeson-1.5.2.0, aeson-1.5.1.0, aeson-1.5.0.0
(conflict: cardano-addresses *test => aeson>=1.4.6.0 && <1.5.0.0)
[__4] trying: aeson-1.4.7.1
[__5] next goal: cardano-api (user goal)
[__5] rejecting: cardano-api-1.26.2 (conflict: aeson==1.4.7.1, cardano-api =>
aeson>=1.5.6.0)
[__5] fail (backjumping, conflict set: aeson, cardano-api)
After searching the rest of the dependency tree exhaustively, these were the
goals I've had most trouble fulfilling: aeson, cardano-addresses:test,
cardano-addresses, cardano-api, base, Win32-network
Try running with --minimize-conflict-set to improve the error message.
@rvl
Rework cabal.project constraints
452975f
@rvl rvl force-pushed the anviking/ADP-845/cardano-node-1.26.1 branch from 61274ac to 452975f Compare April 20, 2021 23:36
rvl
rvl approved these changes Apr 20, 2021
View reviewed changes
Copy link
Contributor

@rvl rvl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good stuff.
I rebased, updated the rev in stack.yaml to point to cardano-haskell master branch, and made the allow-newer tweaks in cabal.project more specific.

@rvl
Copy link
Contributor

rvl commented Apr 20, 2021

bors r+

iohk-bors bot added a commit that referenced this pull request Apr 20, 2021
@iohk-bors @Anviking @rvl
Merge #2612
a026937 
2612: Bump cardano-node to 1.26.2 r=rvl a=Anviking

# Issue Number

ADP-845

# Overview

Updates from 1.25.1 to [1.26.2](https://github.com/input-output-hk/cardano-node/releases/tag/1.26.2).

- [x] Get things compiling.
- [x] Remove TRANS_EXTERNAL tests to drop cardano-transaction dependency
- [x] Fix any warnings etc in CI 
- [x] Move to Stackage LTS 17.9
- [x] Update nix voodoo
- [x] Fix new failing tests.
- [x] Sync `stack.yaml` to `cabal.project`

# Comments

- Depends on input-output-hk/cardano-haskell#44
- Depends on input-output-hk/cardano-haskell#45


Co-authored-by: Johannes Lund <[email protected]>
Co-authored-by: Rodney Lorrimar <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Apr 21, 2021 •
edited by Anviking
Loading

Build failed:

  src/Test/Integration/Scenario/API/Shelley/StakePools.hs:344:26: 
  1) API Specifications, SHELLEY_STAKE_POOLS, STAKE_POOLS_JOIN_01rewards - Can join a pool, earn rewards and collect them
       While verifying (Status {statusCode = 200, statusMessage = "OK"},Right (ApiWallet {id = ApiT {getApiT = WalletId {getWalletId = 748a99c2328eed6609b525d9733505371bf974f2}}, addressPoolGap = ApiT {getApiT = AddressPoolGap {getAddressPoolGap = 20}}, balance = ApiWalletBalance {available = Quantity {getQuantity = 999998774559}, total = Quantity {getQuantity = 1000009083625}, reward = Quantity {getQuantity = 10309066}}, assets = ApiWalletAssetsBalance {available = ApiT {getApiT = TokenMap (fromList [])}, total = ApiT {getApiT = TokenMap (fromList [])}}, delegation = ApiWalletDelegation {active = ApiWalletDelegationNext {status = Delegating, target = Just (ApiT {getApiT = PoolId {getPoolId = "\236(\243=\203\230\214@\n\RS^3\155\208d|\ts\202l\f\249\194\187\230\131\141\198"}}), changesAt = Nothing}, next = []}, name = ApiT {getApiT = WalletName {getWalletName = "Faucet Wallet"}}, passphrase = Just (ApiWalletPassphraseInfo {lastUpdatedAt = 2021-04-21 00:13:24.70013867 UTC}), state = ApiT {getApiT = Ready}, tip = ApiBlockReference {absoluteSlotNumber = ApiT {getApiT = SlotNo 6902}, slotId = ApiSlotId {epochNumber = ApiT {getApiT = EpochNo {unEpochNo = 138}}, slotNumber = ApiT {getApiT = SlotInEpoch {unSlotInEpoch = 2}}}, time = 2021-04-21 00:15:46.4 UTC, block = ApiBlockInfo {height = Quantity {getQuantity = 3537}}}}))
       Waited longer than 90s to resolve action: "Wallet has consumed rewards".
[cardano-wallet.network:Warning:1882] [2021-04-21 00:24:06.44 UTC] Connection lost with the node. writev: resource vanished (Broken pipe)
       expected: Quantity {getQuantity = 0}
        but got: Quantity {getQuantity = 10309066}

#2467

@rvl
Copy link
Contributor

rvl commented Apr 21, 2021

bors r+

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Apr 21, 2021

Build succeeded:

@iohk-bors iohk-bors bot merged commit d136432 into master Apr 21, 2021
@iohk-bors iohk-bors bot deleted the anviking/ADP-845/cardano-node-1.26.1 branch April 21, 2021 05:27
Anviking added a commit that referenced this pull request Aug 25, 2021
@Anviking
Add missing Alonzo-case in decodeSignedTx
82d4afc 
1. Add missing Alonzo-case in decodeSignedTx, breaking the /v2/proxy/transactions
   endpoint.
2. Replace the wildcard `_` with a case for Byron, such that we don't
   repeat the mistake for future eras.

   Although, the decodeSignedTx will be simplified before then anyway.

We used to have integration tests for external tx submission, but they
were removed in #2612 to drop the cardano-transactions dependency.

This fix is not yet tested. I believe, with the tx rework, all txs will
be submitted through the external endpoint anyway. So then we will have
good coverage. For now perhaps a quick check is enough?
@Anviking Anviking mentioned this pull request Aug 25, 2021
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rvl rvl rvl approved these changes

Assignees

@Anviking Anviking

@rvl rvl

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Anviking @rvl