Skip to content

Commit

Permalink
[ADP-3472] Bump node dependencies to 10.1.1 (#4826)
Browse files Browse the repository at this point in the history
- Bump ouroboros-network dep to 0.17.1.2
- Bump node runtime version to 10.1.1

ADP-3472
  • Loading branch information
paolino authored Nov 1, 2024
2 parents e402ecd + 3384d9f commit af05bcf
Show file tree
Hide file tree
Showing 16 changed files with 44 additions and 94 deletions.
68 changes: 1 addition & 67 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,24 +143,6 @@ steps:
concurrency: 1
concurrency_group: 'linux-e2e-tests'

- label: Private Network Full Sync
timeout_in_minutes: 30
depends_on: []
command: |
rm -rf run/private/nix/logs
mkdir -p run/private/nix/logs
rm -rf run/private/nix/databases
cd run/private/nix && ./run.sh sync
artifact_paths:
- "./run/private/nix/logs/*"
agents:
system: x86_64-linux
env:
NODE_LOGS_FILE: ./logs/node.log
WALLET_LOGS_FILE: ./logs/wallet.log
CLEANUP_DB: true
NETWORK: testnet

- label: Preview Network Boot Sync
timeout_in_minutes: 2
depends_on: []
Expand All @@ -171,7 +153,7 @@ steps:
rm -rf databases
./run.sh sync
artifact_paths:
- "./run/private/nix/logs/*"
- "./run/preview/nix/logs/*"
agents:
system: x86_64-linux
env:
Expand Down Expand Up @@ -233,30 +215,6 @@ steps:
concurrency: 1
concurrency_group: 'mithril-mainnet-full-sync'

- block: Sanchonet Full Sync
if: build.env("RELEASE_CANDIDATE") == null
depends_on: []
key: linux-sanchonet-full-sync-block

- label: Sanchonet Full Sync
depends_on:
- linux-sanchonet-full-sync-block
timeout_in_minutes: 120
command: |
rm -rf run/sanchonet/nix/logs
mkdir -p run/sanchonet/nix/logs
rm -rf run/sanchonet/nix/databases
cd run/sanchonet/nix && ./run.sh sync
artifact_paths:
- "./run/sanchonet/nix/logs/*"
agents:
system: x86_64-linux
env:
NODE_LOGS_FILE: ./logs/node.log
WALLET_LOGS_FILE: ./logs/wallet.log
CLEANUP_DB: true
NETWORK: testnet

- block: Preprod Full Sync
if: build.env("RELEASE_CANDIDATE") == null
depends_on: []
Expand Down Expand Up @@ -761,18 +719,6 @@ steps:
concurrency: 1
concurrency_group: 'mithril-mainnet-full-sync'

- label: Private Network Full Sync
timeout_in_minutes: 30
command: |
cd run/private/docker
export WALLET_TAG=$(buildkite-agent meta-data get "release-cabal-version")
rm -rf databases
./run.sh sync
agents:
system: x86_64-linux
env:
USE_LOCAL_IMAGE: true

- label: Preview Network Boot Sync
timeout_in_minutes: 30
command: |
Expand All @@ -786,18 +732,6 @@ steps:
SUCCESS_STATUS: syncing
USE_LOCAL_IMAGE: true

- label: Sanchonet Full Sync
timeout_in_minutes: 240
command: |
cd run/sanchonet/docker
export WALLET_TAG=$(buildkite-agent meta-data get "release-cabal-version")
rm -rf databases
./run.sh sync
agents:
system: x86_64-linux
env:
USE_LOCAL_IMAGE: true

- label: Preprod Full Sync
timeout_in_minutes: 240
soft_fail:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Or modify the `docker-compose.yml` to host your client in the `mainnet_default`

### Running on preprod

Preprod network is broken for node 9.1.0 at some block in the past.
Preprod network is broken for node 10.1.1 at some block in the past.
One way to overcome that limitation is to download a snapshot that used an old version node (1.35.2)
to trespass that point.
Use `snpashot.sh` to download the snapshot.
Expand Down
10 changes: 5 additions & 5 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ repository cardano-haskell-packages
d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee

-- repeating the index-state for hackage to work around hackage.nix parsing limitation
index-state: 2024-09-23T00:00:00Z
index-state: 2024-10-10T00:52:24Z

index-state:
, hackage.haskell.org 2024-09-23T00:00:00Z
, cardano-haskell-packages 2024-09-23T21:46:49Z
, hackage.haskell.org 2024-10-10T00:52:24Z
, cardano-haskell-packages 2024-10-23T20:55:17Z

packages:
lib/address-derivation-discovery
Expand Down Expand Up @@ -187,7 +187,7 @@ constraints:
, io-classes >= 1.4
, io-classes -asserts

, ouroboros-network == 0.17.1.1
, ouroboros-network == 0.17.1.2


-- Related to: https://github.com/haskell/cabal/issues/8554
Expand Down Expand Up @@ -296,7 +296,7 @@ package wai-middleware-logging

package cardano-wallet-ui
tests: True

-- Now disable all other tests with a global flag.
-- This is what they do in cardano-node/cabal.project.

Expand Down
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,12 @@ integration-tests match:
-c integration-exe -j 2 --match="{{match}}"


# start a shell with 9.1.0 in scope
# start a shell with 10.1.1 in scope
node-910:
nix shell \
--accept-flake-config \
'github:IntersectMBO/cardano-node?ref=9.1.0#cardano-node' \
'github:IntersectMBO/cardano-node?ref=9.1.0#cardano-cli'
'github:IntersectMBO/cardano-node?ref=10.1.1#cardano-node' \
'github:IntersectMBO/cardano-node?ref=10.1.1#cardano-cli'

# run babbage integration tests matching the given pattern via nix
babbage-integration-tests-match match:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ import qualified Cardano.Address as CA
import qualified Cardano.Address.Derivation as CA
import qualified Cardano.Address.Style.Shelley as Shelley
import qualified Cardano.Api as CardanoApi
import qualified Cardano.Api.Byron as CardanoApi
import qualified Cardano.Api.Byron as ByronApi
import qualified Cardano.Api.Gen as CardanoApi
import qualified Cardano.Api.Shelley as CardanoApi
import qualified Cardano.Chain.Common as Byron
Expand Down Expand Up @@ -1637,7 +1637,7 @@ prop_bootstrapWitnesses

addrAttr = Byron.mkAttributes $ Byron.AddrAttributes
(toHDPayloadAddress addr)
(CardanoApi.toByronNetworkMagic network)
(ByronApi.toByronNetworkMagic network)

-- TODO [ADO-2997] Test this property in all recent eras.
-- https://cardanofoundation.atlassian.net/browse/ADP-2997
Expand Down
19 changes: 17 additions & 2 deletions lib/cardano-api-extra/lib/Cardano/Api/Gen.hs
Original file line number Diff line number Diff line change
Expand Up @@ -1760,6 +1760,19 @@ genVotingProcedures w = case w of
, pure TxVotingProceduresNone
]

