diff --git a/script/DeployBase.sol b/script/DeployBase.sol index 8dd42a103..e2c575cb7 100644 --- a/script/DeployBase.sol +++ b/script/DeployBase.sol @@ -6,11 +6,12 @@ import {Script, console} from "forge-std/Script.sol"; abstract contract DeployBase is Script { function run() public { vm.startBroadcast(); - address _contract = _deploy(); + (address _contract, string memory _contractName) = _deploy(); vm.stopBroadcast(); + console.log("Contract name: %s", _contractName); console.log("Deployed contract at address: %s", _contract); } - function _deploy() internal virtual returns (address _contract) {} + function _deploy() internal virtual returns (address _contract, string memory _contractName) {} } diff --git a/script/DeployDirectAllocation.sol b/script/DeployDirectAllocation.sol index 832dcb627..bce0c41a2 100644 --- a/script/DeployDirectAllocation.sol +++ b/script/DeployDirectAllocation.sol @@ -5,8 +5,10 @@ import {DeployBase} from "script/DeployBase.sol"; import {DirectAllocationStrategy} from "contracts/strategies/examples/direct-allocation/DirectAllocation.sol"; contract DeployDirectAllocation is DeployBase { - function _deploy() internal override returns (address _contract) { + function _deploy() internal override returns (address _contract, string memory _contractName) { address _allo = vm.envAddress("ALLO_ADDRESS"); - return address(new DirectAllocationStrategy(_allo)); + + _contract = address(new DirectAllocationStrategy(_allo)); + _contractName = "DirectAllocationStrategy"; } } diff --git a/script/DeployDonationVotingMerkleDistribution.sol b/script/DeployDonationVotingMerkleDistribution.sol index 3b23c9683..3bce28966 100644 --- a/script/DeployDonationVotingMerkleDistribution.sol +++ b/script/DeployDonationVotingMerkleDistribution.sol @@ -6,9 +6,11 @@ import {DonationVotingMerkleDistribution} from "contracts/strategies/examples/donation-voting/DonationVotingMerkleDistribution.sol"; contract DeployDonationVotingMerkleDistribution is DeployBase { - function _deploy() internal override returns (address _contract) { + function _deploy() internal override returns (address _contract, string memory _contractName) { address _allo = vm.envAddress("ALLO_ADDRESS"); bool _directTransfer = vm.envBool("DONATION_VOTING_MERKLE_DISTRIBUTION_IS_DIRECT_TRANSFER"); - return address(new DonationVotingMerkleDistribution(_allo, _directTransfer)); + + _contract = address(new DonationVotingMerkleDistribution(_allo, _directTransfer)); + _contractName = "DonationVotingMerkleDistributionStrategy"; } } diff --git a/script/DeployDonationVotingOffchain.sol b/script/DeployDonationVotingOffchain.sol index 4ef239e8a..80c269675 100644 --- a/script/DeployDonationVotingOffchain.sol +++ b/script/DeployDonationVotingOffchain.sol @@ -5,9 +5,11 @@ import {DeployBase} from "script/DeployBase.sol"; import {DonationVotingOffchain} from "contracts/strategies/examples/donation-voting/DonationVotingOffchain.sol"; contract DeployDonationVotingOffchain is DeployBase { - function _deploy() internal override returns (address _contract) { + function _deploy() internal override returns (address _contract, string memory _contractName) { address _allo = vm.envAddress("ALLO_ADDRESS"); bool _directTransfer = vm.envBool("DONATION_VOTING_OFFCHAIN_IS_DIRECT_TRANSFER"); - return address(new DonationVotingOffchain(_allo, _directTransfer)); + + _contract = address(new DonationVotingOffchain(_allo, _directTransfer)); + _contractName = "DonationVotingOffchainStrategy"; } } diff --git a/script/DeployDonationVotingOnchain.sol b/script/DeployDonationVotingOnchain.sol index 16062529a..602993ce6 100644 --- a/script/DeployDonationVotingOnchain.sol +++ b/script/DeployDonationVotingOnchain.sol @@ -5,8 +5,10 @@ import {DeployBase} from "script/DeployBase.sol"; import {DonationVotingOnchain} from "contracts/strategies/examples/donation-voting/DonationVotingOnchain.sol"; contract DeployDonationVotingOnchain is DeployBase { - function _deploy() internal override returns (address _contract) { + function _deploy() internal override returns (address _contract, string memory _contractName) { address _allo = vm.envAddress("ALLO_ADDRESS"); - return address(new DonationVotingOnchain(_allo)); + + _contract = address(new DonationVotingOnchain(_allo)); + _contractName = "DonationVotingOnchainStrategy"; } } diff --git a/script/DeployEasyRPGF.sol b/script/DeployEasyRPGF.sol index c09a4b4d5..7c07909b9 100644 --- a/script/DeployEasyRPGF.sol +++ b/script/DeployEasyRPGF.sol @@ -5,8 +5,10 @@ import {DeployBase} from "script/DeployBase.sol"; import {EasyRPGF} from "contracts/strategies/examples/easy-rpgf/EasyRPGF.sol"; contract DeployEasyRPGF is DeployBase { - function _deploy() internal override returns (address _contract) { + function _deploy() internal override returns (address _contract, string memory _contractName) { address _allo = vm.envAddress("ALLO_ADDRESS"); - return address(new EasyRPGF(_allo)); + + _contract = address(new EasyRPGF(_allo)); + _contractName = "EasyRPGFStrategy"; } } diff --git a/script/DeployQVImpactStream.sol b/script/DeployQVImpactStream.sol index 9576a94cb..6777db537 100644 --- a/script/DeployQVImpactStream.sol +++ b/script/DeployQVImpactStream.sol @@ -5,8 +5,10 @@ import {DeployBase} from "script/DeployBase.sol"; import {QVImpactStream} from "contracts/strategies/examples/impact-stream/QVImpactStream.sol"; contract DeployQVImpactStream is DeployBase { - function _deploy() internal override returns (address _contract) { + function _deploy() internal override returns (address _contract, string memory _contractName) { address _allo = vm.envAddress("ALLO_ADDRESS"); - return address(new QVImpactStream(_allo)); + + _contract = address(new QVImpactStream(_allo)); + _contractName = "QVImpactStreamStrategy"; } } diff --git a/script/DeployQVSimple.sol b/script/DeployQVSimple.sol index 43859857f..73611daa7 100644 --- a/script/DeployQVSimple.sol +++ b/script/DeployQVSimple.sol @@ -5,8 +5,10 @@ import {DeployBase} from "script/DeployBase.sol"; import {QVSimple} from "contracts/strategies/examples/quadratic-voting/QVSimple.sol"; contract DeployQVSimple is DeployBase { - function _deploy() internal override returns (address _contract) { + function _deploy() internal override returns (address _contract, string memory _contractName) { address _allo = vm.envAddress("ALLO_ADDRESS"); - return address(new QVSimple(_allo)); + + _contract = address(new QVSimple(_allo)); + _contractName = "QVSimpleStrategy"; } } diff --git a/script/DeployRFPSimple.sol b/script/DeployRFPSimple.sol index 3a38a615a..0a12d87bf 100644 --- a/script/DeployRFPSimple.sol +++ b/script/DeployRFPSimple.sol @@ -5,8 +5,10 @@ import {DeployBase} from "script/DeployBase.sol"; import {RFPSimple} from "contracts/strategies/examples/rfp/RFPSimple.sol"; contract DeployRFPSimple is DeployBase { - function _deploy() internal override returns (address _contract) { + function _deploy() internal override returns (address _contract, string memory _contractName) { address _allo = vm.envAddress("ALLO_ADDRESS"); - return address(new RFPSimple(_allo)); + + _contract = address(new RFPSimple(_allo)); + _contractName = "RFPSimpleStrategy"; } }