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

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: helium/miner
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: validator1.13.7
Choose a base ref
...
head repository: helium/miner
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 2,167 additions and 61 deletions.
  1. +2 −2 Dockerfile
  2. +1 −0 Dockerfile-ubuntu
  3. +2 −2 Makefile
  4. +32 −0 audit/var-148.md
  5. +45 −0 audit/var-149.md
  6. +212 −0 audit/var-150.md
  7. +32 −0 audit/var-151.md
  8. +35 −0 audit/var-152.md
  9. +33 −0 audit/var-153.md
  10. +38 −0 audit/var-154.md
  11. +33 −0 audit/var-155.md
  12. +214 −0 audit/var-156.md
  13. +35 −0 audit/var-157.md
  14. +32 −0 audit/var-158.md
  15. +34 −0 audit/var-159.md
  16. +32 −0 audit/var-160.md
  17. +35 −0 audit/var-161.md
  18. +36 −0 audit/var-162.md
  19. +31 −0 audit/var-163.md
  20. +42 −0 audit/var-164.md
  21. +31 −0 audit/var-165.md
  22. +42 −0 audit/var-166.md
  23. +39 −0 audit/var-167.md
  24. +43 −0 audit/var-168.md
  25. +217 −0 audit/var-169.md
  26. +232 −0 audit/var-170.md
  27. +32 −0 audit/var-171.md
  28. +1 −1 config/docker-val.config.src
  29. +10 −4 config/sys.config
  30. +6 −1 config/val.config.src
  31. +2 −0 rebar.config
  32. +15 −15 rebar.lock
  33. +21 −0 scripts/extensions/denylist
  34. +120 −0 src/cli/miner_cli_denylist.erl
  35. +27 −0 src/cli/miner_cli_hbbft.erl
  36. +0 −1 src/cli/miner_cli_info.erl
  37. +1 −0 src/cli/miner_cli_registry.erl
  38. +3 −0 src/handlers/miner_hbbft_handler.erl
  39. +36 −0 src/jsonrpc/miner_jsonrpc_denylist.erl
  40. +21 −10 src/jsonrpc/miner_jsonrpc_ledger.erl
  41. +12 −1 src/miner.app.src
  42. +48 −3 src/miner.erl
  43. +97 −0 src/miner_blockhistory.erl
  44. +8 −3 src/miner_consensus_mgr.erl
  45. +11 −1 src/miner_critical_sup.erl
  46. +49 −0 src/miner_gateway_port.erl
  47. +2 −0 src/miner_jsonrpc_handler.erl
  48. +5 −1 src/miner_lora.erl
  49. +1 −1 src/miner_lora_light.erl
  50. +2 −1 src/miner_restart_sup.erl
  51. +5 −0 src/miner_util.erl
  52. +6 −2 src/miner_val_heartbeat.erl
  53. +1 −1 src/poc/miner_poc_denylist.erl
  54. +20 −7 src/poc/miner_poc_grpc_client_statem.erl
  55. +45 −4 src/poc/miner_poc_mgr.erl
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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 protobuf sed tar wget gcompat \
${EXTRA_BUILD_APK_PACKAGES}

# Install Rust toolchain
@@ -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
1 change: 1 addition & 0 deletions Dockerfile-ubuntu
Original file line number Diff line number Diff line change
@@ -86,6 +86,7 @@ RUN apt update \
libncurses6 \
libsodium23 \
libstdc++6 \
curl \
${EXTRA_RUNNER_APT_PACKAGES} \
&& rm -rf /var/lib/apt/lists \
&& ln -sf /opt/miner/releases/${VERSION} /config
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -11,8 +11,8 @@ endif

GRPC_SERVICES_DIR=src/grpc/autogen

GATEWAY_RS_VSN ?= "v1.0.0-alpha.30"
GWMP_MUX_VSN ?= "v0.9.4"
GATEWAY_RS_VSN ?= "4335121d045907c627dcd385f9dcee429c41bb22"
GWMP_MUX_VSN ?= "v0.10.5"

all: compile

32 changes: 32 additions & 0 deletions audit/var-148.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Chain Variable Transaction 148

## Changes

This transaction altered the `poc_hexing_type` variable to be `h3dex`.

## Version threshold

None

## Transaction

```erlang
{blockchain_txn_vars_v1_pb,
[{blockchain_var_v1_pb,"poc_hexing_type","atom",
<<"h3dex">>}],
0,
<<48,70,2,33,0,166,71,157,53,222,177,230,185,131,91,88,
127,141,45,163,239,85,10,7,26,153,4,3,11,97,195,181,220,
39,198,215,101,2,33,0,134,87,235,205,220,175,242,178,83,
234,184,213,16,163,34,88,38,98,223,94,57,25,54,40,241,
33,192,233,234,198,248,71>>,
<<>>,<<>>,[],[],148,[],[],[]}
```

## Acceptance block

1469951

## Acceptance block time

Fri Aug 08 12:07:32 PM UTC 2022
45 changes: 45 additions & 0 deletions audit/var-149.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Chain Variable Transaction 149

## Changes

This transaction introduces the following chain vars to allow activation of
MOBILE tokens on chain.

|Var | Old | New |
|-------------------------------|-----------|-----|
|allowed_num_reward_server_keys |undefined |1 |
|deprecate_security_exchange_v1 |undefined |true |
|token_version |undefined |2 |
|ledger_entry_version |undefined |2 |


## Version threshold

None

## Transaction

```erlang
[{1475513,
[{blockchain_txn_vars_v1_pb,[{blockchain_var_v1_pb,"allowed_num_reward_server_keys",
"int",<<"1">>},
{blockchain_var_v1_pb,"deprecate_security_exchange_v1",
"atom",<<"true">>},
{blockchain_var_v1_pb,"ledger_entry_version","int",<<"2">>},
{blockchain_var_v1_pb,"token_version","int",<<"2">>}],
0,
<<48,70,2,33,0,212,194,187,175,153,211,64,145,248,28,143,
209,165,178,1,77,75,162,143,30,168,47,93,237,156,15,19,
88,53,88,23,45,2,33,0,136,114,15,27,17,150,108,234,243,
236,176,84,101,252,7,103,130,70,12,71,163,218,165,23,33,
176,21,22,105,79,160,91>>,
<<>>,<<>>,[],[],149,[],[],[]}]}]
```

## Acceptance block

1475513

## Acceptance block time

Fri Aug 12 02:46:33 PM UTC 2022
Loading