diff --git a/.env_example b/.env_example index 2f54d225..be1139e0 100644 --- a/.env_example +++ b/.env_example @@ -1,7 +1,5 @@ # used to submit and block result through a web3 storage service -WEB3_JWT= -# used for testing and forking a state of ethereum mainnent -ERIGON_NODE= +WEB3_JWT= # used to submit block result proofs BLOCK_RESULT_OPERATOR_PRIVATE_KEY= diff --git a/.envrc b/.envrc index 387aeca7..ee901fcb 100644 --- a/.envrc +++ b/.envrc @@ -1,4 +1,3 @@ -export ERIGON_NODE="https://ethereum.web3.covalenthq.com/mainnet/rpc" export IPFS_PINNER_URL="http://127.0.0.1:3001" export EVM_SERVER_URL="http://127.0.0.1:3002" diff --git a/config/dev.exs b/config/dev.exs index 9e9a40f6..b7f3c9a1 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -51,7 +51,7 @@ config :phoenix, :plug_init_mode, :runtime config :rudder, operator_private_key: System.get_env("BLOCK_RESULT_OPERATOR_PRIVATE_KEY"), bsp_proofchain_address: "0x1BFa3b5E9bE2c5298B7DE11B5Acb08c37683f4eF", - brp_proofchain_address: "0xeFD84B6F1C04Ad9A7D666E21C9608a2ea2FE4B83", + brp_proofchain_address: "0x06A38f70c8e245e1cfe1b7d5ACa1B7cd29380343", proofchain_chain_id: 1287, proofchain_node: System.get_env("NODE_ETHEREUM_MAINNET"), ipfs_pinner_url: System.get_env("IPFS_PINNER_URL"), diff --git a/docker-compose-mbase.yml b/docker-compose-mbase.yml index e1433b66..21776ccd 100644 --- a/docker-compose-mbase.yml +++ b/docker-compose-mbase.yml @@ -12,14 +12,12 @@ services: labels: "autoheal": "true" expose: - - "4001:4001" - "3001:3001" environment: - WEB3_JWT=${WEB3_JWT} networks: - cqt-net ports: - - "4001:4001" - "3001:3001" evm-server: @@ -66,7 +64,7 @@ services: networks: - cqt-net ports: - - "9568:9568" + - "9568:9568" # prometheus metrics will be exported at http://localhost:9568/metrics etc. autoheal: image: willfarrell/autoheal diff --git a/lib/rudder/block_result/block_result_uploader.ex b/lib/rudder/block_result/block_result_uploader.ex index ff43157a..ecae359a 100644 --- a/lib/rudder/block_result/block_result_uploader.ex +++ b/lib/rudder/block_result/block_result_uploader.ex @@ -51,7 +51,7 @@ defmodule Rudder.BlockResultUploader do block_height, specimen_hash_bytes32, block_result_hash, - cid + "ipfs://#{cid}" ) do {:ok, :submitted} -> :ok = Events.brp_upload_success(System.monotonic_time(:millisecond) - start_upload_ms) diff --git a/mix.exs b/mix.exs index c934057a..a6217a49 100644 --- a/mix.exs +++ b/mix.exs @@ -4,7 +4,7 @@ defmodule Rudder.MixProject do def project do [ app: :rudder, - version: "0.2.12", + version: "0.2.13", elixir: "~> 1.14.3", start_permanent: Mix.env() == :prod, deps: deps() diff --git a/mix.lock b/mix.lock index ff06660f..76e2484a 100644 --- a/mix.lock +++ b/mix.lock @@ -27,7 +27,7 @@ "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"}, "finch": {:hex, :finch, "0.16.0", "40733f02c89f94a112518071c0a91fe86069560f5dbdb39f9150042f44dcfb1a", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.3", [hex: :mint, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.4 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:nimble_pool, "~> 0.2.6 or ~> 1.0", [hex: :nimble_pool, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "f660174c4d519e5fec629016054d60edd822cdfe2b7270836739ac2f97735ec5"}, "gen_stage": {:hex, :gen_stage, "1.2.1", "19d8b5e9a5996d813b8245338a28246307fd8b9c99d1237de199d21efc4c76a1", [:mix], [], "hexpm", "83e8be657fa05b992ffa6ac1e3af6d57aa50aace8f691fcf696ff02f8335b001"}, - "gettext": {:hex, :gettext, "0.22.2", "6bfca374de34ecc913a28ba391ca184d88d77810a3e427afa8454a71a51341ac", [:mix], [{:expo, "~> 0.4.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "8a2d389673aea82d7eae387e6a2ccc12660610080ae7beb19452cfdc1ec30f60"}, + "gettext": {:hex, :gettext, "0.22.3", "c8273e78db4a0bb6fba7e9f0fd881112f349a3117f7f7c598fa18c66c888e524", [:mix], [{:expo, "~> 0.4.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "935f23447713954a6866f1bb28c3a878c4c011e802bcd68a726f5e558e4b64bd"}, "hackney": {:hex, :hackney, "1.18.1", "f48bf88f521f2a229fc7bae88cf4f85adc9cd9bcf23b5dc8eb6a1788c662c4f6", [:rebar3], [{:certifi, "~> 2.9.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~> 6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~> 1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~> 1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.3.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~> 1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~> 0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "a4ecdaff44297e9b5894ae499e9a070ea1888c84afdd1fd9b7b2bc384950128e"}, "hpax": {:hex, :hpax, "0.1.2", "09a75600d9d8bbd064cdd741f21fc06fc1f4cf3d0fcc335e5aa19be1a7235c84", [:mix], [], "hexpm", "2c87843d5a23f5f16748ebe77969880e29809580efdaccd615cd3bed628a8c13"}, "httpoison": {:hex, :httpoison, "1.8.2", "9eb9c63ae289296a544842ef816a85d881d4a31f518a0fec089aaa744beae290", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "2bb350d26972e30c96e2ca74a1aaf8293d61d0742ff17f01e0279fef11599921"},