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.

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

feat: update dependencies in sync with node v9.1.0 & Conway support #327

Merged
merged 52 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
9d5024a
feat: update dependencies in sync with node v9.1.0
sourabhxyz Jul 30, 2024
17bd9f7
feat: feat: update dependencies in sync with node v9.1.0
sourabhxyz Jul 30, 2024
8016109
feat: update dependencies in sync with node v9.1.0
sourabhxyz Jul 30, 2024
4c0a2d8
chore: update `.gitignore` to ignore for `secrets` folder
sourabhxyz Jul 30, 2024
a2446e7
ci: no need to download node version
sourabhxyz Jul 30, 2024
2bbf7f4
test: update doctests
sourabhxyz Jul 31, 2024
b73bcd1
feat: wip support of conway
sourabhxyz Aug 14, 2024
a8dc9c0
feat: remove `GYEra`, abstract out api era type
sourabhxyz Aug 14, 2024
a368d7b
feat: clean out references to babbage
sourabhxyz Aug 14, 2024
32704c5
feat: further cleaning to make use of abstracted era type
sourabhxyz Aug 14, 2024
a5463f5
feat: remove no longer required constructors of `GYBuildTxError`
sourabhxyz Aug 14, 2024
91d32c1
feat: reviewed usage of alonzo related imports
sourabhxyz Aug 14, 2024
bab693a
feat: clean out usage of `unsafeCoerce`
sourabhxyz Aug 14, 2024
47da864
feat: clean cabal file and fix some of the warnings
sourabhxyz Aug 14, 2024
70e901f
Merge branch 'main' into update-node-9.1.0
sourabhxyz Aug 14, 2024
8f4d3f9
feat: add support of simple (native) scripts as part of UTxO referenc…
sourabhxyz Aug 15, 2024
3218ace
feat: update Maestro provider to make use of newer protocol-parameter…
sourabhxyz Aug 19, 2024
a62008e
feat: removed commented deprecated code block inside plutus version m…
sourabhxyz Aug 19, 2024
b8da9a7
feat: remove requirement of `getSlotOfCurrentBlock` in `makeGetParame…
sourabhxyz Aug 20, 2024
c4002ea
feat: hardcode missing protocol parameters
sourabhxyz Aug 20, 2024
edaa3cf
fix: remove usage of `undefined` for unpopulated fields, fix `committ…
sourabhxyz Aug 20, 2024
ccf8681
feat: updated privnet to Conway, fix privnet tests
sourabhxyz Aug 21, 2024
814ed3c
feat: add `MonadIO` instance for `GYTxBuilderMonadIO`, etc.
sourabhxyz Aug 21, 2024
bd066fb
feat: relax constraint of `someUTxOWithoutRefScript` to `GYTxUserQuer…
sourabhxyz Aug 22, 2024
6350d53
feat: add instances for `ExceptT GYTxMonadException ...`
sourabhxyz Aug 22, 2024
004f7cd
feat: add `Exception`, `IsGYApiError` instance for `GYBuildTxError`
sourabhxyz Aug 22, 2024
172a963
feat: relax constraints of some of the functions
sourabhxyz Aug 22, 2024
c484710
feat: add `sendSkeleton`, make use of `ownChangeAddress`
sourabhxyz Aug 22, 2024
8bf8bc2
feat: add back `logInfoS`
sourabhxyz Aug 22, 2024
c3e2ef0
feat: add `sendSkeleton'`
sourabhxyz Aug 23, 2024
7b3253c
feat(#326): update protocol parameters for privnet
sourabhxyz Aug 25, 2024
ffc995c
feat(#326): include PlutusV3 as a reference script when fetching UTxO…
sourabhxyz Aug 25, 2024
b1ca12b
feat(#326): fix tests inside `atlas-unified-tests`, add it to CI
sourabhxyz Aug 25, 2024
3658eb7
feat(#326): fix doc typos, remove `MonadIO` instance for some of the …
sourabhxyz Aug 26, 2024
34885c2
feat(#326): make `waitUntilSlot`, `waitForNextBlock` as part of `GYTx…
sourabhxyz Aug 26, 2024
c9cba1a
feat(#326): add back `MonadIO` instance for *monadio types
sourabhxyz Aug 26, 2024
fe20429
feat(#326): expose `sendSkeleton'`
sourabhxyz Aug 26, 2024
53cc045
feat(#326): remove instance of `Exception` and `IsGYApiError` for `GY…
sourabhxyz Aug 26, 2024
2f09f82
feat(#326): remove instances for `ExceptT GYTxMonadException...`
sourabhxyz Aug 26, 2024
6c7d7a3
feat(#326): update sha hash of deps (nix)
sourabhxyz Aug 26, 2024
174371d
feat(#326): add version bounds to cabal file
sourabhxyz Aug 26, 2024
19423dc
feat(#326): remove `MonadIO` instance, expose unsafe functions as an …
sourabhxyz Aug 26, 2024
05487e3
feat(#326): remove protocol parameters abstraction
sourabhxyz Aug 27, 2024
a56c7d4
feat(#326): update version to 0.6.0
sourabhxyz Aug 27, 2024
89978b2
feat(#326): module `GeniusYield.Unsafe` renamed to `GeniusYield.TxBui…
sourabhxyz Aug 28, 2024
34c7645
chore: add newline to `.gitignore`
sourabhxyz Aug 28, 2024
df17110
feat(#326): update deps reference in `cabal.project`
sourabhxyz Aug 28, 2024
5c0e557
Merge branch 'update-node-9.1.0' of github.com:geniusyield/atlas into…
sourabhxyz Aug 28, 2024
1ff14cd
docs(#326): update haddock of `withPrivnet`
sourabhxyz Aug 28, 2024
6f1f770
feat(#326): update `VersionIsGreaterOrEqual` etc. plutus version comp…
sourabhxyz Aug 28, 2024
5771ef4
feat(#326): update provider mashup test so that it succeeds for now
sourabhxyz Aug 29, 2024
cf3fa99
feat(#326): remove some compile time warnings and update doctests
sourabhxyz Aug 29, 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
12 changes: 4 additions & 8 deletions .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,10 @@ jobs:
run: cabal build --only-dependencies --enable-tests --enable-benchmarks
- name: Build all targets (cabal)
run: cabal build --enable-tests --enable-benchmarks all
- name: Symlink cardano-node binaries
run: cabal install --package-env=$(pwd) --overwrite-policy=always cardano-cli cardano-node
- name: Run privnet tests
run: cabal run atlas-privnet-tests -- -j1 --hide-successes
- name: Run all tests (cabal)
run: cabal run atlas-tests -- -j1 --hide-successes
- name: Run doctest (docspec)
Expand All @@ -182,14 +186,6 @@ jobs:
echo "===========================[ RUN DOCSPEC ]==========================="
./cabal-docspec -q --ignore-trailing-space
echo " ============================[ FINISHED ]============================"
- name: Install cardano-node
run: |
curl -sL https://github.com/input-output-hk/cardano-node/releases/download/8.1.2/cardano-node-8.1.2-linux.tar.gz > ./cardano-node.tar.gz
tar xf ./cardano-node.tar.gz -C $HOME/.local/bin
- name: Symlink cardano-node binaries
run: cabal install --package-env=$(pwd) --overwrite-policy=always cardano-cli cardano-node
- name: Run privnet tests
run: cabal run atlas-privnet-tests -- -j1 --hide-successes
- name: Run checks (cabal)
run: cabal check
- name: Create source distribution file (cabal)
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,6 @@ cabal.project.local~
maestro-config.json
blockfrost-config.json
*.skey
.direnv
.direnv
secrets/
sourabhxyz marked this conversation as resolved.
Show resolved Hide resolved
.vscode
122 changes: 61 additions & 61 deletions atlas-cardano.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ library
GeniusYield.Types.Certificate
GeniusYield.Types.Credential
GeniusYield.Types.Datum
GeniusYield.Types.Delegatee
GeniusYield.Types.DRep
GeniusYield.Types.Era
GeniusYield.Types.Key
GeniusYield.Types.Key.Class
Expand All @@ -126,6 +128,7 @@ library
GeniusYield.Types.OpenApi
GeniusYield.Types.PaymentKeyHash
GeniusYield.Types.PlutusVersion
GeniusYield.Types.ProtocolParameters
GeniusYield.Types.Providers
GeniusYield.Types.PubKeyHash
GeniusYield.Types.Rational
Expand Down Expand Up @@ -161,59 +164,59 @@ library
GeniusYield.TxBuilder.IO.Builder
GeniusYield.Utils
build-depends:
, async ^>=2.2.5
, aeson ^>=2.2.1.0
, attoparsec ^>=0.14.4
, base ^>=4.18.2.0
, base16-bytestring ^>=1.0.2.0
, blockfrost-client ^>=0.8.0.1
, bytestring ^>=0.11.4.0
, cache ^>=0.1.3.0
, cassava ^>=0.5.3.0
, cborg ^>=0.2.9.0
, containers ^>=0.6.5.1
, data-default ^>=0.7.1.1
, deriving-aeson ^>=0.2.9
, directory ^>=1.3.6.2
, either ^>=5.0.2
, filepath ^>=1.4.2.2
, hashable ^>=1.4.2.0
, hedgehog ^>=1.4
, hedgehog-extras ^>=0.6.1.0
, http-api-data ^>=0.6
, http-client ^>=0.7.13.1
, http-client-tls ^>=0.3.6.1
, http-types ^>=0.12.3
, indexed-traversable ^>=0.1.2.1
, katip ^>=0.8.7.4
, lens ^>=5.2.3
, MonadRandom ^>=0.6
, mtl ^>=2.3.1
, network-uri ^>=2.6.4.2
, postgresql-simple ^>=0.7.0.0
, prettyprinter ^>=1.7.1
, raven-haskell ^>=0.1.4.1
, resourcet ^>=1.3.0
, safe-money ^>=0.9.1
, scientific ^>=0.3.7.0
, servant ^>=0.20.1
, servant-client ^>=0.20
, servant-client-core ^>=0.20
, some ^>=1.0.5
, sop-extras ^>=0.1.0.0
, stm ^>=2.5.1.0
, string-conv ^>=0.2.0
, swagger2 ^>=2.8.7
, tasty ^>=1.5
, tasty-hunit ^>=0.10.0.3
, tasty-quickcheck ^>=0.10.2
, template-haskell ^>=2.20.0.0
, text ^>=2.0.2
, time ^>=1.12.2
, transformers ^>=0.6.1.0
, unordered-containers ^>=0.2.19.1
, vector ^>=0.13.1.0
, witherable ^>=0.4.2
, async
, aeson
, attoparsec
, auto-update
, base
, base16-bytestring
, blockfrost-client
, bytestring
, cache
, cassava
, cborg
, containers
, data-default
, deriving-aeson
, either
, hashable
, hedgehog
, hedgehog-extras
, http-api-data
, http-client
, http-client-tls
, http-types
, indexed-traversable
, katip
, lens
, MonadRandom
, mtl
, network-uri
, postgresql-simple
, prettyprinter
, raven-haskell >= 0.1.4.1
, resourcet
, safe-money
, scientific
, servant
, servant-client
, servant-client-core
, some
, sop-extras
, stm
, strict-mvar
, string-conv
, swagger2
, tasty
, tasty-hunit
, tasty-quickcheck
, template-haskell
, text
, time
, transformers
, unordered-containers
, vector
, witherable

-- Dependencies whose version is fixed/constrained by @cabal.project@ file.
build-depends:
Expand All @@ -233,13 +236,13 @@ library
, cardano-ledger-api
, cardano-ledger-core:{cardano-ledger-core, testlib}
, cardano-ledger-byron
, cardano-ledger-core
, cardano-ledger-conway
, cardano-ledger-shelley
, cardano-ledger-alonzo
, cardano-ledger-babbage
, cardano-ledger-binary
, cardano-ledger-shelley
, cardano-slotting
, cardano-strict-containers
, cardano-testnet
, cardano-wallet-primitive
, ouroboros-consensus
Expand Down Expand Up @@ -304,7 +307,6 @@ test-suite atlas-tests
, base
, bytestring
, cardano-api
, cardano-ledger-alonzo
, clb
, containers
, data-default
Expand All @@ -317,7 +319,6 @@ test-suite atlas-tests
, plutus-ledger-api
, plutus-tx
, plutus-tx-plugin
, some
, tasty
, tasty-hunit
, tasty-quickcheck
Expand All @@ -327,9 +328,9 @@ test-suite atlas-tests

-- Additional dependencies.
build-depends:
, QuickCheck ^>=2.14
, quickcheck-instances ^>=0.3
, tasty-golden ^>=2.3
, QuickCheck
, quickcheck-instances
, tasty-golden

test-suite atlas-privnet-tests
import: common
Expand Down Expand Up @@ -374,7 +375,6 @@ test-suite atlas-unified-tests
, base
, containers
, tasty
, tasty-hunit
, text
, mtl
-- OnChain
Expand Down
81 changes: 43 additions & 38 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repository cardano-haskell-packages
url: https://input-output-hk.github.io/cardano-haskell-packages
url: https://chap.intersectmbo.org/
secure: True
root-keys:
3e0cce471cf09815f930210f7827266fd09045445d65923e6d0238a6cd15126f
Expand All @@ -14,53 +14,46 @@ packages: .
tests: true

-- repeating the index-state for hackage to work around hackage.nix parsing limitation
index-state: 2024-06-15T17:35:54Z
index-state: 2024-06-23T23:01:13Z

index-state:
, hackage.haskell.org 2024-06-15T17:35:54Z
, cardano-haskell-packages 2024-06-13T23:12:13Z
, hackage.haskell.org 2024-07-29T00:00:00Z
, cardano-haskell-packages 2024-07-24T14:16:32Z

-- TODO: Default value should be @direct@ in upcoming 3.10 version of cabal, omit this line then.
test-show-details: direct

package cardano-crypto-praos
flags: -external-libsodium-vrf

-- TODO: This is fixed for in their later version, omit this when we update to it.
package strict-containers
ghc-options: -Wwarn=noncanonical-monad-instances

source-repository-package
type: git
location: https://github.com/maestro-org/haskell-sdk
tag: d70479ce3be06d6b7c52bf39d783f36d6771e36d
--sha256: sha256-8se+xlIB1BDEuKGwjaldmW5G4LpCujD1ABgBaY0cY6Y=
tag: v1.7.0
--sha256: sha256-i0rRBxFHC2/cJoYjDP6sZHaI+e2hbU1jYeHe8EmJ1RE=

source-repository-package
type: git
location: https://github.com/mlabs-haskell/clb
tag: 18e781b5b53adc1aa1d8c057c1b606b536a80350
--sha256: sha256-PDmrXYTBHPcY0x+JnF21uupLMBwURLSiNMqNmwwapkc=
location: https://github.com/sourabhxyz/clb
tag: 09414a93047b4c7f6e03e20d1730c9c0f88e1d46
--sha256: FIXME:

-- Obtaining cardano-node stuff for 8.9.*. These aren't published on CHaP yet.
-- Obtaining cardano-node stuff for 9.1.0. These aren't published on CHaP yet.
source-repository-package
type: git
location: https://github.com/IntersectMBO/cardano-node
tag: 8.9.2
--sha256: sha256-PxMlVzTLMuVeu04QcGOxjaSMnpWJG78J0Rul3423too=
tag: 9.1.0
--sha256: FIXME:
subdir:
cardano-node
cardano-testnet
cardano-git-rev
trace-dispatcher

-- Everything below is essentially copied from cardano-wallet's cabal.project.

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-wallet
tag: v2024-03-27
--sha256: sha256-rxMPopa3nxQaM0yOxUCq5oj3+XSL68jkuuFVhj/SY+w=
location: https://github.com/geniusyield/cardano-wallet
tag: 3413fdf74fd25b100662abf2a49c1afc892f1b79
--sha256: FIXME:
subdir:
lib/address-derivation-discovery
lib/balance-tx/
Expand All @@ -83,15 +76,15 @@ source-repository-package
lib/wallet-benchmarks/
lib/wallet/

------ Begin contents from @cardano-wallet@'s @cabal.project@ file. --------
------ Following is mostly from @cardano-wallet@'s @cabal.project@ file. -------

--------------------------------------------------------------------------------

source-repository-package
type: git
location: https://github.com/IntersectMBO/cardano-addresses
tag: 126964483d188c2362393d2a6eea8c65dfc43097
--sha256: 1w152imj28ap5dfdc8x9ly0cy7dn500v7k63vw11f70gvgg6x7my
tag: 2bca06deaa60e54a5322ac757387d744bf043367
--sha256: 1y1mzfly7jac40b9g4xc078rcm5zqhc3xxv77kwxi10yph1jwq7z
subdir: command-line
core

Expand Down Expand Up @@ -132,21 +125,30 @@ source-repository-package
--------------------------------------------------------------------------------
-- BEGIN Constraints tweaking section

-- cardano-addresses unit tests bring in some version constraint conflicts.
--
-- 1. hjsonschema and hjsonpointer deps have overly strict bounds.
-- 2. it has strict aeson < 1.5 dep - this will be fixed in the next release.
allow-newer:
hjsonschema:*
, hjsonpointer:*
, *:aeson
, *:hashable
, async-timer:unliftio-core
, ekg:*
, ntp-client:*
, libsystemd-journal:base
, cardano-addresses-cli:mtl
async-timer:unliftio-core
, servant-openapi3:*
, katip:Win32
, raven-haskell:aeson

constraints:
base >= 4.18.2.0 && < 5
, openapi3 >= 3.2.0
, persistent ^>= 2.14.6.0
, cardano-node ^>= 9.1.0
, bech32 >= 1.1.7

-- lower versions of katip won't build with the Win32-2.12.0.1
-- which is shipped with the ghc-9.2.8
, katip >= 0.8.7.4


-- Cardano Node dependencies:
, io-classes >= 1.4
, io-classes -asserts
, ouroboros-consensus-cardano ^>= 0.18
, ouroboros-network ^>= 0.16.1
, ouroboros-network-protocols ^>= 0.9

-- END Constraints tweaking section
--------------------------------------------------------------------------------
Expand All @@ -168,6 +170,9 @@ package cardano-config
package cardano-node
flags: -systemd

package bitvec
flags: -simd

-- -------------------------------------------------------------------------

-------- End contents from @cardano-wallet@'s @cabal.project@ file. --------
Loading
Loading