Skip to content

Commit

Permalink
SAM (#287)
Browse files Browse the repository at this point in the history
* Merge commit '0be60759a91efc1d0960f6913b7f6b8ce2d4b257'

* interface build changes

* changeset

* Delete .pnpm-debug.log

* remappings
  • Loading branch information
PabloSzx authored Mar 27, 2023
1 parent 428577c commit ada3ba9
Show file tree
Hide file tree
Showing 45 changed files with 6,060 additions and 425 deletions.
5 changes: 5 additions & 0 deletions .changeset/neat-llamas-cough.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@soundxyz/sound-protocol": minor
---

Sound Edition V1.2, w/ SAM
9 changes: 0 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,3 @@ jobs:
forge test -vvv --gas-report
id: test

- name: Code coverage
run: |
forge coverage --report lcov
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: lcov.info
15 changes: 10 additions & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@
url = https://github.com/openzeppelin/openzeppelin-contracts-upgradeable
branch = master
ignore = dirty
[submodule "lib/ERC721A-Upgradeable"]
path = lib/ERC721A-Upgradeable
url = https://github.com/chiru-labs/ERC721A-Upgradeable
branch = main
ignore = dirty
[submodule "lib/solady"]
path = lib/solady
url = https://github.com/vectorized/solady
Expand All @@ -31,3 +26,13 @@
url = https://github.com/vectorized/closedsea
branch = main
ignore = dirty
[submodule "lib/ERC721A-Upgradeable"]
path = lib/ERC721A-Upgradeable
url = https://github.com/chiru-labs/ERC721A-Upgradeable
branch = 05bd2b9993e632ff898472fb6aec6d698a4c6015
ignore = dirty
[submodule "lib/multicaller"]
path = lib/multicaller
url = https://github.com/vectorized/multicaller
branch = main
ignore = dirty
4 changes: 2 additions & 2 deletions contracts/core/SoundCreatorV1.sol
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ pragma solidity ^0.8.16;
import { Clones } from "openzeppelin/proxy/Clones.sol";

import { ISoundCreatorV1 } from "./interfaces/ISoundCreatorV1.sol";
import { ISoundEditionV1_1 } from "./interfaces/ISoundEditionV1_1.sol";
import { ISoundEditionV1_2 } from "./interfaces/ISoundEditionV1_2.sol";
import { IMetadataModule } from "./interfaces/IMetadataModule.sol";

import { OwnableRoles } from "solady/auth/OwnableRoles.sol";

/**
* @title SoundCreatorV1
* @notice A factory that deploys minimal proxies of `SoundEditionV1_1.sol`.
* @notice A factory that deploys minimal proxies of `SoundEditionV1_2.sol`.
* @dev The proxies are OpenZeppelin's Clones implementation of https://eips.ethereum.org/EIPS/eip-1167
*/
contract SoundCreatorV1 is ISoundCreatorV1, OwnableRoles {
Expand Down
Loading

0 comments on commit ada3ba9

Please sign in to comment.