Merge pull request #141 from BreadchainCoop/feat-lp-locking

Feat lp locking
BreadchainCoop · Dec 2, 2024 · ec26082 · ec26082
2 parents 4463c12 + 060f2a2
commit ec26082
Show file tree

Hide file tree

Showing 93 changed files with 5,011 additions and 2,022 deletions.
diff --git a/bread.theme.ts b/bread.theme.ts
@@ -10,6 +10,7 @@ const colors = {
     "og-dark": "#2E2E2E",
     charcoal: "#242424",
     darkest: "#272727",
+    pitchblack: "#181818",
     "cta-bg": "#2c2c2c",
     grey300: "#222222",
     grey200: "#1c1c1c",
@@ -23,6 +24,7 @@ const colors = {
     300: "#E873D3",
     400: "#A416AD",
     500: "#D04EC5",
+    600: "#F5E8F6",
   },
   status: {
     danger: "#D8745C",

diff --git a/contracts/script/Deploy.s.sol b/contracts/script/Deploy.s.sol
@@ -23,7 +23,7 @@ contract Deploy is Script {
     // Distributor Config
     address _bread = address(0xa555d5344f6FB6c65da19e403Cb4c1eC4a1a5Ee3);
     uint256 _minRequiredVotingPower = 5;
-    uint256 _cycleLength = 518400;
+    uint256 _cycleLength = 60;
     uint256 _maxPoints = 10000;
     uint256 _precision = 1000000000000000000;
     uint256 _yieldFixedSplitDivisor = 2;

diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "serve": "serve out",
     "deploy": "npm install -g [email protected] && pnpm install --prod=true --frozen-lockfile && pnpm run build",
     "chain:start": "anvil --fork-url https://rpc.gnosis.gateway.fm --chain-id 31337 --block-time 5",
-    "chain:setup": "tsx scripts/setup.ts && cd contracts && forge script script/Deploy.s.sol:Deploy --broadcast --rpc-url http://localhost:8545 --private-key 0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6 --legacy",
+    "chain:setup": "NODE_ENV=development tsx scripts/setupPreDeploy.ts && cd contracts && forge script script/Deploy.s.sol:Deploy --broadcast --rpc-url http://localhost:8545 --private-key 0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6 --legacy && cd .. && NODE_ENV=development tsx scripts/setupPostDeploy.ts",
     "lint": "next lint",
     "find-deadcode": "ts-prune | grep -v '(used in module)'"
   },

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/public/wxdai_bread_lp_icon.png b/public/wxdai_bread_lp_icon.png
diff --git a/public/wxdai_icon.png b/public/wxdai_icon.png
diff --git a/scripts/bakeDevBread.ts b/scripts/bakeDevBread.ts
diff --git a/scripts/checkYield.ts b/scripts/checkYield.ts
diff --git a/scripts/createCheckpoint.ts b/scripts/createCheckpoint.ts
diff --git a/scripts/fundWallet.js b/scripts/fundWallet.js
diff --git a/scripts/getDistributions.ts b/scripts/getDistributions.ts