diff --git a/.devnet/.analytics/analytics.js b/.devnet/.analytics/analytics.js index 30f551b6c0..897eb1cb10 100644 --- a/.devnet/.analytics/analytics.js +++ b/.devnet/.analytics/analytics.js @@ -134,7 +134,7 @@ async function main() { if (match && match[1]) { const ipAddress = match[1]; - const baseUrl = `http://${ipAddress}:3033/mainnet/block`; + const baseUrl = `http://${ipAddress}:3030/mainnet/block`; console.log(`${dimStart}IP Address: ${ipAddress}${dimEnd}`); console.log(`${dimStart}Base URL: ${baseUrl}${dimEnd}`); diff --git a/.devnet/README.md b/.devnet/README.md index a6b51f69ef..57610c5ef3 100644 --- a/.devnet/README.md +++ b/.devnet/README.md @@ -6,8 +6,8 @@ Start by creating EC2 instances in the AWS console. - Ubuntu 22.04 LTS (not Amazon Linux) - Security Group - Inbound Policy - SSH - Port 22 - 0.0.0.0/0 (or your IP) - - Custom TCP - Port 3033 - 0.0.0.0/0 (or your IP) - - Custom TCP - Port 4133 - 0.0.0.0/0 + - Custom TCP - Port 3030 - 0.0.0.0/0 (or your IP) + - Custom TCP - Port 4130 - 0.0.0.0/0 - Custom TCP - Port 5000 - 0.0.0.0/0 Be sure the give the EC2 instances a name tag, i.e. `devnet`. diff --git a/.devnet/start.sh b/.devnet/start.sh index 755cacf31b..6d61198721 100755 --- a/.devnet/start.sh +++ b/.devnet/start.sh @@ -37,7 +37,7 @@ start_snarkos_in_tmux() { tmux new-session -d -s snarkos-session # Send the snarkOS start command to the tmux session with the NODE_ID - tmux send-keys -t "snarkos-session" "snarkos start --nodisplay --bft 0.0.0.0:5000 --rest 0.0.0.0:3033 --peers $NODE_IP:4133 --validators $NODE_IP:5000 --verbosity $VERBOSITY --dev $NODE_ID --dev-num-validators $NUM_INSTANCES --validator --metrics" C-m + tmux send-keys -t "snarkos-session" "snarkos start --nodisplay --bft 0.0.0.0:5000 --rest 0.0.0.0:3030 --peers $NODE_IP:4130 --validators $NODE_IP:5000 --verbosity $VERBOSITY --dev $NODE_ID --dev-num-validators $NUM_INSTANCES --validator --metrics" C-m exit # Exit root user EOF diff --git a/Cargo.lock b/Cargo.lock index 398f40ac23..d7dda17b58 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3526,7 +3526,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "anstyle", "anyhow", @@ -3557,7 +3557,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "aleo-std", "anyhow", @@ -3587,7 +3587,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -3601,7 +3601,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -3612,7 +3612,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -3622,7 +3622,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -3632,7 +3632,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "indexmap 2.2.2", "itertools 0.11.0", @@ -3650,12 +3650,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" [[package]] name = "snarkvm-circuit-network" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -3666,7 +3666,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "paste", "snarkvm-circuit-account", @@ -3681,7 +3681,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -3696,7 +3696,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3709,7 +3709,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -3718,7 +3718,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3728,7 +3728,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3740,7 +3740,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3752,7 +3752,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3763,7 +3763,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3775,7 +3775,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -3788,7 +3788,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "bs58", "snarkvm-console-network", @@ -3799,7 +3799,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "blake2s_simd", "smallvec", @@ -3812,7 +3812,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "aleo-std", "rayon", @@ -3823,7 +3823,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "anyhow", "indexmap 2.2.2", @@ -3846,7 +3846,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "anyhow", "bech32", @@ -3864,7 +3864,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "enum_index", "enum_index_derive", @@ -3885,7 +3885,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -3900,7 +3900,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3911,7 +3911,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-console-network-environment", ] @@ -3919,7 +3919,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3929,7 +3929,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3940,7 +3940,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3951,7 +3951,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3962,7 +3962,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3973,7 +3973,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "rand", "rayon", @@ -3987,7 +3987,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "aleo-std", "anyhow", @@ -4004,7 +4004,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "aleo-std", "anyhow", @@ -4029,7 +4029,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "anyhow", "rand", @@ -4041,7 +4041,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "indexmap 2.2.2", "rayon", @@ -4060,7 +4060,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-coinbase" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "aleo-std", "anyhow", @@ -4080,7 +4080,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "anyhow", "indexmap 2.2.2", @@ -4098,7 +4098,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -4111,7 +4111,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "indexmap 2.2.2", "rayon", @@ -4124,7 +4124,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "indexmap 2.2.2", "serde_json", @@ -4136,7 +4136,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "bytes", "serde_json", @@ -4147,7 +4147,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "indexmap 2.2.2", "rayon", @@ -4162,7 +4162,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "bytes", "serde_json", @@ -4175,7 +4175,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "snarkvm-console", "snarkvm-ledger-coinbase", @@ -4184,7 +4184,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "async-trait", "reqwest", @@ -4197,7 +4197,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "aleo-std-storage", "anyhow", @@ -4222,7 +4222,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-test-helpers" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "once_cell", "snarkvm-circuit", @@ -4237,7 +4237,7 @@ dependencies = [ [[package]] name = "snarkvm-metrics" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "metrics", "metrics-exporter-prometheus", @@ -4246,7 +4246,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "aleo-std", "anyhow", @@ -4271,7 +4271,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "aleo-std", "anyhow", @@ -4295,7 +4295,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "aleo-std", "colored", @@ -4318,7 +4318,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "indexmap 2.2.2", "paste", @@ -4332,7 +4332,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "bincode", "once_cell", @@ -4345,7 +4345,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "aleo-std", "anyhow", @@ -4366,7 +4366,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=62bce04#62bce0440360e2a58838795bfd1d6afa17a6acdf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=97cb08d#97cb08dcc2aea125e2054440539d15cf1adad4a1" dependencies = [ "proc-macro2", "quote 1.0.35", diff --git a/README.md b/README.md index 7bffeeb106..6fa2186ca0 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ Lastly, install `snarkOS`: cargo install --locked --path . ``` -Please ensure ports `4133/tcp` and `3033/tcp` are open on your router and OS firewall. +Please ensure ports `4130/tcp` and `3030/tcp` are open on your router and OS firewall. ## 3. Run an Aleo Node @@ -144,7 +144,7 @@ APrivateKey1xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx ### 2. My node is unable to connect to peers on the network. -- Ensure ports `4133/tcp` and `3033/tcp` are open on your router and OS firewall. +- Ensure ports `4130/tcp` and `3030/tcp` are open on your router and OS firewall. - Ensure `snarkOS` is started using `./run-client.sh` or `./run-prover.sh`. ### 3. I can't generate a new address ### @@ -191,10 +191,10 @@ OPTIONS: --private-key Specify the node's account private key --private-key-file Specify the path to a file containing the node's account private key - --node Specify the IP address and port for the node server [default: 0.0.0.0:4133] + --node Specify the IP address and port for the node server [default: 0.0.0.0:4130] --connect Specify the IP address and port of a peer to connect to - --rest Specify the IP address and port for the REST server [default: 0.0.0.0:3033] + --rest Specify the IP address and port for the REST server [default: 0.0.0.0:3030] --norest If the flag is set, the node will not initialize the REST server --nodisplay If the flag is set, the node will not render the display diff --git a/build_ubuntu.sh b/build_ubuntu.sh index 53cad73e4a..84d7379c51 100755 --- a/build_ubuntu.sh +++ b/build_ubuntu.sh @@ -31,12 +31,12 @@ source $HOME/.cargo/env cargo install --locked --path . echo "==================================================" -echo " Attention - Please ensure ports 4133 and 3033" +echo " Attention - Please ensure ports 4130 and 3030" echo " are enabled on your local network." echo "" -echo " Cloud Providers - Enable ports 4133 and 3033" +echo " Cloud Providers - Enable ports 4130 and 3030" echo " in your network firewall" echo "" echo " Home Users - Enable port forwarding or NAT rules" -echo " for 4133 and 3033 on your router." +echo " for 4130 and 3030 on your router." echo "==================================================" diff --git a/cli/src/commands/start.rs b/cli/src/commands/start.rs index a6d30e99c3..8887016802 100644 --- a/cli/src/commands/start.rs +++ b/cli/src/commands/start.rs @@ -76,7 +76,7 @@ pub struct Start { pub private_key_file: Option, /// Specify the IP address and port for the node server - #[clap(default_value = "0.0.0.0:4133", long = "node")] + #[clap(default_value = "0.0.0.0:4130", long = "node")] pub node: SocketAddr, /// Specify the IP address and port for the BFT #[clap(long = "bft")] @@ -89,7 +89,7 @@ pub struct Start { pub validators: String, /// Specify the IP address and port for the REST server - #[clap(default_value = "0.0.0.0:3033", long = "rest")] + #[clap(default_value = "0.0.0.0:3030", long = "rest")] pub rest: SocketAddr, /// Specify the requests per second (RPS) rate limit per IP for the REST server #[clap(default_value = "10", long = "rest-rps")] @@ -789,8 +789,8 @@ mod tests { Start::try_parse_from(["snarkos", "--dev", "3", "--client", "--private-key", ""].iter()).unwrap(); config.parse_development(&mut trusted_peers, &mut trusted_validators).unwrap(); let genesis = config.parse_genesis::().unwrap(); - assert_eq!(config.node, SocketAddr::from_str("0.0.0.0:4133").unwrap()); - assert_eq!(config.rest, SocketAddr::from_str("0.0.0.0:3033").unwrap()); + assert_eq!(config.node, SocketAddr::from_str("0.0.0.0:4130").unwrap()); + assert_eq!(config.rest, SocketAddr::from_str("0.0.0.0:3030").unwrap()); assert_eq!(trusted_peers.len(), 3); assert_eq!(trusted_validators.len(), 2); assert!(!config.validator); @@ -817,7 +817,7 @@ mod tests { "--validators", "IP1,IP2,IP3", "--rest", - "127.0.0.1:3033", + "127.0.0.1:3030", ]; let cli = CLI::parse_from(arg_vec); @@ -827,7 +827,7 @@ mod tests { assert!(start.validator); assert_eq!(start.private_key.as_deref(), Some("PRIVATE_KEY")); assert_eq!(start.cdn, "CDN"); - assert_eq!(start.rest, "127.0.0.1:3033".parse().unwrap()); + assert_eq!(start.rest, "127.0.0.1:3030".parse().unwrap()); assert_eq!(start.network, 3); assert_eq!(start.peers, "IP1,IP2,IP3"); assert_eq!(start.validators, "IP1,IP2,IP3"); diff --git a/node/router/src/lib.rs b/node/router/src/lib.rs index 6f4465aaca..3dab4b01b2 100644 --- a/node/router/src/lib.rs +++ b/node/router/src/lib.rs @@ -381,10 +381,10 @@ impl Router { vec![] } else { vec![ - SocketAddr::from_str("35.224.50.150:4133").unwrap(), - SocketAddr::from_str("35.227.159.141:4133").unwrap(), - SocketAddr::from_str("34.139.203.87:4133").unwrap(), - SocketAddr::from_str("34.150.221.166:4133").unwrap(), + SocketAddr::from_str("35.224.50.150:4130").unwrap(), + SocketAddr::from_str("35.227.159.141:4130").unwrap(), + SocketAddr::from_str("34.139.203.87:4130").unwrap(), + SocketAddr::from_str("34.150.221.166:4130").unwrap(), ] } } diff --git a/node/src/validator/mod.rs b/node/src/validator/mod.rs index fc0c277371..2c964c78a5 100644 --- a/node/src/validator/mod.rs +++ b/node/src/validator/mod.rs @@ -470,8 +470,8 @@ mod tests { #[tokio::test] async fn test_profiler() -> Result<()> { // Specify the node attributes. - let node = SocketAddr::from_str("0.0.0.0:4133").unwrap(); - let rest = SocketAddr::from_str("0.0.0.0:3033").unwrap(); + let node = SocketAddr::from_str("0.0.0.0:4130").unwrap(); + let rest = SocketAddr::from_str("0.0.0.0:3030").unwrap(); let storage_mode = StorageMode::Development(0); // Initialize an (insecure) fixed RNG.