genSupplementalData
:: CardanoEra era
-> ( Gen
(BuildTxWith BuildTx (ShelleyApi.TxSupplementalDatums era2))
)
genSupplementalData era = fmap BuildTxWith
$ flip (inEonForEra (pure ShelleyApi.TxSupplementalDataNone)) era
$ \case
ConwayEraOnwardsConway -> oneof
[ pure ShelleyApi.TxSupplementalDataNone
, ShelleyApi.TxSupplementalDatums <$> listOf genHashableScriptData
]

genTxBodyContent :: CardanoEra era -> Gen (TxBodyContent BuildTx era)
genTxBodyContent era = withEraWitness era $ \sbe -> do
txIns <- scale (`div` 3) $ do
Expand All @@ -1782,9 +1795,10 @@ genTxBodyContent era = withEraWitness era $ \sbe -> do
txValidityUpperBound <- genTxValidityUpperBound era
txProposalProcedures <- genMaybeFeaturedInEra genProposals era
txVotingProcedures <- genMaybeFeaturedInEra genVotingProcedures era
txCurrentTreasuryValue <- genMaybeFeaturedInEra (const (pure <$> genCoin)) era
txCurrentTreasuryValue <-
genMaybeFeaturedInEra (const (pure <$> genCoin)) era
txTreasuryDonation <- genMaybeFeaturedInEra (const genCoin) era

txSupplementalData <- genSupplementalData era
let
txBody =
TxBodyContent
Expand Down Expand Up @@ -1816,6 +1830,7 @@ genTxBodyContent era = withEraWitness era $ \sbe -> do
, Api.txVotingProcedures
, Api.txCurrentTreasuryValue
, Api.txTreasuryDonation
, Api.txSupplementalData
}

