Skip to content

ERC1155 ZKSync #168

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

ERC1155 ZKSync #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c99a21
bump solady, update ERC1155 to zksync compatible, deployment script
tenthirtyone Jan 23, 2025
435c4b1
drop unit test
tenthirtyone Jan 23, 2025
89e614c
forge fmt
tenthirtyone Jan 23, 2025
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: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
node_modules
.env
coverage.json
coverage-hh/
coverage-forge/
typechain
typechain-types
cache
Expand All @@ -10,6 +12,7 @@ artifacts
dist
.DS_Store
out/
zkout/
lcov.info
lcov.info.pruned
coverage/
Expand All @@ -18,4 +21,4 @@ broadcast/
*collections*
*whitelist*
*invalid*
*.tmp
*.tmp
2 changes: 1 addition & 1 deletion contracts/nft/erc1155m/clones/ERC1155ConduitPreapprovedCloneable.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.22;

import {ERC1155} from "solady/src/tokens/ERC1155.sol";
import {ERC1155} from "solady/src/tokens/ext/zksync/ERC1155.sol";

/// @title ERC1155ConduitPreapprovedCloneable
/// @notice ERC1155 token with the MagicEden conduit preapproved for seamless transactions.
Expand Down
2 changes: 1 addition & 1 deletion contracts/nft/erc1155m/clones/ERC1155MagicDropMetadataCloneable.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {ERC2981} from "solady/src/tokens/ERC2981.sol";
import {Ownable} from "solady/src/auth/Ownable.sol";
import {Initializable} from "solady/src/utils/Initializable.sol";

import {ERC1155} from "solady/src/tokens/ERC1155.sol";
import {ERC1155} from "solady/src/tokens/ext/zksync/ERC1155.sol";
import {IERC1155MagicDropMetadata} from "../interfaces/IERC1155MagicDropMetadata.sol";
import {ERC1155ConduitPreapprovedCloneable} from "./ERC1155ConduitPreapprovedCloneable.sol";

Expand Down
2 changes: 1 addition & 1 deletion lib/solady
Open in desktop
Submodule solady updated 21 files
+13 −1 docs/accounts/erc7821.md
+12 −2 docs/index.html
+1 −1 docs/sidebar.md
+2 −2 docs/tokens/erc20votes.md
+33 −0 docs/utils/dynamicarraylib.md
+33 −0 docs/utils/libbit.md
+42 −2 docs/utils/libsort.md
+38 −1 docs/utils/safetransferlib.md
+1 −1 package.json
+27 −19 src/accounts/ERC7821.sol
+2 −2 src/tokens/ERC20Votes.sol
+30 −0 src/utils/DynamicArrayLib.sol
+24 −0 src/utils/LibBit.sol
+58 −1 src/utils/LibSort.sol
+43 −0 src/utils/SafeTransferLib.sol
+301 −0 src/utils/ext/zksync/delegatexyz/DelegateCheckerLib.sol
+30 −0 src/utils/g/DynamicArrayLib.sol
+17 −1 test/DynamicArrayLib.t.sol
+52 −0 test/LibBit.t.sol
+60 −0 test/LibSort.t.sol
+27 −0 test/SafeTransferLib.t.sol
11 changes: 4 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"erc721a": "^4.2.3",
"erc721a-upgradeable": "^4.3.0",
"operator-filter-registry": "^1.4.2",
"solady": "^0.0.249"
"solady": "^0.0.298"
},
"peerDependencies": {
"ethers": "^5.0.0"
Expand Down Expand Up @@ -99,4 +99,4 @@
"prettier --write --plugin=prettier-plugin-solidity contracts"
]
}
}
}
17 changes: 17 additions & 0 deletions scripts-foundry/deploy1155m.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;

import "forge-std/Script.sol";
import "../contracts/nft/erc1155m/clones/ERC1155MagicDropCloneable.sol";

contract testDeploy is Script {
function run() external {
uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
vm.startBroadcast(deployerPrivateKey);
ERC1155MagicDropCloneable erc1155blahblahblah = new ERC1155MagicDropCloneable();

console.log(address(erc1155blahblahblah));

vm.stopBroadcast();
}
}
2 changes: 1 addition & 1 deletion test/erc1155m/clones/ERC1155MagicDropMetadataCloneable.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
pragma solidity ^0.8.22;

import {Test} from "forge-std/Test.sol";
import {ERC1155} from "solady/src/tokens/ERC1155.sol";
import {ERC1155} from "solady/src/tokens/ext/zksync/ERC1155.sol";

import {Ownable} from "solady/src/auth/Ownable.sol";
import {LibClone} from "solady/src/utils/LibClone.sol";
Expand Down
Loading