feat: ERC7540 deposit actions

.env-example

@@ -25,6 +25,8 @@ REFUEL_ERC20_ACTION_GAS_CONSTANT=
 SWEEP_ACTION_GAS_CONSTANT=
 SWEEP_CCTP_ACTION_GAS_CONSTANT=
 SWEEP_DEPOSIT_ERC4626_ACTION_GAS_CONSTANT=
+REQUEST_DEPOSIT_ERC7540_ACTION_GAS_CONSTANT=
+SWEEP_REQUEST_DEPOSIT_ERC7540_ACTION_GAS_CONSTANT=
 SWEEP_ERC20_ACTION_GAS_CONSTANT=
 SWEEP_UNISWAP_V3_ACTION_GAS_CONSTANT=
 SWEEP_WITHDRAW_ERC4626_ACTION_GAS_CONSTANT=
@@ -48,6 +50,8 @@ EXPECTED_SWEEP_ERC20_ACTION_ADDRESS=
 EXPECTED_CALL_ONCE_ACTION_ADDRESS=
 EXPECTED_DEPOSIT_ERC4626_ACTION_ADDRESS=
 EXPECTED_SWEEP_DEPOSIT_ERC4626_ACTION_ADDRESS=
+EXPECTED_REQUEST_DEPOSIT_ERC7540_ACTION_ADDRESS=
+EXPECTED_SWEEP_REQUEST_DEPOSIT_ERC7540_ACTION_ADDRESS=
 EXPECTED_WITHDRAW_ERC4626_ACTION_ADDRESS=
 EXPECTED_SWEEP_WITHDRAW_ERC4626_ACTION_ADDRESS=
 

.gas-snapshot

