From a864b792d86550583f502d24828d7b01f555f547 Mon Sep 17 00:00:00 2001 From: Gabriel de Quadros Ligneul Date: Wed, 31 Jan 2024 11:28:48 -0300 Subject: [PATCH] chore: bump contracts to 1.2.0 --- CHANGELOG.md | 1 + README.md | 2 +- build/Dockerfile | 1 - build/docker-bake.hcl | 1 - build/shasumfile | 1 - offchain/contracts/build.rs | 2 +- pkg/contracts/generate/main.go | 2 +- scripts/devnet/gen-devnet.sh | 2 +- 8 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 build/shasumfile diff --git a/CHANGELOG.md b/CHANGELOG.md index edda48a8d..b4eef0893 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Changed installation paths in the Docker image. Now all the binaries are installed in /usr/bin instead of /opt/cartesi/bin. - Changed the base Docker image to debian-bookworm instead cartesi/server-manager. +- Bumped Cartesi Rollups contracts to version 1.2.0. ### Removed diff --git a/README.md b/README.md index eef4bf612..cbc72eff7 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ The Cartesi Node depends on the following Cartesi components: |---|---| | Cartesi Machine SDK | [v0.16.2](https://github.com/cartesi/machine-emulator-sdk/releases/tag/v0.16.2) | | Cartesi OpenAPI Interfaces | [v0.7.0](https://github.com/cartesi/openapi-interfaces/releases/tag/v0.7.0) | -| Cartesi Rollups Contracts | [v1.1.0](https://github.com/cartesi/rollups-contracts/releases/tag/v1.1.0) | +| Cartesi Rollups Contracts | [v1.2.0](https://github.com/cartesi/rollups-contracts/releases/tag/v1.2.0) | | Cartesi Server Manager | [v0.8.2](https://github.com/cartesi/server-manager/releases/tag/v0.8.2) | ## Node Configuration diff --git a/build/Dockerfile b/build/Dockerfile index 9c0ec2759..4afe3e751 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -11,7 +11,6 @@ ARG BASE_IMAGE ARG RUST_VERSION ARG GO_VERSION ARG FOUNDRY_COMMIT_VERSION -ARG ROLLUPS_CONTRACTS_VERSION ARG SERVER_MANAGER_VERSION ARG MACHINE_EMULATOR_VERSION ARG ROOTFS_VERSION diff --git a/build/docker-bake.hcl b/build/docker-bake.hcl index cf2856aea..7058b527c 100644 --- a/build/docker-bake.hcl +++ b/build/docker-bake.hcl @@ -21,7 +21,6 @@ target "common" { RUST_VERSION = "1.75.0" GO_VERSION = "1.21.1" FOUNDRY_COMMIT_VERSION = "24abca6c9133618e0c355842d2be2dd4f36da46d" - ROLLUPS_CONTRACTS_VERSION = "1.1.0" SERVER_MANAGER_VERSION = "0.8.2" MACHINE_EMULATOR_VERSION = "0.15.2" ROOTFS_VERSION = "0.18.0" diff --git a/build/shasumfile b/build/shasumfile deleted file mode 100644 index c548db506..000000000 --- a/build/shasumfile +++ /dev/null @@ -1 +0,0 @@ -c633bb04772ccaefbc45a2e019ef8556d0c6855649a0c11817fb67c29e713284 rollups-1.1.0.tgz diff --git a/offchain/contracts/build.rs b/offchain/contracts/build.rs index 379eb8370..91140acc9 100644 --- a/offchain/contracts/build.rs +++ b/offchain/contracts/build.rs @@ -11,7 +11,7 @@ use std::str; use eth_state_fold_types::contract; const ROLLUPS_CONTRACTS_URL: &str = - "https://registry.npmjs.org/@cartesi/rollups/-/rollups-1.1.0.tgz"; + "https://registry.npmjs.org/@cartesi/rollups/-/rollups-1.2.0.tgz"; fn main() -> Result<(), Box> { let tempdir = tempfile::tempdir()?; diff --git a/pkg/contracts/generate/main.go b/pkg/contracts/generate/main.go index ee7e1c67e..a0dba4861 100644 --- a/pkg/contracts/generate/main.go +++ b/pkg/contracts/generate/main.go @@ -20,7 +20,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" ) -const rollupsContractsUrl = "https://registry.npmjs.org/@cartesi/rollups/-/rollups-1.1.0.tgz" +const rollupsContractsUrl = "https://registry.npmjs.org/@cartesi/rollups/-/rollups-1.2.0.tgz" const baseContractsPath = "package/export/artifacts/contracts/" const bindingPkg = "contracts" diff --git a/scripts/devnet/gen-devnet.sh b/scripts/devnet/gen-devnet.sh index 668940bf9..504f63e55 100755 --- a/scripts/devnet/gen-devnet.sh +++ b/scripts/devnet/gen-devnet.sh @@ -14,7 +14,7 @@ readonly script_dir ################################################################################ # Configuration -ROLLUPS_CONTRACTS_VERSION="1.1.0" +ROLLUPS_CONTRACTS_VERSION="1.2.0" DEVNET_RPC_URL="http://localhost:8545" DEVNET_FOUNDRY_ACCOUNT_0_ADDRESS="0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266" DEVNET_FOUNDRY_ACCOUNT_0_PRIVATE_KEY="0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"