resolving merge conflicts

.github/workflows/status.yml

@@ -6,7 +6,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    permissions: 
+    permissions:
       contents: write
     strategy:
       matrix:
@@ -32,6 +32,7 @@ jobs:
       - name: Run status checks
         id: status_check
         run: |
+          mkdir -p pr
           # Run status checks, Remove ANSI colors from the text
           output=$(ts-node ./status-checks/index.ts | sed 's/\x1B\[[0-9;]\{1,\}[A-Za-z]//g')
           # Escape newlines so _all_ the output is included in the set-output

contracts/mainnet/connectors/sushi-incentive/main.sol

@@ -20,6 +20,7 @@ abstract contract SushipswapIncentiveResolver is Helpers, Events {
 	 * @param amount amount of LP token
 	 * @param getId ID to retrieve amount
 	 * @param setId ID stores Pool ID
+	 * @param data the metadata struct
 	 */
 	function deposit(
 		address token1,
@@ -66,6 +67,7 @@ abstract contract SushipswapIncentiveResolver is Helpers, Events {
 	 * @param amount amount of LP token
 	 * @param getId ID to retrieve amount
 	 * @param setId ID stores Pool ID
+	 * @param data the metadata struct
 	 */
 	function withdraw(
 		address token1,
@@ -104,6 +106,7 @@ abstract contract SushipswapIncentiveResolver is Helpers, Events {
 	 * @param token1 token1 deposited of LP token
 	 * @param token2 token2 deposited LP token
 	 * @param setId ID stores Pool ID
+	 * @param data the metadata struct
 	 */
 	function harvest(
 		address token1,
@@ -143,6 +146,7 @@ abstract contract SushipswapIncentiveResolver is Helpers, Events {
 	 * @param amount amount of LP token
 	 * @param getId ID to retrieve amount
 	 * @param setId ID stores Pool ID
+	 * @param data the metadata struct
 	 */
 	function withdrawAndHarvest(
 		address token1,
@@ -183,6 +187,7 @@ abstract contract SushipswapIncentiveResolver is Helpers, Events {
 	 * @param token1 token1 deposited of LP token
 	 * @param token2 token2 deposited LP token
 	 * @param setId ID stores Pool ID
+	 * @param data the metadata struct
 	 */
 	function emergencyWithdraw(
 		address token1,

status-checks/index.ts

@@ -3,7 +3,7 @@ import fetch from "node-fetch";
 
 import checks from "./checks";
 
-const [owner, repo] = process.env.GITHUB_REPOSITORY.split("/");
+const [owner, repo] = String(process.env.GITHUB_REPOSITORY).split("/");
 
 function getCurrentCommitSha() {
   return cp
@@ -46,7 +46,7 @@ async function setStatus(context: any, state: string, description: string) {
       try {
         const response = await callback();
         await setStatus(name, "success", response);
-      } catch (err) {
+      } catch (err: any) {
         const message = err ? err.message : "Something went wrong";
         await setStatus(name, "failure", message);
       }

tsconfig.json

@@ -21,6 +21,7 @@
     "tasks/**/*",
     "test/**/*",
     "typechain/**/*",
-    "types/**/*"
+    "types/**/*",
+    "status-checks/*"
   ]
 }