Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/brown-books-smash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@cartesi/devnet": patch
---

bump foundry
5 changes: 5 additions & 0 deletions .changeset/cruel-geese-repair.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@cartesi/devnet": patch
---

temporarily remove ERC-4337 contracts
5 changes: 5 additions & 0 deletions .changeset/free-pets-dig.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@cartesi/devnet": patch
---

bump cannon
5 changes: 5 additions & 0 deletions .changeset/orange-pants-boil.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@cartesi/devnet": patch
---

bump rollups-contracts
5 changes: 5 additions & 0 deletions .changeset/wicked-phones-sing.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@cartesi/devnet": patch
---

bump openzeppelin
4 changes: 2 additions & 2 deletions .github/workflows/cli.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ jobs:
cache: "pnpm"

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@de808b1eea699e761c404bda44ba8f21aba30b2c # 1.3.1
uses: foundry-rs/foundry-toolchain@8b0419c685ef46cb79ec93fbdc131174afceb730 # 1.6.0
with:
version: v0.3.0
version: v1.4.3

- name: Install dependencies
run: pnpm install
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/devnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ jobs:
cache: "pnpm"

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@de808b1eea699e761c404bda44ba8f21aba30b2c # 1.3.1
uses: foundry-rs/foundry-toolchain@8b0419c685ef46cb79ec93fbdc131174afceb730 # 1.6.0
with:
version: v1.2.1
version: v1.4.3

- name: Install dependencies
run: pnpm install
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/paymaster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ jobs:
cache: "pnpm"

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@de808b1eea699e761c404bda44ba8f21aba30b2c # 1.3.1
uses: foundry-rs/foundry-toolchain@8b0419c685ef46cb79ec93fbdc131174afceb730 # 1.6.0
with:
version: v0.3.0
version: v1.4.3

- name: Install dependencies
run: pnpm install
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ jobs:
# Minimum required version for npm publish with OIDC Support
# https://docs.npmjs.com/trusted-publishers
- run: |
npm install -g npm@latest
npm --version
npm install -g npm@latest
npm --version

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@de808b1eea699e761c404bda44ba8f21aba30b2c # 1.3.1
uses: foundry-rs/foundry-toolchain@8b0419c685ef46cb79ec93fbdc131174afceb730 # 1.6.0
with:
version: v0.3.0
version: v1.4.3

- name: Install Dependencies
run: pnpm install
Expand Down
76 changes: 2 additions & 74 deletions packages/devnet/cannonfile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,80 +2,8 @@ name = 'cartesi-rollups-devnet'
version = '<%= package.version %>'
description = 'Cartesi Rollups Devnet'

[pull.cartesiRollups]
source = "cartesi-rollups:2.0.0@main"

[pull.entrypointSimulations]
source = "pimlico-entrypoint-simulations:0.7.0@main"

[pull.simpleAccount06]
source = "eth-infinitism-simple-account:0.6.0@main"

[pull.simpleAccount07]
source = "eth-infinitism-simple-account:0.7.0@main"

[pull.simpleAccount08]
source = "eth-infinitism-simple-account:0.8.0@main"

[pull.zerodevKernel030]
source = "zerodev-kernel:0.3.0@main"

[pull.zerodevKernel031]
source = "zerodev-kernel:0.3.1@main"

[pull.zerodevKernel032]
source = "zerodev-kernel:0.3.2@main"

[pull.zerodevKernelSudoPolicy]
source = "zerodev-kernel-sudo-policy:0.0.1@main"

[pull.zerodevKernelCallPolicy]
source = "zerodev-kernel-call-policy:0.0.1@main"

[pull.zerodevKernelCallPolicy2]
source = "zerodev-kernel-call-policy:0.0.2@main"

[pull.zerodevKernelCallPolicy3]
source = "zerodev-kernel-call-policy:0.0.3@main"

[pull.zerodevKernelCallPolicy4]
source = "zerodev-kernel-call-policy:0.0.4@main"

[pull.zerodevKernelGasPolicy]
source = "zerodev-kernel-gas-policy:0.0.1@main"

[pull.zerodevKernelTimestampPolicy]
source = "zerodev-kernel-timestamp-policy:0.0.1@main"

[pull.zerodevKernelRatelimitPolicy]
source = "zerodev-kernel-ratelimit-policy:0.0.1@main"

[pull.zerodevKernelSignaturePolicy]
source = "zerodev-kernel-signature-policy:0.0.1@main"

[pull.zerodevKernelEcdsaSigner]
source = "zerodev-kernel-ecdsa-signer:0.0.1@main"

[pull.zerodevKernelWebAuthnSigner]
source = "zerodev-kernel-web-authn-signer:0.0.1@main"

[pull.zerodevKernelWebAuthnSigner2]
source = "zerodev-kernel-web-authn-signer:0.0.2@main"

[pull.zerodevKernelAuthnValidator]
source = "zerodev-kernel-authn-validator:0.0.1@main"

[pull.zerodevKernelAuthnValidator2]
source = "zerodev-kernel-authn-validator:0.0.2@main"

[pull.alchemyLightAccountV1]
source = "alchemy-light-account:1.1.0@main"

[pull.alchemyLightAccountV2]
source = "alchemy-light-account:2.0.0@main"

[pull.alchemyModularAccountV2]
source = "alchemy-modular-account:2.0.0@main"
[pull.cartesiDaveAppFactory]
source = "cartesi-dave-app-factory:2.0.0@main"

[var.Settings]
token_owner = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
Expand Down
4 changes: 2 additions & 2 deletions packages/devnet/foundry.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[profile.default]
libs = ["dependencies"]
solc_version = "0.8.23"
solc_version = "0.8.30"
optimizer = true

[dependencies]
"@openzeppelin-contracts" = "5.2.0"
"@openzeppelin-contracts" = "5.5.0"
2 changes: 1 addition & 1 deletion packages/devnet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"fmt:write": "forge fmt"
},
"devDependencies": {
"@usecannon/cli": "^2.23.0",
"@usecannon/cli": "^2.25.1",
"npm-run-all": "^4.1.5"
},
"files": [
Expand Down
8 changes: 4 additions & 4 deletions packages/devnet/soldeer.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[[dependencies]]
name = "@openzeppelin-contracts"
version = "5.2.0"
url = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts/5_2_0_11-01-2025_09:30:20_contracts.zip"
checksum = "6dbd0440446b2ed16ca25e9f1af08fc0c5c1e73e71fee86ae8a00daa774e3817"
integrity = "4cb7f3777f67fdf4b7d0e2f94d2f93f198b2e5dce718b7062ac7c2c83e1183bd"
version = "5.5.0"
url = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts/5_5_0_01-11-2025_09:56:40_contracts.zip"
checksum = "2ee78837130cf06b456d9ef7ab70753685d9c1c9c2c5b70f24bd4c16695d0337"
integrity = "da8336cf949f0e0667ae8360af849681e3a3e76d7e61e7a86b1a3414a158aeea"
25 changes: 16 additions & 9 deletions packages/devnet/src/TestMultiToken.sol
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
// Compatible with OpenZeppelin Contracts ^5.0.0
pragma solidity ^0.8.20;
// Compatible with OpenZeppelin Contracts ^5.0
pragma solidity ^0.8;

import "@openzeppelin-contracts-5.2.0/token/ERC1155/ERC1155.sol";
import "@openzeppelin-contracts-5.2.0/access/Ownable.sol";
import {ERC1155} from "@openzeppelin-contracts-5.5.0/token/ERC1155/ERC1155.sol";
import {Ownable} from "@openzeppelin-contracts-5.5.0/access/Ownable.sol";

contract TestMultiToken is ERC1155, Ownable {
constructor(address initialOwner) ERC1155("") Ownable(initialOwner) {}
Expand All @@ -12,14 +12,21 @@ contract TestMultiToken is ERC1155, Ownable {
_setURI(newuri);
}

function mint(address account, uint256 id, uint256 amount, bytes memory data) public onlyOwner {
function mint(
address account,
uint256 id,
uint256 amount,
bytes memory data
) public onlyOwner {
_mint(account, id, amount, data);
}

function mintBatch(address to, uint256[] memory ids, uint256[] memory amounts, bytes memory data)
public
onlyOwner
{
function mintBatch(
address to,
uint256[] memory ids,
uint256[] memory amounts,
bytes memory data
) public onlyOwner {
_mintBatch(to, ids, amounts, data);
}
}
30 changes: 21 additions & 9 deletions packages/devnet/src/TestNFT.sol
Original file line number Diff line number Diff line change
@@ -1,26 +1,38 @@
// SPDX-License-Identifier: Apache-2.0
// Compatible with OpenZeppelin Contracts ^5.0.0
pragma solidity ^0.8.20;
// Compatible with OpenZeppelin Contracts ^5.0
pragma solidity ^0.8;

import "@openzeppelin-contracts-5.2.0/token/ERC721/ERC721.sol";
import "@openzeppelin-contracts-5.2.0/token/ERC721/extensions/ERC721URIStorage.sol";
import "@openzeppelin-contracts-5.2.0/access/Ownable.sol";
import {ERC721} from "@openzeppelin-contracts-5.5.0/token/ERC721/ERC721.sol";
import {
ERC721URIStorage
} from "@openzeppelin-contracts-5.5.0/token/ERC721/extensions/ERC721URIStorage.sol";
import {Ownable} from "@openzeppelin-contracts-5.5.0/access/Ownable.sol";

contract TestNFT is ERC721, ERC721URIStorage, Ownable {
constructor(address initialOwner) ERC721("TestNFT", "SUNN") Ownable(initialOwner) {}
constructor(
address initialOwner
) ERC721("TestNFT", "SUNN") Ownable(initialOwner) {}

function safeMint(address to, uint256 tokenId, string memory uri) public onlyOwner {
function safeMint(
address to,
uint256 tokenId,
string memory uri
) public onlyOwner {
_safeMint(to, tokenId);
_setTokenURI(tokenId, uri);
}

// The following functions are overrides required by Solidity.

function tokenURI(uint256 tokenId) public view override(ERC721, ERC721URIStorage) returns (string memory) {
function tokenURI(
uint256 tokenId
) public view override(ERC721, ERC721URIStorage) returns (string memory) {
return super.tokenURI(tokenId);
}

function supportsInterface(bytes4 interfaceId) public view override(ERC721, ERC721URIStorage) returns (bool) {
function supportsInterface(
bytes4 interfaceId
) public view override(ERC721, ERC721URIStorage) returns (bool) {
return super.supportsInterface(interfaceId);
}
}
39 changes: 30 additions & 9 deletions packages/devnet/src/TestToken.sol
Original file line number Diff line number Diff line change
@@ -1,14 +1,31 @@
// SPDX-License-Identifier: Apache-2.0
pragma solidity ^0.8.20;
// Compatible with OpenZeppelin Contracts ^5.0
pragma solidity ^0.8;

import "@openzeppelin-contracts-5.2.0/token/ERC20/ERC20.sol";
import "@openzeppelin-contracts-5.2.0/token/ERC20/extensions/ERC20Burnable.sol";
import "@openzeppelin-contracts-5.2.0/token/ERC20/extensions/ERC20Pausable.sol";
import "@openzeppelin-contracts-5.2.0/access/manager/AccessManaged.sol";
import "@openzeppelin-contracts-5.2.0/token/ERC20/extensions/ERC20Permit.sol";
import {ERC20} from "@openzeppelin-contracts-5.5.0/token/ERC20/ERC20.sol";
import {
ERC20Burnable
} from "@openzeppelin-contracts-5.5.0/token/ERC20/extensions/ERC20Burnable.sol";
import {
ERC20Pausable
} from "@openzeppelin-contracts-5.5.0/token/ERC20/extensions/ERC20Pausable.sol";
import {
AccessManaged
} from "@openzeppelin-contracts-5.5.0/access/manager/AccessManaged.sol";
import {
ERC20Permit
} from "@openzeppelin-contracts-5.5.0/token/ERC20/extensions/ERC20Permit.sol";

contract TestToken is ERC20, ERC20Burnable, ERC20Pausable, AccessManaged, ERC20Permit {
constructor(address initialAuthority)
contract TestToken is
ERC20,
ERC20Burnable,
ERC20Pausable,
AccessManaged,
ERC20Permit
{
constructor(
address initialAuthority
)
ERC20("TestToken", "TEST")
AccessManaged(initialAuthority)
ERC20Permit("TestToken")
Expand All @@ -26,7 +43,11 @@ contract TestToken is ERC20, ERC20Burnable, ERC20Pausable, AccessManaged, ERC20P

// The following functions are overrides required by Solidity.

function _update(address from, address to, uint256 value) internal override(ERC20, ERC20Pausable) {
function _update(
address from,
address to,
uint256 value
) internal override(ERC20, ERC20Pausable) {
super._update(from, to, value);
}
}
Loading
Loading