Merge pull request #205 from covalenthq/develop

Refiner-DTM-RC:v0.5.0 (Ethereum Migration v1.5)
covalenthq · Apr 24, 2024 · e7828b3 · e7828b3
2 parents 42125e1 + c93ae09
commit e7828b3
Show file tree

Hide file tree

Showing 10 changed files with 42,504 additions and 11 deletions.
diff --git a/docker-compose-mbase.yml b/docker-compose-mbase.yml
@@ -62,9 +62,6 @@ services:
       - BLOCK_RESULT_OPERATOR_PRIVATE_KEY=${BLOCK_RESULT_OPERATOR_PRIVATE_KEY}
       - EVM_SERVER_URL=${EVM_SERVER_URL}
       - IPFS_PINNER_URL=${IPFS_PINNER_URL}
-      - BSP_PROOFCHAIN_ADDRESS=${BSP_PROOFCHAIN_ADDRESS}
-      - BRP_PROOFCHAIN_ADDRESS=${BRP_PROOFCHAIN_ADDRESS}
-      - PROOFCHAIN_CHAIN_ID=${PROOFCHAIN_CHAIN_ID}
     networks:
       - cqt-net
     ports:

diff --git a/docker-compose-mbeam.yml b/docker-compose-mbeam.yml
@@ -63,9 +63,6 @@ services:
       - BLOCK_RESULT_OPERATOR_PRIVATE_KEY=${BLOCK_RESULT_OPERATOR_PRIVATE_KEY}
       - EVM_SERVER_URL=${EVM_SERVER_URL}
       - IPFS_PINNER_URL=${IPFS_PINNER_URL}
-      - BSP_PROOFCHAIN_ADDRESS=${BSP_PROOFCHAIN_ADDRESS}
-      - BRP_PROOFCHAIN_ADDRESS=${BRP_PROOFCHAIN_ADDRESS}
-      - PROOFCHAIN_CHAIN_ID=${PROOFCHAIN_CHAIN_ID}
     networks:
       - cqt-net
     ports:

diff --git a/lib/refiner/rpc/ethereum_mainnet.ex b/lib/refiner/rpc/ethereum_mainnet.ex
@@ -1,8 +1,8 @@
 defmodule Refiner.Network.EthereumMainnet do
   use Refiner.RPC.EthereumClient,
     otp_app: :refiner,
-    client_opts: Application.get_env(:refiner, :proofchain_node),
-    chain_id: Application.get_env(:refiner, :proofchain_chain_id),
+    client_opts: Application.compile_env(:refiner, :proofchain_node),
+    chain_id: Application.compile_env(:refiner, :proofchain_chain_id),
     description: "Ethereum Foundation Mainnet",
     currency: [name: "Ether", ticker_symbol: "ETH"]
 end
diff --git a/mix.exs b/mix.exs
@@ -4,7 +4,7 @@ defmodule Refiner.MixProject do
   def project do
     [
       app: :refiner,
-      version: "0.4.3",
+      version: "0.5.0",
       elixir: "~> 1.14.3",
       start_permanent: Mix.env() == :prod,
       deps: deps(),

diff --git a/mix.lock b/mix.lock
@@ -35,7 +35,7 @@
   "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~> 0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
   "jason": {:hex, :jason, "1.4.1", "af1504e35f629ddcdd6addb3513c3853991f694921b1b9368b0bd32beb9f1b63", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"},
   "jsone": {:hex, :jsone, "1.4.6", "644d6d57befb22c8e19b324dee19d73b1c004565009861a8f64c68b7b9e64dbf", [:rebar3], [], "hexpm", "78eee8bb38f0bee2e73673d71bc75fc6fb01f56f0d23e769a26eee3655487a38"},
-  "logger_file_backend": {:hex, :logger_file_backend, "0.0.13", "df07b14970e9ac1f57362985d76e6f24e3e1ab05c248055b7d223976881977c2", [:mix], [], "hexpm", "71a453a7e6e899ae4549fb147b1c6621f4233f8f48f58ca10a64ec67b6c50018"},
+  "logger_file_backend": {:hex, :logger_file_backend, "0.0.14", "774bb661f1c3fed51b624d2859180c01e386eb1273dc22de4f4a155ef749a602", [:mix], [], "hexpm", "071354a18196468f3904ef09413af20971d55164267427f6257b52cfba03f9e6"},
   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},
   "mime": {:hex, :mime, "2.0.5", "dc34c8efd439abe6ae0343edbb8556f4d63f178594894720607772a041b04b02", [:mix], [], "hexpm", "da0d64a365c45bc9935cc5c8a7fc5e49a0e0f9932a761c55d6c52b142780a05c"},
   "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"},

diff --git a/priv/schemas/block-ethereum.avsc b/priv/schemas/block-ethereum.avsc
@@ -302,6 +302,37 @@
                                        {
                                           "name":"input",
                                           "type":"string"
+                                       },
+                                       {
+                                          "name":"blobFeeCap",
+                                          "type":[
+                                             "null",
+                                             {
+                                                "type":"bytes",
+                                                "logicalType":"decimal",
+                                                "precision":1000
+                                             }
+                                          ],
+                                          "default":"null"
+                                       },
+                                       {
+                                          "name":"blobHashes",
+                                          "type":[
+                                             "null",
+                                             {
+                                                "type":"array",
+                                                "items":"string"
+                                             }
+                                          ],
+                                          "default":"null"
+                                       },
+                                       {
+                                          "name":"blobGas",
+                                          "type":[
+                                             "null",
+                                             "int"
+                                          ],
+                                          "default":"null"
                                        }
                                     ]
                                  }
@@ -544,6 +575,43 @@
                                  }
                               ],
                               "default":"null"
+                           },
+                           {
+                              "name":"BlobTxSidecars",
+                              "type":[
+                                 "null",
+                                 {
+                                    "type":"array",
+                                    "items":{
+                                       "name":"BlobTxSidecars_record",
+                                       "type":"record",
+                                       "fields":[
+                                          {
+                                             "name":"Blobs",
+                                             "type":{
+                                                "type":"array",
+                                                "items":"bytes"
+                                             }
+                                          },
+                                          {
+                                             "name":"Commitments",
+                                             "type":{
+                                                "type":"array",
+                                                "items":"bytes"
+                                             }
+                                          },
+                                          {
+                                             "name":"Proofs",
+                                             "type":{
+                                                "type":"array",
+                                                "items":"bytes"
+                                             }
+                                          }
+                                       ]
+                                    }
+                                 }
+                              ],
+                              "default":"null"
                            }
                         ]
                      }
@@ -567,7 +635,7 @@
       {
          "name":"codecVersion",
          "type":"double",
-         "default":0.36
+         "default":0.37
       }
    ]
 }