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

merge master into pact5 #2037

Merged
merged 7 commits into from
Nov 12, 2024
+6 −7
Merged

merge master into pact5 #2037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e5a05c6
pact version that support hashable-1.5
larskuhtz Nov 3, 2024
3686dea
update cabal.project.freeze
chessai Nov 4, 2024
343b6e3
update pact pin
larskuhtz Nov 4, 2024
cd7b4dc
update nix hackage index
chessai Nov 4, 2024
7eea51a
Typos Update README.md (#2032)
mdqst Nov 12, 2024
e3447f2
Revert "revert rosetta test changes based on hashable update"
larskuhtz Nov 3, 2024
33a00af
Merge branch 'master' into lars/pact5
larskuhtz Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Read our [whitepapers](https://www.kadena.io/whitepapers):
- [Chainweb: A Proof-of-Work Parallel-Chain Architecture for Massive Throughput](https://d31d887a-c1e0-47c2-aa51-c69f9f998b07.filesusr.com/ugd/86a16f_029c9991469e4565a7c334dd716345f4.pdf)
- [Agent-based Simulations of Blockchain Protocols illustrated via Kadena's *Chainweb*](https://d31d887a-c1e0-47c2-aa51-c69f9f998b07.filesusr.com/ugd/86a16f_3b2d0c58179d4edd9df6df4d55d61dda.pdf)

For additional information, press, and development inquires, please refer to the Kadena [website](https://kadena.io)
For additional information, press, and development inquiries, please refer to the Kadena [website](https://kadena.io)

## Table of Contents

Expand Down Expand Up @@ -103,7 +103,7 @@ At this point, you are ready to [run a Chainweb node](#configuring-running-and-m

## Building from Source

*IMPORTANT NODE: We recommend the use of officially released chainweb-node
*IMPORTANT NOTE: We recommend the use of officially released chainweb-node
binaries or docker images, which can be found in the
[release section of this
repository](https://github.com/kadena-io/chainweb-node/releases).
Expand Down
3 changes: 1 addition & 2 deletions cabal.project.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,7 @@ constraints: any.Cabal ==3.12.1.0,
any.groups ==0.5.3,
any.growable-vector ==0.1,
any.half ==0.3.1,
any.happy ==1.20.1.1 || ==2.1.2,
any.happy-lib ==2.1.2,
any.happy ==1.20.1.1,
any.hashable ==1.5.0.0,
hashable -arch-native -random-initial-seed,
any.hashes ==0.3.0,
Expand Down
6 changes: 3 additions & 3 deletions flake.lock
View file
Open in desktop

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

Loading