parent
7489784ba8
commit
c5101c16e9
|
@ -64,7 +64,7 @@ jobs:
|
||||||
include:
|
include:
|
||||||
- target:
|
- target:
|
||||||
os: linux
|
os: linux
|
||||||
builder: ubuntu-18.04
|
builder: ubuntu-20.04
|
||||||
shell: bash
|
shell: bash
|
||||||
- target:
|
- target:
|
||||||
os: macos
|
os: macos
|
||||||
|
|
|
@ -110,7 +110,7 @@ jobs:
|
||||||
include:
|
include:
|
||||||
- target:
|
- target:
|
||||||
os: linux
|
os: linux
|
||||||
builder: ubuntu-18.04
|
builder: ubuntu-20.04
|
||||||
shell: bash
|
shell: bash
|
||||||
- target:
|
- target:
|
||||||
os: macos
|
os: macos
|
||||||
|
|
|
@ -118,6 +118,8 @@ proc run(config: PortalConf) {.raises: [CatchableError, Defect].} =
|
||||||
registerIncomingSocketCallback(@[
|
registerIncomingSocketCallback(@[
|
||||||
stateNetwork.portalProtocol.stream,
|
stateNetwork.portalProtocol.stream,
|
||||||
historyNetwork.portalProtocol.stream]),
|
historyNetwork.portalProtocol.stream]),
|
||||||
|
# for now we do not use user data in callbacks
|
||||||
|
nil,
|
||||||
allowRegisteredIdCallback(@[
|
allowRegisteredIdCallback(@[
|
||||||
stateNetwork.portalProtocol.stream,
|
stateNetwork.portalProtocol.stream,
|
||||||
historyNetwork.portalProtocol.stream]),
|
historyNetwork.portalProtocol.stream]),
|
||||||
|
|
|
@ -34,6 +34,7 @@ proc newHistoryNode(rng: ref HmacDrbgContext, port: int): HistoryNode =
|
||||||
node,
|
node,
|
||||||
utpProtocolId,
|
utpProtocolId,
|
||||||
registerIncomingSocketCallback(@[hn.portalProtocol.stream]),
|
registerIncomingSocketCallback(@[hn.portalProtocol.stream]),
|
||||||
|
nil,
|
||||||
allowRegisteredIdCallback(@[hn.portalProtocol.stream]),
|
allowRegisteredIdCallback(@[hn.portalProtocol.stream]),
|
||||||
socketConfig
|
socketConfig
|
||||||
)
|
)
|
||||||
|
|
|
@ -51,6 +51,7 @@ proc initPortalProtocol(
|
||||||
streamTransport = UtpDiscv5Protocol.new(
|
streamTransport = UtpDiscv5Protocol.new(
|
||||||
d, utpProtocolId,
|
d, utpProtocolId,
|
||||||
registerIncomingSocketCallback(@[proto.stream]),
|
registerIncomingSocketCallback(@[proto.stream]),
|
||||||
|
nil,
|
||||||
allowRegisteredIdCallback(@[proto.stream]),
|
allowRegisteredIdCallback(@[proto.stream]),
|
||||||
socketConfig)
|
socketConfig)
|
||||||
|
|
||||||
|
|
|
@ -64,7 +64,7 @@ proc defaultDataDir*(): string =
|
||||||
|
|
||||||
const
|
const
|
||||||
defaultDataDirDesc = defaultDataDir()
|
defaultDataDirDesc = defaultDataDir()
|
||||||
defaultBlockFileName = "eth-block-data.json"
|
defaultBlockFileName = "eth-block-data"
|
||||||
defaultAccumulatorFileName = "eth-accumulator.json"
|
defaultAccumulatorFileName = "eth-accumulator.json"
|
||||||
|
|
||||||
type
|
type
|
||||||
|
|
|
@ -240,6 +240,7 @@ proc run(config: PortalCliConf) =
|
||||||
d,
|
d,
|
||||||
utpProtocolId,
|
utpProtocolId,
|
||||||
registerIncomingSocketCallback(@[portal.stream]),
|
registerIncomingSocketCallback(@[portal.stream]),
|
||||||
|
nil,
|
||||||
allowRegisteredIdCallback(@[portal.stream]), socketConfig)
|
allowRegisteredIdCallback(@[portal.stream]), socketConfig)
|
||||||
|
|
||||||
setTransport(portal.stream, streamTransport)
|
setTransport(portal.stream, streamTransport)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 883825aad78f5db6f24257e64c1441ae7f3a1d21
|
Subproject commit 2556b090ea78416410098172b1ad3cc4d21a6474
|
Loading…
Reference in New Issue