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

Jump to bottom

chore: bump contracts to 1.2.0 #295

Merged
merged 2 commits into from
Jan 31, 2024
Merged

chore: bump contracts to 1.2.0 #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba709da
chore: add submodules as dependency to build
gligneul Jan 31, 2024
a864b79
chore: bump contracts to 1.2.0
gligneul Jan 31, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ check-generate: generate graphql-schema ## Check whether the generated files are
fi

.PHONY: docker-build
docker-build: ## Build the docker images using bake
docker-build: submodules ## Build the docker images using bake
@cd build && docker buildx bake --load

.PHONY: docker-run
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion build/docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion build/shasumfile
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion offchain/contracts/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<dyn Error>> {
let tempdir = tempfile::tempdir()?;
Expand Down
2 changes: 1 addition & 1 deletion pkg/contracts/generate/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion scripts/devnet/gen-devnet.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading