Skip to content

[TM-283] Merge `master` to `babylon`

Konstantin Ivanov requested to merge martoon/tm283-merge-master-to-babylon into babylon

Description

Problem: we are going to start actively implementing Babylon features, but master has gone very far since babylon branch has been forked. Need to catch up with changes in it to avoid harsh conflicts in future.

Solution: merge master to babylon.

Conflicts I encountered:

  • renderDoc for UPDATE and NEG - in babylon annotation was added, in master we replaced renderDoc with renderAnn.
  • renderDoc for CREATE_ACCOUNT - in babylon this instruction was removed, in master its implementation was updated.

Related issue(s)

https://issues.serokell.io/issue/TM-283

Checklist for your Merge Request

Related changes (conditional)

  • Tests (see short guidelines)

    • If I added new functionality, I added tests covering it.
    • If I fixed a bug, I added a regression test to prevent the bug from silently reappearing again.
  • Documentation

    • I checked whether I should update the docs and did so if necessary:

Stylistic guide (mandatory)

Merge request reports