Skip to content

Commit e0873c5

Browse files
dylandesrosierMcOso
dylandesrosier
authored and
McOso
committed
chore: update script to use a single variable
1 parent 8cb74f5 commit e0873c5

5 files changed

Lines changed: 53 additions & 52 deletions

File tree

‎script/DeployEnvironmentSetUp.s.sol‎

Lines changed: 41 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -55,74 +55,67 @@ contract DeployEnvironmentSetUp is Script {
5555
console2.log("~~~");
5656
vm.startBroadcast();
5757

58+
address deployedAddress;
59+
5860
// Deploy Delegation Environment Contracts
5961
address delegationManager = address(new DelegationManager{ salt: salt }(deployer));
6062
console2.log("DelegationManager: %s", address(delegationManager));
61-
{
62-
address multiSigDeleGatorImpl_ =
63-
address(new MultiSigDeleGator{ salt: salt }(IDelegationManager(delegationManager), entryPoint));
64-
console2.log("MultiSigDeleGatorImpl: %s", address(multiSigDeleGatorImpl_));
65-
66-
address hybridDeleGatorImpl_ =
67-
address(new HybridDeleGator{ salt: salt }(IDelegationManager(delegationManager), entryPoint));
68-
console2.log("HybridDeleGatorImpl: %s", address(hybridDeleGatorImpl_));
69-
}
63+
deployedAddress = address(new MultiSigDeleGator{ salt: salt }(IDelegationManager(delegationManager), entryPoint));
64+
console2.log("MultiSigDeleGatorImpl: %s", deployedAddress);
65+
66+
deployedAddress = address(new HybridDeleGator{ salt: salt }(IDelegationManager(delegationManager), entryPoint));
67+
console2.log("HybridDeleGatorImpl: %s", address(deployedAddress));
7068
console2.log("~~~");
7169

72-
{
73-
// Caveat Enforcers
74-
address allowedCalldataEnforcer = address(new AllowedCalldataEnforcer{ salt: salt }());
75-
console2.log("AllowedCalldataEnforcer: %s", address(allowedCalldataEnforcer));
70+
// Caveat Enforcers
71+
deployedAddress = address(new AllowedCalldataEnforcer{ salt: salt }());
72+
console2.log("AllowedCalldataEnforcer: %s", deployedAddress);
7673

77-
address allowedMethodsEnforcer = address(new AllowedMethodsEnforcer{ salt: salt }());
78-
console2.log("AllowedMethodsEnforcer: %s", address(allowedMethodsEnforcer));
74+
deployedAddress = address(new AllowedMethodsEnforcer{ salt: salt }());
75+
console2.log("AllowedMethodsEnforcer: %s", deployedAddress);
7976

80-
address allowedTargetsEnforcer = address(new AllowedTargetsEnforcer{ salt: salt }());
81-
console2.log("AllowedTargetsEnforcer: %s", address(allowedTargetsEnforcer));
77+
deployedAddress = address(new AllowedTargetsEnforcer{ salt: salt }());
78+
console2.log("AllowedTargetsEnforcer: %s", deployedAddress);
8279

83-
address blockNumberEnforcer = address(new BlockNumberEnforcer{ salt: salt }());
84-
console2.log("BlockNumberEnforcer: %s", address(blockNumberEnforcer));
80+
deployedAddress = address(new BlockNumberEnforcer{ salt: salt }());
81+
console2.log("BlockNumberEnforcer: %s", deployedAddress);
8582

86-
address deployedEnforcer = address(new DeployedEnforcer{ salt: salt }());
87-
console2.log("DeployedEnforcer: %s", address(deployedEnforcer));
83+
deployedAddress = address(new DeployedEnforcer{ salt: salt }());
84+
console2.log("DeployedEnforcer: %s", deployedAddress);
8885

89-
address erc20BalanceGteEnforcer = address(new ERC20BalanceGteEnforcer{ salt: salt }());
90-
console2.log("ERC20BalanceGteEnforcer: %s", address(erc20BalanceGteEnforcer));
86+
deployedAddress = address(new ERC20BalanceGteEnforcer{ salt: salt }());
87+
console2.log("ERC20BalanceGteEnforcer: %s", deployedAddress);
9188

92-
address erc20TransferAmountEnforcer = address(new ERC20TransferAmountEnforcer{ salt: salt }());
93-
console2.log("ERC20TransferAmountEnforcer: %s", address(erc20TransferAmountEnforcer));
89+
deployedAddress = address(new ERC20TransferAmountEnforcer{ salt: salt }());
90+
console2.log("ERC20TransferAmountEnforcer: %s", deployedAddress);
9491

95-
address idEnforcer = address(new IdEnforcer{ salt: salt }());
96-
console2.log("IdEnforcer: %s", address(idEnforcer));
92+
deployedAddress = address(new IdEnforcer{ salt: salt }());
93+
console2.log("IdEnforcer: %s", deployedAddress);
9794

98-
address limitedCallsEnforcer = address(new LimitedCallsEnforcer{ salt: salt }());
99-
console2.log("LimitedCallsEnforcer: %s", address(limitedCallsEnforcer));
95+
deployedAddress = address(new LimitedCallsEnforcer{ salt: salt }());
96+
console2.log("LimitedCallsEnforcer: %s", deployedAddress);
10097

101-
address nonceEnforcer = address(new NonceEnforcer{ salt: salt }());
102-
console2.log("NonceEnforcer: %s", address(nonceEnforcer));
98+
deployedAddress = address(new NonceEnforcer{ salt: salt }());
99+
console2.log("NonceEnforcer: %s", deployedAddress);
103100

104-
address timestampEnforcer = address(new TimestampEnforcer{ salt: salt }());
105-
console2.log("TimestampEnforcer: %s", address(timestampEnforcer));
101+
deployedAddress = address(new TimestampEnforcer{ salt: salt }());
102+
console2.log("TimestampEnforcer: %s", deployedAddress);
106103

107-
address valueLteEnfocer = address(new ValueLteEnforcer{ salt: salt }());
108-
console2.log("ValueLteEnforcer: %s", address(valueLteEnfocer));
104+
deployedAddress = address(new ValueLteEnforcer{ salt: salt }());
105+
console2.log("ValueLteEnforcer: %s", deployedAddress);
109106

110-
address nativeTokenTransferAmountEnforcer = address(new NativeTokenTransferAmountEnforcer{ salt: salt }());
111-
console2.log("NativeTokenTransferAmountEnforcer: %s", address(nativeTokenTransferAmountEnforcer));
107+
deployedAddress = address(new NativeTokenTransferAmountEnforcer{ salt: salt }());
108+
console2.log("NativeTokenTransferAmountEnforcer: %s", deployedAddress);
112109

113-
address nativeBalanceGteEnforcer = address(new NativeBalanceGteEnforcer{ salt: salt }());
114-
console2.log("NativeBalanceGteEnforcer: %s", address(nativeBalanceGteEnforcer));
110+
deployedAddress = address(new NativeBalanceGteEnforcer{ salt: salt }());
111+
console2.log("NativeBalanceGteEnforcer: %s", deployedAddress);
115112

116-
address argsEqualityCheckEnforcer = address(new ArgsEqualityCheckEnforcer{ salt: salt }());
117-
console2.log("ArgsEqualityCheckEnforcer: %s", address(argsEqualityCheckEnforcer));
113+
deployedAddress = address(new ArgsEqualityCheckEnforcer{ salt: salt }());
114+
console2.log("ArgsEqualityCheckEnforcer: %s", deployedAddress);
118115

119-
address nativeTokenPaymentEnforcer = address(
120-
new NativeTokenPaymentEnforcer{ salt: salt }(
121-
IDelegationManager(delegationManager), address(argsEqualityCheckEnforcer)
122-
)
123-
);
124-
console2.log("NativeTokenPaymentEnforcer: %s", address(nativeTokenPaymentEnforcer));
125-
}
116+
deployedAddress =
117+
address(new NativeTokenPaymentEnforcer{ salt: salt }(IDelegationManager(delegationManager), deployedAddress));
118+
console2.log("NativeTokenPaymentEnforcer: %s", deployedAddress);
126119

127120
vm.stopBroadcast();
128121
}

