rename tag stuff, add source mainnet

.buildkite/pipeline.yml

@@ -11,7 +11,7 @@ steps:
     artifact_paths:
       - "artifacts/*"
 
-  - if: build.tag =~ /^val/
+  - if: build.tag =~ /^validator/
     name: ":debian: build validator deb"
     commands:
       - "git fetch -t"
@@ -23,7 +23,7 @@ steps:
     agents:
       queue: "erlang"
 
-  - if: build.tag =~ /^val/
+  - if: build.tag =~ /^validator/
     name: ":cloud: upload validator deb to packagecloud"
     commands:
       - "git fetch -t"
@@ -32,7 +32,7 @@ steps:
     agents:
       queue: "erlang"
 
-  - if: build.tag =~ /^val/
+  - if: build.tag =~ /^validator/
     name: "validator AMD64 docker"
     env:
       REGISTRY_HOST: "quay.io"
@@ -58,7 +58,7 @@ steps:
       - "git fetch -t"
       - ".buildkite/scripts/make_val_image.sh"
 
-  - if: build.tag =~ /^testval/
+  - if: build.tag =~ /^val\d/
     name: "testnet validator AMD64 docker"
     env:
       REGISTRY_HOST: "quay.io"
@@ -71,7 +71,7 @@ steps:
       - "git fetch -t"
       - ".buildkite/scripts/make_testval_image.sh"
 
-  - if: build.tag =~ /^testval/
+  - if: build.tag =~ /^val\d/
     name: "testnet validator ARM64 docker"
     env:
       REGISTRY_HOST: "quay.io"
@@ -84,7 +84,7 @@ steps:
       - "git fetch -t"
       - ".buildkite/scripts/make_testval_image.sh"
 
-  - if: build.tag != null && build.tag !~ /^testval/ && build.tag !~ /^val/
+  - if: build.tag != null && build.tag !~ /^validator/ && build.tag !~ /^val\d/
     name: ":whale: AMD64 docker"
     env:
       REGISTRY_HOST: "quay.io"
@@ -97,7 +97,7 @@ steps:
       - "git fetch -t"
       - ".buildkite/scripts/make_image.sh"
 
-  - if: build.tag != null && build.tag !~ /^testval/ && build.tag !~ /^val/
+  - if: build.tag != null && build.tag !~ /^validator/ && build.tag !~ /^val\d/
     name: ":whale: ARM64 docker"
     agents:
       queue: "arm64"

.buildkite/scripts/make_testval_image.sh

