Skip to content

Commit 882f8c8

Browse files
authored
Fix forge release script (#479)
* pkg bump * pkg bump * updated release script * Dont use IERC721 from openzeppelin * pkg bump * update release process * pkg bump * pkg bump
1 parent 6956628 commit 882f8c8

File tree

18 files changed

+73
-20
lines changed

18 files changed

+73
-20
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ contracts/abi/
1919
contracts/README.md
2020
artifacts/
2121
artifacts_forge/
22+
contract_artifacts/
2223

2324
# files
2425
*.env

contracts/airdrop/AirdropERC721.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pragma solidity ^0.8.11;
1313
// \____/ \__| \__|\__|\__| \_______| \_____\____/ \_______|\_______/
1414

1515
// ========== External imports ==========
16-
import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
16+
import "../eip/interface/IERC721.sol";
1717

1818
import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
1919
import "@openzeppelin/contracts-upgradeable/utils/MulticallUpgradeable.sol";

contracts/airdrop/AirdropERC721Claimable.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pragma solidity ^0.8.11;
1313
// \____/ \__| \__|\__|\__| \_______| \_____\____/ \_______|\_______/
1414

1515
// ========== External imports ==========
16-
import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
16+
import "../eip/interface/IERC721.sol";
1717

1818
import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
1919
import "@openzeppelin/contracts-upgradeable/utils/MulticallUpgradeable.sol";

contracts/extension/Staking721Upgradeable.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pragma solidity ^0.8.11;
55

66
import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
77
import "../openzeppelin-presets/utils/math/SafeMath.sol";
8-
import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
8+
import "../eip/interface/IERC721.sol";
99

1010
import "./interface/IStaking721.sol";
1111

contracts/marketplace/direct-listings/DirectListingsLogic.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import "./DirectListingsStorage.sol";
77

88
// ====== External imports ======
99
import "@openzeppelin/contracts/token/ERC1155/IERC1155.sol";
10-
import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
10+
import "../../eip/interface/IERC721.sol";
1111
import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
1212
import "@openzeppelin/contracts/interfaces/IERC2981.sol";
1313

contracts/marketplace/english-auctions/EnglishAuctionsLogic.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import "./EnglishAuctionsStorage.sol";
99
import "@openzeppelin/contracts/utils/Context.sol";
1010
import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
1111
import "@openzeppelin/contracts/token/ERC1155/IERC1155.sol";
12-
import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
12+
import "../../eip/interface/IERC721.sol";
1313
import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
1414
import "@openzeppelin/contracts/interfaces/IERC2981.sol";
1515

contracts/marketplace/offers/OffersLogic.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import "./OffersStorage.sol";
88
// ====== External imports ======
99
import "@openzeppelin/contracts/utils/Context.sol";
1010
import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
11-
import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
11+
import "../../eip/interface/IERC721.sol";
1212
import "@openzeppelin/contracts/token/ERC1155/IERC1155.sol";
1313
import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
1414
import "@openzeppelin/contracts/interfaces/IERC2981.sol";

contracts/mock/Mock.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pragma solidity ^0.8.11;
44
/// @author thirdweb
55

66
import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
7-
import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
7+
import "../eip/interface/IERC721.sol";
88
import "@openzeppelin/contracts/token/ERC1155/IERC1155.sol";
99

1010
/*

contracts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@thirdweb-dev/contracts",
33
"description": "Collection of smart contracts deployable via the thirdweb SDK, dashboard and CLI",
4-
"version": "3.8.4-1",
4+
"version": "3.8.4",
55
"license": "Apache-2.0",
66
"repository": {
77
"type": "git",

contracts/staking/NFTStake.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pragma solidity ^0.8.11;
1313
// \____/ \__| \__|\__|\__| \_______| \_____\____/ \_______|\_______/
1414

1515
// Token
16-
import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
16+
import "../eip/interface/IERC721.sol";
1717
import "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol";
1818
import "@openzeppelin/contracts-upgradeable/token/ERC721/IERC721ReceiverUpgradeable.sol";
1919

0 commit comments

Comments
 (0)