From 1331510059a38be09a940127372817197b36c51d Mon Sep 17 00:00:00 2001 From: highskore <80688826+highskore@users.noreply.github.com> Date: Tue, 29 Jul 2025 23:08:48 +0200 Subject: [PATCH] Revert "fix(foundry): add mainnet rpc" --- .github/workflows/ci.yaml | 21 ++++++++++++------- build-artifacts.sh | 6 ------ foundry.toml | 3 --- .../integration/concrete/DeadmanSwitch.t.sol | 5 +---- 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 411a43e..f57f786 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -40,14 +40,21 @@ jobs: uses: "rhinestonewtf/reusable-workflows/.github/workflows/forge-release.yaml@main" strategy: matrix: - contract-path: + contract-name: [ - "src/MultiFactor/MultiFactor", - "src/OwnableExecutor/OwnableExecutor", - "src/OwnableValidator/OwnableValidator", - "src/SocialRecovery/SocialRecovery", - "src/WebAuthnValidator/WebAuthnValidator", + "AutoSavings", + "ColdStorageFlashloan", + "ColdStorageHook", + "DeadmanSwitch", + "HookMultiPlexer", + "MultiFactor", + "OwnableExecutor", + "OwnableValidator", + "RegistryHook", + "SocialRecovery", + "ScheduledOrders", + "ScheduledTransfers", ] with: - contract-path: ${{ matrix.contract-path }} + contract-name: ${{ matrix.contract-name }} store-artifacts: true diff --git a/build-artifacts.sh b/build-artifacts.sh index 0d5221f..9a754dc 100755 --- a/build-artifacts.sh +++ b/build-artifacts.sh @@ -8,12 +8,6 @@ if [ $# -eq 0 ]; then fi CONTRACT_PATH=$1 - -# Add .sol extension if not present -if [[ ! "$CONTRACT_PATH" == *.sol ]]; then - CONTRACT_PATH="${CONTRACT_PATH}.sol" -fi - CONTRACT_NAME=$(basename "$CONTRACT_PATH" .sol) mkdir -p ./artifacts/$CONTRACT_NAME diff --git a/foundry.toml b/foundry.toml index dcae0b6..cc109a8 100644 --- a/foundry.toml +++ b/foundry.toml @@ -20,6 +20,3 @@ wrap_comments = true [fuzz] runs=1000 - -[rpc_endpoints] -mainnet = "https://mainnet.gateway.tenderly.co" \ No newline at end of file diff --git a/test/DeadmanSwitch/integration/concrete/DeadmanSwitch.t.sol b/test/DeadmanSwitch/integration/concrete/DeadmanSwitch.t.sol index ca872e7..73903bf 100644 --- a/test/DeadmanSwitch/integration/concrete/DeadmanSwitch.t.sol +++ b/test/DeadmanSwitch/integration/concrete/DeadmanSwitch.t.sol @@ -102,8 +102,6 @@ contract DeadmanSwitchIntegrationTest is BaseIntegrationTest { } function test_ValidateUserOp_RevertWhen_TimeoutNotDue() public { - // Set simulate mode to false - instance.simulateUserOp(false); // it should revert UserOpData memory userOpData = instance.getExecOps({ target: address(1), @@ -112,13 +110,12 @@ contract DeadmanSwitchIntegrationTest is BaseIntegrationTest { txValidator: address(dms) }); userOpData.userOp.signature = signHash(_nomineePk, userOpData.userOpHash); + instance.expect4337Revert(); userOpData.execUserOps(); } function test_ValidateUserOp() public { - // Set simulate mode to false - instance.simulateUserOp(false); // it should revert vm.warp(block.timestamp + _timeout);