Skip to content

Commit

Permalink
Re-arrange sol files and update test covearge (#118)
Browse files Browse the repository at this point in the history
  • Loading branch information
channing-magiceden authored Mar 7, 2024
1 parent 0cf4bd5 commit c00b28e
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 6 deletions.
8 changes: 8 additions & 0 deletions .solcover.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module.exports = {
skipFiles: [
"auctions/",
"creator-token-standards/",
"mocks/",
"onft/",
],
};
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
[![NPM][npm-shield]][npm-url]
[![CI][ci-shield]][ci-url]
[![MIT License][license-shield]][license-url]
[![Coverage][coverage-shield]][coverage-url]

ERC721M is a EVM minting protocol that enables the multi stage minting, per stage WL management, per stage supply limit, and crossmint support.

Expand Down Expand Up @@ -115,3 +116,5 @@ MIT © [MagicEden Open Source](https://github.com/magiceden-oss)
[npm-url]: https://www.npmjs.com/package/@magiceden-oss/erc721m
[license-shield]: https://img.shields.io/badge/License-MIT-green.svg?style=for-the-badge
[license-url]: https://github.com/magiceden-oss/erc721m/blob/main/LICENSE.txt
[coverage-shield]: https://img.shields.io/codecov/c/gh/magicoss/erc721m?style=for-the-badge
[coverage-url]: https://codecov.io/gh/magicoss/erc721m
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
import "erc721a/contracts/ERC721A.sol";

import "./IBucketAuction.sol";
import "./ERC721M.sol";
import "../ERC721M.sol";

contract BucketAuction is IBucketAuction, ERC721M {
using EnumerableSet for EnumerableSet.AddressSet;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pragma solidity ^0.8.4;

import "./BucketAuction.sol";
import {UpdatableOperatorFilterer} from "operator-filter-registry/src/UpdatableOperatorFilterer.sol";
import {CANONICAL_OPERATOR_FILTER_REGISTRY_ADDRESS, ME_SUBSCRIPTION} from "./utils/Constants.sol";
import {CANONICAL_OPERATOR_FILTER_REGISTRY_ADDRESS, ME_SUBSCRIPTION} from "../utils/Constants.sol";

contract BucketAuctionOperatorFilterer is
BucketAuction,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import "@openzeppelin/contracts/token/common/ERC2981.sol";
import "erc721a/contracts/ERC721A.sol";

import "./IDutchAuction.sol";
import "./ERC721M.sol";
import "../ERC721M.sol";

contract DutchAuction is IDutchAuction, ERC721M {
bool private immutable _refundable;
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions contracts/ERC721MLite.sol → contracts/onft/ERC721MLite.sol
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
import {MerkleProof} from "@openzeppelin/contracts/utils/cryptography/MerkleProof.sol";
import {SignatureChecker} from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol";
import {ERC721A, ERC721AQueryable, ERC721A__IERC721Receiver} from "erc721a/contracts/extensions/ERC721AQueryable.sol";
import {IERC721A, IERC721M} from "./IERC721M.sol";
import {IERC721A, IERC721M} from "../IERC721M.sol";
import {UpdatableOperatorFilterer} from "operator-filter-registry/src/UpdatableOperatorFilterer.sol";
import {CANONICAL_OPERATOR_FILTER_REGISTRY_ADDRESS, ME_SUBSCRIPTION} from "./utils/Constants.sol";
import {CANONICAL_OPERATOR_FILTER_REGISTRY_ADDRESS, ME_SUBSCRIPTION} from "../utils/Constants.sol";

/**
* @title ERC721MLite
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity ^0.8.4;

import {IONFT721Core, ONFT721CoreLite} from "./onft/ONFT721CoreLite.sol";
import {IONFT721Core, ONFT721CoreLite} from "./ONFT721CoreLite.sol";
import {ERC721MLite, ERC721A, ERC721A__IERC721Receiver, IERC721A, Ownable} from "./ERC721MLite.sol";
import {IONFT721} from "@layerzerolabs/solidity-examples/contracts/token/onft/IONFT721.sol";

Expand Down

0 comments on commit c00b28e

Please sign in to comment.