Merge pull request #94 from axieinfinity/feature/forge-std

chore(forge-std): bump forge-std
axieinfinity · Feb 20, 2024 · bb0fce1 · bb0fce1
2 parents 3db11cc + c2a1d17
commit bb0fce1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/script/libraries/LibProxy.sol b/script/libraries/LibProxy.sol
@@ -9,7 +9,7 @@ library LibProxy {
   bytes32 internal constant ADMIN_SLOT = 0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103;
   bytes32 internal constant IMPLEMENTATION_SLOT = 0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc;
 
-  function getProxyAdmin(address payable proxy, bool nullCheck) internal returns (address payable proxyAdmin) {
+  function getProxyAdmin(address payable proxy, bool nullCheck) internal view returns (address payable proxyAdmin) {
     proxyAdmin = payable(address(uint160(uint256(vm.load(address(proxy), ADMIN_SLOT)))));
     if (!nullCheck) return proxyAdmin;
     require(
@@ -18,11 +18,11 @@ library LibProxy {
     );
   }
 
-  function getProxyAdmin(address payable proxy) internal returns (address payable proxyAdmin) {
+  function getProxyAdmin(address payable proxy) internal view returns (address payable proxyAdmin) {
     proxyAdmin = getProxyAdmin({ proxy: proxy, nullCheck: true });
   }
 
-  function getProxyImplementation(address payable proxy, bool nullCheck) internal returns (address payable impl) {
+  function getProxyImplementation(address payable proxy, bool nullCheck) internal view returns (address payable impl) {
     impl = payable(address(uint160(uint256(vm.load(address(proxy), IMPLEMENTATION_SLOT)))));
     if (!nullCheck) return impl;
     require(
@@ -31,7 +31,7 @@ library LibProxy {
     );
   }
 
-  function getProxyImplementation(address payable proxy) internal returns (address payable impl) {
+  function getProxyImplementation(address payable proxy) internal view returns (address payable impl) {
     impl = getProxyImplementation({ proxy: proxy, nullCheck: true });
   }
 }
+1 −1		package.json
+17 −48		scripts/vm.py
+5 −1		src/StdChains.sol
+1 −1		src/StdJson.sol
+37 −9		src/Vm.sol
+51 −33		src/mocks/MockERC20.sol
+46 −32		src/mocks/MockERC721.sol
+2 −2		test/StdUtils.t.sol
+2 −2		test/Vm.t.sol