Skip to content
This repository was archived by the owner on Jun 12, 2023. It is now read-only.

[DNM] Adt/beacon testing #1831

Draft
wants to merge 22 commits into
base: master
Choose a base branch
from
Draft

[DNM] Adt/beacon testing #1831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a104c9d
Bump gateway-rs for beacon testing
Vagabond Oct 5, 2022
dbf3e28
Add gcompat so vendored protoc will work
Vagabond Oct 5, 2022
ed85dcb
bump gateway-rs for uri fixes
Vagabond Oct 6, 2022
0a2db5c
gateway_rs needs curl for polling entropy service
JayKickliter Oct 7, 2022
f6f2dab
updating gw sha with auth token
jeffgrunewald Oct 7, 2022
93c9488
mux logs to debug
jeffgrunewald Oct 10, 2022
73a7916
update gwmp-mux/semtech-udp
jeffgrunewald Oct 10, 2022
e666511
update gwmp-mux/semtech-udp
jeffgrunewald Oct 10, 2022
c7f7e32
rev gateway-rs with beacon header size fix
jeffgrunewald Oct 10, 2022
39340ed
fix phypayload size restriction
jeffgrunewald Oct 11, 2022
f357fd5
Update gateway-rs
Vagabond Oct 11, 2022
ef53532
Bump gateway-rs to test connection reuse issue fix
Vagabond Oct 11, 2022
c2b6545
Bump gateway-rs for signal/snr fixes
Vagabond Oct 12, 2022
528980e
mux upgrade for tmst
jeffgrunewald Oct 12, 2022
ab50182
Bump gateway-rs to fix signedness of signal field
Vagabond Oct 13, 2022
baa583f
Bump gw-rs for secondary beacon testing
Vagabond Oct 17, 2022
8242db3
Bump mux to tolerate jerminator
Vagabond Oct 18, 2022
37d8157
Bump gwrs for more logging
Vagabond Oct 18, 2022
048442d
bump gwrs for bugfix
Vagabond Oct 18, 2022
7ca5298
Bump gwrs for secondary beacon entropy versioning
Vagabond Oct 18, 2022
2015d3e
Bump gateway-rs for rebase with send/receive tmst
Vagabond Oct 21, 2022
c5d9f50
Bump gwrs for improvement
Vagabond Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ARG EXTRA_BUILD_APK_PACKAGES
RUN apk add --no-cache --update \
autoconf automake bison build-base bzip2 cmake curl \
dbus-dev flex git gmp-dev libsodium-dev libtool linux-headers lz4 \
openssl-dev pkgconfig protoc sed tar wget \
openssl-dev pkgconfig protoc sed tar wget gcompat \
${EXTRA_BUILD_APK_PACKAGES}

# Install Rust toolchain
Expand Down Expand Up @@ -59,7 +59,7 @@ FROM ${RUNNER_IMAGE} as runner
ARG VERSION
ARG EXTRA_RUNNER_APK_PACKAGES

RUN apk add --no-cache --update ncurses dbus libsodium libstdc++ \
RUN apk add --no-cache --update ncurses dbus libsodium libstdc++ curl \
${EXTRA_RUNNER_APK_PACKAGES}

RUN ulimit -n 64000
Expand Down
5 changes: 2 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ else
endif

GRPC_SERVICES_DIR=src/grpc/autogen

GATEWAY_RS_VSN ?= "v1.0.0-alpha.31"
GWMP_MUX_VSN ?= "v0.9.4"
GATEWAY_RS_VSN ?= "0c37be5dff56d6f989c1dcc8ebf6bb1819d6e447"
GWMP_MUX_VSN ?= "v0.9.8"

all: compile

Expand Down
1 change: 1 addition & 0 deletions config/val.config.src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
]},
{blockchain,
[
{aux_ledger_dir, "aux"},
Copy link
Contributor

@jeffgrunewald jeffgrunewald Nov 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is on the validator config, did you want it on a config used by miner?

{listen_addresses, ["${LISTEN_ADDRESS:-/ip4/0.0.0.0/tcp/2154}"]},
{fetch_latest_from_snap_source, false},
{block_sync_batch_size, 10},
Expand Down
6 changes: 6 additions & 0 deletions priv/gateway_rs/settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
## api listening port override
api = 4468

[poc]
entropy_uri = "https://entropy.helium.io/entropy"
ingest_uri = "http://mainnet-pociot.helium.io:9080"
beacon_interval = 600
Copy link
Contributor

@jeffgrunewald jeffgrunewald Nov 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

beacon_interval seems to be the only setting you actually need here. Ingest token is not needed on the lora network ingestor and the two URIs match the default values.
you could set this as an environment variable for the gateway in miner_gateway_port as GW_POC_BEACON_INTERVAL=600 if you prefer but I thought we had to rename that to just interval?

ingest_token = "dev"