Skip to content

[TM-283] Merge master

Ivan Gromakovskii requested to merge gromak/merge-babylon into babylon

Description

It's a routine MR which merges master into babylon. I have encountered some conflicts, the only non-trivial one is caused by !81 (merged) and addition of chain_id. I've added chain_id unpacking from string and corresponding test.

Related issue(s)

It's needed for TM-283 to reduce number of conflicts later

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)

Edited by Ivan Gromakovskii

Merge request reports