Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PM-1170 update daemon to rc1 #99

Merged
merged 2 commits into from
Feb 7, 2024
Merged

PM-1170 update daemon to rc1 #99

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a2f1af
update daemon to rc1
piotr-iohk Feb 5, 2024
4ee2992
update genesis-ledgers
piotr-iohk Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions scripts/update_mina.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
# 1. Update the variables below to the desired versions
# 2. ./scripts/update_mina.sh

daemon_old="gcr.io/o1labs-192920/mina-daemon:2.0.0rampup6-4061884-bullseye-berkeley"
daemon_new="gcr.io/o1labs-192920/mina-daemon:2.0.0rampup7-4a0fff9-bullseye-berkeley"
daemon_old="gcr.io/o1labs-192920/mina-daemon:2.0.0rampup7-4a0fff9-bullseye-berkeley"
daemon_new="gcr.io/o1labs-192920/mina-daemon:2.0.0berkeley-rc1-1551e2f-bullseye-berkeley"

archive_old="gcr.io/o1labs-192920/mina-archive:2.0.0rampup6-4061884-bullseye"
archive_new="gcr.io/o1labs-192920/mina-archive:2.0.0rampup7-4a0fff9-bullseye"
archive_old="gcr.io/o1labs-192920/mina-archive:2.0.0rampup7-4a0fff9-bullseye"
archive_new="gcr.io/o1labs-192920/mina-archive:2.0.0berkeley-rc1-1551e2f-bullseye"

commit_old="4061884"
commit_new="4a0fff9"
commit_old="4a0fff9"
commit_new="1551e2f"