let witnesses = collectTxBodyScriptWitnesses sbe txBody
Expand Down
1 change: 1 addition & 0 deletions lib/wallet/src/Cardano/Wallet/Shelley/Transaction.hs
Original file line number Diff line number Diff line change
Expand Up @@ -963,6 +963,7 @@ mkUnsignedTx
Nothing
, txCurrentTreasuryValue = Nothing
, txTreasuryDonation = Nothing
, txSupplementalData = Cardano.BuildTxWith Cardano.TxSupplementalDataNone
}
where
era = Write.recentEra @era
Expand Down
2 changes: 1 addition & 1 deletion nix/project-package-list.nix
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[ "address-derivation-discovery" "cardano-api-extra" "cardano-balance-tx" "cardano-coin-selection" "cardano-numeric" "cardano-wallet" "cardano-wallet-api" "cardano-wallet-benchmarks" "cardano-wallet-blackbox-benchmarks" "cardano-wallet-integration" "cardano-wallet-launcher" "cardano-wallet-network-layer" "cardano-wallet-primitive" "cardano-wallet-secrets" "cardano-wallet-test-utils" "cardano-wallet-unit" "customer-deposit-wallet" "delta-chain" "delta-store" "delta-table" "delta-types" "faucet" "local-cluster" "text-class" "wai-middleware-logging" ]
[ "address-derivation-discovery" "cardano-api-extra" "cardano-balance-tx" "cardano-coin-selection" "cardano-numeric" "cardano-wallet" "cardano-wallet-api" "cardano-wallet-benchmarks" "cardano-wallet-blackbox-benchmarks" "cardano-wallet-integration" "cardano-wallet-launcher" "cardano-wallet-network-layer" "cardano-wallet-primitive" "cardano-wallet-read" "cardano-wallet-secrets" "cardano-wallet-test-utils" "cardano-wallet-unit" "customer-deposit-wallet" "delta-chain" "delta-store" "delta-table" "delta-types" "faucet" "local-cluster" "text-class" "wai-middleware-logging" ]
Empty file removed nix/project-package-list.nix.new
Empty file.
4 changes: 2 additions & 2 deletions run/common/docker/run.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /bin/bash

# Enforce strict script execution modes
set -euox pipefail
set -euo pipefail

# Function to display usage information
usage() {
Expand Down Expand Up @@ -29,7 +29,7 @@ RELEASE_WALLET_TAG=2024.7.27
WALLET_TAG=${WALLET_TAG:=$RELEASE_WALLET_TAG}
export WALLET_TAG

NODE_TAG=9.1.0
NODE_TAG=10.1.1
export NODE_TAG

# Generate a random port for the wallet service and export it
Expand Down
2 changes: 1 addition & 1 deletion scripts/buildkite/main/docker-smoke-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ rsync -a --delete "$NODE_STATE_DIR/db/" "$TESTS_NODE_DB"
WALLET_TAG=$(buildkite-agent meta-data get "release-cabal-version")
export WALLET_TAG

NODE_TAG="9.1.0"
NODE_TAG="10.1.1"
export NODE_TAG

NODE_DB="$TESTS_NODE_DB"
Expand Down
2 changes: 1 addition & 1 deletion scripts/buildkite/release/docker-smoke-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ rsync -a --delete "$NODE_STATE_DIR/db/" "$TESTS_NODE_DB"
WALLET_TAG=$(buildkite-agent meta-data get "release-cabal-version")
export WALLET_TAG

NODE_TAG="9.1.0"
NODE_TAG="10.1.1"
export NODE_TAG

NODE_DB="$TESTS_NODE_DB"
Expand Down
2 changes: 1 addition & 1 deletion scripts/release-candidate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ echo "OLD_GIT_TAG=$OLD_GIT_TAG"
OLD_CABAL_VERSION=$(tag_cabal_ver "$OLD_GIT_TAG")
echo "OLD_CABAL_VERSION=$OLD_CABAL_VERSION"

CARDANO_NODE_TAG="9.1.0"
CARDANO_NODE_TAG="10.1.1"
echo "CARDANO_NODE_TAG=$CARDANO_NODE_TAG"

git checkout "$BASE_COMMIT"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ One can also start tests against cardano-wallet docker. There is docker-compose-
>NETWORK=preprod \
>TESTS_E2E_TOKEN_METADATA=https://metadata.world.dev.cardano.org/ \
>WALLET=dev-master \
>NODE=9.1.0 \
>NODE=10.1.1 \
>NODE_CONFIG_PATH=`pwd`/state/configs/$NETWORK \
>DATA=`pwd`/state/node_db/$NETWORK
>docker-compose -f docker-compose-test.yml up
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/docker_compose.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
NETWORK=preprod \
TESTS_E2E_TOKEN_METADATA=https://metadata.world.dev.cardano.org/ \
WALLET=dev-master \
NODE=9.1.0 \
NODE=10.1.1 \
NODE_CONFIG_PATH=`pwd`/state/configs/$NETWORK \
DATA=`pwd`/state/node_db/$NETWORK \
WALLET_DATA=`pwd`/state/wallet_db/$NETWORK \
Expand Down

0 comments on commit af05bcf

Please sign in to comment.