From 11c08ea7441765c0d83bf937f6ec9a29fa7bfbb5 Mon Sep 17 00:00:00 2001
From: Thrilok kumar <thrilok2000@gmail.com>
Date: Wed, 14 Jul 2021 19:17:55 +0530
Subject: [PATCH 1/2] Fixed instapool interface
---
contracts/mainnet/connectors/instapool_v2/interfaces.sol | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contracts/mainnet/connectors/instapool_v2/interfaces.sol b/contracts/mainnet/connectors/instapool_v2/interfaces.sol
index 506a2edb..dee5cc3d 100644
--- a/contracts/mainnet/connectors/instapool_v2/interfaces.sol
+++ b/contracts/mainnet/connectors/instapool_v2/interfaces.sol
@@ -2,10 +2,10 @@ pragma solidity >=0.7.0;
pragma experimental ABIEncoderV2;
interface InstaFlashV2Interface {
- function initiateFlashLoan(address[] calldata tokens, uint256[] calldata amts, uint route, bytes calldata data) external;
+ function initiateFlashLoan(address token, uint256 amt, uint route, bytes calldata data) external;
}
interface AccountInterface {
function enable(address) external;
function disable(address) external;
-}
\ No newline at end of file
+}
From 9fcd712d0e6dbcd5abfe833014ac31108f8e0a9f Mon Sep 17 00:00:00 2001
From: Aleksandr S <ardhead@gmail.com>
Date: Mon, 26 Jul 2021 18:59:54 +0300
Subject: [PATCH 2/2] check if public function is payable
---
status-checks/check.js | 40 +++++++++++++++++++++++++++++++++-------
1 file changed, 33 insertions(+), 7 deletions(-)
diff --git a/status-checks/check.js b/status-checks/check.js
index 8c9addbe..a76d81ae 100644
--- a/status-checks/check.js
+++ b/status-checks/check.js
@@ -180,10 +180,20 @@ const parseCode = async (connector) => {
func = []
}
}
- funcs = funcs
+ const allPublicFuncs = funcs
.filter(({ raw }) => {
- if ((raw.includes('external') || raw.includes('public')) &&
- raw.includes('returns')) {
+ return raw.includes('external') || raw.includes('public')
+ })
+ .map(f => {
+ const name = f.raw.split('(')[0].split('function')[1].trim()
+ return {
+ ...f,
+ name
+ }
+ })
+ funcs = allPublicFuncs
+ .filter(({ raw }) => {
+ if (raw.includes('returns')) {
const returns = raw.split('returns')[1].split('(')[1].split(')')[0]
return returns.includes('string') && returns.includes('bytes')
}
@@ -193,11 +203,9 @@ const parseCode = async (connector) => {
const args = f.raw.split('(')[1].split(')')[0].split(',')
.map(arg => arg.trim())
.filter(arg => arg !== '')
- const name = f.raw.split('(')[0].split('function')[1].trim()
return {
...f,
- args,
- name
+ args
}
})
const eventsPath = `${connector.path}/events.sol`
@@ -229,7 +237,8 @@ const parseCode = async (connector) => {
eventsFirstLines,
mainEvents,
mainEventsLines,
- funcs
+ funcs,
+ allPublicFuncs
}
} catch (error) {
return Promise.reject(error)
@@ -262,6 +271,21 @@ const checkComments = async (connector) => {
}
}
+const checkPublicFuncs = async (connector) => {
+ try {
+ const errors = []
+ for (let i1 = 0; i1 < connector.allPublicFuncs.length; i1++) {
+ const { raw, firstLine, name } = connector.allPublicFuncs[i1]
+ if (!raw.includes('payable')) {
+ errors.push(`public function ${name} is not payable at ${connector.path}/main.sol:${firstLine}`)
+ }
+ }
+ return errors
+ } catch (error) {
+ return Promise.reject(error)
+ }
+}
+
const checkName = async (connector) => {
try {
const strs = connector.code.split('\n')
@@ -313,12 +337,14 @@ async function checkMain () {
const commentsErrors = await checkComments(connectors[index])
const nameErrors = await checkName(connectors[index])
const headCommentsErrors = await checkHeadComments(connectors[index])
+ const publicFuncsErrors = await checkPublicFuncs(connectors[index])
errors.push(...forbiddenErrors)
errors.push(...eventsErrors)
errors.push(...commentsErrors)
errors.push(...nameErrors)
errors.push(...headCommentsErrors)
+ errors.push(...publicFuncsErrors)
warnings.push(...eventsWarnings)
}
if (errors.length) {