@@ -40,14 +40,12 @@ ACCOUNT_IMPL=$(echo "$DEPLOY_OUTPUT" | grep "ModularSmartAccount implementation:
4040BEACON=$( echo " $DEPLOY_OUTPUT " | grep " UpgradeableBeacon:" | awk ' {print $2}' )
4141FACTORY=$( echo " $DEPLOY_OUTPUT " | grep " MSAFactory:" | awk ' {print $2}' )
4242
43- # Deploy paymaster separately (with dependencies from erc4337-contracts)
43+ # Deploy MockPaymaster directly from erc4337-contracts (simpler, no dependencies )
4444echo " "
45- echo " 📦 Deploying TestPaymaster ..."
46- PAYMASTER_OUTPUT =$( cd " $WORKSPACE_ROOT /examples/demo-app/smart-contracts " && forge script DeployPaymaster.s. sol:DeployPaymaster --rpc-url " $RPC_URL " --broadcast -- private-key 0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6 2>&1 )
45+ echo " 📦 Deploying MockPaymaster ..."
46+ PAYMASTER =$( cd " $CONTRACTS_DIR " && forge create test/mocks/MockPaymaster. sol:MockPaymaster --rpc-url " $RPC_URL " --private-key 0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6 2>&1 | grep " Deployed to: " | awk ' {print $3} ' )
4747
48- echo " $PAYMASTER_OUTPUT "
49-
50- PAYMASTER=$( echo " $PAYMASTER_OUTPUT " | grep " TestPaymaster:" | awk ' {print $2}' )
48+ echo " MockPaymaster deployed to: $PAYMASTER "
5149
5250# Fund the paymaster with ETH from Anvil account #0 (has plenty of ETH)
5351echo " "
@@ -76,7 +74,7 @@ echo " GuardianExecutor: $GUARDIAN_EXECUTOR"
7674echo " ModularSmartAccount impl: $ACCOUNT_IMPL "
7775echo " UpgradeableBeacon: $BEACON "
7876echo " MSAFactory: $FACTORY "
79- echo " TestPaymaster : $PAYMASTER "
77+ echo " MockPaymaster : $PAYMASTER "
8078
8179# Create contracts-anvil.json
8280echo " "
@@ -96,6 +94,7 @@ cat > contracts-anvil.json << EOF
9694 "beacon": "$BEACON ",
9795 "factory": "$FACTORY ",
9896 "testPaymaster": "$PAYMASTER ",
97+ "mockPaymaster": "$PAYMASTER ",
9998 "entryPoint": "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
10099 "bundlerUrl": "http://localhost:4337"
101100}
0 commit comments