feat: merge latest v0.4 to master

feat: merge latest v0.4 to master

.circleci/config.yml

@@ -200,10 +200,11 @@ jobs:
           command: |
             if [ -n "$CIRCLE_TAG" ]; then
               _tagged_version="${CIRCLE_TAG#*v}"
+              _tagged_version_ignoring_pre="${_tagged_version%%-pre.*}"
               _filed_version="$(head -n 1 ./VERSION | sed 's/^[ \t]*//;s/[ \t]*$//')"
 
-              if [ "$_tagged_version" != "$_filed_version" ]; then
-                echo "The git tag \"${CIRCLE_TAG}\" expects the VERSION to be \"${_tagged_version}\". Got \"${_filed_version}\"."
+              if [ "$_tagged_version_ignoring_pre" != "$_filed_version" ]; then
+                echo "The git tag \"${CIRCLE_TAG}\" expects the VERSION to be \"${_tagged_version_ignoring_pre}\". Got \"${_filed_version}\"."
                 exit 1
               fi
             else

CHANGELOG.md

@@ -1,15 +1,33 @@
 # Changelog
 
-## Unreleased
+## v0.4.7 (Unreleased)
 
 #### APIs
-- None
+- [Fixed] Proper error message when retrieving In-Flight Exit data for a spent deposit (#1397)
 
 #### Core
-- None
+- [Added] Derive contract-related data from the contracts and add checks to prevent contract addresses changing (#1404)
+- [Added] Build adapter to pull fees from the fee feed service (#1373)
+- [Added] Observe the authority address balance on block submission (#1449)
+- [Changed] Upgrade elixir to v1.10.2 (#1440)
+- [Changed] Update default stall threshold to 300s (#1456)
+- [Changed] Standardize OMG.Bus event and topic names (#1441)
+- [Fixed] Add retries to gas cost retrieval (#1434)
+- [Fixed] Broken logging in contract event consumer (#1460)
+- [Fixed] Keep authority_addr naming for phash2 for backwards compatibility (#1457)
 
 #### Miscellaneous
-- None
+- [Added] Missing tests for release task of setting fee claimer address (#1451)
+- [Added] Load test merge_utxos() (#1446)
+- [Added] More load test scenarios (#1403, #1429, #1433)
+- [Added] Prevent adding more single pipes (#1462)
+- [Changed] Update Spandex (tracing library) to 2.4.3 (#1432)
+- [Changed] Modify the load test faucet to only deposit when necessary (#1445)
+- [Changed] Move nightly build steps into PR's non-mandatory build steps (#1287)
+- [Changed] Clean up documentation for ExitProcessor, OMG.State and RootChainCoordinator (#1410)
+- [Changed] Update install docs for elixir 1.10 (#1461)
+- [Fixed] Broken macos nightly build (#1458)
+- [Fixed] Errors not reported due to misconfugration (#1489)
 
 ## [v0.4.6](https://github.com/omisego/elixir-omg/releases/tag/v0.4.6)
 

VERSION

@@ -1 +1 @@
-0.4.6
+0.4.7

apps/omg_status/lib/omg_status/release_tasks/set_sentry.ex

@@ -47,14 +47,14 @@ defmodule OMG.Status.ReleaseTasks.SetSentry do
             environment_name: app_env,
             included_environments: [app_env],
             server_name: hostname,
-            tags: [
+            tags: %{
               application: release,
               eth_network: get_env("ETHEREUM_NETWORK"),
               eth_node: get_rpc_client_type(),
               current_version: "vsn-#{current_version}",
               app_env: "#{app_env}",
               hostname: "#{hostname}"
-            ]
+            }
           ]
         )
 

apps/omg_status/test/omg_status/release_tasks/set_sentry_test.exs

@@ -50,14 +50,14 @@ defmodule OMG.Status.ReleaseTasks.SetSentryTest do
           environment_name: yolo,
           included_environments: [yolo],
           server_name: server_name,
-          tags: [
+          tags: %{
             application: :watcher,
             eth_network: network,
             eth_node: :geth,
             current_version: "vsn-" <> current_version,
             app_env: yolo,
             hostname: server_name
-          ]
+          }
         ]
       ]