Merge pull request #131 from axieinfinity/feature/misc

Feature/misc
axieinfinity · Mar 25, 2024 · 0c79a76 · 0c79a76
2 parents d363121 + 1e2d229
commit 0c79a76
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git a/.github/workflows/create-PR-implement.yml b/.github/workflows/create-PR-implement.yml
@@ -41,7 +41,7 @@ jobs:
             toBranch: ${{ env.FEATURE_BRANCH }}
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6.0.1
         with:
           branch: ${{ env.HEAD_BRANCH }}
           base: ${{env.FEATURE_BRANCH}}

diff --git a/.github/workflows/create-PR-release.yml b/.github/workflows/create-PR-release.yml
@@ -75,7 +75,7 @@ jobs:
             toBranch: ${{matrix.branch_name}}
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6.0.1
         with:
           labels: automated PR
           delete-branch: true

diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,16 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+	shallow = true
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+	shallow = true
 [submodule "lib/solady"]
 	path = lib/solady
-	url = https://github.com/Vectorized/solady
+	url = https://github.com/vectorized/solady
+	shallow = true
 [submodule "lib/contract-libs"]
 	path = lib/contract-libs
 	url = https://github.com/axieinfinity/contract-libs
+	shallow = true
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/script/BaseMigration.s.sol b/script/BaseMigration.s.sol
@@ -143,7 +143,7 @@ abstract contract BaseMigration is ScriptExtended {
     address proxyAdmin = _getProxyAdmin();
     assertTrue(proxyAdmin != address(0x0), "BaseMigration: Null ProxyAdmin");
 
-    vm.broadcast(sender());
+    _prankOrBroadcast(sender());
     deployed = payable(address(new Proxy(logic, proxyAdmin, args)));
 
     // validate proxy admin
@@ -172,7 +172,7 @@ abstract contract BaseMigration is ScriptExtended {
     returns (address payable deployed, uint256 nonce)
   {
     nonce = vm.getNonce(sender());
-    vm.broadcast(sender());
+    _prankOrBroadcast(sender());
     deployed = payable(deployCode(filename, args));
   }
 
@@ -265,7 +265,7 @@ abstract contract BaseMigration is ScriptExtended {
 
     // if proxyAdmin is External Owned Wallet
     if (proxyAdmin.code.length == 0) {
-      vm.broadcast(proxyAdmin);
+      _prankOrBroadcast(proxyAdmin);
       if (args.length == 0) iProxy.upgradeTo(logic);
       else iProxy.upgradeToAndCall(logic, args);
     } else {
@@ -278,7 +278,7 @@ abstract contract BaseMigration is ScriptExtended {
             if (owner.code.length != 0) {
               _cheatUpgrade(owner, wProxyAdmin, iProxy, logic);
             } else {
-              vm.broadcast(owner);
+              _prankOrBroadcast(owner);
               wProxyAdmin.upgrade(iProxy, logic);
             }
           } else {
@@ -288,15 +288,15 @@ abstract contract BaseMigration is ScriptExtended {
             if (owner.code.length != 0) {
               _cheatUpgradeAndCall(owner, wProxyAdmin, iProxy, logic, args);
             } else {
-              vm.broadcast(owner);
+              _prankOrBroadcast(owner);
               wProxyAdmin.upgradeAndCall(iProxy, logic, args);
             }
           }
         } else {
           if (owner.code.length != 0) {
             _cheatUpgradeAndCall(owner, wProxyAdmin, iProxy, logic, args);
           } else {
-            vm.broadcast(owner);
+            _prankOrBroadcast(owner);
             wProxyAdmin.upgradeAndCall(iProxy, logic, args);
           }
         }
@@ -402,6 +402,14 @@ abstract contract BaseMigration is ScriptExtended {
     wProxyAdmin.upgradeAndCall(iProxy, logic, args);
   }
 
+  function _prankOrBroadcast(address to) internal virtual {
+    if (CONFIG.isPostChecking()) {
+      vm.prank(to);
+    } else {
+      vm.broadcast(to);
+    }
+  }
+
   function _setDependencyDeployScript(TContract contractType, IScriptExtended deployScript) internal virtual {
     _deployScript[contractType] = IMigrationScript(address(deployScript));
   }

diff --git a/script/extensions/ScriptExtended.s.sol b/script/extensions/ScriptExtended.s.sol
@@ -17,7 +17,6 @@ abstract contract ScriptExtended is Script, StdAssertions, IScriptExtended {
 
   bytes public constant EMPTY_ARGS = "";
   IGeneralConfig public constant CONFIG = IGeneralConfig(LibSharedAddress.CONFIG);
-  bool internal _isPostChecking;
 
   modifier logFn(string memory fnName) {
     _logFn(fnName);
+0 −3		.gitmodules
+1 −1		README.md
+0 −1		lib/ds-test
+518 −225		src/StdAssertions.sol
+2 −0		src/StdChains.sol
+7 −11		src/StdJson.sol
+201 −106		src/StdStorage.sol
+179 −0		src/StdToml.sol
+2 −5		src/Test.sol
+522 −1		src/Vm.sol
+39 −909		test/StdAssertions.t.sol
+27 −22		test/StdChains.t.sol
+18 −10		test/StdCheats.t.sol
+49 −0		test/StdJson.t.sol
+8 −8		test/StdMath.t.sol
+159 −11		test/StdStorage.t.sol
+49 −0		test/StdToml.t.sol
+18 −18		test/StdUtils.t.sol
+2 −2		test/Vm.t.sol
+8 −0		test/fixtures/test.json
+6 −0		test/fixtures/test.toml
+1 −1		test/mocks/MockERC20.t.sol
+1 −1		test/mocks/MockERC721.t.sol