‎src/enforcers/BlockNumberEnforcer.sol‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ contract BlockNumberEnforcer is CaveatEnforcer {
4949
* @return blockAfterThreshold_ The earliest block number before which the delegation can be used.
5050
* @return blockBeforeThreshold_ The latest block number after which the delegation can be used.
5151
*/
52-
function getTermsInfo(bytes calldata _terms)
52+
function getTermsInfo(
53+
bytes calldata _terms
54+
)
5355
public
5456
pure
5557
returns (uint128 blockAfterThreshold_, uint128 blockBeforeThreshold_)

‎src/enforcers/DeployedEnforcer.sol‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ contract DeployedEnforcer is CaveatEnforcer {
8181
* @return salt_ The salt to use for create2.
8282
* @return bytecode_ The bytecode of the contract to deploy.
8383
*/
84-
function getTermsInfo(bytes calldata _terms)
84+
function getTermsInfo(
85+
bytes calldata _terms
86+
)
8587
public
8688
pure
8789
returns (address expectedAddress_, bytes32 salt_, bytes memory bytecode_)

‎src/enforcers/TimestampEnforcer.sol‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ contract TimestampEnforcer is CaveatEnforcer {
4949
* @return timestampAfterThreshold_ The earliest timestamp before which the delegation can be used.
5050
* @return timestampBeforeThreshold_ The latest timestamp after which the delegation can be used.
5151
*/
52-
function getTermsInfo(bytes calldata _terms)
52+
function getTermsInfo(
53+
bytes calldata _terms
54+
)
5355
public
5456
pure
5557
returns (uint128 timestampAfterThreshold_, uint128 timestampBeforeThreshold_)

‎src/libraries/P256VerifierLib.sol‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ library P256VerifierLib {
7979
* @param _signature The signature to be decoded
8080
* @return decodedSig the decoded signature
8181
*/
82-
function _decodeWebAuthnP256Signature(bytes memory _signature)
82+
function _decodeWebAuthnP256Signature(
83+
bytes memory _signature
84+
)
8385
internal
8486
pure
8587
returns (DecodedWebAuthnSignature memory decodedSig)

0 commit comments

Comments
 (0)