diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 136ed78db96..855a042177d 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -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: [] @@ -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: @@ -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: [] @@ -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: | @@ -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: diff --git a/README.md b/README.md index fb42270a2ca..58e8679f41b 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/cabal.project b/cabal.project index f147e29c4aa..1244d0b1410 100644 --- a/cabal.project +++ b/cabal.project @@ -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 @@ -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 @@ -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. diff --git a/flake.lock b/flake.lock index 393125edd8e..bcdb8f286b0 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1727364445, - "narHash": "sha256-i/m1fmNx0BQbRvHz9ZbY6t0I5BGqwyCA/Jd/BL1Lp0Q=", + "lastModified": 1730295876, + "narHash": "sha256-ijnHTQ6eKIQ9FpEqDKt6c7vuFYN8aOBDhonp67utx2s=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "a28f93d778031ddabda3ac1aef9616ae933eea82", + "rev": "25591f43ab943d5a070db5e8a2b9ff3a499d4d92", "type": "github" }, "original": { @@ -775,11 +775,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1723163183, - "narHash": "sha256-sE4XQVbluIlaBFPZ+JYIGum8RwnIBezx+XIt1FpEXUw=", + "lastModified": 1730334523, + "narHash": "sha256-m3YpA8tDs3EA3UZZy8U9hDT4NJuKuwi67qnGAwMBdMw=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "f318344f0ba597c523d69c417894054be969880a", + "rev": "49a85d9969134eac18146e75d99e67dc454cfa34", "type": "github" }, "original": { diff --git a/justfile b/justfile index 7aa3f374491..94d2534bf86 100644 --- a/justfile +++ b/justfile @@ -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: diff --git a/lib/balance-tx/test/spec/Internal/Cardano/Write/Tx/BalanceSpec.hs b/lib/balance-tx/test/spec/Internal/Cardano/Write/Tx/BalanceSpec.hs index 59a3a7cd801..323fa2938a6 100644 --- a/lib/balance-tx/test/spec/Internal/Cardano/Write/Tx/BalanceSpec.hs +++ b/lib/balance-tx/test/spec/Internal/Cardano/Write/Tx/BalanceSpec.hs @@ -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 @@ -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 diff --git a/lib/cardano-api-extra/lib/Cardano/Api/Gen.hs b/lib/cardano-api-extra/lib/Cardano/Api/Gen.hs index 6d49c91e03b..1c517a64e36 100644 --- a/lib/cardano-api-extra/lib/Cardano/Api/Gen.hs +++ b/lib/cardano-api-extra/lib/Cardano/Api/Gen.hs @@ -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 @@ -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 @@ -1816,6 +1830,7 @@ genTxBodyContent era = withEraWitness era $ \sbe -> do , Api.txVotingProcedures , Api.txCurrentTreasuryValue , Api.txTreasuryDonation + , Api.txSupplementalData } let witnesses = collectTxBodyScriptWitnesses sbe txBody diff --git a/lib/wallet/src/Cardano/Wallet/Shelley/Transaction.hs b/lib/wallet/src/Cardano/Wallet/Shelley/Transaction.hs index 5cc0f5ec0d8..8d30f270a57 100644 --- a/lib/wallet/src/Cardano/Wallet/Shelley/Transaction.hs +++ b/lib/wallet/src/Cardano/Wallet/Shelley/Transaction.hs @@ -963,6 +963,7 @@ mkUnsignedTx Nothing , txCurrentTreasuryValue = Nothing , txTreasuryDonation = Nothing + , txSupplementalData = Cardano.BuildTxWith Cardano.TxSupplementalDataNone } where era = Write.recentEra @era diff --git a/nix/project-package-list.nix b/nix/project-package-list.nix index 4e5def2b7f5..a24396101f7 100644 --- a/nix/project-package-list.nix +++ b/nix/project-package-list.nix @@ -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" ] diff --git a/nix/project-package-list.nix.new b/nix/project-package-list.nix.new deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/run/common/docker/run.sh b/run/common/docker/run.sh index bc2d6347bee..7ee1ac5041d 100755 --- a/run/common/docker/run.sh +++ b/run/common/docker/run.sh @@ -1,7 +1,7 @@ #! /bin/bash # Enforce strict script execution modes -set -euox pipefail +set -euo pipefail # Function to display usage information usage() { @@ -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 diff --git a/scripts/buildkite/main/docker-smoke-test.sh b/scripts/buildkite/main/docker-smoke-test.sh index 0601de0d118..c175ef29ce1 100755 --- a/scripts/buildkite/main/docker-smoke-test.sh +++ b/scripts/buildkite/main/docker-smoke-test.sh @@ -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" diff --git a/scripts/buildkite/release/docker-smoke-test.sh b/scripts/buildkite/release/docker-smoke-test.sh index 9ca4e039710..47c4a22aaa3 100755 --- a/scripts/buildkite/release/docker-smoke-test.sh +++ b/scripts/buildkite/release/docker-smoke-test.sh @@ -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" diff --git a/scripts/release-candidate.sh b/scripts/release-candidate.sh index d054f7c2b6b..d69a510857b 100755 --- a/scripts/release-candidate.sh +++ b/scripts/release-candidate.sh @@ -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" diff --git a/test/e2e/README.md b/test/e2e/README.md index 97ad31bcc45..bc821e3479d 100644 --- a/test/e2e/README.md +++ b/test/e2e/README.md @@ -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 diff --git a/test/e2e/docker_compose.sh b/test/e2e/docker_compose.sh index 77a9a9f2050..0b985fd2e39 100755 --- a/test/e2e/docker_compose.sh +++ b/test/e2e/docker_compose.sh @@ -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 \