merge main

thirdweb-dev · Mar 25, 2024 · d364ddc · d364ddc
2 parents ea526c3 + 494edf8
commit d364ddc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/contracts/external-deps/openzeppelin/token/ERC20/utils/SafeERC20.sol b/contracts/external-deps/openzeppelin/token/ERC20/utils/SafeERC20.sol
@@ -4,7 +4,7 @@
 pragma solidity ^0.8.0;
 
 import "../../../../../eip/interface/IERC20.sol";
-import { Address } from "@openzeppelin/contracts/utils/Address.sol";
+import { Address } from "../../../../../lib/Address.sol";
 
 /**
  * @title SafeERC20

diff --git a/contracts/package.json b/contracts/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@thirdweb-dev/contracts",
   "description": "Collection of smart contracts deployable via the thirdweb SDK, dashboard and CLI",
-  "version": "3.12.0",
+  "version": "3.13.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

diff --git a/package.json b/package.json
@@ -11,6 +11,7 @@
     "@openzeppelin/contracts": "^4.9.3",
     "@openzeppelin/contracts-upgradeable": "^4.9.3",
     "@thirdweb-dev/dynamic-contracts": "^1.2.4",
+    "@thirdweb-dev/merkletree": "^0.2.2",
     "@typechain/ethers-v5": "^10.2.1",
     "@types/fs-extra": "^9.0.13",
     "@types/mocha": "^9.1.1",

diff --git a/src/test/mocks/MockRoyaltyEngineV1.sol b/src/test/mocks/MockRoyaltyEngineV1.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
 
 import "contracts/extension/interface/IRoyaltyEngineV1.sol";
 import { IERC2981 } from "contracts/eip/interface/IERC2981.sol";
-import { ERC165, IERC165 } from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
+import { ERC165 } from "contracts/eip/ERC165.sol";
 
 contract MockRoyaltyEngineV1 is ERC165, IRoyaltyEngineV1 {
     address payable[] public mockRecipients;