From 81060d5ed5d4d417307666ef00e10f1e39b5bc96 Mon Sep 17 00:00:00 2001
From: Thrilok Kumar <thrilok2000@gmail.com>
Date: Fri, 18 Mar 2022 15:04:28 +0400
Subject: [PATCH 1/2] fixed Aave v2-to-v3 minor fix
---
contracts/avalanche/connectors/aave/v2-to-v3-import/main.sol | 2 +-
contracts/polygon/connectors/aave/v2-to-v3-import/main.sol | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contracts/avalanche/connectors/aave/v2-to-v3-import/main.sol b/contracts/avalanche/connectors/aave/v2-to-v3-import/main.sol
index 24fa0cdf..d8fc54bc 100644
--- a/contracts/avalanche/connectors/aave/v2-to-v3-import/main.sol
+++ b/contracts/avalanche/connectors/aave/v2-to-v3-import/main.sol
@@ -143,7 +143,7 @@ contract _AaveV2ToV3MigrationResolver is _AaveHelper {
payable
returns (string memory _eventName, bytes memory _eventParam)
{
- (_eventName, _eventParam) = _importAave(msg.sender, inputData, false);
+ (_eventName, _eventParam) = _importAave(address(this), inputData, false);
}
}
diff --git a/contracts/polygon/connectors/aave/v2-to-v3-import/main.sol b/contracts/polygon/connectors/aave/v2-to-v3-import/main.sol
index 06a7d43b..44f738c2 100644
--- a/contracts/polygon/connectors/aave/v2-to-v3-import/main.sol
+++ b/contracts/polygon/connectors/aave/v2-to-v3-import/main.sol
@@ -151,7 +151,7 @@ contract _AaveV2ToV3MigrationResolver is _AaveHelper {
payable
returns (string memory _eventName, bytes memory _eventParam)
{
- (_eventName, _eventParam) = _importAave(msg.sender, inputData, false);
+ (_eventName, _eventParam) = _importAave(address(this), inputData, false);
}
}
From ed3fdab7ac26324b53f8f49339a8d3e37c70636d Mon Sep 17 00:00:00 2001
From: pradyuman-verma <pradyumnverma27@gmail.com>
Date: Sat, 19 Mar 2022 12:55:39 +0530
Subject: [PATCH 2/2] lint fix
---
.../avalanche/connectors/aave/v2-to-v3-import/main.sol | 6 +++++-
contracts/polygon/connectors/aave/v2-to-v3-import/main.sol | 6 +++++-
hardhat.config.ts | 6 +++---
package.json | 2 +-
4 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/contracts/avalanche/connectors/aave/v2-to-v3-import/main.sol b/contracts/avalanche/connectors/aave/v2-to-v3-import/main.sol
index d8fc54bc..c9b992b6 100644
--- a/contracts/avalanche/connectors/aave/v2-to-v3-import/main.sol
+++ b/contracts/avalanche/connectors/aave/v2-to-v3-import/main.sol
@@ -143,7 +143,11 @@ contract _AaveV2ToV3MigrationResolver is _AaveHelper {
payable
returns (string memory _eventName, bytes memory _eventParam)
{
- (_eventName, _eventParam) = _importAave(address(this), inputData, false);
+ (_eventName, _eventParam) = _importAave(
+ address(this),
+ inputData,
+ false
+ );
}
}
diff --git a/contracts/polygon/connectors/aave/v2-to-v3-import/main.sol b/contracts/polygon/connectors/aave/v2-to-v3-import/main.sol
index 44f738c2..e4915292 100644
--- a/contracts/polygon/connectors/aave/v2-to-v3-import/main.sol
+++ b/contracts/polygon/connectors/aave/v2-to-v3-import/main.sol
@@ -151,7 +151,11 @@ contract _AaveV2ToV3MigrationResolver is _AaveHelper {
payable
returns (string memory _eventName, bytes memory _eventParam)
{
- (_eventName, _eventParam) = _importAave(address(this), inputData, false);
+ (_eventName, _eventParam) = _importAave(
+ address(this),
+ inputData,
+ false
+ );
}
}
diff --git a/hardhat.config.ts b/hardhat.config.ts
index 9b7e4eb6..a9ee4f9b 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -52,8 +52,8 @@ const networkGasPriceConfig: Record<string, string> = {
function createConfig(network: string) {
return {
url: getNetworkUrl(network),
- accounts: !!PRIVATE_KEY ? [`0x${PRIVATE_KEY}`] : { mnemonic }
- // gasPrice: 1000000, // 0.0001 GWEI
+ accounts: !!PRIVATE_KEY ? [`0x${PRIVATE_KEY}`] : { mnemonic },
+ gasPrice: 35 * 1e9 // 0.0001 GWEI
};
}
@@ -126,7 +126,7 @@ const config: HardhatUserConfig = {
tests: "./test"
},
etherscan: {
- apiKey: getScanApiKey(String(process.env.networkType))
+ apiKey: "CZ1YB396AX4XAQ489Y4NJ33SJBCYZZD1VS"
},
typechain: {
outDir: "typechain",
diff --git a/package.json b/package.json
index 0deaf533..84f57114 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
"chalk": "^5.0.0",
"dotenv": "^10.0.0",
"hardhat-docgen": "^1.2.0",
- "inquirer": "^8.2.0",
+ "inquirer": "^8.2.0",
"minimist": "^1.2.5",
"solc": "^0.8.10",
"typechain": "^6.0.5"