Merge pull request #20 from j-h-scheufen/develop

Release to prod
Axe-DAO · Oct 20, 2024 · f616ac6 · f616ac6
2 parents b8a6fa8 + 402eb55
commit f616ac6
Show file tree

Hide file tree

Showing 277 changed files with 20,997 additions and 24,305 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,9 +15,9 @@ jobs:
     name: Contracts
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
           registry-url: https://registry.npmjs.org

diff --git a/.gitmodules b/.gitmodules
@@ -1,5 +1,5 @@
-[submodule "contracts/lib/forge-std"]
-	path = contracts/lib/forge-std
+[submodule "packages/contracts/lib/forge-std"]
+	path = packages/contracts/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
 [submodule "packages/contracts/lib/create3-factory"]
 	path = packages/contracts/lib/create3-factory

diff --git a/.yarn/releases/yarn-4.1.1.cjs b/.yarn/releases/yarn-4.1.1.cjs
diff --git a/.yarn/releases/yarn-4.5.0.cjs b/.yarn/releases/yarn-4.5.0.cjs
diff --git a/.yarnrc b/.yarnrc
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -1,3 +1,3 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.1.1.cjs
+yarnPath: .yarn/releases/yarn-4.5.0.cjs
diff --git a/=16.0.0 b/=16.0.0
diff --git a/=4.5.0 b/=4.5.0
diff --git a/=8.0.0 b/=8.0.0
diff --git a/=9.1.0 b/=9.1.0
diff --git a/packages/app/LICENSE → LICENSE b/packages/app/LICENSE → LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Next UI
+Copyright (c) 2024 Axé DAO
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,27 +1,11 @@
 # axedao
 
-Notes:
+Roadmap:
 
-- Consider a FAQ on www
-- Make a long-term roadmap:
-
-  - Build open registry and app for Capoeira groups and their members for fair token distribution.
-  - Build DAO capabilities to govern together for the good of Capoeira
-  - Build badge / NFT system for roles (graduados), events, collections
-  - Create revenue streams via liquidity provision
-  - Create revenue streams via NFT - AXÉ integration
-  - Create revenue streams via services (group management, payments, events, tickets / admission), services could be free in bundle for certain level of yearly DAO contribution (again, something the DAO can set via proposal).
-
-- Keep building base app (start proper coding: utils, state, contract function helpers, errors -> UI)
-- Launch website
-- Start asking around for more supporters? Dial up outreach
-- dao voting functions might be a huge incentive to join (power, inclusion, participation), but really only needed when there's money to spend
-
-Don't Forget:
-
-- Test XERC20
-- use "forge doc" to generate documentation
-- check all dependency licenses!!
+- Build badge / NFT system for roles (graduados), events, collections
+- Create revenue streams via liquidity provision
+- Create revenue streams via NFT - AXÉ integration
+- Create revenue streams via services (group management, payments, events, tickets / admission), services could be free in bundle for certain level of yearly DAO contribution (again, something the DAO can set via proposal).
 
 ## Local Development
 
@@ -159,9 +143,6 @@ Read the ETH balance of the AxeDeployer:
 cast balance -e --rpc-url http://localhost:8545 0x7e95A312E398431a26AC266B9215A7DddD5Ea60B
 ```
 
-Contracts on Sepolia:
-v2 Router: 0xB26B2De65D07eBB5E54C7F6282424D3be670E1f0
-
 Deploy MockERC20 and mint into treasury:
 
 ```shell
@@ -175,6 +156,6 @@ cast send 0xD44Eb94380bff68a827604fDb2dA7b0A3Ec6Ad0B "mint(address,uint256)" 0xE
 ### Sepolia
 
 AXESource: 0xaE8F6454fa13EbA1Be4ea60019d1bd34F9D04895
-MockERC20: 0xD44Eb94380bff68a827604fDb2dA7b0A3Ec6Ad0B
+axeUSD: 0xD44Eb94380bff68a827604fDb2dA7b0A3Ec6Ad0B
 UniswapV2Factory: 0xAB5db096E5d2d79434ADC48B8D34f878dD7Fa0b0
 UniswapV2Router02: 0xEF5aC450A41A39ef8A652C154318b3c8902ed86E