@@ -56,14 +56,16 @@ DeactivateInstruction:test_deactivateInstruction_maxExecutionsZero() (gas: 33078
 DeploymentAddressesTest:test_callOnceAction_deployedAddress() (gas: 858783)
 DeploymentAddressesTest:test_deactivateInstructionAction_deployedAddress() (gas: 698733)
 DeploymentAddressesTest:test_depositERC4626Action_deployedAddress() (gas: 993127)
-DeploymentAddressesTest:test_feeTokenRegistry_deployedAddress() (gas: 732476)
-DeploymentAddressesTest:test_otimDelegate_deployedAddress() (gas: 2330388)
-DeploymentAddressesTest:test_refuelAction_deployedAddress() (gas: 693656)
-DeploymentAddressesTest:test_refuelERC20Action_deployedAddress() (gas: 714297)
-DeploymentAddressesTest:test_sweepAction_deployedAddress() (gas: 681964)
+DeploymentAddressesTest:test_feeTokenRegistry_deployedAddress() (gas: 732499)
+DeploymentAddressesTest:test_otimDelegate_deployedAddress() (gas: 2330366)
+DeploymentAddressesTest:test_refuelAction_deployedAddress() (gas: 693634)
+DeploymentAddressesTest:test_refuelERC20Action_deployedAddress() (gas: 714362)
+DeploymentAddressesTest:test_requestDepositERC7540Action_deployedAddress() (gas: 987068)
+DeploymentAddressesTest:test_sweepAction_deployedAddress() (gas: 681942)
 DeploymentAddressesTest:test_sweepCCTPAction_deployedAddress() (gas: 862238)
-DeploymentAddressesTest:test_sweepDepositERC4626Action_deployedAddress() (gas: 872805)
+DeploymentAddressesTest:test_sweepDepositERC4626Action_deployedAddress() (gas: 872783)
 DeploymentAddressesTest:test_sweepERC20Action_deployedAddress() (gas: 683152)
+DeploymentAddressesTest:test_sweepRequestDepositERC7540Action_deployedAddress() (gas: 857913)
 DeploymentAddressesTest:test_sweepUniswapV3Action_deployedAddress() (gas: 1692681)
 DeploymentAddressesTest:test_sweepWithdrawERC4626Action_deployedAddress() (gas: 789965)
 DeploymentAddressesTest:test_transferAction_deployedAddress() (gas: 807651)
@@ -72,35 +74,37 @@ DeploymentAddressesTest:test_transferERC20Action_deployedAddress() (gas: 808874)
 DeploymentAddressesTest:test_transferOnceAction_deployedAddress() (gas: 649365)
 DeploymentAddressesTest:test_transferOnceERC20Action_deployedAddress() (gas: 650598)
 DeploymentAddressesTest:test_treasury_deployedAddress() (gas: 389464)
-DeploymentAddressesTest:test_uniswapV3ExactInputAction_deployedAddress() (gas: 1826284)
-DeploymentAddressesTest:test_withdrawERC4626Action_deployedAddress() (gas: 864746)
-DepositERC4626Test:test_depositERC4626_happyPath() (gas: 481909)
-DepositERC4626Test:test_depositERC4626_insufficientBalance() (gas: 258567)
+DeploymentAddressesTest:test_uniswapV3ExactInputAction_deployedAddress() (gas: 1826262)
+DeploymentAddressesTest:test_withdrawERC4626Action_deployedAddress() (gas: 864812)
+DepositERC4626Test:test_depositERC4626_happyPath() (gas: 481184)
+DepositERC4626Test:test_depositERC4626_insufficientBalance() (gas: 258277)
 DepositERC4626Test:test_depositERC4626_maxDepositReached() (gas: 150609)
 DepositERC4626Test:test_depositERC4626_maxDepositTooLow() (gas: 38646)
 DepositERC4626Test:test_depositERC4626_minTotalSharesZero() (gas: 36832)
 DepositERC4626Test:test_depositERC4626_recipientZero() (gas: 36769)
 DepositERC4626Test:test_depositERC4626_totalSharesTooLow() (gas: 39187)
 DepositERC4626Test:test_depositERC4626_valueZero() (gas: 36815)
 DepositERC4626Test:test_depositERC4626_vaultZero() (gas: 36798)
-EstimateCallOnceGasConstant:testFuzz_callOnce_gasConstant(uint256,(address,bool,uint256,uint256,uint16,bytes4,bytes,(address,uint256,uint256,uint256))) (runs: 256, μ: 4127, ~: 3876)
-EstimateDeactivateInstructionGasConstant:testFuzz_deactivateInstruction_gasConstant(uint256,(bytes32,(address,uint256,uint256,uint256))) (runs: 256, μ: 1960, ~: 1914)
-EstimateDepositERC4626GasConstant:testFuzz_depositERC4626_gasConstant(uint256,uint256,(address,address,uint256,uint256,uint256,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 4486, ~: 4434)
+EstimateCallOnceGasConstant:testFuzz_callOnce_gasConstant(uint256,(address,bool,uint256,uint256,uint16,bytes4,bytes,(address,uint256,uint256,uint256))) (runs: 256, μ: 4170, ~: 3858)
+EstimateDeactivateInstructionGasConstant:testFuzz_deactivateInstruction_gasConstant(uint256,(bytes32,(address,uint256,uint256,uint256))) (runs: 256, μ: 1957, ~: 1941)
+EstimateDepositERC4626GasConstant:testFuzz_depositERC4626_gasConstant(uint256,uint256,(address,address,uint256,uint256,uint256,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 4505, ~: 4452)
 EstimateRefuelERC20GasConstant:testFuzz_refuelERC20_gasConstant(uint256,uint256,(address,address,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 3014, ~: 3006)
-EstimateRefuelGasConstant:testFuzz_refuel_gasConstant(uint256,uint256,(address,uint256,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 2897, ~: 2835)
-EstimateSweepCCTPGasConstant:testFuzz_sweepCCTP_gasConstant(uint256,uint256,(address,uint32,bytes32,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 3356, ~: 3333)
-EstimateSweepDepositERC4626GasConstant:testFuzz_sweepDepositERC4626_gasConstant(uint256,uint256,(address,address,uint256,uint256,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 3523, ~: 3516)
-EstimateSweepERC20GasConstant:testFuzz_sweepERC20_gasConstant(uint256,uint256,(address,address,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 3026, ~: 3042)
-EstimateSweepGasConstant:testFuzz_sweep_gasConstant(uint256,uint256,(address,uint256,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 2871, ~: 2808)
-EstimateSweepUniswapV3GasConstant:testFuzz_sweepUniswapV3_gasConstant(uint256,uint256,(address,address,address,uint24,uint256,uint256,uint256,uint32,uint32,(address,uint256,uint256,uint256))) (runs: 256, μ: 4424, ~: 4398)
-EstimateSweepWithdrawERC4626GasConstant:testFuzz_sweepWithdrawERC4626_gasConstant(uint256,uint256,(address,address,uint256,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 3297, ~: 3297)
-EstimateTransferCCTPGasConstant:testFuzz_transferCCTP_gasConstant(uint256,uint256,(address,uint256,uint32,bytes32,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 4224, ~: 4206)
-EstimateTransferERC20GasConstant:testFuzz_transferERC20_gasConstant(uint256,uint256,(address,address,uint256,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 4009, ~: 3969)
-EstimateTransferGasConstant:testFuzz_transfer_gasConstant(uint256,uint256,(address,uint256,uint256,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 3766, ~: 3762)
+EstimateRefuelGasConstant:testFuzz_refuel_gasConstant(uint256,uint256,(address,uint256,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 2897, ~: 2826)
+EstimateRequestDepositERC7540GasConstant:testFuzz_requestDepositERC7540_gasConstant(uint256,uint256,(address,uint256,address,uint256,uint256,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 257, μ: 4446, ~: 4416)
+EstimateSweepCCTPGasConstant:testFuzz_sweepCCTP_gasConstant(uint256,uint256,(address,uint32,bytes32,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 3341, ~: 3297)
+EstimateSweepDepositERC4626GasConstant:testFuzz_sweepDepositERC4626_gasConstant(uint256,uint256,(address,address,uint256,uint256,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 3537, ~: 3516)
+EstimateSweepERC20GasConstant:testFuzz_sweepERC20_gasConstant(uint256,uint256,(address,address,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 3025, ~: 3042)
+EstimateSweepGasConstant:testFuzz_sweep_gasConstant(uint256,uint256,(address,uint256,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 2853, ~: 2808)
+EstimateSweepRequestDepositERC7540GasConstant:testFuzz_sweepRequestDepositERC7540_gasConstant(uint256,uint256,(address,address,uint256,uint256,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 257, μ: 3494, ~: 3498)
+EstimateSweepUniswapV3GasConstant:testFuzz_sweepUniswapV3_gasConstant(uint256,uint256,(address,address,address,uint24,uint256,uint256,uint256,uint32,uint32,(address,uint256,uint256,uint256))) (runs: 256, μ: 4428, ~: 4425)
+EstimateSweepWithdrawERC4626GasConstant:testFuzz_sweepWithdrawERC4626_gasConstant(uint256,uint256,(address,address,uint256,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 3285, ~: 3288)
+EstimateTransferCCTPGasConstant:testFuzz_transferCCTP_gasConstant(uint256,uint256,(address,uint256,uint32,bytes32,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 4222, ~: 4206)
+EstimateTransferERC20GasConstant:testFuzz_transferERC20_gasConstant(uint256,uint256,(address,address,uint256,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 4004, ~: 3942)
+EstimateTransferGasConstant:testFuzz_transfer_gasConstant(uint256,uint256,(address,uint256,uint256,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 3771, ~: 3771)
 EstimateTransferOnceERC20GasConstant:testFuzz_transferERC20Once_gasConstant(uint256,(address,address,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 2575, ~: 2586)
-EstimateTransferOnceGasConstant:testFuzz_transferOnce_gasConstant(uint256,(address,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 2322, ~: 2298)
-EstimateUniswapV3ExactInputGasConstant:testFuzz_uniswapV3ExactInput_gasConstant(uint256,uint256,(address,address,address,uint24,uint256,uint256,uint32,uint32,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 5332, ~: 5316)
-EstimateWithdrawERC4626GasConstant:testFuzz_withdrawERC4626_gasConstant(uint256,uint256,(address,address,uint256,uint256,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 4177, ~: 4170)
+EstimateTransferOnceGasConstant:testFuzz_transferOnce_gasConstant(uint256,(address,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 2322, ~: 2289)
+EstimateUniswapV3ExactInputGasConstant:testFuzz_uniswapV3ExactInput_gasConstant(uint256,uint256,(address,address,address,uint24,uint256,uint256,uint32,uint32,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 5336, ~: 5334)
+EstimateWithdrawERC4626GasConstant:testFuzz_withdrawERC4626_gasConstant(uint256,uint256,(address,address,uint256,uint256,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 4226, ~: 4206)
 FeeTokenRegistryTest:test_addFeeToken_alreadyRegistered() (gas: 1898)
 FeeTokenRegistryTest:test_addFeeToken_happyPath() (gas: 37590)
 FeeTokenRegistryTest:test_addFeeToken_roundIdZero() (gas: 12004)
@@ -203,6 +207,14 @@ RefuelTest:test_refuel_targetRevert() (gas: 65323)
 RefuelTest:test_refuel_targetZero() (gas: 34369)
 RefuelTest:test_refuel_thresholdAboveEndBalance() (gas: 34401)
 RefuelTest:test_refuel_thresholdEqualsEndBalance() (gas: 34401)
+RequestDepositERC7540Test:test_requestDepositERC7540_assetsZero() (gas: 36778)
+RequestDepositERC7540Test:test_requestDepositERC7540_controllerZero() (gas: 36813)
+RequestDepositERC7540Test:test_requestDepositERC7540_happyPath() (gas: 123660)
+RequestDepositERC7540Test:test_requestDepositERC7540_insufficientBalance() (gas: 47730)
+RequestDepositERC7540Test:test_requestDepositERC7540_maxDepositTooLow() (gas: 131895)
+RequestDepositERC7540Test:test_requestDepositERC7540_minTotalSharesZero() (gas: 36830)
+RequestDepositERC7540Test:test_requestDepositERC7540_totalSharesTooLow() (gas: 45887)
+RequestDepositERC7540Test:test_requestDepositERC7540_vaultZero() (gas: 36761)
 SweepCCTPTest:test_sweepCCTP_balanceUnderThreshold() (gas: 34607)
 SweepCCTPTest:test_sweepCCTP_destinationMintRecipientZero() (gas: 34903)
 SweepCCTPTest:test_sweepCCTP_endBalanceOverThreshold() (gas: 34932)
@@ -213,7 +225,7 @@ SweepCCTPTest:test_sweepCCTP_tokenNotSupported() (gas: 36792)
 SweepCCTPTest:test_sweepCCTP_tokenZero() (gas: 34886)
 SweepDepositERC4626Test:test_sweepDepositERC4626_balanceUnderThreshold() (gas: 38503)
 SweepDepositERC4626Test:test_sweepDepositERC4626_endBalanceOverThreshold() (gas: 35287)
-SweepDepositERC4626Test:test_sweepDepositERC4626_happyPath() (gas: 460478)
+SweepDepositERC4626Test:test_sweepDepositERC4626_happyPath() (gas: 459753)
 SweepDepositERC4626Test:test_sweepDepositERC4626_maxDepositReached() (gas: 149430)
 SweepDepositERC4626Test:test_sweepDepositERC4626_maxDepositTooLow() (gas: 36753)
 SweepDepositERC4626Test:test_sweepDepositERC4626_minTotalSharesZero() (gas: 35304)
@@ -230,6 +242,14 @@ SweepERC20Test:test_sweepERC20_happyPath_thresholdEqualsEndBalance() (gas: 80396
 SweepERC20Test:test_sweepERC20_targetZero() (gas: 34607)
 SweepERC20Test:test_sweepERC20_tokenTransferRevert() (gas: 34653)
 SweepERC20Test:test_sweepERC20_tokenZero() (gas: 34572)
+SweepRequestDepositERC7540Test:test_sweepRequestDepositERC7540_balanceUnderThreshold() (gas: 39579)
+SweepRequestDepositERC7540Test:test_sweepRequestDepositERC7540_controllerZero() (gas: 35258)
+SweepRequestDepositERC7540Test:test_sweepRequestDepositERC7540_endBalanceOverThreshold() (gas: 35287)
+SweepRequestDepositERC7540Test:test_sweepRequestDepositERC7540_happyPath() (gas: 126576)
+SweepRequestDepositERC7540Test:test_sweepRequestDepositERC7540_maxDepositTooLow() (gas: 130310)
+SweepRequestDepositERC7540Test:test_sweepRequestDepositERC7540_minTotalSharesZero() (gas: 35304)
+SweepRequestDepositERC7540Test:test_sweepRequestDepositERC7540_totalSharesTooLow() (gas: 44255)
+SweepRequestDepositERC7540Test:test_sweepRequestDepositERC7540_vaultZero() (gas: 35223)
 SweepTest:test_sweep_balanceEqualsEndBalance() (gas: 29978)
 SweepTest:test_sweep_balanceUnderThreshold() (gas: 34458)
 SweepTest:test_sweep_balanceZero() (gas: 29978)
@@ -253,7 +273,7 @@ SweepUniswapV3Test:test_sweepUniswapV3_tokenToEth() (gas: 3042)
 SweepUniswapV3Test:test_sweepUniswapV3_tokenToToken() (gas: 3086)
 SweepWithdrawERC4626Test:test_sweepWithdrawERC4626_balanceUnderThreshold() (gas: 56923)
 SweepWithdrawERC4626Test:test_sweepWithdrawERC4626_endBalanceOverThreshold() (gas: 34904)
-SweepWithdrawERC4626Test:test_sweepWithdrawERC4626_happyPath() (gas: 373047)
+SweepWithdrawERC4626Test:test_sweepWithdrawERC4626_happyPath() (gas: 372612)
 SweepWithdrawERC4626Test:test_sweepWithdrawERC4626_maxWithdrawReached() (gas: 100002)
 SweepWithdrawERC4626Test:test_sweepWithdrawERC4626_maxWithdrawTooLow() (gas: 38358)
 SweepWithdrawERC4626Test:test_sweepWithdrawERC4626_recipientZero() (gas: 34875)
@@ -312,7 +332,7 @@ UniswapV3ExactInputTest:test_uniswapV3ExactInput_recipientZero() (gas: 38513)
 UniswapV3ExactInputTest:test_uniswapV3ExactInput_sameToken() (gas: 38484)
 UniswapV3ExactInputTest:test_uniswapV3ExactInput_tokenToEth() (gas: 3042)
 UniswapV3ExactInputTest:test_uniswapV3ExactInput_tokenToToken() (gas: 3064)
-WithdrawERC4626Test:test_withdrawERC4626_happyPath() (gas: 302453)
+WithdrawERC4626Test:test_withdrawERC4626_happyPath() (gas: 302163)
 WithdrawERC4626Test:test_withdrawERC4626_maxWithdrawReached() (gas: 96775)
 WithdrawERC4626Test:test_withdrawERC4626_maxWithdrawTooLow() (gas: 37566)
 WithdrawERC4626Test:test_withdrawERC4626_recipientZero() (gas: 36481)

.github/deployment/networks/.env-gas-constants

@@ -8,6 +8,8 @@ REFUEL_ERC20_ACTION_GAS_CONSTANT=104500
 SWEEP_ACTION_GAS_CONSTANT=104000
 SWEEP_CCTP_ACTION_GAS_CONSTANT=104500
 SWEEP_DEPOSIT_ERC4626_ACTION_GAS_CONSTANT=104500
+REQUEST_DEPOSIT_ERC7540_ACTION_GAS_CONSTANT=106000
+SWEEP_REQUEST_DEPOSIT_ERC7540_ACTION_GAS_CONSTANT=104500
 SWEEP_ERC20_ACTION_GAS_CONSTANT=104000
 SWEEP_UNISWAP_V3_ACTION_GAS_CONSTANT=106000
 SWEEP_WITHDRAW_ERC4626_ACTION_GAS_CONSTANT=104500

.github/deployment/networks/devnet/.env-otim-devnet

@@ -27,6 +27,8 @@ EXPECTED_DEPOSIT_ERC4626_ACTION_ADDRESS=0xf753Cbd47E73aeaa6706f80B966c58Cc2e4D1E
 EXPECTED_SWEEP_DEPOSIT_ERC4626_ACTION_ADDRESS=0x960824ED624f905d829Cb15FB36D388F413a2D01
 EXPECTED_WITHDRAW_ERC4626_ACTION_ADDRESS=0x10C1B5521c531Ed61728A1365e1c35dd1ab35D06
 EXPECTED_SWEEP_WITHDRAW_ERC4626_ACTION_ADDRESS=0x94838eB908dcA9e473CE9a52e6F1377baD706629
+EXPECTED_REQUEST_DEPOSIT_ERC7540_ACTION_ADDRESS=0x0340A903d91fF8c46EBB44fcC418CDe60bB3b81F
+EXPECTED_SWEEP_REQUEST_DEPOSIT_ERC7540_ACTION_ADDRESS=0x562eA8EAd6988b2fB7b7e86135D7397844d189f8
 
 # Foundry configuration
 FOUNDRY_VERSION=stable

.github/deployment/scripts/protocol-cli.rs

@@ -369,6 +369,20 @@ fn get_contract_mapping() -> HashMap<String, TierConfig> {
                     source_path: "src/actions/CallOnceAction.sol:CallOnceAction",
                     constructor_type: ConstructorType::Action,
                 }),
+                ("RequestDepositERC7540Action".to_string(), ContractDetails {
+                    script: Some("DeployRequestDepositERC7540Action".to_string()),
+                    expected_addr_envvar: Some("EXPECTED_REQUEST_DEPOSIT_ERC7540_ACTION_ADDRESS"),
+                    chain_config_key: Some("actions.RequestDepositERC7540".to_string()),
+                    source_path: "src/actions/RequestDepositERC7540Action.sol:RequestDepositERC7540Action",
+                    constructor_type: ConstructorType::Action,
+                }),
+                ("SweepRequestDepositERC7540Action".to_string(), ContractDetails {
+                    script: Some("DeploySweepRequestDepositERC7540Action".to_string()),
+                    expected_addr_envvar: Some("EXPECTED_SWEEP_REQUEST_DEPOSIT_ERC7540_ACTION_ADDRESS"),
+                    chain_config_key: Some("actions.SweepRequestDepositERC7540".to_string()),
+                    source_path: "src/actions/SweepRequestDepositERC7540Action.sol:SweepRequestDepositERC7540Action",
+                    constructor_type: ConstructorType::Action,
+                }),
             ]),
         }),
     ])