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

Merge main branch into next-node #609

Merged
merged 17 commits into from
Jul 20, 2022
Merged

Merge main branch into next-node #609

merged 17 commits into from
Jul 20, 2022

Conversation

koslambrou
Copy link
Contributor

@koslambrou koslambrou commented Jul 20, 2022 •
edited
Loading

Conflicts:

  • plutus-chain-index-core/src/Plutus/ChainIndex/Emulator/DiskState.hs (fix import conflicts)
  • plutus-chain-index-core/src/Plutus/ChainIndex/Tx.hs (fix fromOnChainTx)
  • plutus-chain-index-core/src/Plutus/ChainIndex/Types.hs (fix import conflicts)
  • plutus-chain-index-core/test/Generators.hs (fix 'genTx')
  • plutus-contract/src/Plutus/Trace/Emulator/ContractInstance.hs (fix 'indexBlock')
  • Deleted plutus-pab-executables/demo/pab-nami/client/generated
  • Deleted plutus-playground-client/generated

Pre-submit checklist:

  • Branch
    • Tests are provided (if possible)
    • Commit sequence broadly makes sense
    • Key commits have useful messages
    • Formatting, PNG optimization, etc. are updated
  • PR
    • Self-reviewed the diff
    • Useful pull request description
    • Reference the ADR in the PR and reference the PR in the ADR (if revelant)
    • Reviewer requested

