Refactor to reduce code size and avoid memory structs

k06a · k06a · commit 5849d1b643ac · 2022-12-25T17:12:38.000+04:00
diff --git a/contracts/ERC1155Pods.sol b/contracts/ERC1155Pods.sol
@@ -9,7 +9,7 @@ import "./TokenPodsLib.sol";
 import "./libs/ReentrancyGuard.sol";
 
 abstract contract ERC1155Pods is ERC1155, IERC1155Pods, ReentrancyGuardExt {
-    using TokenPodsLib for TokenPodsLib.Info;
+    using TokenPodsLib for TokenPodsLib.Data;
     using ReentrancyGuardLib for ReentrancyGuardLib.Data;
 
     error ZeroPodsLimit();
@@ -29,43 +29,39 @@ abstract contract ERC1155Pods is ERC1155, IERC1155Pods, ReentrancyGuardExt {
     }
 
     function hasPod(address account, address pod, uint256 id) public view virtual returns(bool) {
-        return _info(id).hasPod(account, pod);
+        return _pods[id].hasPod(account, pod);
     }
 
     function podsCount(address account, uint256 id) public view virtual returns(uint256) {
-        return _info(id).podsCount(account);
+        return _pods[id].podsCount(account);
     }
 
     function podAt(address account, uint256 index, uint256 id) public view virtual returns(address) {
-        return _info(id).podAt(account, index);
+        return _pods[id].podAt(account, index);
     }
 
     function pods(address account, uint256 id) public view virtual returns(address[] memory) {
-        return _info(id).pods(account);
+        return _pods[id].pods(account);
     }
 
     function balanceOf(address account, uint256 id) public nonReentrantView(_guard) view override(IERC1155, ERC1155) virtual returns(uint256) {
         return super.balanceOf(account, id);
     }
 
     function podBalanceOf(address pod, address account, uint256 id) public nonReentrantView(_guard) view returns(uint256) {
-        return _info(id).podBalanceOf(account, pod, super.balanceOf(msg.sender, id));
+        return _pods[id].podBalanceOf(account, pod, super.balanceOf(msg.sender, id));
     }
 
     function addPod(address pod, uint256 id) public virtual {
-        if (_info(id).addPod(msg.sender, pod, balanceOf(msg.sender, id)) > podsLimit) revert PodsLimitReachedForAccount();
+        if (_pods[id].addPod(msg.sender, pod, balanceOf(msg.sender, id), podCallGasLimit) > podsLimit) revert PodsLimitReachedForAccount();
     }
 
     function removePod(address pod, uint256 id) public virtual {
-        _info(id).removePod(msg.sender, pod, balanceOf(msg.sender, id));
+        _pods[id].removePod(msg.sender, pod, balanceOf(msg.sender, id), podCallGasLimit);
     }
 
     function removeAllPods(uint256 id) public virtual {
-        _info(id).removeAllPods(msg.sender, balanceOf(msg.sender, id));
-    }
-
-    function _info(uint256 id) private view returns(TokenPodsLib.Info memory) {
-        return TokenPodsLib.makeInfo(_pods[id], podCallGasLimit);
+        _pods[id].removeAllPods(msg.sender, balanceOf(msg.sender, id), podCallGasLimit);
     }
 
     // ERC1155 Overrides
@@ -82,7 +78,7 @@ abstract contract ERC1155Pods is ERC1155, IERC1155Pods, ReentrancyGuardExt {
 
         unchecked {
             for (uint256 i = 0; i < ids.length; i++) {
-                _info(ids[i]).updateBalancesWithTokenId(from, to, amounts[i], ids[i]);
+                _pods[i].updateBalancesWithTokenId(from, to, amounts[i], ids[i], podCallGasLimit);
             }
         }
     }
diff --git a/contracts/ERC20Pods.sol b/contracts/ERC20Pods.sol
@@ -10,7 +10,7 @@ import "./TokenPodsLib.sol";
 import "./libs/ReentrancyGuard.sol";
 
 abstract contract ERC20Pods is ERC20, IERC20Pods, ReentrancyGuardExt {
-    using TokenPodsLib for TokenPodsLib.Info;
+    using TokenPodsLib for TokenPodsLib.Data;
     using ReentrancyGuardLib for ReentrancyGuardLib.Data;
 
     error ZeroPodsLimit();
@@ -30,49 +30,45 @@ abstract contract ERC20Pods is ERC20, IERC20Pods, ReentrancyGuardExt {
     }
 
     function hasPod(address account, address pod) public view virtual returns(bool) {
-        return _info().hasPod(account, pod);
+        return _pods.hasPod(account, pod);
     }
 
     function podsCount(address account) public view virtual returns(uint256) {
-        return _info().podsCount(account);
+        return _pods.podsCount(account);
     }
 
     function podAt(address account, uint256 index) public view virtual returns(address) {
-        return _info().podAt(account, index);
+        return _pods.podAt(account, index);
     }
 
     function pods(address account) public view virtual returns(address[] memory) {
-        return _info().pods(account);
+        return _pods.pods(account);
     }
 
     function balanceOf(address account) public nonReentrantView(_guard) view override(IERC20, ERC20) virtual returns(uint256) {
         return super.balanceOf(account);
     }
 
     function podBalanceOf(address pod, address account) public nonReentrantView(_guard) view virtual returns(uint256) {
-        return _info().podBalanceOf(account, pod, super.balanceOf(account));
+        return _pods.podBalanceOf(account, pod, super.balanceOf(account));
     }
 
     function addPod(address pod) public virtual {
-        if (_info().addPod(msg.sender, pod, balanceOf(msg.sender)) > podsLimit) revert PodsLimitReachedForAccount();
+        if (_pods.addPod(msg.sender, pod, balanceOf(msg.sender), podCallGasLimit) > podsLimit) revert PodsLimitReachedForAccount();
     }
 
     function removePod(address pod) public virtual {
-        _info().removePod(msg.sender, pod, balanceOf(msg.sender));
+        _pods.removePod(msg.sender, pod, balanceOf(msg.sender), podCallGasLimit);
     }
 
     function removeAllPods() public virtual {
-        _info().removeAllPods(msg.sender, balanceOf(msg.sender));
-    }
-
-    function _info() private view returns(TokenPodsLib.Info memory) {
-        return TokenPodsLib.makeInfo(_pods, podCallGasLimit);
+        _pods.removeAllPods(msg.sender, balanceOf(msg.sender), podCallGasLimit);
     }
 
     // ERC20 Overrides
 
     function _afterTokenTransfer(address from, address to, uint256 amount) internal nonReentrant(_guard) override virtual {
         super._afterTokenTransfer(from, to, amount);
-        _info().updateBalances(from, to, amount);
+        _pods.updateBalances(from, to, amount, podCallGasLimit);
     }
 }
diff --git a/contracts/ERC721Pods.sol b/contracts/ERC721Pods.sol
@@ -11,7 +11,7 @@ import "./TokenPodsLib.sol";
 import "./libs/ReentrancyGuard.sol";
 
 abstract contract ERC721Pods is ERC721, IERC721Pods, ReentrancyGuardExt {
-    using TokenPodsLib for TokenPodsLib.Info;
+    using TokenPodsLib for TokenPodsLib.Data;
     using ReentrancyGuardLib for ReentrancyGuardLib.Data;
 
     error ZeroPodsLimit();
@@ -31,49 +31,45 @@ abstract contract ERC721Pods is ERC721, IERC721Pods, ReentrancyGuardExt {
     }
 
     function hasPod(address account, address pod) public view virtual returns(bool) {
-        return _info().hasPod(account, pod);
+        return _pods.hasPod(account, pod);
     }
 
     function podsCount(address account) public view virtual returns(uint256) {
-        return _info().podsCount(account);
+        return _pods.podsCount(account);
     }
 
     function podAt(address account, uint256 index) public view virtual returns(address) {
-        return _info().podAt(account, index);
+        return _pods.podAt(account, index);
     }
 
     function pods(address account) public view virtual returns(address[] memory) {
-        return _info().pods(account);
+        return _pods.pods(account);
     }
 
     function balanceOf(address account) public nonReentrantView(_guard) view override(IERC721, ERC721) virtual returns(uint256) {
         return super.balanceOf(account);
     }
 
     function podBalanceOf(address pod, address account) public nonReentrantView(_guard) view virtual returns(uint256) {
-        return _info().podBalanceOf(account, pod, super.balanceOf(account));
+        return _pods.podBalanceOf(account, pod, super.balanceOf(account));
     }
 
     function addPod(address pod) public virtual {
-        if (_info().addPod(msg.sender, pod, balanceOf(msg.sender)) > podsLimit) revert PodsLimitReachedForAccount();
+        if (_pods.addPod(msg.sender, pod, balanceOf(msg.sender), podCallGasLimit) > podsLimit) revert PodsLimitReachedForAccount();
     }
 
     function removePod(address pod) public virtual {
-        _info().removePod(msg.sender, pod, balanceOf(msg.sender));
+        _pods.removePod(msg.sender, pod, balanceOf(msg.sender), podCallGasLimit);
     }
 
     function removeAllPods() public virtual {
-        _info().removeAllPods(msg.sender, balanceOf(msg.sender));
-    }
-
-    function _info() private view returns(TokenPodsLib.Info memory) {
-        return TokenPodsLib.makeInfo(_pods, podCallGasLimit);
+        _pods.removeAllPods(msg.sender, balanceOf(msg.sender), podCallGasLimit);
     }
 
     // ERC721 Overrides
 
     function _afterTokenTransfer(address from, address to, uint256 firstTokenId, uint256 batchSize) internal nonReentrant(_guard) override virtual {
         super._afterTokenTransfer(from, to, firstTokenId, batchSize);
-        _info().updateBalances(from, to, batchSize);
+        _pods.updateBalances(from, to, batchSize, podCallGasLimit);
     }
 }
diff --git a/contracts/Pod.sol b/contracts/Pod.sol
@@ -3,9 +3,10 @@
 pragma solidity ^0.8.0;
 
 import "./interfaces/IPod.sol";
+import "./interfaces/IPodWithId.sol";
 import "./interfaces/IERC20Pods.sol";
 
-abstract contract Pod is IPod {
+abstract contract Pod is IPod, IPodWithId {
     error AccessDenied();
 
     IERC20Pods public immutable token;
diff --git a/contracts/TokenPodsLib.sol b/contracts/TokenPodsLib.sol

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import "./TokenPodsLib.sol";`
`9`	`9`	`import "./libs/ReentrancyGuard.sol";`
`10`	`10`
`11`	`11`	`abstract contract ERC1155Pods is ERC1155, IERC1155Pods, ReentrancyGuardExt {`
`12`		`- using TokenPodsLib for TokenPodsLib.Info;`
	`12`	`+ using TokenPodsLib for TokenPodsLib.Data;`
`13`	`13`	`using ReentrancyGuardLib for ReentrancyGuardLib.Data;`
`14`	`14`
`15`	`15`	`error ZeroPodsLimit();`
`@@ -29,43 +29,39 @@ abstract contract ERC1155Pods is ERC1155, IERC1155Pods, ReentrancyGuardExt {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`function hasPod(address account, address pod, uint256 id) public view virtual returns(bool) {`
`32`		`- return _info(id).hasPod(account, pod);`
	`32`	`+ return _pods[id].hasPod(account, pod);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`function podsCount(address account, uint256 id) public view virtual returns(uint256) {`
`36`		`- return _info(id).podsCount(account);`
	`36`	`+ return _pods[id].podsCount(account);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`function podAt(address account, uint256 index, uint256 id) public view virtual returns(address) {`
`40`		`- return _info(id).podAt(account, index);`
	`40`	`+ return _pods[id].podAt(account, index);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`function pods(address account, uint256 id) public view virtual returns(address[] memory) {`
`44`		`- return _info(id).pods(account);`
	`44`	`+ return _pods[id].pods(account);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`function balanceOf(address account, uint256 id) public nonReentrantView(_guard) view override(IERC1155, ERC1155) virtual returns(uint256) {`
`48`	`48`	`return super.balanceOf(account, id);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`function podBalanceOf(address pod, address account, uint256 id) public nonReentrantView(_guard) view returns(uint256) {`
`52`		`- return _info(id).podBalanceOf(account, pod, super.balanceOf(msg.sender, id));`
	`52`	`+ return _pods[id].podBalanceOf(account, pod, super.balanceOf(msg.sender, id));`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`function addPod(address pod, uint256 id) public virtual {`
`56`		`- if (_info(id).addPod(msg.sender, pod, balanceOf(msg.sender, id)) > podsLimit) revert PodsLimitReachedForAccount();`
	`56`	`+ if (_pods[id].addPod(msg.sender, pod, balanceOf(msg.sender, id), podCallGasLimit) > podsLimit) revert PodsLimitReachedForAccount();`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`function removePod(address pod, uint256 id) public virtual {`
`60`		`- _info(id).removePod(msg.sender, pod, balanceOf(msg.sender, id));`
	`60`	`+ _pods[id].removePod(msg.sender, pod, balanceOf(msg.sender, id), podCallGasLimit);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`function removeAllPods(uint256 id) public virtual {`
`64`		`- _info(id).removeAllPods(msg.sender, balanceOf(msg.sender, id));`
`65`		`- }`
`66`		`-`
`67`		`- function _info(uint256 id) private view returns(TokenPodsLib.Info memory) {`
`68`		`- return TokenPodsLib.makeInfo(_pods[id], podCallGasLimit);`
	`64`	`+ _pods[id].removeAllPods(msg.sender, balanceOf(msg.sender, id), podCallGasLimit);`
`69`	`65`	`}`
`70`	`66`
`71`	`67`	`// ERC1155 Overrides`
`@@ -82,7 +78,7 @@ abstract contract ERC1155Pods is ERC1155, IERC1155Pods, ReentrancyGuardExt {`
`82`	`78`
`83`	`79`	`unchecked {`
`84`	`80`	`for (uint256 i = 0; i < ids.length; i++) {`
`85`		`- _info(ids[i]).updateBalancesWithTokenId(from, to, amounts[i], ids[i]);`
	`81`	`+ _pods[i].updateBalancesWithTokenId(from, to, amounts[i], ids[i], podCallGasLimit);`
`86`	`82`	`}`
`87`	`83`	`}`
`88`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import "./TokenPodsLib.sol";`
`10`	`10`	`import "./libs/ReentrancyGuard.sol";`
`11`	`11`
`12`	`12`	`abstract contract ERC20Pods is ERC20, IERC20Pods, ReentrancyGuardExt {`
`13`		`- using TokenPodsLib for TokenPodsLib.Info;`
	`13`	`+ using TokenPodsLib for TokenPodsLib.Data;`
`14`	`14`	`using ReentrancyGuardLib for ReentrancyGuardLib.Data;`
`15`	`15`
`16`	`16`	`error ZeroPodsLimit();`
`@@ -30,49 +30,45 @@ abstract contract ERC20Pods is ERC20, IERC20Pods, ReentrancyGuardExt {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`function hasPod(address account, address pod) public view virtual returns(bool) {`
`33`		`- return _info().hasPod(account, pod);`
	`33`	`+ return _pods.hasPod(account, pod);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`function podsCount(address account) public view virtual returns(uint256) {`
`37`		`- return _info().podsCount(account);`
	`37`	`+ return _pods.podsCount(account);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`function podAt(address account, uint256 index) public view virtual returns(address) {`
`41`		`- return _info().podAt(account, index);`
	`41`	`+ return _pods.podAt(account, index);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`function pods(address account) public view virtual returns(address[] memory) {`
`45`		`- return _info().pods(account);`
	`45`	`+ return _pods.pods(account);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`function balanceOf(address account) public nonReentrantView(_guard) view override(IERC20, ERC20) virtual returns(uint256) {`
`49`	`49`	`return super.balanceOf(account);`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`function podBalanceOf(address pod, address account) public nonReentrantView(_guard) view virtual returns(uint256) {`
`53`		`- return _info().podBalanceOf(account, pod, super.balanceOf(account));`
	`53`	`+ return _pods.podBalanceOf(account, pod, super.balanceOf(account));`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`function addPod(address pod) public virtual {`
`57`		`- if (_info().addPod(msg.sender, pod, balanceOf(msg.sender)) > podsLimit) revert PodsLimitReachedForAccount();`
	`57`	`+ if (_pods.addPod(msg.sender, pod, balanceOf(msg.sender), podCallGasLimit) > podsLimit) revert PodsLimitReachedForAccount();`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`function removePod(address pod) public virtual {`
`61`		`- _info().removePod(msg.sender, pod, balanceOf(msg.sender));`
	`61`	`+ _pods.removePod(msg.sender, pod, balanceOf(msg.sender), podCallGasLimit);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`function removeAllPods() public virtual {`
`65`		`- _info().removeAllPods(msg.sender, balanceOf(msg.sender));`
`66`		`- }`
`67`		`-`
`68`		`- function _info() private view returns(TokenPodsLib.Info memory) {`
`69`		`- return TokenPodsLib.makeInfo(_pods, podCallGasLimit);`
	`65`	`+ _pods.removeAllPods(msg.sender, balanceOf(msg.sender), podCallGasLimit);`
`70`	`66`	`}`
`71`	`67`
`72`	`68`	`// ERC20 Overrides`
`73`	`69`
`74`	`70`	`function _afterTokenTransfer(address from, address to, uint256 amount) internal nonReentrant(_guard) override virtual {`
`75`	`71`	`super._afterTokenTransfer(from, to, amount);`
`76`		`- _info().updateBalances(from, to, amount);`
	`72`	`+ _pods.updateBalances(from, to, amount, podCallGasLimit);`
`77`	`73`	`}`
`78`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import "./TokenPodsLib.sol";`
`11`	`11`	`import "./libs/ReentrancyGuard.sol";`
`12`	`12`
`13`	`13`	`abstract contract ERC721Pods is ERC721, IERC721Pods, ReentrancyGuardExt {`
`14`		`- using TokenPodsLib for TokenPodsLib.Info;`
	`14`	`+ using TokenPodsLib for TokenPodsLib.Data;`
`15`	`15`	`using ReentrancyGuardLib for ReentrancyGuardLib.Data;`
`16`	`16`
`17`	`17`	`error ZeroPodsLimit();`
`@@ -31,49 +31,45 @@ abstract contract ERC721Pods is ERC721, IERC721Pods, ReentrancyGuardExt {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`function hasPod(address account, address pod) public view virtual returns(bool) {`
`34`		`- return _info().hasPod(account, pod);`
	`34`	`+ return _pods.hasPod(account, pod);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`function podsCount(address account) public view virtual returns(uint256) {`
`38`		`- return _info().podsCount(account);`
	`38`	`+ return _pods.podsCount(account);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`function podAt(address account, uint256 index) public view virtual returns(address) {`
`42`		`- return _info().podAt(account, index);`
	`42`	`+ return _pods.podAt(account, index);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`function pods(address account) public view virtual returns(address[] memory) {`
`46`		`- return _info().pods(account);`
	`46`	`+ return _pods.pods(account);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`function balanceOf(address account) public nonReentrantView(_guard) view override(IERC721, ERC721) virtual returns(uint256) {`
`50`	`50`	`return super.balanceOf(account);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`function podBalanceOf(address pod, address account) public nonReentrantView(_guard) view virtual returns(uint256) {`
`54`		`- return _info().podBalanceOf(account, pod, super.balanceOf(account));`
	`54`	`+ return _pods.podBalanceOf(account, pod, super.balanceOf(account));`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`function addPod(address pod) public virtual {`
`58`		`- if (_info().addPod(msg.sender, pod, balanceOf(msg.sender)) > podsLimit) revert PodsLimitReachedForAccount();`
	`58`	`+ if (_pods.addPod(msg.sender, pod, balanceOf(msg.sender), podCallGasLimit) > podsLimit) revert PodsLimitReachedForAccount();`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`function removePod(address pod) public virtual {`
`62`		`- _info().removePod(msg.sender, pod, balanceOf(msg.sender));`
	`62`	`+ _pods.removePod(msg.sender, pod, balanceOf(msg.sender), podCallGasLimit);`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`function removeAllPods() public virtual {`
`66`		`- _info().removeAllPods(msg.sender, balanceOf(msg.sender));`
`67`		`- }`
`68`		`-`
`69`		`- function _info() private view returns(TokenPodsLib.Info memory) {`
`70`		`- return TokenPodsLib.makeInfo(_pods, podCallGasLimit);`
	`66`	`+ _pods.removeAllPods(msg.sender, balanceOf(msg.sender), podCallGasLimit);`
`71`	`67`	`}`
`72`	`68`
`73`	`69`	`// ERC721 Overrides`
`74`	`70`
`75`	`71`	`function _afterTokenTransfer(address from, address to, uint256 firstTokenId, uint256 batchSize) internal nonReentrant(_guard) override virtual {`
`76`	`72`	`super._afterTokenTransfer(from, to, firstTokenId, batchSize);`
`77`		`- _info().updateBalances(from, to, batchSize);`
	`73`	`+ _pods.updateBalances(from, to, batchSize, podCallGasLimit);`
`78`	`74`	`}`
`79`	`75`	`}`