From 137d6b2141907961add47ea1afc4f2493cbba958 Mon Sep 17 00:00:00 2001 From: Martin Boehm Date: Mon, 16 Oct 2023 22:50:06 +0200 Subject: [PATCH] Bump polygon bor to 1.0.6, heimdall to 1.0.2 --- .../backend/scripts/polygon_archive_bor.sh | 2 +- .../scripts/polygon_archive_heimdall.sh | 3 +- .../templates/backend/scripts/polygon_bor.sh | 2 +- .../backend/scripts/polygon_heimdall.sh | 3 +- configs/coins/polygon.json | 10 +-- configs/coins/polygon_archive.json | 10 +-- configs/coins/polygon_heimdall.json | 78 +++++++++---------- configs/coins/polygon_heimdall_archive.json | 78 +++++++++---------- 8 files changed, 94 insertions(+), 92 deletions(-) diff --git a/build/templates/backend/scripts/polygon_archive_bor.sh b/build/templates/backend/scripts/polygon_archive_bor.sh index 09360286..c7cabd3f 100644 --- a/build/templates/backend/scripts/polygon_archive_bor.sh +++ b/build/templates/backend/scripts/polygon_archive_bor.sh @@ -15,7 +15,7 @@ $BOR_BIN server \ --syncmode full \ --datadir $DATA_DIR \ --bor.heimdall http://127.0.0.1:8173 \ - --bootnodes enode://0cb82b395094ee4a2915e9714894627de9ed8498fb881cec6db7c65e8b9a5bd7f2f25cc84e71e89d0947e51c76e85d0847de848c7782b13c0255247a6758178c@44.232.55.71:30303,enode://88116f4295f5a31538ae409e4d44ad40d22e44ee9342869e7d68bdec55b0f83c1530355ce8b41fbec0928a7d75a5745d528450d30aec92066ab6ba1ee351d710@159.203.9.164:30303 \ + --bootnodes enode://76316d1cb93c8ed407d3332d595233401250d48f8fbb1d9c65bd18c0495eca1b43ec38ee0ea1c257c0abb7d1f25d649d359cdfe5a805842159cfe36c5f66b7e8@52.78.36.216:30303,enode://b8f1cc9c5d4403703fbf377116469667d2b1823c0daf16b7250aa576bacf399e42c3930ccfcb02c5df6879565a2b8931335565f0e8d3f8e72385ecf4a4bf160a@3.36.224.80:30303,enode://8729e0c825f3d9cad382555f3e46dcff21af323e89025a0e6312df541f4a9e73abfa562d64906f5e59c51fe6f0501b3e61b07979606c56329c020ed739910759@54.194.245.5:30303,enode://681ebac58d8dd2d8a6eef15329dfbad0ab960561524cf2dfde40ad646736fe5c244020f20b87e7c1520820bc625cfb487dd71d63a3a3bf0baea2dbb8ec7c79f1@34.240.245.39:30303 \ --port {{.Ports.BackendP2P}} \ --http \ --http.addr 127.0.0.1 \ diff --git a/build/templates/backend/scripts/polygon_archive_heimdall.sh b/build/templates/backend/scripts/polygon_archive_heimdall.sh index 211718a1..30c55058 100644 --- a/build/templates/backend/scripts/polygon_archive_heimdall.sh +++ b/build/templates/backend/scripts/polygon_archive_heimdall.sh @@ -23,10 +23,11 @@ fi # --eth_rpc_url: backend-ethereum-archive ports.backend_http $HEIMDALL_BIN start \ --home $HOME_DIR \ + --chain=mainnet \ --rpc.laddr tcp://127.0.0.1:{{.Ports.BackendRPC}} \ --p2p.laddr tcp://0.0.0.0:{{.Ports.BackendP2P}} \ --laddr tcp://127.0.0.1:{{.Ports.BackendHttp}} \ - --p2p.seeds "2a53a15ffc70ad41b6876ecbe05c50a66af01e20@3.211.248.31:26656,6f829065789e5b156cbbf076f9d133b4d7725847@3.212.183.151:26656,7285a532bad665f051c0aadc31054e2e61ca2b3d@3.93.224.197:26656,0b431127d21c8970f1c353ab212be4f1ba86c3bf@184.73.124.158:26656,f4f605d60b8ffaaf15240564e58a81103510631c@159.203.9.164:26656,31b79cf4a628a4619e8e9ae95b72e4354c5a5d90@44.232.55.71:26656,a385dd467d11c4cdb0be8b51d7bfb0990f49abc3@35.199.4.13:26656,daad548c0a163faae1d8d58425f97207acf923fd@35.230.116.151:26656,81c76e82fcc3dc9a0a1554a3edaa09a632795ea8@35.221.13.28:26656" \ + --p2p.seeds "f4f605d60b8ffaaf15240564e58a81103510631c@159.203.9.164:26656,4fb1bc820088764a564d4f66bba1963d47d82329@44.232.55.71:26656,2eadba4be3ce47ac8db0a3538cb923b57b41c927@35.199.4.13:26656,3b23b20017a6f348d329c102ddc0088f0a10a444@35.221.13.28:26656,25f5f65a09c56e9f1d2d90618aa70cd358aa68da@35.230.116.151:26656,4cd60c1d76e44b05f7dfd8bab3f447b119e87042@54.147.31.250:26656,b18bbe1f3d8576f4b73d9b18976e71c65e839149@34.226.134.117:26656,1500161dd491b67fb1ac81868952be49e2509c9f@52.78.36.216:26656,dd4a3f1750af5765266231b9d8ac764599921736@3.36.224.80:26656,8ea4f592ad6cc38d7532aff418d1fb97052463af@34.240.245.39:26656,e772e1fb8c3492a9570a377a5eafdb1dc53cd778@54.194.245.5:26656,6726b826df45ac8e9afb4bdb2469c7771bd797f1@52.209.21.164:26656" \ --node tcp://127.0.0.1:{{.Ports.BackendRPC}} \ --bor_rpc_url http://127.0.0.1:8172 \ --eth_rpc_url http://127.0.0.1:8116 \ diff --git a/build/templates/backend/scripts/polygon_bor.sh b/build/templates/backend/scripts/polygon_bor.sh index 9ba96185..5c877ce4 100644 --- a/build/templates/backend/scripts/polygon_bor.sh +++ b/build/templates/backend/scripts/polygon_bor.sh @@ -15,7 +15,7 @@ $BOR_BIN server \ --syncmode full \ --datadir $DATA_DIR \ --bor.heimdall http://127.0.0.1:8171 \ - --bootnodes enode://0cb82b395094ee4a2915e9714894627de9ed8498fb881cec6db7c65e8b9a5bd7f2f25cc84e71e89d0947e51c76e85d0847de848c7782b13c0255247a6758178c@44.232.55.71:30303,enode://88116f4295f5a31538ae409e4d44ad40d22e44ee9342869e7d68bdec55b0f83c1530355ce8b41fbec0928a7d75a5745d528450d30aec92066ab6ba1ee351d710@159.203.9.164:30303 \ + --bootnodes enode://76316d1cb93c8ed407d3332d595233401250d48f8fbb1d9c65bd18c0495eca1b43ec38ee0ea1c257c0abb7d1f25d649d359cdfe5a805842159cfe36c5f66b7e8@52.78.36.216:30303,enode://b8f1cc9c5d4403703fbf377116469667d2b1823c0daf16b7250aa576bacf399e42c3930ccfcb02c5df6879565a2b8931335565f0e8d3f8e72385ecf4a4bf160a@3.36.224.80:30303,enode://8729e0c825f3d9cad382555f3e46dcff21af323e89025a0e6312df541f4a9e73abfa562d64906f5e59c51fe6f0501b3e61b07979606c56329c020ed739910759@54.194.245.5:30303,enode://681ebac58d8dd2d8a6eef15329dfbad0ab960561524cf2dfde40ad646736fe5c244020f20b87e7c1520820bc625cfb487dd71d63a3a3bf0baea2dbb8ec7c79f1@34.240.245.39:30303 \ --port {{.Ports.BackendP2P}} \ --http \ --http.addr 127.0.0.1 \ diff --git a/build/templates/backend/scripts/polygon_heimdall.sh b/build/templates/backend/scripts/polygon_heimdall.sh index 8651cc3a..27d4ee24 100644 --- a/build/templates/backend/scripts/polygon_heimdall.sh +++ b/build/templates/backend/scripts/polygon_heimdall.sh @@ -23,10 +23,11 @@ fi # --eth_rpc_url: backend-ethereum ports.backend_http $HEIMDALL_BIN start \ --home $HOME_DIR \ + --chain=mainnet \ --rpc.laddr tcp://127.0.0.1:{{.Ports.BackendRPC}} \ --p2p.laddr tcp://0.0.0.0:{{.Ports.BackendP2P}} \ --laddr tcp://127.0.0.1:{{.Ports.BackendHttp}} \ - --p2p.seeds "2a53a15ffc70ad41b6876ecbe05c50a66af01e20@3.211.248.31:26656,6f829065789e5b156cbbf076f9d133b4d7725847@3.212.183.151:26656,7285a532bad665f051c0aadc31054e2e61ca2b3d@3.93.224.197:26656,0b431127d21c8970f1c353ab212be4f1ba86c3bf@184.73.124.158:26656,f4f605d60b8ffaaf15240564e58a81103510631c@159.203.9.164:26656,31b79cf4a628a4619e8e9ae95b72e4354c5a5d90@44.232.55.71:26656,a385dd467d11c4cdb0be8b51d7bfb0990f49abc3@35.199.4.13:26656,daad548c0a163faae1d8d58425f97207acf923fd@35.230.116.151:26656,81c76e82fcc3dc9a0a1554a3edaa09a632795ea8@35.221.13.28:26656" \ + --p2p.seeds "f4f605d60b8ffaaf15240564e58a81103510631c@159.203.9.164:26656,4fb1bc820088764a564d4f66bba1963d47d82329@44.232.55.71:26656,2eadba4be3ce47ac8db0a3538cb923b57b41c927@35.199.4.13:26656,3b23b20017a6f348d329c102ddc0088f0a10a444@35.221.13.28:26656,25f5f65a09c56e9f1d2d90618aa70cd358aa68da@35.230.116.151:26656,4cd60c1d76e44b05f7dfd8bab3f447b119e87042@54.147.31.250:26656,b18bbe1f3d8576f4b73d9b18976e71c65e839149@34.226.134.117:26656,1500161dd491b67fb1ac81868952be49e2509c9f@52.78.36.216:26656,dd4a3f1750af5765266231b9d8ac764599921736@3.36.224.80:26656,8ea4f592ad6cc38d7532aff418d1fb97052463af@34.240.245.39:26656,e772e1fb8c3492a9570a377a5eafdb1dc53cd778@54.194.245.5:26656,6726b826df45ac8e9afb4bdb2469c7771bd797f1@52.209.21.164:26656" \ --node tcp://127.0.0.1:{{.Ports.BackendRPC}} \ --bor_rpc_url http://127.0.0.1:8170 \ --eth_rpc_url http://127.0.0.1:8136 \ diff --git a/configs/coins/polygon.json b/configs/coins/polygon.json index e833ea69..a7b609e2 100644 --- a/configs/coins/polygon.json +++ b/configs/coins/polygon.json @@ -20,16 +20,16 @@ "package_name": "backend-polygon-bor", "package_revision": "satoshilabs-1", "system_user": "polygon", - "version": "0.4.0", - "binary_url": "https://github.com/maticnetwork/bor/archive/refs/tags/v0.4.0.tar.gz", + "version": "1.0.6", + "binary_url": "https://github.com/maticnetwork/bor/archive/refs/tags/v1.0.6.tar.gz", "verification_type": "sha256", - "verification_source": "99fa80e9320075f581ba17b2f58330917688794650873a7484ddb8b80ee4a84d", - "extract_command": "mkdir backend/source && tar -C backend/source --strip 1 -xf v0.4.0.tar.gz && cd backend/source && make bor && mv build/bin/bor ../ && rm -rf ../source && echo", + "verification_source": "56dde862945cb48e1e301027edb47e979fe340c25fb412848dbbba5213105fa8", + "extract_command": "mkdir backend/source && tar -C backend/source --strip 1 -xf v1.0.6.tar.gz && cd backend/source && make bor && mv build/bin/bor ../ && rm -rf ../source && echo", "exclude_files": [], "exec_command_template": "/bin/sh -c '{{.Env.BackendInstallPath}}/{{.Coin.Alias}}/polygon_bor_exec.sh 2>> {{.Env.BackendDataPath}}/{{.Coin.Alias}}/backend/{{.Coin.Alias}}.log'", "exec_script": "polygon_bor.sh", "logrotate_files_template": "{{.Env.BackendDataPath}}/{{.Coin.Alias}}/backend/{{.Coin.Alias}}.log", - "postinst_script_template": "wget https://raw.githubusercontent.com/maticnetwork/bor/v0.4.0/builder/files/genesis-mainnet-v1.json -O {{.Env.BackendInstallPath}}/{{.Coin.Alias}}/genesis.json", + "postinst_script_template": "wget https://raw.githubusercontent.com/maticnetwork/bor/v1.0.6/builder/files/genesis-mainnet-v1.json -O {{.Env.BackendInstallPath}}/{{.Coin.Alias}}/genesis.json", "service_type": "simple", "service_additional_params_template": "", "protect_memory": true, diff --git a/configs/coins/polygon_archive.json b/configs/coins/polygon_archive.json index 86fb1753..fd056679 100644 --- a/configs/coins/polygon_archive.json +++ b/configs/coins/polygon_archive.json @@ -20,16 +20,16 @@ "package_name": "backend-polygon-archive-bor", "package_revision": "satoshilabs-1", "system_user": "polygon", - "version": "0.4.0", - "binary_url": "https://github.com/maticnetwork/bor/archive/refs/tags/v0.4.0.tar.gz", + "version": "1.0.6", + "binary_url": "https://github.com/maticnetwork/bor/archive/refs/tags/v1.0.6.tar.gz", "verification_type": "sha256", - "verification_source": "99fa80e9320075f581ba17b2f58330917688794650873a7484ddb8b80ee4a84d", - "extract_command": "mkdir backend/source && tar -C backend/source --strip 1 -xf v0.4.0.tar.gz && cd backend/source && make bor && mv build/bin/bor ../ && rm -rf ../source && echo", + "verification_source": "56dde862945cb48e1e301027edb47e979fe340c25fb412848dbbba5213105fa8", + "extract_command": "mkdir backend/source && tar -C backend/source --strip 1 -xf v1.0.6.tar.gz && cd backend/source && make bor && mv build/bin/bor ../ && rm -rf ../source && echo", "exclude_files": [], "exec_command_template": "/bin/sh -c '{{.Env.BackendInstallPath}}/{{.Coin.Alias}}/polygon_archive_bor_exec.sh 2>> {{.Env.BackendDataPath}}/{{.Coin.Alias}}/backend/{{.Coin.Alias}}.log'", "exec_script": "polygon_archive_bor.sh", "logrotate_files_template": "{{.Env.BackendDataPath}}/{{.Coin.Alias}}/backend/{{.Coin.Alias}}.log", - "postinst_script_template": "wget https://raw.githubusercontent.com/maticnetwork/bor/v0.4.0/builder/files/genesis-mainnet-v1.json -O {{.Env.BackendInstallPath}}/{{.Coin.Alias}}/genesis.json", + "postinst_script_template": "wget https://raw.githubusercontent.com/maticnetwork/bor/v1.0.6/builder/files/genesis-mainnet-v1.json -O {{.Env.BackendInstallPath}}/{{.Coin.Alias}}/genesis.json", "service_type": "simple", "service_additional_params_template": "", "protect_memory": true, diff --git a/configs/coins/polygon_heimdall.json b/configs/coins/polygon_heimdall.json index cb56be64..e99822f5 100644 --- a/configs/coins/polygon_heimdall.json +++ b/configs/coins/polygon_heimdall.json @@ -1,40 +1,40 @@ { - "coin": { - "name": "Polygon Heimdall", - "shortcut": "MATIC", - "label": "Polygon", - "alias": "polygon_heimdall" - }, - "ports": { - "backend_rpc": 8071, - "backend_p2p": 38371, - "backend_http": 8171, - "blockbook_internal": 9071, - "blockbook_public": 9171 - }, - "backend": { - "package_name": "backend-polygon-heimdall", - "package_revision": "satoshilabs-1", - "system_user": "polygon", - "version": "0.3.4", - "binary_url": "https://github.com/maticnetwork/heimdall/archive/refs/tags/v0.3.4.tar.gz", - "verification_type": "sha256", - "verification_source": "6d75bf685ce6714472afcc2ec8ecae5b53aa3aae513ffca9d1b2d26ae5892872", - "extract_command": "mkdir backend/source && tar -C backend/source --strip 1 -xf v0.3.4.tar.gz && cd backend/source && make build && mv build/heimdalld ../ && rm -rf ../source && echo", - "exclude_files": [], - "exec_command_template": "/bin/sh -c '{{.Env.BackendInstallPath}}/{{.Coin.Alias}}/polygon_heimdall_exec.sh 2>&1 >> {{.Env.BackendDataPath}}/{{.Coin.Alias}}/backend/{{.Coin.Alias}}.log'", - "exec_script": "polygon_heimdall.sh", - "logrotate_files_template": "{{.Env.BackendDataPath}}/{{.Coin.Alias}}/backend/{{.Coin.Alias}}.log", - "postinst_script_template": "wget https://raw.githubusercontent.com/maticnetwork/heimdall/v0.3.4/builder/files/genesis-mainnet-v1.json -O {{.Env.BackendInstallPath}}/{{.Coin.Alias}}/genesis.json", - "service_type": "simple", - "service_additional_params_template": "", - "protect_memory": true, - "mainnet": true, - "server_config_file": "", - "client_config_file": "" - }, - "meta": { - "package_maintainer": "IT", - "package_maintainer_email": "it@satoshilabs.com" - } -} \ No newline at end of file + "coin": { + "name": "Polygon Heimdall", + "shortcut": "MATIC", + "label": "Polygon", + "alias": "polygon_heimdall" + }, + "ports": { + "backend_rpc": 8071, + "backend_p2p": 38371, + "backend_http": 8171, + "blockbook_internal": 9071, + "blockbook_public": 9171 + }, + "backend": { + "package_name": "backend-polygon-heimdall", + "package_revision": "satoshilabs-1", + "system_user": "polygon", + "version": "1.0.2", + "binary_url": "https://github.com/maticnetwork/heimdall/archive/refs/tags/v1.0.2.tar.gz", + "verification_type": "sha256", + "verification_source": "b3b3bf9d821b6e0e9532a03062b68289a5840eedbfd570f2fc489acc72c5d6d7", + "extract_command": "mkdir backend/source && tar -C backend/source --strip 1 -xf v1.0.2.tar.gz && cd backend/source && make build && mv build/heimdalld ../ && rm -rf ../source && echo", + "exclude_files": [], + "exec_command_template": "/bin/sh -c '{{.Env.BackendInstallPath}}/{{.Coin.Alias}}/polygon_heimdall_exec.sh 2>&1 >> {{.Env.BackendDataPath}}/{{.Coin.Alias}}/backend/{{.Coin.Alias}}.log'", + "exec_script": "polygon_heimdall.sh", + "logrotate_files_template": "{{.Env.BackendDataPath}}/{{.Coin.Alias}}/backend/{{.Coin.Alias}}.log", + "postinst_script_template": "wget https://raw.githubusercontent.com/maticnetwork/heimdall/v1.0.2/builder/files/genesis-mainnet-v1.json -O {{.Env.BackendInstallPath}}/{{.Coin.Alias}}/genesis.json", + "service_type": "simple", + "service_additional_params_template": "", + "protect_memory": true, + "mainnet": true, + "server_config_file": "", + "client_config_file": "" + }, + "meta": { + "package_maintainer": "IT", + "package_maintainer_email": "it@satoshilabs.com" + } +} diff --git a/configs/coins/polygon_heimdall_archive.json b/configs/coins/polygon_heimdall_archive.json index ebb58565..f3eeadb7 100644 --- a/configs/coins/polygon_heimdall_archive.json +++ b/configs/coins/polygon_heimdall_archive.json @@ -1,40 +1,40 @@ { - "coin": { - "name": "Polygon Archive Heimdall", - "shortcut": "MATIC", - "label": "Polygon", - "alias": "polygon_archive_heimdall" - }, - "ports": { - "backend_rpc": 8073, - "backend_p2p": 38373, - "backend_http": 8173, - "blockbook_internal": 9073, - "blockbook_public": 9173 - }, - "backend": { - "package_name": "backend-polygon-archive-heimdall", - "package_revision": "satoshilabs-1", - "system_user": "polygon", - "version": "0.3.4", - "binary_url": "https://github.com/maticnetwork/heimdall/archive/refs/tags/v0.3.4.tar.gz", - "verification_type": "sha256", - "verification_source": "6d75bf685ce6714472afcc2ec8ecae5b53aa3aae513ffca9d1b2d26ae5892872", - "extract_command": "mkdir backend/source && tar -C backend/source --strip 1 -xf v0.3.4.tar.gz && cd backend/source && make build && mv build/heimdalld ../ && rm -rf ../source && echo", - "exclude_files": [], - "exec_command_template": "/bin/sh -c '{{.Env.BackendInstallPath}}/{{.Coin.Alias}}/polygon_archive_heimdall_exec.sh 2>&1 >> {{.Env.BackendDataPath}}/{{.Coin.Alias}}/backend/{{.Coin.Alias}}.log'", - "exec_script": "polygon_archive_heimdall.sh", - "logrotate_files_template": "{{.Env.BackendDataPath}}/{{.Coin.Alias}}/backend/{{.Coin.Alias}}.log", - "postinst_script_template": "wget https://raw.githubusercontent.com/maticnetwork/heimdall/v0.3.4/builder/files/genesis-mainnet-v1.json -O {{.Env.BackendInstallPath}}/{{.Coin.Alias}}/genesis.json", - "service_type": "simple", - "service_additional_params_template": "", - "protect_memory": true, - "mainnet": true, - "server_config_file": "", - "client_config_file": "" - }, - "meta": { - "package_maintainer": "IT", - "package_maintainer_email": "it@satoshilabs.com" - } -} \ No newline at end of file + "coin": { + "name": "Polygon Archive Heimdall", + "shortcut": "MATIC", + "label": "Polygon", + "alias": "polygon_archive_heimdall" + }, + "ports": { + "backend_rpc": 8073, + "backend_p2p": 38373, + "backend_http": 8173, + "blockbook_internal": 9073, + "blockbook_public": 9173 + }, + "backend": { + "package_name": "backend-polygon-archive-heimdall", + "package_revision": "satoshilabs-1", + "system_user": "polygon", + "version": "1.0.2", + "binary_url": "https://github.com/maticnetwork/heimdall/archive/refs/tags/v1.0.2.tar.gz", + "verification_type": "sha256", + "verification_source": "b3b3bf9d821b6e0e9532a03062b68289a5840eedbfd570f2fc489acc72c5d6d7", + "extract_command": "mkdir backend/source && tar -C backend/source --strip 1 -xf v1.0.2.tar.gz && cd backend/source && make build && mv build/heimdalld ../ && rm -rf ../source && echo", + "exclude_files": [], + "exec_command_template": "/bin/sh -c '{{.Env.BackendInstallPath}}/{{.Coin.Alias}}/polygon_archive_heimdall_exec.sh 2>&1 >> {{.Env.BackendDataPath}}/{{.Coin.Alias}}/backend/{{.Coin.Alias}}.log'", + "exec_script": "polygon_archive_heimdall.sh", + "logrotate_files_template": "{{.Env.BackendDataPath}}/{{.Coin.Alias}}/backend/{{.Coin.Alias}}.log", + "postinst_script_template": "wget https://raw.githubusercontent.com/maticnetwork/heimdall/v1.0.2/builder/files/genesis-mainnet-v1.json -O {{.Env.BackendInstallPath}}/{{.Coin.Alias}}/genesis.json", + "service_type": "simple", + "service_additional_params_template": "", + "protect_memory": true, + "mainnet": true, + "server_config_file": "", + "client_config_file": "" + }, + "meta": { + "package_maintainer": "IT", + "package_maintainer_email": "it@satoshilabs.com" + } +}