sjoerdvisscher and others added 16 commits July 8, 2022 19:13
@sjoerdvisscher
PLT-308: Add UnspentTxOutsAt query (#567)
02ae267 
* Add UnspentTxOutsAt query, cherry picked from Djed

* Fix PAB

* Generate purs

* Actually use new code in utxosAt (the whole point!)

* Merge collectQueryResponse and getAllTxOuts

* Use utxosAt in utxosTxOutTxAt
@zeme-wana
Issue #580 - Build create-script-context with Nix (#581)
0c2b6ad 
* `create-script-context`script is available in our Nix shell
@zeme-wana
PLT-502 Added missing local information to nix shell
28bbb7b
@raduom
Fix utxo sync delay. (#590)
455f4c2 
* Fix utxo sync delay.

* Adjust some parameters.
@koslambrou
Small revision to ADR 3 (Move Marconi into a separate repository) (#579)
fe47249
@raduom
Raduom/fix utxo sync time (#592)
da0f456 
* Fix utxo sync delay.

* Adjust some parameters.
@andreabedini
Fix plutus-streaming-example-2 (#554)
30bc533 
* Fix plutus-streaming-example-2

The datums function was wrong. This replaces the whole example with
working functions.

* Fix typo (remove it, actually)
@joseph-fajen @koslambrou @raduom
Create README_alpha-release_Marconi.md (#591)
4cc6c84 
* Create README_alpha-release_Marconi.md

* Update README_alpha-release_Marconi.md

* Update plutus-chain-index/README_alpha-release_Marconi.md

Co-authored-by: koslambrou <konstantinos.lambrou@iohk.io>

* Update plutus-chain-index/README_alpha-release_Marconi.md

Co-authored-by: koslambrou <konstantinos.lambrou@iohk.io>

* Update plutus-chain-index/README_alpha-release_Marconi.md

Co-authored-by: Radu Ometita <radu.ometita@gmail.com>

* Update plutus-chain-index/README_alpha-release_Marconi.md

Co-authored-by: Radu Ometita <radu.ometita@gmail.com>

* Update plutus-chain-index/README_alpha-release_Marconi.md

Co-authored-by: Radu Ometita <radu.ometita@gmail.com>

* Apply suggestions from code review

Co-authored-by: Radu Ometita <radu.ometita@gmail.com>

* Update plutus-chain-index/README_alpha-release_Marconi.md

Co-authored-by: Radu Ometita <radu.ometita@gmail.com>

* Update README_alpha-release_Marconi.md

Incorporating comments received so far. Some comments/suggested content from Radu seems to have disappeared, so I've asked Radu to post them again.

* Update plutus-chain-index/README_alpha-release_Marconi.md

Radu's most recent additional content

Co-authored-by: Radu Ometita <radu.ometita@gmail.com>

* Update README_alpha-release_Marconi.md

Adding content from Radu, additional piece

Co-authored-by: koslambrou <konstantinos.lambrou@iohk.io>
Co-authored-by: Radu Ometita <radu.ometita@gmail.com>
@catch-21
Add build-and-serve-docs to CONTRIBUTING... (#595)
de954bc 
* Add build-and-serve-docs to CONTRIBUTING...

... and docs README

* Update README.md
Replace Set TxIn with [TxIn] to fix StateMachine.getInput (#594)
b7c773c
@catch-21
Require markdown 3.3.7 (#601)
4e1dcd1 
* Require markdown 3.3.7

* fix version
@koslambrou
Added precision on the meaning of the first-major version of plutus-a…
139c042 
…pps (#597)
@FinleyMcIlwaine
Add note to checkPredicateGenOptions (#603)
6e81cd8 
It is not obvious that the `initialChainState` of the `CheckOptions` will come from the generator model. I would have benefitted from seeing this note attached to the function.
Fix the swagger with CardanoBuildTx's OpenApi stub schema (#599)
29c3dc7
@koslambrou
Buildkite will now generate the docker devcontainer with the vX.Y.Z…
cb6b8c9 
… tag name instead of `plutus-starter-devcontainer-v*` (#598)
@zeme-wana
PLT-515 Improve DevX for plutus-playground-server/client and `pab-n…
6866224 
…ami` users (#559)

- Purs file generation is no longer part of CI (it was not being run anyway)
- Generated purs files are no longer in VC
- Generation of purs files is now the responsibility of plutus-playground-server and pab-nami-demo-client users
- Improved the two scripts above: the user will be informed about the age the generated files and able to regenerated by passing a -g flag.
- Removed two obsolete .gitignore files
@koslambrou koslambrou force-pushed the kll/merge-main-into-next-node branch from 85d13e9 to 7f2e6cc Compare July 20, 2022 11:45
@koslambrou
Merge 'origin/main' into kll/merge-main-into-next-node
d7027ed 
* plutus-chain-index-core/src/Plutus/ChainIndex/Emulator/DiskState.hs (fix import conflicts)
* plutus-chain-index-core/src/Plutus/ChainIndex/Tx.hs (fix fromOnChainTx)
* plutus-chain-index-core/src/Plutus/ChainIndex/Types.hs (fix import conflicts)
* plutus-chain-index-core/test/Generators.hs (fix 'genTx')
* plutus-contract/src/Plutus/Trace/Emulator/ContractInstance.hs (fix 'indexBlock')
* Deleted plutus-pab-executables/demo/pab-nami/client/generated
* Deleted plutus-playground-client/generated
@koslambrou koslambrou force-pushed the kll/merge-main-into-next-node branch from 7f2e6cc to d7027ed Compare July 20, 2022 13:10
@koslambrou koslambrou mentioned this pull request Jul 20, 2022
Merged
8 tasks
@koslambrou koslambrou marked this pull request as ready for review July 20, 2022 13:57
@koslambrou koslambrou requested a review from a user July 20, 2022 13:57
@koslambrou koslambrou merged commit e90be95 into next-node Jul 20, 2022
@koslambrou koslambrou deleted the kll/merge-main-into-next-node branch July 20, 2022 17:25
koslambrou added a commit that referenced this pull request Apr 6, 2023
@koslambrou
Merge pull request #609 from input-output-hk/kll/merge-main-into-next…
64901b2 
…-node

Merge main branch into next-node
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@koslambrou @sjoerdvisscher @zeme-wana @raduom @andreabedini @joseph-fajen @catch-21 @FinleyMcIlwaine