Merge pull request #1 from GenerationSoftware/gen-821-port-twab-rewar…

…ds-contract-over-to-v5 Port TwabRewards contract over to v5
GenerationSoftware · Nov 3, 2023 · 682d2c2 · 682d2c2
2 parents be5137c + 40eea17
commit 682d2c2
Show file tree

Hide file tree

Showing 17 changed files with 1,516 additions and 77 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,11 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-	branch = v1.3.0
+	branch = v1
+[submodule "lib/pt-v5-twab-controller"]
+	path = lib/pt-v5-twab-controller
+	url = https://github.com/GenerationSoftware/pt-v5-twab-controller
+[submodule "lib/openzeppelin-contracts"]
+	path = lib/openzeppelin-contracts
+	url = https://github.com/openzeppelin/openzeppelin-contracts
+	branch = release-v4.9
diff --git a/.prettierrc b/.prettierrc
@@ -4,7 +4,7 @@
     {
       "files": "*.sol",
       "options": {
-        "compiler": "0.8.21",
+        "compiler": "0.8.19",
         "bracketSpacing": true,
         "printWidth": 120,
         "tabWidth": 4

diff --git a/.solhint.json b/.solhint.json
@@ -3,7 +3,7 @@
   "plugins": ["prettier"],
   "rules": {
     "avoid-low-level-calls": "off",
-    "compiler-version": ["error", "0.8.21"],
+    "compiler-version": ["error", "0.8.19"],
     "func-visibility": "off",
     "no-empty-blocks": "off",
     "no-inline-assembly": "off"

diff --git a/foundry.toml b/foundry.toml
@@ -3,7 +3,7 @@ src = 'src'
 out = 'out'
 test = 'test'
 libs = ['lib']
-solc = "0.8.21"
+solc = "0.8.19"
 fs_permissions = [{ access = "read", path = "./broadcast" }]
 gas_reports = ["Foo"]
 

diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/pt-v5-twab-controller b/lib/pt-v5-twab-controller
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,14 +1,14 @@
 {
-  "name": "@pooltogether/foundry-template",
+  "name": "@generationsoftware/pt-v5-twab-rewards",
   "version": "1.0.0",
-  "description": "Template to kickstart a Foundry project",
+  "description": "PoolTogether V5 TWAB Rewards Contract",
   "author": {
-    "name": "PoolTogether Inc.",
-    "url": "https://github.com/pooltogether"
+    "name": "G9 Software Inc.",
+    "url": "https://github.com/GenerationSoftware"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/pooltogether/foundry-template.git"
+    "url": "git+https://github.com/GenerationSoftware/pt-v5-twab-rewards.git"
   },
   "scripts": {
     "clean": "forge clean",

diff --git a/remappings.txt b/remappings.txt
@@ -1,3 +1,4 @@
 ds-test/=lib/forge-std/lib/ds-test/src/
 forge-std/=lib/forge-std/src/
-src/=src/
+openzeppelin-contracts/=lib/openzeppelin-contracts/contracts/
+pt-v5-twab-controller/=lib/pt-v5-twab-controller/src/
diff --git a/script/Foo.s.sol b/script/Foo.s.sol
diff --git a/src/Foo.sol b/src/Foo.sol