@@ -15,5 +15,5 @@ docker login -u="team-helium+buildkite" -p="${QUAY_BUILDKITE_PASSWORD}" ${REGIST
 docker build -t helium:$DOCKER_NAME -f "${DOCKERFILE_NAME}" .
 docker tag helium:$DOCKER_NAME "$MINER_REGISTRY_NAME:$DOCKER_NAME"
 docker push "$MINER_REGISTRY_NAME:$DOCKER_NAME"
-docker tag helium:$DOCKER_NAME "$MINER_REGISTRY_NAME:latest-testval-${IMAGE_ARCH}"
-docker push "$MINER_REGISTRY_NAME:latest-val-${IMAGE_ARCH}"
+# docker tag helium:$DOCKER_NAME "$MINER_REGISTRY_NAME:latest-val-${IMAGE_ARCH}"
+# docker push "$MINER_REGISTRY_NAME:latest-val-${IMAGE_ARCH}"

.buildkite/scripts/make_val_image.sh

@@ -15,5 +15,5 @@ docker login -u="team-helium+buildkite" -p="${QUAY_BUILDKITE_PASSWORD}" ${REGIST
 docker build -t helium:$DOCKER_NAME -f "${DOCKERFILE_NAME}" .
 docker tag helium:$DOCKER_NAME "$MINER_REGISTRY_NAME:$DOCKER_NAME"
 docker push "$MINER_REGISTRY_NAME:$DOCKER_NAME"
-docker tag helium:$DOCKER_NAME "$MINER_REGISTRY_NAME:latest-val-${IMAGE_ARCH}"
-docker push "$MINER_REGISTRY_NAME:latest-val-${IMAGE_ARCH}"
+# docker tag helium:$DOCKER_NAME "$MINER_REGISTRY_NAME:latest-validator-${IMAGE_ARCH}"
+# docker push "$MINER_REGISTRY_NAME:latest-validator-${IMAGE_ARCH}"

config/test_val.config.src

+%% -*- erlang -*-
+[
+ "config/sys.config",
+ {lager,
+  [
+   {log_root, "log"},
+   {handlers,
+    [
+     {lager_file_backend, [{file, "console.log"}, {size, 52428800}, {level, info}]},
+     {lager_file_backend, [{file, "error.log"}, {size, 52428800}, {level, error}]}
+    ]}
+  ]},
+ {blockchain,
+  [
+   {seed_nodes, "/ip4/3.12.155.25/tcp/2154"},
+   {seed_node_dns, ""},
+   {ports, [2154]},
+   {honor_quick_sync, true},
+   {quick_sync_mode, blessed_snapshot},
+   {blessed_snapshot_block_height, 15121},
+   {blessed_snapshot_block_hash,
+     <<212,153,235,149,144,169,179,243,176,156,92,202,217,40,119,223,177,191,83,51,215,65,206,217,63,112,27,245,207,218,100,196>>},
+   {key, undefined},
+   {relay_limit, 100},
+   {base_dir, "data"},
+   {gw_cache_retention_limit, 76},
+   {gw_context_cache_max_size, 500}
+  ]},
+ {libp2p,
+  [
+   {nat_map, #{ {"${NAT_INTERNAL_IP}", "${NAT_INTERNAL_PORT}"} => {"${NAT_EXTERNAL_IP}", "${NAT_EXTERNAL_PORT}"}}}
+  ]
+ },
+ {relcast,
+  [
+   {pipeline_depth, 125}
+  ]},
+ {rocksdb,
+  [{global_opts,
+    [
+     {compaction_style, universal},
+     {block_based_table_options, [{cache_index_and_filter_blocks, true}]},
+     {max_write_buffer_number, 16},
+     {keep_log_file_num, 10}
+    ]}
+  ]},
+ {miner,
+  [
+   {mode, validator},
+   {stabilization_period, 8000},
+   {network, testnet},
+   %% these two now disable all the poc stuff
+   {use_ebus, false},
+   {radio_device, undefined},
+   %% dont perform regionalised checks in dev envs
+   %% we only realy need the params below if this file is changed to specify a radio device
+   %% as without one miner_lora is not started
+   %% including the params anyway in case someone needs it in this env
+   {region_override, 'US915'}
+
+  ]}
+].

config/val.config.src

@@ -12,19 +12,10 @@
   ]},
  {blockchain,
   [
-   {seed_nodes, "/ip4/3.12.155.25/tcp/2154"},
-   {seed_node_dns, ""},
    {ports, [2154]},
-   {honor_quick_sync, true},
-   {quick_sync_mode, blessed_snapshot},
-   {blessed_snapshot_block_height, 15121},
-   {blessed_snapshot_block_hash,
-     <<212,153,235,149,144,169,179,243,176,156,92,202,217,40,119,223,177,191,83,51,215,65,206,217,63,112,27,245,207,218,100,196>>},
    {key, undefined},
    {relay_limit, 100},
-   {base_dir, "data"},
-   {gw_cache_retention_limit, 76},
-   {gw_context_cache_max_size, 500}
+   {base_dir, "data"}
   ]},
  {libp2p,
   [
@@ -47,8 +38,6 @@
  {miner,
   [
    {mode, validator},
-   {stabilization_period, 8000},
-   {network, testnet},
    %% these two now disable all the poc stuff
    {use_ebus, false},
    {radio_device, undefined},

rebar.config

@@ -212,7 +212,7 @@
              [
               {relx,
                [
-                {release, {miner, {semver, "val"}},
+                {release, {miner, {semver, "validator"}},
                  [miner,
                   tools,
                   runtime_tools,
@@ -227,9 +227,28 @@
                 {extended_start_script, true},
                 {include_src, false}]}]
             },
+            {test_validator,
+             [
+              {relx,
+               [
+                {release, {miner, {semver, "val"}},
+                 [miner,
+                  tools,
+                  runtime_tools,
+                  recon]},
+                {sys_config_src, "config/test_val.config.src"},
+                %% {vm_args_src, "config/vm_val.args.src"},
+                {overlay,
+                 [{copy, "config/sys.config", "config/sys.config"},
+                  {template, "config/vm_val.args", "{{output_dir}}/releases/{{release_version}}/vm.args"}]},
+                {dev_mode, false},
+                {include_erts, true},
+                {extended_start_script, true},
+                {include_src, false}]}]
+            },
             {docker_val, [
               {relx, [
-                {release, {miner, {semver, "val"}},
+                {release, {miner, {semver, "validator"}},
                   [miner,
                     tools,
                     runtime_tools,
@@ -246,7 +265,7 @@
             },
             {docker_testval, [
               {relx, [
-                {release, {miner, {semver, "testval"}},
+                {release, {miner, {semver, "val"}},
                   [miner,
                     tools,
                     runtime_tools,