Merge pull request #129 from axieinfinity/implement-feature/misc/add-…

…minor-enhancements feat(misc): implement `add-minor-enhancements`
axieinfinity · Mar 25, 2024 · 1e2d229 · 1e2d229
2 parents 229bd0f + 25e5d3a
commit 1e2d229
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 12 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/lib/contract-libs b/lib/contract-libs
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
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 −62		.github/workflows/create-PR-deploy-to-release.yml
+1 −1		.github/workflows/create-PR-implement.yml
+0 −47		.github/workflows/create-PR-release-to-network.yml
+1 −1		.github/workflows/create-PR-release.yml
+0 −64		.github/workflows/create-release-tag.yml
+0 −3		.gitmodules
+4 −4		.husky/generate-layout.sh
+2 −2		.husky/pre-push
+31 −36		.husky/storage-logger.js
+1 −1		lib/forge-std
+1 −1		lib/openzeppelin-contracts
+0 −27		logs/contract-code-sizes.log
+0 −1		logs/storage/Counter.sol:Counter.log
+0 −26		src/interfaces/IWRON.sol
+0 −25		src/interfaces/IWRONHelper.sol
+0 −35		src/legacy/transfers/RONTransferHelper.sol
+0 −118		src/legacy/transfers/RONTransferHelperExtended.sol
+0 −39		src/legacy/transfers/TransferFromHelper.sol
+0 −36		src/legacy/transfers/TransferHelper.sol
+1 −1		.github/actions/setup/action.yml
+0 −9		CHANGELOG.md
+10 −21		contracts/metatx/ERC2771Context.sol
+1 −6		contracts/mocks/ERC2771ContextMock.sol
+23 −36		contracts/mocks/docs/ERC4626Fees.sol
+10 −10		contracts/mocks/token/ERC4646FeesMock.sol
+1 −1		contracts/package.json
+3 −5		contracts/token/ERC20/README.adoc
+4 −4		contracts/token/ERC20/extensions/ERC20Permit.sol
+1 −31		contracts/token/ERC20/extensions/IERC20Permit.sol
+1 −5		contracts/utils/Context.sol
+3 −17		contracts/utils/Multicall.sol
+1 −0		docs/modules/ROOT/nav.adoc
+15 −0		docs/modules/ROOT/pages/wizard.adoc
+1 −1		package.json
+2 −8		scripts/release/workflow/publish.sh
+1 −54		test/metatx/ERC2771Context.test.js
+3 −3		test/token/ERC20/extensions/ERC4626.test.js