🥢 ~~

NaniDAO · Feb 15, 2024 · 445430c · 445430c
1 parent 46f3661
commit 445430c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 27 deletions.
diff --git a/.gas-snapshot b/.gas-snapshot
@@ -1,19 +1,19 @@
-IETest:testBalanceInERC20() (gas: 52391)
-IETest:testBalanceInETH() (gas: 43495)
-IETest:testCommandSendERC0() (gas: 103640)
-IETest:testCommandSendETH() (gas: 70119)
-IETest:testCommandSendUSDC() (gas: 136370)
-IETest:testCommandSwapDAI() (gas: 102128)
-IETest:testCommandSwapETH() (gas: 113501)
-IETest:testCommandSwapForETH() (gas: 123704)
-IETest:testCommandSwapUSDC() (gas: 156135)
-IETest:testCommandSwapUSDCForWBTC() (gas: 164392)
-IETest:testDeploy() (gas: 2650229)
-IETest:testENSNameOwnership() (gas: 87602)
-IETest:testIENameSetting() (gas: 10978)
-IETest:testPreviewCommandSendDecimals() (gas: 96485)
-IETest:testPreviewCommandSendUSDC() (gas: 69606)
-IETest:testPreviewSend() (gas: 46115)
-IETest:testPreviewSendCommand() (gas: 57997)
-IETest:testSendETH() (gas: 60357)
-IETest:testTotalSupply() (gas: 18031)
+IETest:testBalanceInERC20() (gas: 49207)
+IETest:testBalanceInETH() (gas: 40333)
+IETest:testCommandSendERC0() (gas: 102975)
+IETest:testCommandSendETH() (gas: 69457)
+IETest:testCommandSendUSDC() (gas: 135705)
+IETest:testCommandSwapDAI() (gas: 102106)
+IETest:testCommandSwapETH() (gas: 113473)
+IETest:testCommandSwapForETH() (gas: 123421)
+IETest:testCommandSwapUSDC() (gas: 156848)
+IETest:testCommandSwapUSDCForWBTC() (gas: 165030)
+IETest:testDeploy() (gas: 2647221)
+IETest:testENSNameOwnership() (gas: 84066)
+IETest:testIENameSetting() (gas: 8142)
+IETest:testPreviewCommandSendDecimals() (gas: 91972)
+IETest:testPreviewCommandSendUSDC() (gas: 66096)
+IETest:testPreviewSend() (gas: 42673)
+IETest:testPreviewSendCommand() (gas: 54554)
+IETest:testSendETH() (gas: 59695)
+IETest:testTotalSupply() (gas: 14808)
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/src/IE.sol b/src/IE.sol
@@ -445,17 +445,14 @@ contract IE {
         address _token = _returnTokenConstant(bytes32(bytes(token)));
         if (_token == address(0)) _token = tokens[token];
         if (_token == ETH) revert InvalidSyntax();
-        supply = _totalSupply(_token);
-        supplyAdjusted = supply / 10 ** _token.readDecimals();
-    }
-
-    /// @dev Returns the total supply of ERC20/721 `token`.
-    function _totalSupply(address token) internal view virtual returns (uint256 supply) {
         assembly ("memory-safe") {
             mstore(0x00, 0x18160ddd) // `totalSupply()`.
-            if iszero(staticcall(gas(), token, 0x1c, 0x04, 0x20, 0x20)) { revert(codesize(), 0x00) }
+            if iszero(staticcall(gas(), _token, 0x1c, 0x04, 0x20, 0x20)) {
+                revert(codesize(), 0x00)
+            }
             supply := mload(0x20)
         }
+        supplyAdjusted = supply / 10 ** _token.readDecimals();
     }
 
     /// ====================== ENS VERIFICATION ====================== ///
+3 −0		.gitmodules
+1 −1		README.md
+1 −0		lib/ds-test
+225 −518		src/StdAssertions.sol
+5 −1		src/Test.sol
+0 −446		src/Vm.sol
+851 −793		test/StdAssertions.t.sol
+10 −7		test/StdCheats.t.sol
+8 −8		test/StdMath.t.sol
+18 −18		test/StdUtils.t.sol
+2 −2		test/Vm.t.sol
+1 −1		test/mocks/MockERC20.t.sol
+1 −1		test/mocks/MockERC721.t.sol