Skip to content

Commit

Permalink
cardano-api: 10.1 (#1740)
Browse files Browse the repository at this point in the history
<!-- Describe your change here -->

---

<!-- Consider each and tick it off one way or the other -->
* [ ] CHANGELOG updated or not needed
* [ ] Documentation updated or not needed
* [ ] Haddocks updated or not needed
* [ ] No new TODOs introduced or explained herafter
  • Loading branch information
locallycompact authored Nov 19, 2024
2 parents 7adc132 + 9ff3c8a commit 264d68f
Show file tree
Hide file tree
Showing 39 changed files with 9,816 additions and 19,040 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-tutorial.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
with open("hydra-cluster/test/Test/CardanoNodeSpec.hs", "r") as cardanoNodeSpecFile:
body = cardanoNodeSpecFile.read()
expectedCardanoNodeVersion = re.findall(r"supportedCardanoNodeVersion.*([0-9]+\.[0-9]+\.[0-9]+)", body)[0]
expectedCardanoNodeVersion = re.findall(r"supportedCardanoNodeVersion = \"([0-9]+\.[0-9]+\.[0-9]+)", body)[0]
print("Checking used cardano-node versions")
if len(usedCardanoNodeVersions) > 0 and all(v == expectedCardanoNodeVersion for v in usedCardanoNodeVersions):
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ changes.
Missing off-chain items to implement as a series of next PR's:
- Revisit types related to observations/posting transactions and make sure the fields are named appropriatelly

- Tested with `cardano-node 9.2.0` and `cardano-cli 9.4.1.0`.
- Tested with `cardano-node 10.1.2` and `cardano-cli 10.1.1.0`.

- **BREAKING** Rewrite of the commit script in aiken:
- This makes `abort` and `collectCom` transactions more efficient and results
Expand Down
8 changes: 6 additions & 2 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ repository cardano-haskell-packages

-- See CONTRIBUTING.md for information about when and how to update these.
index-state:
, hackage.haskell.org 2024-10-14T02:12:15Z
, cardano-haskell-packages 2024-10-11T15:49:11Z
, hackage.haskell.org 2024-11-12T16:26:18Z
, cardano-haskell-packages 2024-11-12T08:40:13Z

packages:
hydra-prelude
Expand Down Expand Up @@ -41,3 +41,7 @@ test-show-details: direct

program-options
ghc-options: -fwrite-ide-info

constraints:
quickcheck-instances==0.3.31,
data-default==0.7.1.3
2 changes: 1 addition & 1 deletion demo/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
cardano-node:
image: ghcr.io/intersectmbo/cardano-node:9.2.0
image: ghcr.io/intersectmbo/cardano-node:10.1.2
volumes:
- ./devnet:/devnet
environment:
Expand Down
4 changes: 2 additions & 2 deletions docs/docs/tutorial/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ that you have a good version of jq with this command:
mkdir -p bin
hydra_version=0.19.0
mithril_version=2437.1
cardano_node_version=9.2.0
cardano_node_version=10.1.2
curl -L -O https://github.com/cardano-scaling/hydra/releases/download/${hydra_version}/hydra-x86_64-linux-${hydra_version}.zip
unzip -d bin hydra-x86_64-linux-${hydra_version}.zip
curl -L -O https://github.com/IntersectMBO/cardano-node/releases/download/${cardano_node_version}/cardano-node-${cardano_node_version}-linux.tar.gz
Expand All @@ -65,7 +65,7 @@ chmod +x bin/*
mkdir -p bin
hydra_version=0.19.0
mithril_version=2437.1
cardano_node_version=9.2.0
cardano_node_version=10.1.2
curl -L -O https://github.com/cardano-scaling/hydra/releases/download/${hydra_version}/hydra-aarch64-darwin-${hydra_version}.zip
unzip -d bin hydra-aarch64-darwin-${hydra_version}.zip
curl -L -O https://github.com/IntersectMBO/cardano-node/releases/download/${cardano_node_version}/cardano-node-${cardano_node_version}-macos.tar.gz
Expand Down
89 changes: 36 additions & 53 deletions flake.lock

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

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
url = "github:haskell/haskell-language-server";
flake = false;
};
cardano-node.url = "github:intersectmbo/cardano-node/9.2.0";
cardano-node.url = "github:intersectmbo/cardano-node/10.1.2";
mithril.url = "github:input-output-hk/mithril/2442.0";
nix-npm-buildpackage.url = "github:serokell/nix-npm-buildpackage";
};
Expand Down
2 changes: 1 addition & 1 deletion hydra-cardano-api/hydra-cardano-api.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ library
, base >=4.16
, base16-bytestring
, bytestring
, cardano-api ^>=9.4
, cardano-api ^>=10.1
, cardano-binary
, cardano-crypto-class
, cardano-ledger-allegra
Expand Down
2 changes: 1 addition & 1 deletion hydra-cluster/datasets/1-node.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion hydra-cluster/datasets/3-nodes.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion hydra-cluster/test/Test/CardanoNodeSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ supportedNetworks :: [KnownNetwork]
supportedNetworks = [Mainnet, Preproduction, Preview, Sanchonet]

supportedCardanoNodeVersion :: String
supportedCardanoNodeVersion = "9.2.0"
supportedCardanoNodeVersion = "10.1.2"

forSupportedKnownNetworks :: String -> (KnownNetwork -> IO ()) -> Spec
forSupportedKnownNetworks msg action = forEachKnownNetwork msg $ \network -> do
Expand Down
5 changes: 3 additions & 2 deletions hydra-cluster/test/Test/Hydra/Cluster/CardanoCliSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec =
Just something -> something == "Witnessed Tx ConwayEra"

it "has expected cardano-cli version available" $
readProcess "cardano-cli" ["--version"] "" >>= (`shouldContain` "9.4.1.0")
readProcess "cardano-cli" ["--version"] "" >>= (`shouldContain` "10.1.1.0")

around (showLogsOnFailure "CardanoCliSpec") $ do
it "query protocol-parameters is compatible with our FromJSON instance" $ \tracer ->
Expand All @@ -58,7 +58,8 @@ spec =
cardanoCliSign txFile =
proc
"cardano-cli"
[ "transaction"
[ "conway"
, "transaction"
, "sign"
, "--tx-file"
, txFile
Expand Down
Loading

0 comments on commit 264d68f

Please sign in to comment.