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

Jump to bottom

Instances and fixes from Cardax CTL integration #529

Merged
merged 109 commits into from
Jun 10, 2022
Merged

Instances and fixes from Cardax CTL integration #529

merged 109 commits into from
Jun 10, 2022

Conversation

ngua
Copy link
Contributor

@ngua ngua commented Jun 10, 2022 •
edited
Loading

Supersedes #419. Retains virtually all fixes from that branch and addresses review comments on #419

Pre-review checklist

  • All code has been formatted using our config (make format for Purescript, nixpkgs-fmt for Nix)
  • All Purescript imports are explicit, including constructors
  • All existing examples have been run locally against a fully-synced testnet node
  • The integration and unit tests have been run (npm run test) locally
  • The changelog has been updated under the ## Unreleased header, using the appropriate sub-headings (### Added, ### Removed, ### Fixed) (I updated the v1 release date)

bladyjoker and others added 30 commits May 17, 2022 17:49
@bladyjoker
Switch Argounaut to Aeson (CurrencySymbol, ByteArray)
f8b58d2
@bladyjoker
Migrate TokenName
3108268
@bladyjoker
Added Aeson encoder for PlutusData and added tests for it
9cc8b10
@bladyjoker
make format
2acb642
@bladyjoker
Make Plutus.Types.AssocMap PlutusData-compatible with PlutusTx.AssocMap
d9444f2
@bladyjoker
Matching plutus-core Data with Types.PlutusData PlutusData rep (confu…
5265417 
…sing)
@MangoIV
adjust api to work for an arbitrary hashing method from PlutusTx
7bb3b70
@bladyjoker
plutus-core Map encoding issues #2
f03223f
@bladyjoker
plutus-core Map encoding issues #3
81373e5
@MangoIV
Merge remote-tracking branch 'upstream/master' into mangoiv/add-sha2-…
b82c08c 
…256-hashing
@MangoIV
add documentation for the new endpoint
51bc89e
@MangoIV
added frontend part of plutusHash
404f9e2
@bladyjoker
Revert "plutus-core Map encoding issues #3"
7e8f874 
This reverts commit 81373e5.
@bladyjoker
Revert "plutus-core Map encoding issues #2"
88f7b1b 
This reverts commit f03223f.
@bladyjoker
Revert "Matching plutus-core Data with Types.PlutusData PlutusData re…
e744b5e 
…p (confusing)"

This reverts commit 5265417.
@MangoIV
fixes and new integrations tests for QueryM.Crypto
d5953f0
@MangoIV
Merge remote-tracking branch 'upstream/master' into mangoiv/add-sha2-…
9cd8095 
…256-hashing
@MangoIV
add fixes required asked for by @ngua
1963a82
@bladyjoker
Revert "Make Plutus.Types.AssocMap PlutusData-compatible with PlutusT…
5473777 
…x.AssocMap"

This reverts commit d9444f2.
@MangoIV
fix integration tests and return Either String instead of Maybe becau…
ccf5767 
…se there are a lot of things to go wrong
@bladyjoker
Switch Plutus.Types.Credential to use HasPlutusSchema
2b7f562
@bladyjoker
Cosmetics on Plutus.Types.Credential
bf14bca
@bladyjoker
Migrate Plutus.Types.Address to HasPlutusSchema
4cd11c3
@bladyjoker
Added a bunch of Aeson instances for plutus-ledger-api types
b6dba8a
@bladyjoker
Merge branch 'master' into bladyjoker/use_aeson
76bd3c5
@bladyjoker
spago2nix generate
f7ceea1
@ngua
Formatting
15a6ec6
@ngua
Merge branch 'master' into hashing
8f041fb
@ngua
Use unless
433ee68
@ngua
Imports
0095aa3
MangoIV and others added 24 commits May 30, 2022 19:26
@MangoIV
Merge remote-tracking branch 'upstream/dshuiski/fix-rdmr-indexes' int…
53ce888 
…o bladyjoker/use_aeson
@MangoIV
tried to implemented MultipleRedeemers test
0bfde32
@bladyjoker
Merge remote-tracking branch 'plutonomicon/master' into bladyjoker/us…
fd3b335 
…e_aeson
Updated Credential Aeson instances
d75bc32
Updated Datum EncodeAeson instance
5da9f36
Updated Interval EncodeAeson instance
b7b7ece
Updated Value EncodeAeson instance
9c4cc8b
Updated PubKeyHash EncodeAeson instance
a45759c
Updated TokenName EncodeAeson instance
d99e71f
@bladyjoker
Merge remote-tracking branch 'plutonomicon/master' into bladyjoker/us…
f5e941d 
…e_aeson
@bladyjoker
Merge remote-tracking branch 'plutonomicon/bladyjoker/use-emurgo-csl'…
1421f8e 
… into bladyjoker/use_aeson
@bladyjoker
Cleanup after merge
86a0afe
@bladyjoker
Merge remote-tracking branch 'plutonomicon/dshuiski/fix-rdmr-indexes'…
16fe556 
… into bladyjoker/use_aeson
@bladyjoker
ScriptLookups cleanup
39b53dd
@bladyjoker
Added Test.OgmiosDatumCache testing hashing and Aeson roundtrip for P…
152b128 
…lutus Data
@ngua
Restore server/* and select modules
97f6ade
@ngua
dhall format
c7e6e7e
@ngua
Revert ODC input
d381099
@ngua
Update gitattributes
545c7cf
@ngua
Merge branch 'master' into from-cardax-work-pr
65d7109
@ngua
Apply suggestions from #419
9de755a
@ngua
Merge branch 'master' into from-cardax-work-pr
17f60f5
@ngua
Update changelog
6ffe323
@ngua
Small style things
f8273f2
bladyjoker added a commit to mlabs-haskell/purescript-bridge that referenced this pull request Jun 10, 2022
@bladyjoker
Sync with CTL at Plutonomicon/cardano-transaction-lib#529
786e488
@bladyjoker
Copy link
Collaborator

This is great! purescript-bridge tests have passed for this branch! We're good to go!

@bladyjoker bladyjoker self-requested a review June 10, 2022 11:36
bladyjoker
bladyjoker approved these changes Jun 10, 2022
View reviewed changes
Copy link
Collaborator

@bladyjoker bladyjoker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Woot woot, thanks @ngua

@ngua ngua merged commit b9593f6 into master Jun 10, 2022
@klntsky klntsky deleted the from-cardax-work-pr branch November 16, 2022 11:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bladyjoker bladyjoker bladyjoker approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ngua @bladyjoker @MangoIV