Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop #136

Merged
merged 31 commits into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
3d85654
expand unit test code coverage
May 25, 2023
052687e
Merge branch 'main' of github.com:ajna-finance/ecosystem-coordination…
May 27, 2023
1016cc5
Merge branch 'main' of github.com:ajna-finance/ecosystem-coordination…
May 31, 2023
9334339
Merge branch 'main' of github.com:ajna-finance/ecosystem-coordination…
Jun 2, 2023
c3aaf10
Merge branch 'main' of github.com:ajna-finance/ecosystem-coordination…
Jun 3, 2023
39dff97
Merge branch 'main' of github.com:ajna-finance/ecosystem-coordination…
Jun 6, 2023
ed47e52
Add invariants DP7, SS10, SS11, ES4, ES5 and DR4 (#105)
prateek105 Jun 9, 2023
e7e9d32
Update invariants (#106)
MikeHathaway Jun 13, 2023
48f027f
Check all invariants across multiple distribution periods (#107)
MikeHathaway Jun 16, 2023
dc667a7
Add grant fund interaction with gnosis safe unit test (#109)
prateek105 Jun 19, 2023
85ac65e
Invariant improvements (#108)
MikeHathaway Jun 21, 2023
ce90939
update makefile (#115)
MikeHathaway Jun 22, 2023
23cdb60
various invariant doc cleanups (#117)
MikeHathaway Jun 27, 2023
e618039
Add fuzz test for screening and funding stage (#116)
prateek105 Jun 27, 2023
76ce84e
expand CS7 invariant check (#118)
MikeHathaway Jun 27, 2023
cf5e7f9
Merge branch 'main' of github.com:ajna-finance/ecosystem-coordination…
Jun 28, 2023
1446c5b
adjusted README
EdNoepel Jul 4, 2023
ef9ccfa
Merge pull request #122 from ajna-finance/deployment
EdNoepel Jul 4, 2023
545ab18
Fix make file spacing
prateek105 Jul 5, 2023
7e546ff
deploy BurnWrapper
EdNoepel Aug 1, 2023
dea251c
Merge pull request #123 from ajna-finance/burnwrapper-deployment
EdNoepel Aug 2, 2023
82bb87c
Add deployer contract to deploy grantfund, fund treasury and startNew…
prateek105 Aug 4, 2023
9732ea2
Add readme for deployer contract
prateek105 Aug 7, 2023
b8662da
Merge branch 'develop' into grantfund-deployer
prateek105 Aug 9, 2023
d50335b
PR feedback
prateek105 Aug 9, 2023
7d49734
Update unit test to improve test coverage (#126)
prateek105 Aug 16, 2023
42bb2ca
Add unit test for cycling voting delegation (#128)
prateek105 Aug 16, 2023
86bd09c
Add invariant scenario for multiple fund treasury (#129)
prateek105 Aug 16, 2023
92880a9
PR feedback
prateek105 Aug 18, 2023
0a7edb0
Merge pull request #125 from ajna-finance/grantfund-deployer
EdNoepel Oct 13, 2023
65be9c1
merge main
Oct 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,9 @@ deploy-grantfund:
eval AJNA_TOKEN=${ajna}
forge script script/GrantFund.s.sol:DeployGrantFund \
--rpc-url ${ETH_RPC_URL} --sender ${DEPLOY_ADDRESS} --keystore ${DEPLOY_KEY} --broadcast -vvv --verify
deploy-burnwrapper:
eval AJNA_TOKEN=${ajna}
forge script script/BurnWrapper.s.sol:DeployBurnWrapper \
--rpc-url ${ETH_RPC_URL} --sender ${DEPLOY_ADDRESS} --keystore ${DEPLOY_KEY} --broadcast -vvv --verify
deploy-grantfund-deployer:
forge create --rpc-url ${ETH_RPC_URL} --sender ${DEPLOY_ADDRESS} --keystore ${DEPLOY_KEY} --verify src/grants/Deployer.sol:Deployer
forge create --rpc-url ${ETH_RPC_URL} --keystore ${DEPLOY_KEY} --verify src/grants/Deployer.sol:Deployer
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@ make deploy-ajnatoken mintto=<MINT_TO_ADDRESS>
```
Record the address of the token upon deployment. See [AJNA_TOKEN.md](src/token/AJNA_TOKEN.md#deployment) for validation.

#### Burn Wrapper
To deploy, ensure the correct AJNA token address is specified in code. Then, run:
```
make deploy-burnwrapper ajna=<AJNA_TOKEN_ADDRESS>
```

#### Grant Fund
Deployment of the Grant Coordination Fund requires an argument to specify the address of the AJNA token. The deployment script also uses the token address to determine funding level.

Expand Down
20 changes: 20 additions & 0 deletions script/BurnWrapper.s.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;

import { Script } from "forge-std/Script.sol";
import { console } from "forge-std/console.sol";

import { BurnWrappedAjna } from "../src/token/BurnWrapper.sol";
import { IERC20 } from "@oz/token/ERC20/IERC20.sol";

contract DeployBurnWrapper is Script {
function run() public {
IERC20 ajna = IERC20(vm.envAddress("AJNA_TOKEN"));

vm.startBroadcast();
address wrapperAddress = address(new BurnWrappedAjna(ajna));
vm.stopBroadcast();

console.log("Created BurnWrapper at %s for AJNA token at %s", wrapperAddress, address(ajna));
}
}