Skip to content

Commit

Permalink
Merge pull request #21 from superform-xyz/migrate-0.8.21
Browse files Browse the repository at this point in the history
feat: migrate to solidity v0.8.21
  • Loading branch information
sujithsomraaj authored Oct 16, 2023
2 parents 08650d6 + c41c54b commit dc69779
Show file tree
Hide file tree
Showing 13 changed files with 208 additions and 78 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[submodule "lib/forge-std"]
path = lib/forge-std
url = https://github.com/foundry-rs/forge-std
[submodule "lib/openzeppelin-contracts"]
path = lib/openzeppelin-contracts
url = https://github.com/OpenZeppelin/openzeppelin-contracts
[submodule "lib/solmate"]
path = lib/solmate
url = https://github.com/transmissions11/solmate
[submodule "lib/openzeppelin-contracts"]
path = lib/openzeppelin-contracts
url = https://github.com/OpenZeppelin/openzeppelin-contracts
4 changes: 2 additions & 2 deletions foundry.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[profile.default]
libs = ['lib']
solc_version = "0.8.19"
solc_version = "0.8.21"

optimizer = true
optimizer_runs = 200
Expand All @@ -14,4 +14,4 @@ multiline_func_header = "all"
number_underscore = "thousands"
quote_style = "double"
tab_width = 4
wrap_comments = true
wrap_comments = true
2 changes: 1 addition & 1 deletion lib/openzeppelin-contracts
2 changes: 1 addition & 1 deletion src/ERC1155A.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/// SPDX-License-Identifier: Apache-2.0
pragma solidity ^0.8.19;
pragma solidity ^0.8.21;

import { IERC1155A } from "./interfaces/IERC1155A.sol";
import { Strings } from "openzeppelin-contracts/contracts/utils/Strings.sol";
Expand Down
16 changes: 12 additions & 4 deletions src/interfaces/IERC1155A.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/// SPDX-License-Identifier: Apache-2.0
pragma solidity ^0.8.19;
pragma solidity ^0.8.21;

import {IERC1155} from "openzeppelin-contracts/contracts/token/ERC1155/IERC1155.sol";
import { IERC1155 } from "openzeppelin-contracts/contracts/token/ERC1155/IERC1155.sol";

interface IERC1155A is IERC1155 {
/*//////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -41,13 +41,21 @@ interface IERC1155A is IERC1155 {

/// @notice Public function for increasing multiple id approval amount at once
/// @dev extension of single id increase allowance
function increaseAllowanceForMany(address spender, uint256[] memory ids, uint256[] memory addedValues)
function increaseAllowanceForMany(
address spender,
uint256[] memory ids,
uint256[] memory addedValues
)
external
returns (bool);

/// @notice Public function for decreasing multiple id approval amount at once
/// @dev extension of single id decrease allowance
function decreaseAllowanceForMany(address spender, uint256[] memory ids, uint256[] memory subtractedValues)
function decreaseAllowanceForMany(
address spender,
uint256[] memory ids,
uint256[] memory subtractedValues
)
external
returns (bool);

Expand Down
9 changes: 7 additions & 2 deletions src/interfaces/ITransmuter.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/// SPDX-License-Identifier: Apache-2.0
pragma solidity ^0.8.19;
pragma solidity ^0.8.21;

interface ITransmuter {
/// @notice id given here needs to be the same as id on Source!
Expand All @@ -9,7 +9,12 @@ interface ITransmuter {
/// @param name name of the ERC20 to create
/// @param symbol symbol of the ERC20 to create
/// @param decimals decimals of the ERC20 to create
function registerTransmuter(uint256 id, string memory name, string memory symbol, uint8 decimals)
function registerTransmuter(
uint256 id,
string memory name,
string memory symbol,
uint8 decimals
)
external
returns (address);

Expand Down
Loading

0 comments on commit dc69779

Please sign in to comment.