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/mean-camels-sleep.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@cartesi/devnet": patch
---

rollups-contract:2.0.0-rc.17
2 changes: 1 addition & 1 deletion packages/devnet/cannonfile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version = '2.0.0-alpha.4'
description = 'Cartesi Rollups Devnet'

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

[var.Settings]
token_owner = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
Expand Down
7 changes: 6 additions & 1 deletion packages/devnet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@
"build:cannon": "cannon build --write-deployments deployments --anvil.dump-state anvil_state.json",
"build:forge": "forge build",
"build:soldeer": "forge soldeer install",
"clean": "cannon clean"
"clean": "run-s clean:cannon clean:dump clean:forge",
"clean:cannon": "cannon clean",
"clean:dump": "rm -rf deployments anvil_state.json",
"clean:forge": "forge clean",
"fmt:check": "forge fmt --check",
"fmt:write": "forge fmt"
},
"devDependencies": {
"@usecannon/cli": "^2.21.5",
Expand Down
17 changes: 5 additions & 12 deletions packages/devnet/src/TestMultiToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,14 @@ 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);
}
}
18 changes: 4 additions & 14 deletions packages/devnet/src/TestNFT.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,20 @@ import "@openzeppelin-contracts-5.2.0/token/ERC721/extensions/ERC721URIStorage.s
import "@openzeppelin-contracts-5.2.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);
}
}
18 changes: 3 additions & 15 deletions packages/devnet/src/TestToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,8 @@ 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";

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 @@ -34,11 +26,7 @@ contract TestToken is

// 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