-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #153 from SmartInvoiceXYZ/develop
- Loading branch information
Showing
165 changed files
with
11,496 additions
and
22,188 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -63,3 +63,6 @@ packages/subgraph/src/types | |
|
|
||
| # firebase tmp | ||
| .firebase/ | ||
|
|
||
| /packages/contracts/flat/ | ||
| /packages/dapp/.next/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| #!/bin/sh | ||
| . "$(dirname "$0")/_/husky.sh" | ||
|
|
||
| yarn lint-staged | ||
| # yarn lint-staged |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,6 @@ | ||
| INFURA_PROJECT_ID= | ||
| PRIVATE_KEY= | ||
| ETHERSCAN_API_KEY= | ||
| COINMARKETCAP_API_KEY= | ||
| CURRENCY= | ||
| POLYGONSCAN_API_KEY= |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| INFURA_PROJECT_ID='<rpc key>' | ||
| PRIVATE_KEY='<wallet private key>' | ||
|
|
||
| # verification | ||
| ETHERSCAN_API_KEY='<etherscan api key>' | ||
| POLYGONSCAN_API_KEY='<polygonscan api key>' | ||
| GNOSISSCAN_API_KEY='<gnosisscan api key>' | ||
|
|
||
| # fork goerli for (zap) tests | ||
| FORK=true |
226 changes: 226 additions & 0 deletions
226
packages/contracts/contracts/SafeSplitsDaoEscrowZap.sol
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,226 @@ | ||
| // SPDX-License-Identifier: MIT | ||
|
|
||
| pragma solidity ^0.8.4; | ||
|
|
||
| import "hardhat/console.sol"; | ||
| import "@openzeppelin/contracts/proxy/Clones.sol"; | ||
| import "@openzeppelin/contracts/access/AccessControl.sol"; | ||
|
|
||
| import "./SafeSplitsEscrowZap.sol"; | ||
| import "./interfaces/ISpoilsManager.sol"; | ||
|
|
||
| contract SafeSplitsDaoEscrowZap is SafeSplitsEscrowZap { | ||
| /// @notice The DAO controller address | ||
| address dao; | ||
|
|
||
| error DaoSplitCreationFailed(); | ||
|
|
||
| /// @notice The DAO's SpoilsManager address | ||
| ISpoilsManager spoilsManager; | ||
|
|
||
| event SafeSplitsDaoEscrowCreated( | ||
| address safe, | ||
| address projectTeamSplit, | ||
| address daoSplit, | ||
| address escrow | ||
| ); | ||
|
|
||
| struct DaoZapData { | ||
| ZapData zapData; | ||
| address daoSplit; | ||
| } | ||
|
|
||
| /** | ||
| * @dev Deploys a new Split with the provided owners and percent allocations, optionally creates a DAO split for spoils | ||
| * @param _owners The address list of owners for the raid party split | ||
| * @param _percentAllocations The percent allocations for the raid party split | ||
| * @param _splitsData Bundled data for splits | ||
| * @param _daoZapData Resulting data struct | ||
| */ | ||
| function _createSplit( | ||
| address[] memory _owners, | ||
| uint32[] memory _percentAllocations, | ||
| bytes calldata _splitsData, | ||
| DaoZapData memory _daoZapData | ||
| ) internal returns (DaoZapData memory) { | ||
| _daoZapData.zapData.projectTeamSplit = splitMain.createSplit( | ||
| _owners, | ||
| _percentAllocations, | ||
| distributorFee, | ||
| _daoZapData.zapData.safe | ||
| ); | ||
| if (_daoZapData.zapData.projectTeamSplit == address(0)) { | ||
| revert ProjectTeamSplitNotCreated(); | ||
| } | ||
|
|
||
| bool _isDaoSplit = abi.decode(_splitsData, (bool)); | ||
|
|
||
| if (_isDaoSplit) { | ||
| // prepare arrays | ||
| address[] memory daoSplitRecipients = new address[](2); | ||
| uint32[] memory daoSplitPercentAllocations = new uint32[](2); | ||
|
|
||
| // dao split recipients | ||
| address daoReceiver = spoilsManager.receiver(); | ||
|
|
||
| // dao split amounts | ||
| uint32 daoSplitAmount = spoilsManager.getSpoils(); | ||
| uint32 projectSplitAmount = (100 * | ||
| spoilsManager.SPLIT_PERCENTAGE_SCALE()) - (daoSplitAmount); | ||
|
|
||
| // sort the addresses into the correct order | ||
| if ( | ||
| uint160(daoReceiver) < | ||
| uint160(_daoZapData.zapData.projectTeamSplit) | ||
| ) { | ||
| daoSplitRecipients[0] = daoReceiver; | ||
| daoSplitRecipients[1] = _daoZapData.zapData.projectTeamSplit; | ||
| daoSplitPercentAllocations[0] = daoSplitAmount; | ||
| daoSplitPercentAllocations[1] = projectSplitAmount; | ||
| } else { | ||
| daoSplitRecipients[0] = _daoZapData.zapData.projectTeamSplit; | ||
| daoSplitRecipients[1] = daoReceiver; | ||
| daoSplitPercentAllocations[0] = projectSplitAmount; | ||
| daoSplitPercentAllocations[1] = daoSplitAmount; | ||
| } | ||
|
|
||
| // (recipients array, percent allocations array, no distributor fee, safe address) | ||
| _daoZapData.daoSplit = splitMain.createSplit( | ||
| daoSplitRecipients, | ||
| daoSplitPercentAllocations, | ||
| distributorFee, | ||
| dao | ||
| ); | ||
| if (_daoZapData.daoSplit == address(0)) { | ||
| revert DaoSplitCreationFailed(); | ||
| } | ||
| } | ||
|
|
||
| return _daoZapData; | ||
| } | ||
|
|
||
| function _handleEscrowParams( | ||
| DaoZapData memory _daoZapData | ||
| ) internal view returns (address[] memory) { | ||
| address[] memory escrowParams = new address[](2); | ||
| escrowParams[0] = _daoZapData.zapData.safe; | ||
| escrowParams[1] = _daoZapData.zapData.projectTeamSplit; | ||
|
|
||
| if (_daoZapData.daoSplit != address(0)) { | ||
| escrowParams[0] = dao; | ||
| escrowParams[1] = _daoZapData.daoSplit; | ||
| } | ||
|
|
||
| return escrowParams; | ||
| } | ||
|
|
||
| function _createSafeSplitEscrow( | ||
| address[] memory _owners, | ||
| uint32[] memory _percentAllocations, | ||
| uint256[] memory _milestoneAmounts, | ||
| bytes calldata _safeData, | ||
| bytes calldata _splitsData, | ||
| bytes calldata _escrowData | ||
| ) internal { | ||
| DaoZapData memory daoZapData = DaoZapData({ | ||
| zapData: ZapData({ | ||
| safe: address(0), | ||
| projectTeamSplit: address(0), | ||
| escrow: address(0) | ||
| }), | ||
| daoSplit: address(0) | ||
| }); | ||
|
|
||
| daoZapData.zapData = _deploySafe( | ||
| _owners, | ||
| _safeData, | ||
| daoZapData.zapData | ||
| ); | ||
|
|
||
| daoZapData = _createSplit( | ||
| _owners, | ||
| _percentAllocations, | ||
| _splitsData, | ||
| daoZapData | ||
| ); | ||
|
|
||
| address[] memory escrowParams = _handleEscrowParams(daoZapData); | ||
|
|
||
| daoZapData.zapData = _deployEscrow( | ||
| _milestoneAmounts, | ||
| _escrowData, | ||
| escrowParams, | ||
| daoZapData.zapData | ||
| ); | ||
|
|
||
| emit SafeSplitsDaoEscrowCreated( | ||
| daoZapData.zapData.safe, | ||
| daoZapData.zapData.projectTeamSplit, | ||
| daoZapData.daoSplit, | ||
| daoZapData.zapData.escrow | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * @dev Deploys a new Safe, Raid Party Split and Escrow with the provided details | ||
| * @param _owners The safe owners and raid party split participants | ||
| * @param _percentAllocations The percent allocations for the raid party split | ||
| * @param _milestoneAmounts The initial milestone amounts for the escrow | ||
| * @param _safeData The number of required confirmations for a Safe transaction | ||
| * @param _escrowData The nonce for the salt used in the escrow deployment (recycled from safe deployment) | ||
| */ | ||
| function createSafeSplitEscrow( | ||
| address[] memory _owners, | ||
| uint32[] memory _percentAllocations, | ||
| uint256[] memory _milestoneAmounts, | ||
| bytes calldata _safeData, | ||
| bytes calldata _splitsData, | ||
| bytes calldata _escrowData | ||
| ) public { | ||
| if (_percentAllocations.length != _owners.length) { | ||
| revert InvalidAllocationsOwnersData(); | ||
| } | ||
| _createSafeSplitEscrow( | ||
| _owners, | ||
| _percentAllocations, | ||
| _milestoneAmounts, | ||
| _safeData, | ||
| _splitsData, | ||
| _escrowData | ||
| ); | ||
| } | ||
|
|
||
| function _handleData(bytes calldata _data) internal override { | ||
| ( | ||
| address _safeSingleton, | ||
| address _fallbackHandler, | ||
| address _safeFactory, | ||
| address _splitMain, | ||
| address _spoilsManager, | ||
| address _escrowFactory, | ||
| address _wrappedNativeToken, | ||
| address _dao | ||
| ) = abi.decode( | ||
| _data, | ||
| ( | ||
| address, | ||
| address, | ||
| address, | ||
| address, | ||
| address, | ||
| address, | ||
| address, | ||
| address | ||
| ) | ||
| ); | ||
|
|
||
| safeSingleton = _safeSingleton; | ||
| fallbackHandler = _fallbackHandler; | ||
| safeFactory = ISafeProxyFactory(_safeFactory); | ||
| splitMain = ISplitMain(_splitMain); | ||
| spoilsManager = ISpoilsManager(_spoilsManager); | ||
| escrowFactory = ISmartInvoiceFactory(_escrowFactory); | ||
| wrappedNativeToken = IWRAPPED(_wrappedNativeToken); | ||
| dao = _dao; | ||
| } | ||
| } |
Oops, something went wrong.
f54faacThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Successfully deployed to the following URLs:
smart-invoice-dapp – ./
smart-invoice-dapp-git-main-smart-invoice.vercel.app
app.smartinvoice.xyz
smart-invoice-dapp.vercel.app
smart-invoice-dapp-smart-invoice.vercel.app