From e3dbb8262c8003d444c0ce6a65b071929ea304d9 Mon Sep 17 00:00:00 2001 From: Sergey Nazarov Date: Thu, 24 Oct 2024 12:15:37 +0300 Subject: [PATCH 1/5] wip --- docker/docker-compose.yml | 3 +++ docker/genesis-mainnet.json | 43 ++++++++++++++++++++++++++++++++++ docker/services/besu.yml | 4 ++-- docker/services/geth.yml | 7 +++--- docker/services/waves-node.yml | 6 ++--- docker/testnet.env | 1 + docker/waves-mainnet.conf | 42 +++++++++++++++++++++++++++++++++ 7 files changed, 98 insertions(+), 8 deletions(-) create mode 100644 docker/genesis-mainnet.json create mode 100644 docker/waves-mainnet.conf diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 61e2af5b..19f5ce9b 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -2,6 +2,7 @@ services: besu: profiles: [besu] hostname: execution-client + restart: unless-stopped extends: file: ./services/besu.yml service: besu @@ -15,6 +16,7 @@ services: geth: profiles: [geth] hostname: execution-client + restart: unless-stopped extends: file: ./services/geth.yml service: geth @@ -23,6 +25,7 @@ services: condition: service_completed_successfully waves-node: + restart: unless-stopped extends: file: ./services/waves-node.yml service: waves-node diff --git a/docker/genesis-mainnet.json b/docker/genesis-mainnet.json new file mode 100644 index 00000000..123c251b --- /dev/null +++ b/docker/genesis-mainnet.json @@ -0,0 +1,43 @@ +{ + "alloc": { + "0x0000000000000000000000000000000000006a7e": { + "code": "0x60806040526004361061006e575f3560e01c806396f396c31161004c57806396f396c3146100e3578063c4a4326d14610105578063e984df0e1461011d578063fccc281314610131575f80fd5b806339dd5d1b146100725780637157405a146100b957806378338413146100ce575b5f80fd5b34801561007d575f80fd5b506100a161008c36600461059e565b5f6020819052908152604090205461ffff1681565b60405161ffff90911681526020015b60405180910390f35b3480156100c4575f80fd5b506100a161040081565b6100e16100dc3660046105b5565b61015c565b005b3480156100ee575f80fd5b506100f761044e565b6040519081526020016100b0565b348015610110575f80fd5b506100f76402540be40081565b348015610128575f80fd5b506100f7610468565b34801561013c575f80fd5b506101445f81565b6040516001600160a01b0390911681526020016100b0565b61016c6402540be40060016105fc565b34101561017834610478565b61019061018b6402540be40060016105fc565b610478565b6040516020016101a1929190610630565b604051602081830303815290604052906101d75760405162461bcd60e51b81526004016101ce9190610688565b60405180910390fd5b506101ef6402540be400677fffffffffffffff6105fc565b3411156101fb34610478565b61021561018b6402540be400677fffffffffffffff6105fc565b6040516020016102269291906106bd565b604051602081830303815290604052906102535760405162461bcd60e51b81526004016101ce9190610688565b50435f8181526020819052604090205461ffff166104009081119061027790610478565b604051602001610287919061070c565b604051602081830303815290604052906102b45760405162461bcd60e51b81526004016101ce9190610688565b505f818152602081905260408120805461ffff16916102d283610786565b91906101000a81548161ffff021916908361ffff160217905550505f6402540be400346102ff91906107a6565b9050346103116402540be400836105fc565b1461031b34610478565b6103296402540be400610478565b60405160200161033a9291906107c5565b604051602081830303815290604052906103675760405162461bcd60e51b81526004016101ce9190610688565b506040515f90819034908281818185825af1925050503d805f81146103a7576040519150601f19603f3d011682016040523d82523d5f602084013e6103ac565b606091505b50509050806103fd5760405162461bcd60e51b815260206004820152601e60248201527f4661696c656420746f2073656e6420746f206275726e2061646472657373000060448201526064016101ce565b604080516bffffffffffffffffffffffff1986168152600784900b60208201527ffeadaf04de8d7c2594453835b9a93b747e20e7a09a7fdb9280579a6dbaf131a8910160405180910390a150505050565b6104656402540be400677fffffffffffffff6105fc565b81565b6104656402540be40060016105fc565b6060815f0361049e5750506040805180820190915260018152600360fc1b602082015290565b815f5b81156104c757806104b181610814565b91506104c09050600a836107a6565b91506104a1565b5f8167ffffffffffffffff8111156104e1576104e161082c565b6040519080825280601f01601f19166020018201604052801561050b576020820181803683370190505b509050815b851561059557610521600182610840565b90505f61052f600a886107a6565b61053a90600a6105fc565b6105449088610840565b61054f906030610853565b90505f8160f81b90508084848151811061056b5761056b61086c565b60200101906001600160f81b03191690815f1a90535061058c600a896107a6565b97505050610510565b50949350505050565b5f602082840312156105ae575f80fd5b5035919050565b5f602082840312156105c5575f80fd5b81356bffffffffffffffffffffffff19811681146105e1575f80fd5b9392505050565b634e487b7160e01b5f52601160045260245ffd5b8082028115828204841417610613576106136105e8565b92915050565b5f81518060208401855e5f93019283525090919050565b6a029b2b73a103b30b63ab2960ad1b81525f61064f600b830185610619565b7f206d7573742062652067726561746572206f7220657175616c20746f20000000815261067f601d820185610619565b95945050505050565b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b6a029b2b73a103b30b63ab2960ad1b81525f6106dc600b830185610619565b7f206d757374206265206c657373206f7220657175616c20746f20000000000000815261067f601a820185610619565b7f4d6178207472616e7366657273206c696d6974206f662000000000000000000081525f61073d6017830184610619565b7f207265616368656420696e207468697320626c6f636b2e2054727920746f207381527232b732103a3930b739b332b9399030b3b0b4b760691b60208201526033019392505050565b5f61ffff821661ffff810361079d5761079d6105e8565b60010192915050565b5f826107c057634e487b7160e01b5f52601260045260245ffd5b500490565b6a029b2b73a103b30b63ab2960ad1b81525f6107e4600b830185610619565b7f206d7573742062652061206d756c7469706c65206f6620000000000000000000815261067f6017820185610619565b5f60018201610825576108256105e8565b5060010190565b634e487b7160e01b5f52604160045260245ffd5b81810381811115610613576106136105e8565b60ff8181168382160190811115610613576106136105e8565b634e487b7160e01b5f52603260045260245ffdfea2646970667358221220106399f534da089226c14e2f183f8421d059a924c65c97d7e4f3e931c54fe1bb64736f6c634300081a0033", + "balance": "0x0" + } + }, + "baseFeePerGas": "0x3b9aca00", + "blobGasUsed": null, + "coinbase": "0x0000000000000000000000000000000000000000", + "config": { + "chainId": 88811, + "arrowGlacierBlock": 0, + "berlinBlock": 0, + "byzantiumBlock": 0, + "cancunTime": 0, + "constantinopleBlock": 0, + "daoForkBlock": 0, + "eip150Block": 0, + "eip155Block": 0, + "eip158Block": 0, + "ethash": {}, + "grayGlacierBlock": 0, + "homesteadBlock": 0, + "istanbulBlock": 0, + "londonBlock": 0, + "muirGlacierBlock": 0, + "petersburgBlock": 0, + "shanghaiTime": 0, + "terminalTotalDifficulty": 0, + "terminalTotalDifficultyPassed": true + }, + "difficulty": "0x0", + "excessBlobGas": null, + "extraData": "0x", + "gasLimit": "0x989680", + "gasUsed": "0x0", + "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "nonce": "0x0", + "number": "0x0", + "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "timestamp": "0x67221fc0" +} diff --git a/docker/services/besu.yml b/docker/services/besu.yml index bc75690f..4762f639 100644 --- a/docker/services/besu.yml +++ b/docker/services/besu.yml @@ -19,8 +19,6 @@ services: - --data-path=/var/lib/besu - --genesis-file=/etc/besu/genesis.json - --data-storage-format=BONSAI - - --network-id=${NETWORK_ID} - - --target-gas-limit=15000000 volumes: - ../genesis-${NETWORK}.json:/etc/besu/genesis.json - ../data/secrets:/etc/secrets:ro @@ -32,3 +30,5 @@ services: - '30303:30303/udp' environment: - LOG4J_CONFIGURATION_FILE=/etc/besu/log4j2.xml + - BESU_TARGET_GAS_LIMIT=${GAS_LIMIT} + - BESU_NETWORK_ID=${NETWORK_ID} diff --git a/docker/services/geth.yml b/docker/services/geth.yml index f64288de..7f6e1a4d 100644 --- a/docker/services/geth.yml +++ b/docker/services/geth.yml @@ -26,11 +26,12 @@ services: - --ws.origins=* - --authrpc.addr=0.0.0.0 - --authrpc.vhosts=* - - --discovery.dns=enrtree://AIRIZFFZSCSIVHXTKA44WYZQJMR75FLTGWJ5TUNEW5IP7QKZDLBRK@${NETWORK}-nodes.unit0.dev - - --networkid=${NETWORK_ID} - --authrpc.jwtsecret=/etc/secrets/jwtsecret + - --discovery.dns=enrtree://AIRIZFFZSCSIVHXTKA44WYZQJMR75FLTGWJ5TUNEW5IP7QKZDLBRK@${NETWORK}-nodes.unit0.dev - --nodekey=/etc/secrets/p2p-key - - --miner.gaslimit=15000000 + env: + - GETH_MINER_GASLIMIT=${GAS_LIMIT} + - GETH_NETWORKID=${NETWORK_ID} logging: driver: local options: diff --git a/docker/services/waves-node.yml b/docker/services/waves-node.yml index 029df6f7..c6de841e 100644 --- a/docker/services/waves-node.yml +++ b/docker/services/waves-node.yml @@ -4,9 +4,9 @@ services: image: ghcr.io/unitsnetwork/consensus-client:testnet stop_grace_period: 5m ports: - - "6869:6869" - - "6868:6868" - - "6865:6865" + - 127.0.0.1:6869:6869 + - 6868:6868 + - 6865:6865 environment: - JAVA_OPTS=-Dwaves.config.directory=/etc/waves -Dlogback.file.level=TRACE -Dwaves.blockchain.type=$NETWORK env_file: diff --git a/docker/testnet.env b/docker/testnet.env index 52b00a8d..343a342a 100644 --- a/docker/testnet.env +++ b/docker/testnet.env @@ -1,5 +1,6 @@ NETWORK=testnet NETWORK_ID=88817 WAVES_NODE_TAG=testnet +GAS_LIMIT=10000000 #WAVES_DECLARED_ADDRESS=1.2.3.4:6868 #UNITS_DECLARED_ADDRESS=1.2.3.4:6865 diff --git a/docker/waves-mainnet.conf b/docker/waves-mainnet.conf new file mode 100644 index 00000000..96f0a2d4 --- /dev/null +++ b/docker/waves-mainnet.conf @@ -0,0 +1,42 @@ +waves { + extensions = [ + units.ConsensusClient + ] + + wallet { + seed = ${WAVES_WALLET_SEED} + password = ${WAVES_WALLET_PASSWORD} + } + + network { + bind-address = "0.0.0.0" + port = 6868 + declared-address = ${?WAVES_DECLARED_ADDRESS} + } + + rest-api { + enable = yes + bind-address = "0.0.0.0" + port = 6869 + api-key-hash = ${?WAVES_API_KEY_HASH} + } +} + +units { + chains = [ + { + chain-contract = 3PKgN8rfmvF7hK7RWJbpvkh59e1pQkUzero + execution-client-address = "http://execution-client:8551" + jwt-secret-file = /etc/secrets/jwtsecret + + network { + port = 6865 + declared-address = ${?UNITS_DECLARED_ADDRESS} + known-peers = [ + "mainnet-htz-fsn1-1.unit0.dev:6865" + ] + } + mining-enable = no + } + ] +} From 54be4547a5a2b245577ba6d50ec6aaa74a3d5418 Mon Sep 17 00:00:00 2001 From: Sergey Nazarov Date: Thu, 31 Oct 2024 15:47:42 +0300 Subject: [PATCH 2/5] wip --- docker/genesis-mainnet.json | 2 +- docker/services/geth.yml | 5 +++-- docker/testnet.env | 1 + src/test/resources/main.ride | 6 +++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docker/genesis-mainnet.json b/docker/genesis-mainnet.json index 123c251b..0824bd88 100644 --- a/docker/genesis-mainnet.json +++ b/docker/genesis-mainnet.json @@ -39,5 +39,5 @@ "nonce": "0x0", "number": "0x0", "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000", - "timestamp": "0x67221fc0" + "timestamp": "0x6720960b" } diff --git a/docker/services/geth.yml b/docker/services/geth.yml index 7f6e1a4d..993f49d0 100644 --- a/docker/services/geth.yml +++ b/docker/services/geth.yml @@ -13,6 +13,7 @@ services: pull_policy: always stop_grace_period: 5m command: + - --syncmode=full - --verbosity=4 - --http - --http.addr=0.0.0.0 @@ -27,11 +28,11 @@ services: - --authrpc.addr=0.0.0.0 - --authrpc.vhosts=* - --authrpc.jwtsecret=/etc/secrets/jwtsecret - - --discovery.dns=enrtree://AIRIZFFZSCSIVHXTKA44WYZQJMR75FLTGWJ5TUNEW5IP7QKZDLBRK@${NETWORK}-nodes.unit0.dev - --nodekey=/etc/secrets/p2p-key - env: + environment: - GETH_MINER_GASLIMIT=${GAS_LIMIT} - GETH_NETWORKID=${NETWORK_ID} + - GETH_BOOTNODES=${BOOTNODES} logging: driver: local options: diff --git a/docker/testnet.env b/docker/testnet.env index 343a342a..71db42c3 100644 --- a/docker/testnet.env +++ b/docker/testnet.env @@ -2,5 +2,6 @@ NETWORK=testnet NETWORK_ID=88817 WAVES_NODE_TAG=testnet GAS_LIMIT=10000000 +BOOTNODES=enode://0a4d389579cfe536da57e2c1699d682d053eccac26412d1a23eca88fc4bdc0d3e2c45ef8fdfeca6eb20ee4ce0ded06fe37625c7e3bee7e097932d85a1b45308c@65.108.122.140:30303 #WAVES_DECLARED_ADDRESS=1.2.3.4:6868 #UNITS_DECLARED_ADDRESS=1.2.3.4:6865 diff --git a/src/test/resources/main.ride b/src/test/resources/main.ride index 1f5456e3..94bf69fb 100644 --- a/src/test/resources/main.ride +++ b/src/test/resources/main.ride @@ -530,8 +530,12 @@ func join(rewardAddressHex: String) = { let parts = rewardAddressHex.split("0x") let rewardAddress = parts[parts.size() - 1].fromBase16String() + let networkIsLaunched = match getInteger("launchHeight") { + case launchHeight: Int => launchHeight <= height + case _ => throw("not launched yet") + } - if (!isContractSetup()) then + if (!isContractSetup() || !networkIsLaunched) then throw("The contract has not yet set up") else if (i.originCaller.wavesBalance().generating < MIN_BALANCE) then throw("Insufficient generating balance: " + i.originCaller.wavesBalance().generating.toString() + ". Required: " + MIN_BALANCE.toString()) From 8a6584078a5f118e75b18406984b3166d3151c76 Mon Sep 17 00:00:00 2001 From: Sergey Nazarov Date: Sat, 2 Nov 2024 17:01:14 +0300 Subject: [PATCH 3/5] wip --- docker/docker-compose.yml | 3 --- docker/geth-mainnet.toml | 10 ++++++++++ docker/init-geth.sh | 6 ------ docker/services/besu.yml | 5 ++++- docker/services/geth.yml | 16 ++++++++++++---- docker/services/waves-node.yml | 1 + docker/static-nodes-mainnet.json | 4 ++++ docker/static-nodes-testnet.json | 0 8 files changed, 31 insertions(+), 14 deletions(-) create mode 100644 docker/geth-mainnet.toml delete mode 100755 docker/init-geth.sh create mode 100644 docker/static-nodes-mainnet.json create mode 100644 docker/static-nodes-testnet.json diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 19f5ce9b..61e2af5b 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -2,7 +2,6 @@ services: besu: profiles: [besu] hostname: execution-client - restart: unless-stopped extends: file: ./services/besu.yml service: besu @@ -16,7 +15,6 @@ services: geth: profiles: [geth] hostname: execution-client - restart: unless-stopped extends: file: ./services/geth.yml service: geth @@ -25,7 +23,6 @@ services: condition: service_completed_successfully waves-node: - restart: unless-stopped extends: file: ./services/waves-node.yml service: waves-node diff --git a/docker/geth-mainnet.toml b/docker/geth-mainnet.toml new file mode 100644 index 00000000..b7f7c958 --- /dev/null +++ b/docker/geth-mainnet.toml @@ -0,0 +1,10 @@ +[Node.P2P] +BootstrapNodes = [ + "enode://b232ad7ca7bd6156e1adaa28ee0d064f3d973a67c0ad507a1b9dc32b3d64b307c754bc48c274aa96852f0041c2f85792681495e21f5baa62f06d3db8097af258@142.132.251.180:30303", + "enode://e8f7dbec4b146ef0ed1852cd05e3c0654f78a5784a7584f45bc0073bf6206d55764600b586148dfca42bd711c1c1bc02cb20abb2210320f830f003aacf074396@95.217.59.114:30303" +] +BootstrapNodesV5 = [] +StaticNodes = [ + "enode://b232ad7ca7bd6156e1adaa28ee0d064f3d973a67c0ad507a1b9dc32b3d64b307c754bc48c274aa96852f0041c2f85792681495e21f5baa62f06d3db8097af258@142.132.251.180:30303", + "enode://e8f7dbec4b146ef0ed1852cd05e3c0654f78a5784a7584f45bc0073bf6206d55764600b586148dfca42bd711c1c1bc02cb20abb2210320f830f003aacf074396@95.217.59.114:30303" +] diff --git a/docker/init-geth.sh b/docker/init-geth.sh deleted file mode 100755 index 39e25e74..00000000 --- a/docker/init-geth.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -if [ ! -d /root/.ethereum/geth ] ; then - geth init /tmp/genesis.json -else - echo geth already initialized -fi diff --git a/docker/services/besu.yml b/docker/services/besu.yml index 4762f639..5ddef47c 100644 --- a/docker/services/besu.yml +++ b/docker/services/besu.yml @@ -4,6 +4,7 @@ services: image: hyperledger/besu:latest pull_policy: always stop_grace_period: 5m + restart: unless-stopped command: - --logging=ALL - --host-allowlist=* @@ -19,9 +20,11 @@ services: - --data-path=/var/lib/besu - --genesis-file=/etc/besu/genesis.json - --data-storage-format=BONSAI + - --static-nodes-file=/etc/besu/static-nodes.json volumes: - - ../genesis-${NETWORK}.json:/etc/besu/genesis.json - ../data/secrets:/etc/secrets:ro + - ../genesis-${NETWORK}.json:/etc/besu/genesis.json + - ../static-nodes-${NETWORK}.json:/etc/besu/static-nodes.json - ../log4j2.xml:/etc/besu/log4j2.xml - ../data/besu:/var/lib/besu - ../logs/besu:/opt/besu/logs diff --git a/docker/services/geth.yml b/docker/services/geth.yml index 993f49d0..a86449d2 100644 --- a/docker/services/geth.yml +++ b/docker/services/geth.yml @@ -2,17 +2,25 @@ services: geth-init: container_name: geth-init image: ethereum/client-go:stable - entrypoint: /tmp/init-geth.sh + entrypoint: /bin/sh -c + command: + - | + if [ ! -d /root/.ethereum/geth ] ; then + geth init /tmp/genesis.json + else + echo geth already initialized + fi volumes: - ../genesis-${NETWORK}.json:/tmp/genesis.json - ../data/geth:/root/.ethereum - - ../init-geth.sh:/tmp/init-geth.sh geth: container_name: geth image: ethereum/client-go:stable pull_policy: always stop_grace_period: 5m + restart: unless-stopped command: + - --config=/etc/config.toml - --syncmode=full - --verbosity=4 - --http @@ -32,7 +40,6 @@ services: environment: - GETH_MINER_GASLIMIT=${GAS_LIMIT} - GETH_NETWORKID=${NETWORK_ID} - - GETH_BOOTNODES=${BOOTNODES} logging: driver: local options: @@ -41,11 +48,12 @@ services: volumes: - ../data/secrets:/etc/secrets:ro - ../data/geth:/root/.ethereum + - ../geth-${NETWORK}:/etc/config.toml ports: - '30303:30303/tcp' - '30303:30303/udp' healthcheck: test: 'wget -qO /dev/null --header "content-type: application/json" --post-data {\"jsonrpc\":\"2.0\",\"method\":\"eth_blockNumber\",\"params\":[],\"id\":1} http://127.0.0.1:8545' - interval: 5s + interval: 10s timeout: 1s retries: 10 diff --git a/docker/services/waves-node.yml b/docker/services/waves-node.yml index c6de841e..377bbe2a 100644 --- a/docker/services/waves-node.yml +++ b/docker/services/waves-node.yml @@ -3,6 +3,7 @@ services: container_name: waves-node image: ghcr.io/unitsnetwork/consensus-client:testnet stop_grace_period: 5m + restart: unless-stopped ports: - 127.0.0.1:6869:6869 - 6868:6868 diff --git a/docker/static-nodes-mainnet.json b/docker/static-nodes-mainnet.json new file mode 100644 index 00000000..a419fafa --- /dev/null +++ b/docker/static-nodes-mainnet.json @@ -0,0 +1,4 @@ +[ + "enode://b232ad7ca7bd6156e1adaa28ee0d064f3d973a67c0ad507a1b9dc32b3d64b307c754bc48c274aa96852f0041c2f85792681495e21f5baa62f06d3db8097af258@142.132.251.180:30303", + "enode://e8f7dbec4b146ef0ed1852cd05e3c0654f78a5784a7584f45bc0073bf6206d55764600b586148dfca42bd711c1c1bc02cb20abb2210320f830f003aacf074396@95.217.59.114:30303" +] diff --git a/docker/static-nodes-testnet.json b/docker/static-nodes-testnet.json new file mode 100644 index 00000000..e69de29b From 636d53e3511ba8221a0e02941a8b74dac52224ee Mon Sep 17 00:00:00 2001 From: Sergey Nazarov Date: Wed, 20 Nov 2024 16:30:49 +0300 Subject: [PATCH 4/5] updated static node list for mainnet --- docker/geth-mainnet.toml | 22 ++++++++++++++++++++-- docker/static-nodes-mainnet.json | 11 ++++++++++- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/docker/geth-mainnet.toml b/docker/geth-mainnet.toml index b7f7c958..60f5f265 100644 --- a/docker/geth-mainnet.toml +++ b/docker/geth-mainnet.toml @@ -1,10 +1,28 @@ [Node.P2P] BootstrapNodes = [ + "enode://02718d9a9c6f829c14ea3fd143e526130c70ae43956682cd234046ec932b1c21ca321c484bbb6aa766322ee7e0089d3405747f31d156ec0d67cd80482aede5d7@81.82.238.146:30301", + "enode://02884ba9163fe92e1aa5a940a050d12c7d857fed092e43d242ebb63472a3e16e77d3b626d50ad790ed454e0e93607ba7ccebd5ac8423d5745df5066708709ac9@185.241.151.12:30303", + "enode://1937134aff8287fddfc80d2583c9218521b15719dc7782ec85322493b973d02a76edf23ad30657f2d827e04a573e8a5bb2a0052a696a960365c2f13e69cbc0f3@95.216.152.163:30303", + "enode://5355b769f711ab1951c788d664d0ccbf4bc989013ea3a4f419ab01d9930b524956be65442fa4b72e7de9c470ceeac796235fb198ad9ef49dab559139f17282e2@38.242.222.27:30303", + "enode://6b534a07943cbca55d6dff834cac2c77f3e82895f51b25fa8cca1689b5cc0921f68453165fa5c736e55e4c61d0b73795445ed2099c09008358805467d07d2066@81.82.238.146:30302", + "enode://85389460716e3e3247b51139de2f11f1b886c7eb3dc849e2e9673447c81922f9955b2d271834cae9c1625e69f7805e2c89362d4dd8cb0ca972668d7262252790@63.250.53.184:30303", "enode://b232ad7ca7bd6156e1adaa28ee0d064f3d973a67c0ad507a1b9dc32b3d64b307c754bc48c274aa96852f0041c2f85792681495e21f5baa62f06d3db8097af258@142.132.251.180:30303", - "enode://e8f7dbec4b146ef0ed1852cd05e3c0654f78a5784a7584f45bc0073bf6206d55764600b586148dfca42bd711c1c1bc02cb20abb2210320f830f003aacf074396@95.217.59.114:30303" + "enode://ded10bb464eea90d2a61ab7fef15531dca698845d93f7fc191a5383c22b09de282982872515f398ae527d300c2d5324bae61199dbb354843e6792f2d13b87880@172.104.241.53:30303", + "enode://e15d6f32cddc2a8e69885fc5c445b8ca7bafd91e9a7a834e89ed688150aa55df20fc7ff14d1fc5dd1e266c2b6a2f9dc75b1d6ed5f80ac71cb27f6ba8af12ba4b@213.238.172.133:30303", + "enode://e8f7dbec4b146ef0ed1852cd05e3c0654f78a5784a7584f45bc0073bf6206d55764600b586148dfca42bd711c1c1bc02cb20abb2210320f830f003aacf074396@95.217.59.114:30303", + "enode://edab526402907ccbbdf51950f09b964d9ebc1b51e1a9a1dca44fdaf823d85f84e513e95503f1e4d9e4e90355674819d52e46b014e054da5f199d5406ae6a5e22@185.31.163.22:30303" ] BootstrapNodesV5 = [] StaticNodes = [ + "enode://02718d9a9c6f829c14ea3fd143e526130c70ae43956682cd234046ec932b1c21ca321c484bbb6aa766322ee7e0089d3405747f31d156ec0d67cd80482aede5d7@81.82.238.146:30301", + "enode://02884ba9163fe92e1aa5a940a050d12c7d857fed092e43d242ebb63472a3e16e77d3b626d50ad790ed454e0e93607ba7ccebd5ac8423d5745df5066708709ac9@185.241.151.12:30303", + "enode://1937134aff8287fddfc80d2583c9218521b15719dc7782ec85322493b973d02a76edf23ad30657f2d827e04a573e8a5bb2a0052a696a960365c2f13e69cbc0f3@95.216.152.163:30303", + "enode://5355b769f711ab1951c788d664d0ccbf4bc989013ea3a4f419ab01d9930b524956be65442fa4b72e7de9c470ceeac796235fb198ad9ef49dab559139f17282e2@38.242.222.27:30303", + "enode://6b534a07943cbca55d6dff834cac2c77f3e82895f51b25fa8cca1689b5cc0921f68453165fa5c736e55e4c61d0b73795445ed2099c09008358805467d07d2066@81.82.238.146:30302", + "enode://85389460716e3e3247b51139de2f11f1b886c7eb3dc849e2e9673447c81922f9955b2d271834cae9c1625e69f7805e2c89362d4dd8cb0ca972668d7262252790@63.250.53.184:30303", "enode://b232ad7ca7bd6156e1adaa28ee0d064f3d973a67c0ad507a1b9dc32b3d64b307c754bc48c274aa96852f0041c2f85792681495e21f5baa62f06d3db8097af258@142.132.251.180:30303", - "enode://e8f7dbec4b146ef0ed1852cd05e3c0654f78a5784a7584f45bc0073bf6206d55764600b586148dfca42bd711c1c1bc02cb20abb2210320f830f003aacf074396@95.217.59.114:30303" + "enode://ded10bb464eea90d2a61ab7fef15531dca698845d93f7fc191a5383c22b09de282982872515f398ae527d300c2d5324bae61199dbb354843e6792f2d13b87880@172.104.241.53:30303", + "enode://e15d6f32cddc2a8e69885fc5c445b8ca7bafd91e9a7a834e89ed688150aa55df20fc7ff14d1fc5dd1e266c2b6a2f9dc75b1d6ed5f80ac71cb27f6ba8af12ba4b@213.238.172.133:30303", + "enode://e8f7dbec4b146ef0ed1852cd05e3c0654f78a5784a7584f45bc0073bf6206d55764600b586148dfca42bd711c1c1bc02cb20abb2210320f830f003aacf074396@95.217.59.114:30303", + "enode://edab526402907ccbbdf51950f09b964d9ebc1b51e1a9a1dca44fdaf823d85f84e513e95503f1e4d9e4e90355674819d52e46b014e054da5f199d5406ae6a5e22@185.31.163.22:30303" ] diff --git a/docker/static-nodes-mainnet.json b/docker/static-nodes-mainnet.json index a419fafa..ce758e65 100644 --- a/docker/static-nodes-mainnet.json +++ b/docker/static-nodes-mainnet.json @@ -1,4 +1,13 @@ [ + "enode://02718d9a9c6f829c14ea3fd143e526130c70ae43956682cd234046ec932b1c21ca321c484bbb6aa766322ee7e0089d3405747f31d156ec0d67cd80482aede5d7@81.82.238.146:30301", + "enode://02884ba9163fe92e1aa5a940a050d12c7d857fed092e43d242ebb63472a3e16e77d3b626d50ad790ed454e0e93607ba7ccebd5ac8423d5745df5066708709ac9@185.241.151.12:30303", + "enode://1937134aff8287fddfc80d2583c9218521b15719dc7782ec85322493b973d02a76edf23ad30657f2d827e04a573e8a5bb2a0052a696a960365c2f13e69cbc0f3@95.216.152.163:30303", + "enode://5355b769f711ab1951c788d664d0ccbf4bc989013ea3a4f419ab01d9930b524956be65442fa4b72e7de9c470ceeac796235fb198ad9ef49dab559139f17282e2@38.242.222.27:30303", + "enode://6b534a07943cbca55d6dff834cac2c77f3e82895f51b25fa8cca1689b5cc0921f68453165fa5c736e55e4c61d0b73795445ed2099c09008358805467d07d2066@81.82.238.146:30302", + "enode://85389460716e3e3247b51139de2f11f1b886c7eb3dc849e2e9673447c81922f9955b2d271834cae9c1625e69f7805e2c89362d4dd8cb0ca972668d7262252790@63.250.53.184:30303", "enode://b232ad7ca7bd6156e1adaa28ee0d064f3d973a67c0ad507a1b9dc32b3d64b307c754bc48c274aa96852f0041c2f85792681495e21f5baa62f06d3db8097af258@142.132.251.180:30303", - "enode://e8f7dbec4b146ef0ed1852cd05e3c0654f78a5784a7584f45bc0073bf6206d55764600b586148dfca42bd711c1c1bc02cb20abb2210320f830f003aacf074396@95.217.59.114:30303" + "enode://ded10bb464eea90d2a61ab7fef15531dca698845d93f7fc191a5383c22b09de282982872515f398ae527d300c2d5324bae61199dbb354843e6792f2d13b87880@172.104.241.53:30303", + "enode://e15d6f32cddc2a8e69885fc5c445b8ca7bafd91e9a7a834e89ed688150aa55df20fc7ff14d1fc5dd1e266c2b6a2f9dc75b1d6ed5f80ac71cb27f6ba8af12ba4b@213.238.172.133:30303", + "enode://e8f7dbec4b146ef0ed1852cd05e3c0654f78a5784a7584f45bc0073bf6206d55764600b586148dfca42bd711c1c1bc02cb20abb2210320f830f003aacf074396@95.217.59.114:30303", + "enode://edab526402907ccbbdf51950f09b964d9ebc1b51e1a9a1dca44fdaf823d85f84e513e95503f1e4d9e4e90355674819d52e46b014e054da5f199d5406ae6a5e22@185.31.163.22:30303" ] From a0cd75733a096fa4ab2ff509031d86c952257be4 Mon Sep 17 00:00:00 2001 From: Sergey Nazarov Date: Wed, 20 Nov 2024 16:34:24 +0300 Subject: [PATCH 5/5] wip --- src/test/resources/main.ride | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/test/resources/main.ride b/src/test/resources/main.ride index 94bf69fb..1f5456e3 100644 --- a/src/test/resources/main.ride +++ b/src/test/resources/main.ride @@ -530,12 +530,8 @@ func join(rewardAddressHex: String) = { let parts = rewardAddressHex.split("0x") let rewardAddress = parts[parts.size() - 1].fromBase16String() - let networkIsLaunched = match getInteger("launchHeight") { - case launchHeight: Int => launchHeight <= height - case _ => throw("not launched yet") - } - if (!isContractSetup() || !networkIsLaunched) then + if (!isContractSetup()) then throw("The contract has not yet set up") else if (i.originCaller.wavesBalance().generating < MIN_BALANCE) then throw("Insufficient generating balance: " + i.originCaller.wavesBalance().generating.toString() + ". Required: " + MIN_BALANCE.toString())