Skip to content

Eco 507 dsl#60

Closed
darthsiroftardis wants to merge 9 commits intomasterfrom
ECO-507-DSL
Closed

Eco 507 dsl#60
darthsiroftardis wants to merge 9 commits intomasterfrom
ECO-507-DSL

Conversation

@darthsiroftardis
Copy link
Contributor

Added contract_macro DSL as a new member of the workspace. Initial PR has it a file within the contract folder. However the way rust exports macros prevented me from merging it like so. Instead I decided to add a new member

@Fraser999 Fraser999 deleted the ECO-507-DSL branch January 28, 2021 11:59
dwerner pushed a commit to dwerner/casper-node that referenced this pull request Apr 4, 2022
60: Merge of release-1.4.5 to dev r=Fraser999 a=Fraser999

This PR merges the `release-1.4.5` branch into `dev` which has itself recently had the long-running `feat-fast-sync` branch merged.

[The second last commit](https://github.com/casper-network/casper-node-private/commit/ebdd51986a6c2615d1f1008a0e6dad054a2fc402) is the huge merge one which was worked on by `@mpapierski` `@rafal-ch` `@fizyk20` and `@Fraser999.`
[The final commit](https://github.com/casper-network/casper-node-private/commit/1d3b388d5b62b8889c6bd01f0798b3cb20455bf1) was only worked on by `@Fraser999` and needs thorough review and perhaps at least one change - details to be discussed offline.

Closes [casper-network#53](https://github.com/casper-network/casper-node-private/issues/53).

Co-authored-by: Fraser Hutchison <fraser@casperlabs.io>
Co-authored-by: Joe Sacher <321623+sacherjj@users.noreply.github.com>
Co-authored-by: Luís Fernando Schultz Xavier da Silveira <luis@casperlabs.io>
Co-authored-by: casperlabs-bors-ng[bot] <82463608+casperlabs-bors-ng[bot]@users.noreply.github.com>
Co-authored-by: Mateusz Górski <gorski.mateusz@protonmail.ch>
Co-authored-by: Austin Buddington <austin@casperlabs.io>
Co-authored-by: Andreas Fackler <andreas@casperlabs.io>
Co-authored-by: Karan Dhareshwar <karan@casperlabs.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants