Skip to content

Commit

Permalink
chore: added redeemer validation to payment enforcer
Browse files Browse the repository at this point in the history
  • Loading branch information
@hanzel98
hanzel98 committed Aug 29, 2024
1 parent b68ce99 commit 0d901f2
Show file tree
Hide file tree
Showing 3 changed files with 216 additions and 186 deletions.
250 changes: 126 additions & 124 deletions script/DeployEnvironmentSetUp.s.sol
View file
Original file line number Diff line number Diff line change
@@ -1,124 +1,126 @@
// SPDX-License-Identifier: MIT AND Apache-2.0
pragma solidity 0.8.23;

import "forge-std/Script.sol";
import { console2 } from "forge-std/console2.sol";
import { IEntryPoint } from "@account-abstraction/interfaces/IEntryPoint.sol";

import { DelegationManager } from "../src/DelegationManager.sol";
import { MultiSigDeleGator } from "../src/MultiSigDeleGator.sol";
import { HybridDeleGator } from "../src/HybridDeleGator.sol";
import { IDelegationManager } from "../src/interfaces/IDelegationManager.sol";

import { AllowedCalldataEnforcer } from "../src/enforcers/AllowedCalldataEnforcer.sol";
import { AllowedMethodsEnforcer } from "../src/enforcers/AllowedMethodsEnforcer.sol";
import { NativeTokenTransferAmountEnforcer } from "../src/enforcers/NativeTokenTransferAmountEnforcer.sol";
import { AllowedTargetsEnforcer } from "../src/enforcers/AllowedTargetsEnforcer.sol";
import { BlockNumberEnforcer } from "../src/enforcers/BlockNumberEnforcer.sol";
import { DeployedEnforcer } from "../src/enforcers/DeployedEnforcer.sol";
import { ERC20BalanceGteEnforcer } from "../src/enforcers/ERC20BalanceGteEnforcer.sol";
import { ERC20TransferAmountEnforcer } from "../src/enforcers/ERC20TransferAmountEnforcer.sol";
import { IdEnforcer } from "../src/enforcers/IdEnforcer.sol";
import { LimitedCallsEnforcer } from "../src/enforcers/LimitedCallsEnforcer.sol";
import { NonceEnforcer } from "../src/enforcers/NonceEnforcer.sol";
import { TimestampEnforcer } from "../src/enforcers/TimestampEnforcer.sol";
import { ValueLteEnforcer } from "../src/enforcers/ValueLteEnforcer.sol";
import { NativeBalanceGteEnforcer } from "../src/enforcers/NativeBalanceGteEnforcer.sol";
import { NativeTokenPaymentEnforcer } from "../src/enforcers/NativeTokenPaymentEnforcer.sol";
import { ArgsEqualityCheckEnforcer } from "../src/enforcers/ArgsEqualityCheckEnforcer.sol";

/**
* @title DeployEnvironmentSetUp
* @notice Deploys the required contracts for the delegation system to function.
* interacting with a chain where the required contracts have already been deployed.
* @dev These contracts are likely already deployed on a testnet or mainnet as many are singletons.
* @dev run the script with:
* forge script script/DeployEnvironmentSetUp.s.sol --rpc-url <your_rpc_url> --private-key $PRIVATE_KEY --broadcast
*/
contract DeployEnvironmentSetUp is Script {
bytes32 salt;
IEntryPoint entryPoint;
address deployer;

function setUp() public {
salt = bytes32(abi.encodePacked(vm.envString("SALT")));
entryPoint = IEntryPoint(vm.envAddress("ENTRYPOINT_ADDRESS"));
deployer = msg.sender;
console2.log("~~~");
console2.log("Deployer: %s", address(deployer));
console2.log("Entry Point: %s", address(entryPoint));
console2.log("Salt:");
console2.logBytes32(salt);
}

function run() public {
console2.log("~~~");
vm.startBroadcast();

// Deploy Delegation Environment Contracts
address delegationManager = address(new DelegationManager{ salt: salt }(deployer));
console2.log("DelegationManager: %s", address(delegationManager));

address multiSigDeleGatorImpl_ =
address(new MultiSigDeleGator{ salt: salt }(IDelegationManager(delegationManager), entryPoint));
console2.log("MultiSigDeleGatorImpl: %s", address(multiSigDeleGatorImpl_));

address hybridDeleGatorImpl_ = address(new HybridDeleGator{ salt: salt }(IDelegationManager(delegationManager), entryPoint));
console2.log("HybridDeleGatorImpl: %s", address(hybridDeleGatorImpl_));

console2.log("~~~");

// Caveat Enforcers
address allowedCalldataEnforcer = address(new AllowedCalldataEnforcer{ salt: salt }());
console2.log("AllowedCalldataEnforcer: %s", address(allowedCalldataEnforcer));

address allowedMethodsEnforcer = address(new AllowedMethodsEnforcer{ salt: salt }());
console2.log("AllowedMethodsEnforcer: %s", address(allowedMethodsEnforcer));

address allowedTargetsEnforcer = address(new AllowedTargetsEnforcer{ salt: salt }());
console2.log("AllowedTargetsEnforcer: %s", address(allowedTargetsEnforcer));

address blockNumberEnforcer = address(new BlockNumberEnforcer{ salt: salt }());
console2.log("BlockNumberEnforcer: %s", address(blockNumberEnforcer));

address deployedEnforcer = address(new DeployedEnforcer{ salt: salt }());
console2.log("DeployedEnforcer: %s", address(deployedEnforcer));

address erc20BalanceGteEnforcer = address(new ERC20BalanceGteEnforcer{ salt: salt }());
console2.log("ERC20BalanceGteEnforcer: %s", address(erc20BalanceGteEnforcer));

address erc20TransferAmountEnforcer = address(new ERC20TransferAmountEnforcer{ salt: salt }());
console2.log("ERC20TransferAmountEnforcer: %s", address(erc20TransferAmountEnforcer));

address idEnforcer = address(new IdEnforcer{ salt: salt }());
console2.log("IdEnforcer: %s", address(idEnforcer));

address limitedCallsEnforcer = address(new LimitedCallsEnforcer{ salt: salt }());
console2.log("LimitedCallsEnforcer: %s", address(limitedCallsEnforcer));

address nonceEnforcer = address(new NonceEnforcer{ salt: salt }());
console2.log("NonceEnforcer: %s", address(nonceEnforcer));

address timestampEnforcer = address(new TimestampEnforcer{ salt: salt }());
console2.log("TimestampEnforcer: %s", address(timestampEnforcer));

address valueLteEnfocer = address(new ValueLteEnforcer{ salt: salt }());
console2.log("ValueLteEnforcer: %s", address(valueLteEnfocer));

address nativeTokenTransferAmountEnforcer = address(new NativeTokenTransferAmountEnforcer{ salt: salt }());
console2.log("NativeTokenTransferAmountEnforcer: %s", address(nativeTokenTransferAmountEnforcer));

address nativeBalanceGteEnforcer = address(new NativeBalanceGteEnforcer{ salt: salt }());
console2.log("NativeBalanceGteEnforcer: %s", address(nativeBalanceGteEnforcer));

address argsEqualityCheckEnforcer = address(new ArgsEqualityCheckEnforcer{ salt: salt }());
console2.log("ArgsEqualityCheckEnforcer: %s", address(argsEqualityCheckEnforcer));

address nativeTokenPaymentEnforcer = address(
new NativeTokenPaymentEnforcer{ salt: salt }(IDelegationManager(delegationManager), address(argsEqualityCheckEnforcer))
);
console2.log("NativeTokenPaymentEnforcer: %s", address(nativeTokenPaymentEnforcer));

vm.stopBroadcast();
}
}
// // SPDX-License-Identifier: MIT AND Apache-2.0
// pragma solidity 0.8.23;

// import "forge-std/Script.sol";
// import { console2 } from "forge-std/console2.sol";
// import { IEntryPoint } from "@account-abstraction/interfaces/IEntryPoint.sol";

// import { DelegationManager } from "../src/DelegationManager.sol";
// import { MultiSigDeleGator } from "../src/MultiSigDeleGator.sol";
// import { HybridDeleGator } from "../src/HybridDeleGator.sol";
// import { IDelegationManager } from "../src/interfaces/IDelegationManager.sol";

// import { AllowedCalldataEnforcer } from "../src/enforcers/AllowedCalldataEnforcer.sol";
// import { AllowedMethodsEnforcer } from "../src/enforcers/AllowedMethodsEnforcer.sol";
// import { NativeTokenTransferAmountEnforcer } from "../src/enforcers/NativeTokenTransferAmountEnforcer.sol";
// import { AllowedTargetsEnforcer } from "../src/enforcers/AllowedTargetsEnforcer.sol";
// import { BlockNumberEnforcer } from "../src/enforcers/BlockNumberEnforcer.sol";
// import { DeployedEnforcer } from "../src/enforcers/DeployedEnforcer.sol";
// import { ERC20BalanceGteEnforcer } from "../src/enforcers/ERC20BalanceGteEnforcer.sol";
// import { ERC20TransferAmountEnforcer } from "../src/enforcers/ERC20TransferAmountEnforcer.sol";
// import { IdEnforcer } from "../src/enforcers/IdEnforcer.sol";
// import { LimitedCallsEnforcer } from "../src/enforcers/LimitedCallsEnforcer.sol";
// import { NonceEnforcer } from "../src/enforcers/NonceEnforcer.sol";
// import { TimestampEnforcer } from "../src/enforcers/TimestampEnforcer.sol";
// import { ValueLteEnforcer } from "../src/enforcers/ValueLteEnforcer.sol";
// import { NativeBalanceGteEnforcer } from "../src/enforcers/NativeBalanceGteEnforcer.sol";
// import { NativeTokenPaymentEnforcer } from "../src/enforcers/NativeTokenPaymentEnforcer.sol";
// import { ArgsEqualityCheckEnforcer } from "../src/enforcers/ArgsEqualityCheckEnforcer.sol";

// /**
// * @title DeployEnvironmentSetUp
// * @notice Deploys the required contracts for the delegation system to function.
// * interacting with a chain where the required contracts have already been deployed.
// * @dev These contracts are likely already deployed on a testnet or mainnet as many are singletons.
// * @dev run the script with:
// * forge script script/DeployEnvironmentSetUp.s.sol --rpc-url <your_rpc_url> --private-key $PRIVATE_KEY --broadcast
// */
// contract DeployEnvironmentSetUp is Script {
// bytes32 salt;
// IEntryPoint entryPoint;
// address deployer;

// function setUp() public {
// salt = bytes32(abi.encodePacked(vm.envString("SALT")));
// entryPoint = IEntryPoint(vm.envAddress("ENTRYPOINT_ADDRESS"));
// deployer = msg.sender;
// console2.log("~~~");
// console2.log("Deployer: %s", address(deployer));
// console2.log("Entry Point: %s", address(entryPoint));
// console2.log("Salt:");
// console2.logBytes32(salt);
// }

// function run() public {
// console2.log("~~~");
// vm.startBroadcast();

// // Deploy Delegation Environment Contracts
// address delegationManager = address(new DelegationManager{ salt: salt }(deployer));
// console2.log("DelegationManager: %s", address(delegationManager));

// address multiSigDeleGatorImpl_ =
// address(new MultiSigDeleGator{ salt: salt }(IDelegationManager(delegationManager), entryPoint));
// console2.log("MultiSigDeleGatorImpl: %s", address(multiSigDeleGatorImpl_));

// address hybridDeleGatorImpl_ = address(new HybridDeleGator{ salt: salt }(IDelegationManager(delegationManager),
// entryPoint));
// console2.log("HybridDeleGatorImpl: %s", address(hybridDeleGatorImpl_));

// console2.log("~~~");

// // Caveat Enforcers
// address allowedCalldataEnforcer = address(new AllowedCalldataEnforcer{ salt: salt }());
// console2.log("AllowedCalldataEnforcer: %s", address(allowedCalldataEnforcer));

// address allowedMethodsEnforcer = address(new AllowedMethodsEnforcer{ salt: salt }());
// console2.log("AllowedMethodsEnforcer: %s", address(allowedMethodsEnforcer));

// address allowedTargetsEnforcer = address(new AllowedTargetsEnforcer{ salt: salt }());
// console2.log("AllowedTargetsEnforcer: %s", address(allowedTargetsEnforcer));

// address blockNumberEnforcer = address(new BlockNumberEnforcer{ salt: salt }());
// console2.log("BlockNumberEnforcer: %s", address(blockNumberEnforcer));

// address deployedEnforcer = address(new DeployedEnforcer{ salt: salt }());
// console2.log("DeployedEnforcer: %s", address(deployedEnforcer));

// address erc20BalanceGteEnforcer = address(new ERC20BalanceGteEnforcer{ salt: salt }());
// console2.log("ERC20BalanceGteEnforcer: %s", address(erc20BalanceGteEnforcer));

// address erc20TransferAmountEnforcer = address(new ERC20TransferAmountEnforcer{ salt: salt }());
// console2.log("ERC20TransferAmountEnforcer: %s", address(erc20TransferAmountEnforcer));

// address idEnforcer = address(new IdEnforcer{ salt: salt }());
// console2.log("IdEnforcer: %s", address(idEnforcer));

// address limitedCallsEnforcer = address(new LimitedCallsEnforcer{ salt: salt }());
// console2.log("LimitedCallsEnforcer: %s", address(limitedCallsEnforcer));

// address nonceEnforcer = address(new NonceEnforcer{ salt: salt }());
// console2.log("NonceEnforcer: %s", address(nonceEnforcer));

// address timestampEnforcer = address(new TimestampEnforcer{ salt: salt }());
// console2.log("TimestampEnforcer: %s", address(timestampEnforcer));

// address valueLteEnfocer = address(new ValueLteEnforcer{ salt: salt }());
// console2.log("ValueLteEnforcer: %s", address(valueLteEnfocer));

// address nativeTokenTransferAmountEnforcer = address(new NativeTokenTransferAmountEnforcer{ salt: salt }());
// console2.log("NativeTokenTransferAmountEnforcer: %s", address(nativeTokenTransferAmountEnforcer));

// address nativeBalanceGteEnforcer = address(new NativeBalanceGteEnforcer{ salt: salt }());
// console2.log("NativeBalanceGteEnforcer: %s", address(nativeBalanceGteEnforcer));

// address argsEqualityCheckEnforcer = address(new ArgsEqualityCheckEnforcer{ salt: salt }());
// console2.log("ArgsEqualityCheckEnforcer: %s", address(argsEqualityCheckEnforcer));

// address nativeTokenPaymentEnforcer = address(
// new NativeTokenPaymentEnforcer{ salt: salt }(IDelegationManager(delegationManager),
// address(argsEqualityCheckEnforcer))
// );
// console2.log("NativeTokenPaymentEnforcer: %s", address(nativeTokenPaymentEnforcer));

// vm.stopBroadcast();
// }
// }
5 changes: 4 additions & 1 deletion src/enforcers/NativeTokenPaymentEnforcer.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,11 @@ contract NativeTokenPaymentEnforcer is CaveatEnforcer {

Delegation[] memory delegations_ = abi.decode(_args, (Delegation[]));

require(delegations_[0].delegator == _redeemer, "NativeTokenPaymentEnforcer:invalid-redeemer");

uint256 delegationsLength = delegations_.length;
// Assign the delegation hash as the args to the args equality enforcer.
for (uint256 x = 0; x < delegations_.length; ++x) {
for (uint256 x = 0; x < delegationsLength; ++x) {
Delegation memory delegation_ = delegations_[x];
for (uint256 i = 0; i < delegation_.caveats.length; ++i) {
if (delegation_.caveats[i].enforcer == argsEqualityCheckEnforcer) {
Expand Down
Loading

0 comments on commit 0d901f2

Please sign in to comment.