escape_slashes() {
echo "$1" | sed 's_/_\\/_g'
Expand Down
6 changes: 3 additions & 3 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ const LEAST_COMPOSE_VERSION: &str = "2.21.0";

// Hardcoded daemon image for default network
const DEFAULT_DAEMON_DOCKER_IMAGE: &str =
"gcr.io/o1labs-192920/mina-daemon:2.0.0rampup7-4a0fff9-bullseye-berkeley";
"gcr.io/o1labs-192920/mina-daemon:2.0.0berkeley-rc1-1551e2f-bullseye-berkeley";

// Hardcoded archive image for default network
const DEFAULT_ARCHIVE_DOCKER_IMAGE: &str =
"gcr.io/o1labs-192920/mina-archive:2.0.0rampup7-4a0fff9-bullseye";
"gcr.io/o1labs-192920/mina-archive:2.0.0berkeley-rc1-1551e2f-bullseye";

const IMAGE_COMMIT_HASH: &str = "4a0fff9";
const IMAGE_COMMIT_HASH: &str = "1551e2f";

// Timeout in seconds for waiting operations
const TIMEOUT_IN_SECS: u16 = 180;
Expand Down
22 changes: 11 additions & 11 deletions tests/data/large_network/topology.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"pk": "B62qqYWdCfrjEznYNc7fsve5Rk5wuho9KwZa2bntKZBdshz1M6RsBna",
"sk": "EKERBeqQE7GLuD9xtCBCGYNAyXpYX8UnXBTkg6rbvwT2LKPYiDdF",
"role": "Snark_coordinator",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0rampup7-4a0fff9-bullseye-berkeley",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0berkeley-rc1-1551e2f-bullseye-berkeley",
"git_build": null,
"worker_nodes": 2,
"snark_worker_fee": "0.0001",
Expand All @@ -26,12 +26,12 @@
"pk": "B62qjw6nhuPRERVeUwwEdT7KAcEg7D8pUiKdDmf7Ny1W7utcq9UKw1q",
"sk": "EKFbpuwm2ALsgDXy7NSpmEaDF62W6ULMSzdV8haSCaHeizFCHcDm",
"role": "Archive_node",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0rampup7-4a0fff9-bullseye-berkeley",
"archive_image": "gcr.io/o1labs-192920/mina-archive:2.0.0rampup7-4a0fff9-bullseye",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0berkeley-rc1-1551e2f-bullseye-berkeley",
"archive_image": "gcr.io/o1labs-192920/mina-archive:2.0.0berkeley-rc1-1551e2f-bullseye",
"git_build": null,
"schema_files": [
"https://raw.githubusercontent.com/MinaProtocol/mina/4a0fff9/src/app/archive/create_schema.sql",
"https://raw.githubusercontent.com/MinaProtocol/mina/4a0fff9/src/app/archive/zkapp_tables.sql"
"https://raw.githubusercontent.com/MinaProtocol/mina/1551e2f/src/app/archive/create_schema.sql",
"https://raw.githubusercontent.com/MinaProtocol/mina/1551e2f/src/app/archive/zkapp_tables.sql"
],
"libp2p_pass": "naughty blue worm",
"libp2p_keyfile": "./tests/data/large_network/libp2p_keys/archive_node.json",
Expand All @@ -53,7 +53,7 @@
"sk": "EKF4pbSdHbXjSXJLWhcgqH3gLzcihNH7uxhxpsoB74JabufNT2p2",
"privkey_path": "./tests/data/large_network/block_producer_keys/receiver.json",
"role": "Block_producer",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0rampup7-4a0fff9-bullseye-berkeley",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0berkeley-rc1-1551e2f-bullseye-berkeley",
"git_build": null,
"libp2p_pass": "naughty blue worm",
"libp2p_keyfile": "./tests/data/large_network/libp2p_keys/receiver.json",
Expand All @@ -75,7 +75,7 @@
"sk": "EKEDFANcgihUz6X8kkZKoB1VNr38zJUaCDYbtbaarKbpMKzCKuH1",
"privkey_path": "./tests/data/large_network/block_producer_keys/empty_node-1.json",
"role": "Block_producer",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0rampup7-4a0fff9-bullseye-berkeley",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0berkeley-rc1-1551e2f-bullseye-berkeley",
"git_build": null,
"libp2p_pass": "naughty blue worm",
"libp2p_keyfile": "./tests/data/large_network/libp2p_keys/empty_node-1.json",
Expand All @@ -97,7 +97,7 @@
"sk": "EKEDFANcgihUz6X8kkZKoB1VNr38zJUaCDYbtbaarKbpMKzCKuH1",
"privkey_path": "./tests/data/large_network/block_producer_keys/empty_node-2.json",
"role": "Block_producer",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0rampup7-4a0fff9-bullseye-berkeley",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0berkeley-rc1-1551e2f-bullseye-berkeley",
"git_build": null,
"libp2p_pass": "naughty blue worm",
"libp2p_keyfile": "./tests/data/large_network/libp2p_keys/empty_node-2.json",
Expand All @@ -119,7 +119,7 @@
"sk": "EKEDFANcgihUz6X8kkZKoB1VNr38zJUaCDYbtbaarKbpMKzCKuH1",
"privkey_path": "./tests/data/large_network/block_producer_keys/observer.json",
"role": "Block_producer",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0rampup7-4a0fff9-bullseye-berkeley",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0berkeley-rc1-1551e2f-bullseye-berkeley",
"git_build": null,
"libp2p_pass": "naughty blue worm",
"libp2p_keyfile": "./tests/data/large_network/libp2p_keys/observer.json",
Expand All @@ -141,7 +141,7 @@
"sk": "EKEmQoyTKdFqKuAz58jA7iAM8UKAzuyfPFKcjFQavCBVgYWC8y2Y",
"privkey_path": null,
"role": "Seed_node",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0rampup7-4a0fff9-bullseye-berkeley",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0berkeley-rc1-1551e2f-bullseye-berkeley",
"git_build": null,
"libp2p_pass": "naughty blue worm",
"libp2p_keyfile": "./tests/data/large_network/libp2p_keys/seed-0.json",
Expand All @@ -163,7 +163,7 @@
"sk": "EKDmEM9PvTrwD2AwB1qsSqWwyzf7ZVawzVxk4xwXG5XYRxhGiQdy",
"privkey_path": null,
"role": "Seed_node",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0rampup7-4a0fff9-bullseye-berkeley",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0berkeley-rc1-1551e2f-bullseye-berkeley",
"git_build": null,
"libp2p_pass": "naughty blue worm",
"libp2p_keyfile": "./tests/data/large_network/libp2p_keys/seed-1.json",
Expand Down
4 changes: 2 additions & 2 deletions tests/data/small_network/topology.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"sk": "EKFFrQVB9tmtHVxAGBqvZYUy9Wm2e5ERwNh4dgZpjyLsT6nfpmPS",
"privkey_path": "./tests/data/small_network/block_producer_keys/receiver.json",
"role": "Block_producer",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0rampup7-4a0fff9-bullseye-berkeley",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0berkeley-rc1-1551e2f-bullseye-berkeley",
"git_build": null,
"libp2p_pass": "naughty blue worm",
"libp2p_keyfile": "./tests/data/small_network/libp2p_keys/receiver.json",
Expand All @@ -26,7 +26,7 @@
"sk": "EKDyUS6K9wkVGiYrvJhtZHSMjeW4JEMiWCXGNco4ZEkbMN9qSeQk",
"privkey_path": null,
"role": "Seed_node",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0rampup7-4a0fff9-bullseye-berkeley",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0berkeley-rc1-1551e2f-bullseye-berkeley",
"git_build": null,
"libp2p_pass": "naughty blue worm",
"libp2p_keyfile": "./tests/data/small_network/libp2p_keys/seed-0.json",
Expand Down
10 changes: 5 additions & 5 deletions tests/data/uptime_service_network/topology.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"pk": "B62qjwzawZqMmm27zwDg5xF8XtrH1TcQedsS3EVStct8wr1FcpRZFbm",
"sk": "EKFBPN3My4Y5GqaYj9pMYvtfzvrzuSQyvTEgxTZmCx4QZg7vJePB",
"role": "Snark_coordinator",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0rampup7-4a0fff9-bullseye-berkeley",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0berkeley-rc1-1551e2f-bullseye-berkeley",
"git_build": null,
"worker_nodes": 1,
"snark_worker_fee": "0.0001",
Expand All @@ -27,7 +27,7 @@
"sk": "EKF83r3ibZ8eCC1PwcgrTAVLVoA3dKXt2iSGxb6vDnofs9nKUY3V",
"privkey_path": "./tests/data/uptime_service_network/block_producer_keys/node-a.json",
"role": "Block_producer",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0rampup7-4a0fff9-bullseye-berkeley",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0berkeley-rc1-1551e2f-bullseye-berkeley",
"git_build": null,
"libp2p_pass": "naughty blue worm",
"libp2p_keyfile": "./tests/data/uptime_service_network/libp2p_keys/node-a.json",
Expand All @@ -49,7 +49,7 @@
"sk": "EKF5AkJQX1B6CgmmaXgsyw4tZFp1M27TRcJrzw67Mtnp7o45rEvv",
"privkey_path": "./tests/data/uptime_service_network/block_producer_keys/node-b.json",
"role": "Block_producer",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0rampup7-4a0fff9-bullseye-berkeley",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0berkeley-rc1-1551e2f-bullseye-berkeley",
"git_build": null,
"libp2p_pass": "naughty blue worm",
"libp2p_keyfile": "./tests/data/uptime_service_network/libp2p_keys/node-b.json",
Expand All @@ -71,7 +71,7 @@
"sk": "EKF44LaJVQKTT1iuSJ3XifSFFtBndMb741kHPzVcYAtYEyJbZ11s",
"privkey_path": "./tests/data/uptime_service_network/block_producer_keys/node-c.json",
"role": "Block_producer",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0rampup7-4a0fff9-bullseye-berkeley",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0berkeley-rc1-1551e2f-bullseye-berkeley",
"git_build": null,
"libp2p_pass": "naughty blue worm",
"libp2p_keyfile": "./tests/data/uptime_service_network/libp2p_keys/node-c.json",
Expand Down Expand Up @@ -99,7 +99,7 @@
"sk": "EKEFB6NduHXqgGUkSSe1TFf1SCpn1SDrJtAcRJiHd4zaks4X5GrD",
"privkey_path": null,
"role": "Seed_node",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0rampup7-4a0fff9-bullseye-berkeley",
"docker_image": "gcr.io/o1labs-192920/mina-daemon:2.0.0berkeley-rc1-1551e2f-bullseye-berkeley",
"git_build": null,
"libp2p_pass": "naughty blue worm",
"libp2p_keyfile": "./tests/data/uptime_service_network/libp2p_keys/default-seed.json",
Expand Down