Skip to content
This repository was archived by the owner on Dec 2, 2024. It is now read-only.

Add marconi-mamba package #724

Merged
merged 14 commits into from
Oct 6, 2022
Merged

Add marconi-mamba package #724

merged 14 commits into from
Oct 6, 2022

Conversation

eyeinsky
Copy link
Contributor

@eyeinsky eyeinsky commented Sep 27, 2022

Todos

  • 17e937a wire up nix
  • 01154c4 where to get ChainPoint from, cli?
  • Comment added fa13a9b the NetworkId parser is copy-paste from cardano-node/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs::1883, add todo to import it instead whenever it's exported?
  • rebased this onto main, while cherry-picked the required commints from unmerged ml/plt-647 get ml/plt-647 merged prior to this one and base this PR on main instead (It's based on ml/plt-647 because that exposes the Address->Utxo indexer as a library)

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

@eyeinsky
Copy link
Contributor Author

@zeme-iohk Could you help set this up in our nix configuration?

@zeme-iohk
Copy link

zeme-iohk commented Sep 28, 2022

You want to add the LICENSE and NOTICE files inside the marconi-mamba folder, or the nix build will fail.
Then you want to add this:
marconi-mamba = plutus-apps.haskell.packages.marconi-mamba.components.exes.marconi-mamba;
below line 67 in default.nix.
Then, users will be able to run nix build .#marconi-mamba to build the executable

@eyeinsky eyeinsky changed the base branch from ml/plt-647 to main September 30, 2022 10:50
@eyeinsky
Copy link
Contributor Author

eyeinsky commented Sep 30, 2022

This PR is now based on main and not on #714, because the latter still has issues and it would be easier to get this merged so that @kayvank can get his PR #727 also merged.

Cherry-picked the commits from #714 that this branch needed, namely the first four: cf5b91f, 11d65a9, 84634a6, 6471cc1.

@eyeinsky eyeinsky marked this pull request as ready for review September 30, 2022 11:05
Copy link
Collaborator

@kayvank kayvank left a comment

Choose a reason for hiding this comment

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

looks good to me

@koslambrou
Copy link
Contributor

koslambrou commented Sep 30, 2022

@eyeinsky Also add the package in the relevant places in nix/pkgs/haskell/haskell.nix. Base on what we do with marconi.

Copy link
Contributor

@raduom raduom left a comment

Choose a reason for hiding this comment

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

I am not sure about all the nix things, but otherwise it looks good.

-Wnoncanonical-monad-instances -Wredundant-constraints
-Wunused-packages

executable marconi-mamba
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we also want a library for this one?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes!

@eyeinsky
Copy link
Contributor Author

CI error: {UNKNOWN}: Died at /nix/store/gwfrn3w2caqdjr7a6vkkcix60r8svvy2-hydra-0.1.20220215.e49dd9c/bin/.hydra-eval-jobset-wrapped line 813. at /nix/store/7r0iilv1hr4nbcgdw2gfgm2slap9hbpk-hydra-perl-deps/lib/perl5/site_perl/5.32.1/Catalyst/Model/DBIC/Schema.pm line 526 (link)

@koslambrou
Copy link
Contributor

CI error: {UNKNOWN}: Died at /nix/store/gwfrn3w2caqdjr7a6vkkcix60r8svvy2-hydra-0.1.20220215.e49dd9c/bin/.hydra-eval-jobset-wrapped line 813. at /nix/store/7r0iilv1hr4nbcgdw2gfgm2slap9hbpk-hydra-perl-deps/lib/perl5/site_perl/5.32.1/Catalyst/Model/DBIC/Schema.pm line 526 (link)

Did you try updating the file I mentioned above?

@eyeinsky eyeinsky force-pushed the ml/plt-861 branch 3 times, most recently from adc49c9 to fb5ce8d Compare September 30, 2022 16:04
@eyeinsky eyeinsky mentioned this pull request Sep 30, 2022
2 tasks
@eyeinsky
Copy link
Contributor Author

eyeinsky commented Oct 3, 2022

CI now fails for the fix I added for darwin/mac minis here by not being able to create a directory under /tmp

@koslambrou
Copy link
Contributor

@eyeinsky Had the same problem in this PR: #728

Tried re-running Hydra and see if anything changes.

@koslambrou
Copy link
Contributor

@eyeinsky You can fix the conflicts and update on main, as the darwin checks have been disabled

@eyeinsky
Copy link
Contributor Author

eyeinsky commented Oct 5, 2022

Got this rebased onto latest main, builds locally, waiting for CI to finish.


args :: Opt.Parser Args
args = Args
<$> Opt.strOption (Opt.long "socket" <> Opt.metavar "FILE" <> Opt.help "Socket path to node")
Copy link
Collaborator

Choose a reason for hiding this comment

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

the cli is socket-path and it would be goo to remain consistent.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@eyeinsky
Copy link
Contributor Author

eyeinsky commented Oct 6, 2022

@koslambrou this can be merged, right?

@koslambrou
Copy link
Contributor

@koslambrou this can be merged, right?

Yep!

@eyeinsky eyeinsky merged commit e882efc into main Oct 6, 2022
@eyeinsky eyeinsky deleted the ml/plt-861 branch October 6, 2022 12:03
koslambrou pushed a commit that referenced this pull request Apr 6, 2023
* Add marconi-mamba package

* Add comment for where opt farser for NetworkId is gotten from

* Add Marconi.CLI module, move `chainPointParser` to it

* Parse ChainPoint from cli

* Add LICENCE and NOTICE files

* Add marconi-mamba to default.nix

* Add marconi-mamba to nix/pkgs/haskell/haskell.nix

* Add library section
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants