Merge branch 'master' into feature/erc721-erc1155

# Conflicts: # contracts/Pod.sol # contracts/interfaces/IPod.sol # contracts/mocks/PodMock.sol # contracts/mocks/WrongPodMock.sol # package.json
1inch · Dec 25, 2022 · cd831e1 · cd831e1
2 parents 3af990f + 9a3e4f7
commit cd831e1
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 16 deletions.
diff --git a/contracts/Pod.sol b/contracts/Pod.sol
@@ -3,15 +3,16 @@
 pragma solidity ^0.8.0;
 
 import "./interfaces/IPod.sol";
+import "./interfaces/IERC20Pods.sol";
 
 abstract contract Pod is IPod {
     error AccessDenied();
 
-    address public immutable token;
+    IERC20Pods public immutable token;
     uint256 public immutable tokenId;
 
     modifier onlyToken {
-        if (msg.sender != token) revert AccessDenied();
+        if (msg.sender != address(token)) revert AccessDenied();
         _;
     }
 
@@ -20,7 +21,7 @@ abstract contract Pod is IPod {
         _;
     }
 
-    constructor(address token_, uint256 tokenId_) {
+    constructor(IERC20Pods token_, uint256 tokenId_) {
         token = token_;
         tokenId = tokenId_;
     }

diff --git a/contracts/mocks/ERC20PodsMock.sol b/contracts/mocks/ERC20PodsMock.sol
@@ -5,11 +5,9 @@ pragma solidity ^0.8.0;
 import "../ERC20Pods.sol";
 
 contract ERC20PodsMock is ERC20Pods {
-    uint256 private constant _POD_CALL_GAS_LIMIT = 200_000;
-
-    constructor(string memory name, string memory symbol, uint256 podsLimit)
+    constructor(string memory name, string memory symbol, uint256 podsLimit, uint256 podCallGasLimit)
         ERC20(name, symbol)
-        ERC20Pods(podsLimit, _POD_CALL_GAS_LIMIT)
+        ERC20Pods(podsLimit, podCallGasLimit)
     {} // solhint-disable-line no-empty-blocks
 
     function mint(address account, uint256 amount) external {

diff --git a/contracts/mocks/PodMock.sol b/contracts/mocks/PodMock.sol
@@ -6,7 +6,7 @@ import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import "../Pod.sol";
 
 contract PodMock is ERC20, Pod {
-    constructor(string memory name, string memory symbol, address token_)
+    constructor(string memory name, string memory symbol, IERC20Pods token_)
         ERC20(name, symbol)
         Pod(token_, 0)
     {} // solhint-disable-line no-empty-blocks

diff --git a/contracts/mocks/WrongPodMock.sol b/contracts/mocks/WrongPodMock.sol
@@ -12,7 +12,10 @@ contract WrongPodMock is ERC20, Pod {
     bool public isOutOfGas;
     bool public isReturnGasBomb;
 
-    constructor(string memory name, string memory symbol, address token_) ERC20(name, symbol) Pod(token_, 0) {} // solhint-disable-line no-empty-blocks
+    constructor(string memory name, string memory symbol, IERC20Pods token_)
+        ERC20(name, symbol)
+        Pod(token_, 0)
+    {} // solhint-disable-line no-empty-blocks
 
     function _updateBalances(address /* from */, address /* to */, uint256 /* amount */) internal view override {
         if (isRevert) revert PodsUpdateBalanceRevert();

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@1inch/token-pods",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "ERC20 extension enabling external smart contract based Pods to track balances of those users who opted-in to these Pods",
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   "author": "1inch",
   "license": "MIT",
   "dependencies": {
-    "@1inch/solidity-utils": "2.2.2",
+    "@1inch/solidity-utils": "2.2.5",
     "@openzeppelin/contracts": "4.8.0"
   },
   "devDependencies": {

diff --git a/test/ERC20Pods.js b/test/ERC20Pods.js
@@ -4,6 +4,7 @@ const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
 const { shouldBehaveLikeERC20Pods, shouldBehaveLikeERC20PodsTransfers } = require('./behaviors/ERC20Pods.behavior');
 
 const POD_LIMITS = 10;
+const POD_GAS_LIMIT = 200_000;
 
 describe('ERC20Pods', function () {
     let wallet1;
@@ -14,7 +15,7 @@ describe('ERC20Pods', function () {
 
     async function initContracts () {
         const ERC20PodsMock = await ethers.getContractFactory('ERC20PodsMock');
-        const erc20Pods = await ERC20PodsMock.deploy('ERC20PodsMock', 'EPM', POD_LIMITS);
+        const erc20Pods = await ERC20PodsMock.deploy('ERC20PodsMock', 'EPM', POD_LIMITS, POD_GAS_LIMIT);
         await erc20Pods.deployed();
 
         const pods = [];

diff --git a/yarn.lock b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@1inch/[email protected].2":
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/@1inch/solidity-utils/-/solidity-utils-2.2.2.tgz#3c7165b0131426a11abd35a556fa244a5ac0c59b"
-  integrity sha512-nO65pP6fgbc0RUbKaI7PrqZdM20KjK6FONrh3iOf5o5y+iH/kf7njcUwXSU9hEB/UmnTUD0lr2LeGOwiCVDCkg==
+"@1inch/[email protected].5":
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/@1inch/solidity-utils/-/solidity-utils-2.2.5.tgz#1d372065cdd8bae096aa831867f22f4b2baeef30"
+  integrity sha512-zdrFYmQYQS0eTkoxgylRq9/2sFMSCMIT73pNLfcYIf4zmkB2cvNzQCiU3W9GvnQTktTMJrmIdbxsCyo/ZZkgbg==
   dependencies:
     "@metamask/eth-sig-util" "4.0.1"
     "@nomicfoundation/hardhat-network-helpers" "1.0.6"