update lib, fix license & tests

GenerationSoftware · Oct 17, 2023 · fc7fa18 · fc7fa18
1 parent e9bdfd2
commit fc7fa18
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -29,6 +29,13 @@ jobs:
           forge build --sizes
         id: build
 
+      - name: Run Forge test
+        env:
+          MAINNET_RPC_URL: ${{ secrets.MAINNET_RPC_URL }}
+        run: |
+          forge test
+        id: test
+
       - name: Install lcov
         uses: hrishikesh-kadam/setup-lcov@v1.0.0
 

diff --git a/.gitmodules b/.gitmodules
@@ -13,12 +13,12 @@
 [submodule "lib/ring-buffer-lib"]
 	path = lib/ring-buffer-lib
 	url = https://github.com/GenerationSoftware/ring-buffer-lib
-	branch = prod-testnet-2
+	branch = prod-testnet-3
 [submodule "lib/uniform-random-number"]
 	path = lib/uniform-random-number
 	url = https://github.com/generationsoftware/uniform-random-number
-	branch = prod-testnet-2
+	branch = prod-testnet-3
 [submodule "lib/pt-v5-twab-controller"]
 	path = lib/pt-v5-twab-controller
 	url = https://github.com/generationsoftware/pt-v5-twab-controller
-	branch = prod-testnet-2
+	branch = prod-testnet-3
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Generation Software
+Copyright (c) 2023 G9 Software Inc.
 
 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/package.json b/package.json
@@ -1,14 +1,14 @@
 {
-  "name": "@pooltogether/foundry-template",
+  "name": "@generationsoftware/pt-v5-prize-pool",
   "version": "1.0.0",
-  "description": "Template to kickstart a Foundry project",
+  "description": "PoolTogether V5 Prize Pool Contracts",
   "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-prize-pool.git"
   },
   "scripts": {
     "clean": "forge clean",
@@ -34,4 +34,4 @@
     "src/**",
     "out/**"
   ]
-}
+}
diff --git a/test/PrizePool.t.sol b/test/PrizePool.t.sol
@@ -76,7 +76,7 @@ contract PrizePoolTest is Test {
 
     prizeToken = new ERC20Mintable("PoolTogether POOL token", "POOL");
     drawPeriodSeconds = 1 days;
-    twabController = new TwabController(drawPeriodSeconds, uint32(block.timestamp));
+    twabController = new TwabController(uint32(drawPeriodSeconds), uint32(block.timestamp));
 
     firstDrawOpensAt = uint48(block.timestamp + 1 days); // set draw start 1 day into future
     initialNumberOfTiers = 3;

diff --git a/test/invariants/helpers/PrizePoolFuzzHarness.sol b/test/invariants/helpers/PrizePoolFuzzHarness.sol
@@ -37,7 +37,7 @@ contract PrizePoolFuzzHarness is CommonBase, StdCheats {
 
     token = new ERC20Mintable("name", "SYMBOL");
     TwabController twabController = new TwabController(
-      drawPeriodSeconds,
+      uint32(drawPeriodSeconds),
       uint32(awardDrawStartsAt)
     );
     // arbitrary mint