Merge updates from master to master-v2

.releaserc.yaml

@@ -0,0 +1,24 @@
+plugins:
+- - '@semantic-release/commit-analyzer'
+  - preset: 'angular'
+    releaseRules:
+      - type: 'refactor'
+        release: 'patch'
+      - type: 'style'
+        release: 'patch'
+      - type: 'feat'
+        release: 'patch'
+      - type: 'chore'
+        release: 'patch'
+      - breaking: true
+        release: 'minor'
+- '@semantic-release/release-notes-generator'
+- '@semantic-release/github'
+tagFormat: 'v${version}'
+dryRun: true
+# observing that job would not be running as it was considered as from PR branch
+# looks that unfortunately that is how it is designed:
+# https://github.com/semantic-release/semantic-release/issues/1166#issuecomment-500094323
+# this workaround is from:
+# https://github.com/semantic-release/semantic-release/issues/1074#issuecomment-696922883
+ci: false

.tool-versions

@@ -1,2 +1,3 @@
-erlang 22.3
-elixir 1.10.2
+elixir 1.11.2
+erlang 23.1.4
+rust 1.46.0

AUTHORS

@@ -1 +1 @@
-OmiseGo Pte Ltd
+OMG Network Pte Ltd

CHANGELOG.md

@@ -1,25 +1,41 @@
 # Changelog
 
-## [Unreleased](https://github.com/omgnetwork/elixir-omg/tree/HEAD)
+## [v1.0.5](https://github.com/omgnetwork/elixir-omg/tree/v1.0.5) (2020-10-01)
 
