Bump nim eth (#1188)

* Bump nim eth

* Bump actions ubuntu

.github/workflows/ci.yml

@@ -64,7 +64,7 @@ jobs:
         include:
           - target:
               os: linux
-            builder: ubuntu-18.04
+            builder: ubuntu-20.04
             shell: bash
           - target:
               os: macos

.github/workflows/fluffy.yml

@@ -110,7 +110,7 @@ jobs:
         include:
           - target:
               os: linux
-            builder: ubuntu-18.04
+            builder: ubuntu-20.04
             shell: bash
           - target:
               os: macos

fluffy/fluffy.nim

@@ -118,6 +118,8 @@ proc run(config: PortalConf) {.raises: [CatchableError, Defect].} =
       registerIncomingSocketCallback(@[
         stateNetwork.portalProtocol.stream,
         historyNetwork.portalProtocol.stream]),
+      # for now we do not use user data in callbacks
+      nil,
       allowRegisteredIdCallback(@[
         stateNetwork.portalProtocol.stream,
         historyNetwork.portalProtocol.stream]),

fluffy/tests/test_history_network.nim

@@ -34,6 +34,7 @@ proc newHistoryNode(rng: ref HmacDrbgContext, port: int): HistoryNode =
       node,
       utpProtocolId,
       registerIncomingSocketCallback(@[hn.portalProtocol.stream]),
+      nil,
       allowRegisteredIdCallback(@[hn.portalProtocol.stream]),
       socketConfig
     )

fluffy/tests/test_portal_wire_protocol.nim

@@ -51,6 +51,7 @@ proc initPortalProtocol(
     streamTransport = UtpDiscv5Protocol.new(
       d, utpProtocolId,
       registerIncomingSocketCallback(@[proto.stream]),
+      nil,
       allowRegisteredIdCallback(@[proto.stream]),
       socketConfig)
 

fluffy/tools/eth_data_exporter.nim

@@ -64,7 +64,7 @@ proc defaultDataDir*(): string =
 
 const
   defaultDataDirDesc = defaultDataDir()
-  defaultBlockFileName = "eth-block-data.json"
+  defaultBlockFileName = "eth-block-data"
   defaultAccumulatorFileName = "eth-accumulator.json"
 
 type

fluffy/tools/portalcli.nim

@@ -240,6 +240,7 @@ proc run(config: PortalCliConf) =
       d,
       utpProtocolId,
       registerIncomingSocketCallback(@[portal.stream]),
+      nil,
       allowRegisteredIdCallback(@[portal.stream]), socketConfig)
 
   setTransport(portal.stream, streamTransport)

vendor/nim-eth

@@ -1 +1 @@
-Subproject commit 883825aad78f5db6f24257e64c1441ae7f3a1d21
+Subproject commit 2556b090ea78416410098172b1ad3cc4d21a6474