From 5571cf187e5577773efc21f567c8b0849194fe72 Mon Sep 17 00:00:00 2001
From: Richa-iitr <richa@cs.iitr.ac.in>
Date: Fri, 2 Sep 2022 19:51:56 +0530
Subject: [PATCH] require statements format

---
 .../connectors/compound/v3/helpers.sol        | 12 ++++--
 .../mainnet/connectors/compound/v3/main.sol   | 39 ++++++++++++-------
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/contracts/mainnet/connectors/compound/v3/helpers.sol b/contracts/mainnet/connectors/compound/v3/helpers.sol
index ad83fdf8..62a9251a 100644
--- a/contracts/mainnet/connectors/compound/v3/helpers.sol
+++ b/contracts/mainnet/connectors/compound/v3/helpers.sol
@@ -58,8 +58,10 @@ abstract contract Helpers is DSMath, Basic {
 		uint256 amt_ = getUint(params.getId, params.amt);
 
 		require(
-			params.market != address(0) && params.token != address(0),
-			"invalid market/token address"
+			params.market != address(0) &&
+				params.token != address(0) &&
+				params.to != address(0),
+			"invalid market/token/to address"
 		);
 		bool isEth = params.token == ethAddr;
 		address token_ = isEth ? wethAddr : params.token;
@@ -99,8 +101,10 @@ abstract contract Helpers is DSMath, Basic {
 		uint256 amt_ = getUint(params.getId, params.amt);
 
 		require(
-			params.market != address(0) && params.token != address(0),
-			"invalid market/token address"
+			params.market != address(0) &&
+				params.token != address(0) &&
+				params.to != address(0),
+			"invalid market/token/to address"
 		);
 
 		bool isEth = params.token == ethAddr;
diff --git a/contracts/mainnet/connectors/compound/v3/main.sol b/contracts/mainnet/connectors/compound/v3/main.sol
index f3b5727f..5ea5e4de 100644
--- a/contracts/mainnet/connectors/compound/v3/main.sol
+++ b/contracts/mainnet/connectors/compound/v3/main.sol
@@ -93,10 +93,9 @@ abstract contract CompoundV3Resolver is Events, Helpers {
 		uint256 amt_ = getUint(getId, amt);
 
 		require(
-			market != address(0) && token != address(0),
-			"invalid market/token address"
+			market != address(0) && token != address(0) && to != address(0),
+			"invalid market/token/to address"
 		);
-		require(to != address(0), "invalid to address");
 
 		bool isEth = token == ethAddr;
 		address token_ = isEth ? wethAddr : token;
@@ -154,10 +153,9 @@ abstract contract CompoundV3Resolver is Events, Helpers {
 		uint256 amt_ = getUint(getId, amt);
 
 		require(
-			market != address(0) && token != address(0),
-			"invalid market/token address"
+			market != address(0) && token != address(0) && to != address(0),
+			"invalid market/token/to address"
 		);
-		require(to != address(0), "invalid to address");
 
 		bool isEth = token == ethAddr;
 		address token_ = isEth ? wethAddr : token;
@@ -482,7 +480,10 @@ abstract contract CompoundV3Resolver is Events, Helpers {
 		returns (string memory eventName_, bytes memory eventParam_)
 	{
 		uint256 amt_ = getUint(getId, amt);
-		require(market != address(0), "invalid market address");
+		require(
+			market != address(0) && token != address(0),
+			"invalid market/token address"
+		);
 
 		bool isEth = token == ethAddr;
 		address token_ = getBaseToken(market);
@@ -534,7 +535,10 @@ abstract contract CompoundV3Resolver is Events, Helpers {
 		returns (string memory eventName_, bytes memory eventParam_)
 	{
 		uint256 amt_ = getUint(getId, amt);
-		require(market != address(0), "invalid market address");
+		require(
+			market != address(0) && token != address(0) && to != address(0),
+			"invalid market/token/to address"
+		);
 
 		address token_ = getBaseToken(market);
 		bool isEth = token == ethAddr;
@@ -587,7 +591,10 @@ abstract contract CompoundV3Resolver is Events, Helpers {
 		returns (string memory eventName_, bytes memory eventParam_)
 	{
 		uint256 amt_ = getUint(getId, amt);
-		require(market != address(0), "invalid market address");
+		require(
+			market != address(0) && token != address(0) && to != address(0),
+			"invalid market/token/to address"
+		);
 
 		address token_ = getBaseToken(market);
 		bool isEth = token == ethAddr;
@@ -637,6 +644,10 @@ abstract contract CompoundV3Resolver is Events, Helpers {
 		returns (string memory eventName_, bytes memory eventParam_)
 	{
 		uint256 amt_ = getUint(getId, baseAmt);
+		require(
+			market != address(0) && asset != address(0) && dest != address(0),
+			"invalid market/token/to address"
+		);
 
 		bool isEth = asset == ethAddr;
 		address token_ = isEth ? wethAddr : asset;
@@ -691,8 +702,8 @@ abstract contract CompoundV3Resolver is Events, Helpers {
 	{
 		uint256 amt_ = getUint(getId, amount);
 		require(
-			market != address(0) && token != address(0),
-			"invalid market address"
+			market != address(0) && token != address(0) && dest != address(0),
+			"invalid market/token/to address"
 		);
 
 		bool isEth = token == ethAddr;
@@ -744,8 +755,10 @@ abstract contract CompoundV3Resolver is Events, Helpers {
 		returns (string memory eventName_, bytes memory eventParam_)
 	{
 		uint256 amt_ = getUint(getId, amount);
-		require(market != address(0), "invalid market address");
-		require(dest != address(0), "invalid destination address");
+		require(
+			market != address(0) && token != address(0) && dest != address(0),
+			"invalid market/token/to address"
+		);
 
 		bool isEth = token == ethAddr;
 		address token_ = isEth ? wethAddr : token;