-[Full Changelog](https://github.com/omgnetwork/elixir-omg/compare/v1.0.4...HEAD)
+[Full Changelog](https://github.com/omgnetwork/elixir-omg/compare/v1.0.4-pre.2...v1.0.5)
 
 ### Enhancements
 
+- deposits performance tests bot [\#1745](https://github.com/omgnetwork/elixir-omg/pull/1745) ([ayrat555](https://github.com/ayrat555))
 - feat: handle in-flight exits deletions [\#1701](https://github.com/omgnetwork/elixir-omg/pull/1701) ([pgebal](https://github.com/pgebal))
+- feat: comply with new Infura API [\#1754](https://github.com/omgnetwork/elixir-omg/pull/1754) ([pgebal](https://github.com/pgebal))
 
 ### Bug fixes
 
+- fix: handle metrics for in flight exit deleted processor [\#1742](https://github.com/omgnetwork/elixir-omg/pull/1742) ([pgebal](https://github.com/pgebal))
 - revert: reverts ife deletion commits [\#1725](https://github.com/omgnetwork/elixir-omg/pull/1725) ([pgebal](https://github.com/pgebal))
+- fix: set :last\_ife\_exit\_deleted\_eth\_height on deplyment if it's not set yet [\#1720](https://github.com/omgnetwork/elixir-omg/pull/1720) ([pgebal](https://github.com/pgebal))
 - fix: fix in-flight exit deleted bug and add tests [\#1714](https://github.com/omgnetwork/elixir-omg/pull/1714) ([pgebal](https://github.com/pgebal))
 - fix: block submission stall monitor should ignore block\_submitting that are already mined [\#1703](https://github.com/omgnetwork/elixir-omg/pull/1703) ([unnawut](https://github.com/unnawut))
+- fix: recheck PR label on synchronize and reopen [\#1748](https://github.com/omgnetwork/elixir-omg/pull/1748) ([unnawut](https://github.com/unnawut))
 
 ### Chores
 
+- Chore: parallelize tests by tags [\#1744](https://github.com/omgnetwork/elixir-omg/pull/1744) ([ayrat555](https://github.com/ayrat555))
+- Chore: use exexec from upstream [\#1743](https://github.com/omgnetwork/elixir-omg/pull/1743) ([ayrat555](https://github.com/ayrat555))
+- move dev env deployment job to helm repo [\#1738](https://github.com/omgnetwork/elixir-omg/pull/1738) ([boolafish](https://github.com/boolafish))
+- Inomurko/remove child chain [\#1737](https://github.com/omgnetwork/elixir-omg/pull/1737) ([InoMurko](https://github.com/InoMurko))
+- Kevsul/standard exit perf test [\#1732](https://github.com/omgnetwork/elixir-omg/pull/1732) ([kevsul](https://github.com/kevsul))
+- update change log v1.0.4 [\#1731](https://github.com/omgnetwork/elixir-omg/pull/1731) ([jarindr](https://github.com/jarindr))
+- chore: add test for 64\_000 txs block hash [\#1729](https://github.com/omgnetwork/elixir-omg/pull/1729) ([ayrat555](https://github.com/ayrat555))
 - Allow to run docker-compose without feefeed docker [\#1726](https://github.com/omgnetwork/elixir-omg/pull/1726) ([boolafish](https://github.com/boolafish))
+- rm mix based chch part 1 [\#1716](https://github.com/omgnetwork/elixir-omg/pull/1716) ([InoMurko](https://github.com/InoMurko))
 - feat: reintroduce automated changelog [\#1708](https://github.com/omgnetwork/elixir-omg/pull/1708) ([unnawut](https://github.com/unnawut))
 - add feefeed docker to elixir-omg setup [\#1700](https://github.com/omgnetwork/elixir-omg/pull/1700) ([boolafish](https://github.com/boolafish))
 - move omg\_performance json rpc tests to perf project [\#1691](https://github.com/omgnetwork/elixir-omg/pull/1691) ([ayrat555](https://github.com/ayrat555))
+- chore: bump version to 1.0.4 [\#1751](https://github.com/omgnetwork/elixir-omg/pull/1751) ([boolafish](https://github.com/boolafish))
+- Chore: try to fix flaky reorg tests [\#1739](https://github.com/omgnetwork/elixir-omg/pull/1739) ([ayrat555](https://github.com/ayrat555))
+- feat: transaction.create optimisation [\#1683](https://github.com/omgnetwork/elixir-omg/pull/1683) ([okalouti](https://github.com/okalouti))
 
 ## [v1.0.4](https://github.com/omgnetwork/elixir-omg/tree/v1.0.4) (2020-09-03)
 
@@ -39,7 +55,6 @@
 
 - corrrectly serialize PIDs in alarms.get [\#1678](https://github.com/omgnetwork/elixir-omg/pull/1678) ([ayrat555](https://github.com/ayrat555))
 - account.get\_exitable\_utxos is unaware of in-flight exited inputs [\#1676](https://github.com/omgnetwork/elixir-omg/pull/1676) ([pnowosie](https://github.com/pnowosie))
-- Fix fee adapter to accept decimal value in fee rules [\#1662](https://github.com/omgnetwork/elixir-omg/pull/1662) ([jarindr](https://github.com/jarindr))
 - Add missing clause on witness validation check [\#1656](https://github.com/omgnetwork/elixir-omg/pull/1656) ([mederic-p](https://github.com/mederic-p))
 - fix: unexpected http method [\#1651](https://github.com/omgnetwork/elixir-omg/pull/1651) ([ripzery](https://github.com/ripzery))
 
@@ -91,10 +106,6 @@
 - Add reorged docker compose [\#1579](https://github.com/omgnetwork/elixir-omg/pull/1579) ([ayrat555](https://github.com/ayrat555))
 - Kevin/load test erc20 token [\#1577](https://github.com/omgnetwork/elixir-omg/pull/1577) ([kevsul](https://github.com/kevsul))
 
-### Documentation updates
-
-- Update request body swagger [\#1609](https://github.com/omgnetwork/elixir-omg/pull/1609) ([jarindr](https://github.com/jarindr))
-
 ## [v1.0.2](https://github.com/omgnetwork/elixir-omg/tree/v1.0.2) (2020-06-30)
 
 [Full Changelog](https://github.com/omgnetwork/elixir-omg/compare/v1.0.2-pre.0...v1.0.2)
@@ -122,11 +133,12 @@
 
 ### Documentation updates
 
+- Update request body swagger [\#1609](https://github.com/omgnetwork/elixir-omg/pull/1609) ([jarindr](https://github.com/jarindr))
 - Update README.md [\#1564](https://github.com/omgnetwork/elixir-omg/pull/1564) ([InoMurko](https://github.com/InoMurko))
 
 ## [v1.0.1](https://github.com/omgnetwork/elixir-omg/tree/v1.0.1) (2020-06-18)
 
-[Full Changelog](https://github.com/omgnetwork/elixir-omg/compare/v1.0.1-pre.0...v1.0.1)
+[Full Changelog](https://github.com/omgnetwork/elixir-omg/compare/v1.0.0-pre.2...v1.0.1)
 
 ### Chores
 

Dockerfile.watcher

@@ -1,7 +1,7 @@
 FROM alpine:3.11
 
-LABEL maintainer="OmiseGO Team <[email protected]>"
-LABEL description="Official image for OmiseGO (Watcher) Plasma Network"
+LABEL maintainer="OMG Network Team <[email protected]>"
+LABEL description="Official image for OMG Network (Watcher) Plasma Network"
 
 ENV LANG=C.UTF-8
 
@@ -54,7 +54,7 @@ RUN set -xe \
 #rocksdb from builder image to deployer image
 RUN mkdir -p /usr/local/rocksdb/lib
 RUN mkdir /usr/local/rocksdb/include
-COPY --from=omisegoimages/elixir-omg-builder:stable-20200410 /usr/local/rocksdb/ /usr/local/rocksdb/
+COPY --from=omisegoimages/elixir-omg-builder:stable-20201207 /usr/local/rocksdb/ /usr/local/rocksdb/
 
 ARG release_version
 ADD _build_docker/prod/watcher-${release_version}.tar.gz /app

Dockerfile.watcher_info

@@ -1,7 +1,7 @@
 FROM alpine:3.11
 
-LABEL maintainer="OmiseGO Team <[email protected]>"
-LABEL description="Official image for OmiseGO (WatcherInfo) Plasma Network"
+LABEL maintainer="OMG Network Team <[email protected]>"
+LABEL description="Official image for OMG Network (WatcherInfo) Plasma Network"
 
 ENV LANG=C.UTF-8
 
@@ -54,7 +54,7 @@ RUN set -xe \
 #rocksdb from builder image to deployer image
 RUN mkdir -p /usr/local/rocksdb/lib
 RUN mkdir /usr/local/rocksdb/include
-COPY --from=omisegoimages/elixir-omg-builder:stable-20200410 /usr/local/rocksdb/ /usr/local/rocksdb/
+COPY --from=omisegoimages/elixir-omg-builder:stable-20201207 /usr/local/rocksdb/ /usr/local/rocksdb/
 
 ARG release_version
 ADD _build_docker/prod/watcher_info-${release_version}.tar.gz /app

LICENSE

@@ -175,7 +175,7 @@ of your accepting any such warranty or additional liability.
 
 END OF TERMS AND CONDITIONS
 
-Copyright 2017-2019 OmiseGO
+Copyright 2017-2019 OMG Network
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

Makefile

@@ -82,7 +82,7 @@ all: clean build-watcher-prod build-watcher_info-prod
 WATCHER_IMAGE_NAME      ?= "omisego/watcher:latest"
 WATCHER_INFO_IMAGE_NAME ?= "omisego/watcher_info:latest"
 
-IMAGE_BUILDER   ?= "omisegoimages/elixir-omg-builder:stable-20200410"
+IMAGE_BUILDER   ?= "omisegoimages/elixir-omg-builder:stable-20201207"
 IMAGE_BUILD_DIR ?= $(PWD)
 
 ENV_DEV         ?= env MIX_ENV=dev
@@ -293,14 +293,14 @@ docker-watcher_info-prod:
 
 docker-watcher-build:
 	docker build -f Dockerfile.watcher \
-		--build-arg release_version=$$(cat $(PWD)/VERSION)+$$(git rev-parse --short=7 HEAD) \
+		--build-arg release_version=$$(git describe --tags) \
 		--cache-from $(WATCHER_IMAGE_NAME) \
 		-t $(WATCHER_IMAGE_NAME) \
 		.
 
 docker-watcher_info-build:
 	docker build -f Dockerfile.watcher_info \
-		--build-arg release_version=$$(cat $(PWD)/VERSION)+$$(git rev-parse --short=7 HEAD) \
+		--build-arg release_version=$$(git describe --tags) \
 		--cache-from $(WATCHER_INFO_IMAGE_NAME) \
 		-t $(WATCHER_INFO_IMAGE_NAME) \
 		.

README.md

@@ -1,6 +1,6 @@
 <img src="docs/assets/logo.png" width="100" height="100" align="right" />
 
-The `elixir-omg` repository contains OmiseGO's Elixir implementation of Plasma and forms the basis for the OMG Network.
+The `elixir-omg` repository contains OMG Network's Elixir implementation of Plasma and forms the basis for the OMG Network.
 
 [![Build Status](https://circleci.com/gh/omgnetwork/elixir-omg.svg?style=svg)](https://circleci.com/gh/omgnetwork/elixir-omg) [![Coverage Status](https://coveralls.io/repos/github/omisego/elixir-omg/badge.svg?branch=master)](https://coveralls.io/github/omisego/elixir-omg?branch=master)
 
@@ -116,10 +116,10 @@ mix test
 
 Longer-running integration tests (requires compiling contracts):
 ```bash
-mix test --trace --only integration
+mix test   --only integration
 ```
 
-For other kinds of checks, refer to the CI/CD pipeline (https://circleci.com/gh/omisego/workflows/elixir-omg) or build steps (https://github.com/omisego/elixir-omg/blob/master/.circleci/config.yml).
+For other kinds of checks, refer to the CI/CD pipeline (https://app.circleci.com/pipelines/github/omgnetwork/elixir-omg) or build steps (https://github.com/omgnetwork/elixir-omg/blob/master/.circleci/config.yml).
 
 To run a development `iex` REPL with all code loaded:
 ```bash
@@ -207,15 +207,15 @@ cd priv/cabbage
 make install
 make generate_api_code
 mix deps.get
-REORG=true mix test --only reorg --trace
+REORG=true mix test --only reorg
 ```
 
 # Working with API Spec's
 
 This repo contains `gh-pages` branch intended to host [Swagger-based](https://docs.omg.network/elixir-omg/) API specification.
 Branch `gh-pages` is totally diseparated from other development branches and contains just Slate generated page's files.
 
-See [gh-pages README](https://github.com/omisego/elixir-omg/tree/gh-pages) for more details.
+See [gh-pages README](https://github.com/omgnetwork/elixir-omg/tree/gh-pages) for more details.
 
 # More details about the design and architecture
 

apps/omg/lib/omg.ex

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 OmiseGO Pte Ltd
+# Copyright 2019-2020 OMG Network Pte Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

apps/omg/lib/omg/application.ex

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 OmiseGO Pte Ltd
+# Copyright 2019-2020 OMG Network Pte Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

apps/omg/lib/omg/block.ex

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 OmiseGO Pte Ltd
+# Copyright 2019-2020 OMG Network Pte Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

apps/omg/lib/omg/configuration.ex

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 OmiseGO Pte Ltd
+# Copyright 2019-2020 OMG Network Pte Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

apps/omg/lib/omg/crypto.ex

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 OmiseGO Pte Ltd
+# Copyright 2019-2020 OMG Network Pte Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ defmodule OMG.Crypto do
   For unsafe code, limited to `:test` and `:dev` environments and related to private key handling refer to:
   `OMG.DevCrypto` in `test/support`
   """
+  alias ExPlasma.Crypto
   alias OMG.Signature
 
   @type sig_t() :: <<_::520>>
@@ -41,22 +42,22 @@ defmodule OMG.Crypto do
       171, 76, 106, 229, 69, 102, 203, 7, 21, 134, 230, 92, 23, 209, 187, 12>>
   """
   @spec hash(binary) :: hash_t()
-  def hash(message), do: ExthCrypto.Hash.hash(message, ExthCrypto.Hash.kec())
+  def hash(message), do: Crypto.keccak_hash(message)
 
   @doc """
   Recovers the address of the signer from a binary-encoded signature.
   """
-  @spec recover_address(hash_t(), sig_t()) :: {:ok, address_t()} | {:error, :signature_corrupt | binary}
+  @spec recover_address(hash_t(), sig_t()) :: {:ok, address_t()} | {:error, atom()}
   def recover_address(<<digest::binary-size(32)>>, <<packed_signature::binary-size(65)>>) do
     case Signature.recover_public(digest, packed_signature) do
       {:ok, pub} ->
         generate_address(pub)
 
-      {:error, "Recovery id invalid 0-3"} ->
+      {:error, :recovery_id_not_u8} ->
         {:error, :signature_corrupt}
 
-      other ->
-        other
+      {:error, _} = error ->
+        error
     end
   end
 

apps/omg/lib/omg/ethereum_event_listener.ex

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 OmiseGO Pte Ltd
+# Copyright 2019-2020 OMG Network Pte Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -146,7 +146,7 @@ defmodule OMG.EthereumEventListener do
 
     case RootChainCoordinator.get_sync_info() do
       :nosync ->
-        :ok = RootChainCoordinator.check_in(Core.get_height_to_check_in(state), state.service_name)
+        :ok = RootChainCoordinator.check_in(state.synced_height, state.service_name)
         {:ok, _} = schedule_get_events(state.ethereum_events_check_interval_ms)
         {:noreply, {state, callbacks}}
 
@@ -158,31 +158,32 @@ defmodule OMG.EthereumEventListener do
   end
 
   # see `handle_info/2`, clause for `:sync`
-  @decorate span(service: :ethereum_event_listener, type: :backend, name: "sync_height/2")
+  @decorate span(service: :ethereum_event_listener, type: :backend, name: "sync_height/3")
   defp sync_height(state, callbacks, sync_guide) do
-    {:ok, events, db_updates, height_to_check_in, new_state} =
-      Core.get_events_range_for_download(state, sync_guide)
-      |> maybe_update_event_cache(callbacks.get_ethereum_events_callback)
-      |> Core.get_events(sync_guide.sync_height)
+    {events, new_state} =
+      state
+      |> Core.calc_events_range_set_height(sync_guide)
+      |> get_events(callbacks.get_ethereum_events_callback)
 
-    :ok = :telemetry.execute([:process, __MODULE__], %{events: events}, state)
+    db_update = [{:put, new_state.synced_height_update_key, new_state.synced_height}]
+    :ok = :telemetry.execute([:process, __MODULE__], %{events: events}, new_state)
 
     {:ok, db_updates_from_callback} = callbacks.process_events_callback.(events)
     :ok = publish_events(events)
-    :ok = OMG.DB.multi_update(db_updates ++ db_updates_from_callback)
-    :ok = RootChainCoordinator.check_in(height_to_check_in, state.service_name)
+    :ok = OMG.DB.multi_update(db_update ++ db_updates_from_callback)
+    :ok = RootChainCoordinator.check_in(new_state.synced_height, new_state.service_name)
 
     new_state
   end
 
-  @decorate span(service: :ethereum_event_listener, type: :backend, name: "maybe_update_event_cache/2")
-  defp maybe_update_event_cache({:get_events, {from, to}, %Core{} = state}, get_ethereum_events_callback) do
-    {:ok, new_events} = get_ethereum_events_callback.(from, to)
-    Core.add_new_events(state, new_events)
+  defp get_events({{from, to}, state}, get_events_callback) do
+    {:ok, new_events} = get_events_callback.(from, to)
+    {new_events, state}
   end
 
-  @decorate span(service: :ethereum_event_listener, type: :backend, name: "maybe_update_event_cache/2")
-  defp maybe_update_event_cache({:dont_fetch_events, %Core{} = state}, _callback), do: state
+  defp get_events({:dont_fetch_events, state}, _callback) do
+    {[], state}
+  end
 
   defp schedule_get_events(ethereum_events_check_interval_ms) do
     :timer.send_after(ethereum_events_check_interval_ms, self(), :sync)