Skip to content

Remove dependency on Lunarity#115

Merged
artob merged 3 commits intodevelopfrom
logos-instead-of-lunarity
Jun 1, 2021
Merged

Remove dependency on Lunarity#115
artob merged 3 commits intodevelopfrom
logos-instead-of-lunarity

Conversation

@birchmd
Copy link
Copy Markdown
Member

@birchmd birchmd commented May 31, 2021

We do not want to depend on Lunarity any more because it uses a difference license than the rest of our project. It also doesn't compile on latest nightly because it depends on an old version of Logos.

In this PR we remove the dependency on Lunarity and instead depend on (the most recent version of) Logos directly. This required adding a bit more code to meta_parsing because we were using Lunarity for parsing the type strings. I think the new code is a little better than the old code anyway because the state machine is a little simpler as the array bracket parsing can be delegated to the lexer.

With this change the project now compiles under latest nightly, though cargo +nightly clippy doesn't pass yet because there are some errors. I'll fix those in a follow-up PR.

Closes #34

@birchmd birchmd added the C-enhancement Category: New feature or request label May 31, 2021
@birchmd birchmd requested review from artob, joshuajbouw and mrLSD May 31, 2021 16:25
@birchmd birchmd linked an issue May 31, 2021 that may be closed by this pull request
@artob artob self-assigned this May 31, 2021
@joshuajbouw joshuajbouw self-assigned this Jun 1, 2021
Copy link
Copy Markdown
Contributor

@joshuajbouw joshuajbouw left a comment

Choose a reason for hiding this comment

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

Good work!

@joshuajbouw joshuajbouw removed their assignment Jun 1, 2021
Copy link
Copy Markdown
Contributor

@artob artob left a comment

Choose a reason for hiding this comment

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

LGTM 👍 Nice work!

@artob artob merged commit ebb2edf into develop Jun 1, 2021
@artob artob deleted the logos-instead-of-lunarity branch June 1, 2021 16:04
artob added a commit that referenced this pull request Jun 5, 2021
* Remove the dependency on Lunarity. (#115)
* Fix Clippy complaint with +nightly. (#117)
* Add an `evm-bully=yes` build to CI. (#121)
* Fix evm-bully builds. (#130)
* Handle transaction gas limit properly. (#123)
* Add an `is_used_proof` interface. (#120)
* Simplify the `sdk::read_u64` return type. (#118)

Co-authored-by: Frank Braun <frank@near.org>
Co-authored-by: Joshua J. Bouw <dev@joshuajbouw.com>
Co-authored-by: Kirill Abramov <septengineering@pm.me>
Co-authored-by: Michael Birch <michael@near.org>
artob added a commit that referenced this pull request Jun 17, 2021
* Introduce precompiles for the ETH & ERC-20 connectors. (#51)
* Implement generational storage with `SELFDESTRUCT` tests. (#84)
* Remove the dependency on Lunarity. (#115)
* Fix Clippy complaint with `+nightly`. (#117)
* Simplify the `sdk::read_u64` return type. (#118)
* Add an `is_used_proof` interface. (#120)
* Add an `evm-bully=yes` build to CI. (#121)
* Handle transaction gas limit properly. (#123)
* Fix u128 JSON parsing & tests in the ETH connector. (#125)
* Fix evm-bully builds. (#130)
* Add JSON custom error types. (#131)
* Don't burn NEP-141 on deposit. (#133)
* Fix needless borrows. (#135)
* Improve and refactor the ETH connector. (#136)
* Add a macro for logging. (#142)

Co-authored-by: Aleksey Kladov <aleksey@near.org>
Co-authored-by: Arto Bendiken <arto@aurora.dev>
Co-authored-by: Evgeny Ukhanov <evgeny@aurora.dev>
Co-authored-by: Frank Braun <frank@aurora.dev>
Co-authored-by: Joshua J. Bouw <joshua@aurora.dev>
Co-authored-by: Kirill <kirill@aurora.dev>
Co-authored-by: Marcelo Fornet <marcelo@aurora.dev>
Co-authored-by: Michael Birch <michael@aurora.dev>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

C-enhancement Category: New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Upgrade logos dependency in lunarity

4 participants