Merge pull request #48 from bcnmy/features/SMA-328-clean-up

3# Features/sma 328 clean up
bcnmy · Nov 10, 2023 · c9fce4c · c9fce4c
2 parents 1fd6af4 + 117155a
commit c9fce4c
Show file tree

Hide file tree

Showing 24 changed files with 62 additions and 311 deletions.
diff --git a/contracts/test/helpers/MockChainlinkAggregator.sol b/contracts/test/helpers/MockChainlinkAggregator.sol
@@ -16,7 +16,6 @@ contract MockChainlinkOracleAggregator is Ownable, IOracleAggregator {
      a price of $100.50 might be represented as 100500000000 in the contract, with 9 decimal places 
      of precision */
         uint8 decimals;
-        // uint8 tokenDecimals;
         bool dataSigned;
         address callAddress;
         bytes callData;
@@ -96,20 +95,14 @@ contract MockChainlinkOracleAggregator is Ownable, IOracleAggregator {
 
     // Making explicit revert or make use of stale price feed which reverts
     // like done in below function and the test case
-    /*function _getTokenPrice(
-        address token
-    ) internal view returns (uint256 tokenPriceUnadjusted) {
-        bool success = false;
-        require(success, "ChainlinkOracleAggregator:: query failed");
-    }*/
 
     function _getTokenPrice(
         address token
     ) internal view returns (uint256 tokenPriceUnadjusted) {
         (bool success, bytes memory ret) = tokensInfo[token]
             .callAddress
             .staticcall(tokensInfo[token].callData);
-        console.log("price feed reverted here? success = %s ", success);
+
         require(success, "ChainlinkOracleAggregator:: query failed");
         if (tokensInfo[token].dataSigned) {
             tokenPriceUnadjusted = uint256(abi.decode(ret, (int256)));

diff --git a/package.json b/package.json
@@ -19,6 +19,7 @@
     "lint:sol": "yarn solhint 'contracts/**/*.sol'",
     "lint:sol-fix": "yarn prettier 'contracts/**/*.sol' --write && yarn solhint 'contracts/**/*.sol' --fix",
     "lint:fix": "yarn lint:ts-fix && yarn lint:sol-fix",
+    "secret": "echo -e '\u001b[31m⚠️ WARNING: This script is intended for development use only. The generated .secret file is NOT SAFE for production environments.\u001b[0m' && echo 'primary twist rack vendor diagram image used route theme frown either will' > .abc",
     "postinstall": "husky install",
     "prepack": "pinst --disable && ./scripts/prepack-contracts.sh",
     "postpack": "pinst --enable && ./scripts/postpack-contracts.sh",

diff --git a/scripts/deploy-arbitrum-goerli.ts b/scripts/deploy-arbitrum-goerli.ts
@@ -85,7 +85,6 @@ async function deployChainlinkOracleAggregatorContract(
       });
     } catch (err) {
       console.log("issue with the verification ", oracleAggregatorComputedAddr);
-      // console.log(err);
       return oracleAggregatorComputedAddr;
     }
   } else {
@@ -147,7 +146,6 @@ async function deployTokenPaymasterContract(
       });
     } catch (err) {
       console.log("issue with the verification ", tokenPaymasterComputedAddr);
-      // console.log(err);
       return tokenPaymasterComputedAddr;
     }
   } else {
@@ -217,7 +215,6 @@ async function deployDerivedPriceFeed(
         "issue with the verification ",
         derivedPriceFeedBComputedAddr
       );
-      // console.log(err);
       return derivedPriceFeedBComputedAddr;
     }
   } else {
@@ -468,10 +465,6 @@ async function main() {
     console.log(
       "==================tokenPaymasterInstance======================="
     );
-
-    // tx = await tokenPaymasterInstance.transferOwnership(owner)
-    // receipt = await tx.wait()
-    // console.log("tokenPaymasterInstance ownership transferred to %s", owner);
   }
 }
 

diff --git a/scripts/deploy-arbitrum-one-mainnet.ts b/scripts/deploy-arbitrum-one-mainnet.ts
@@ -88,7 +88,7 @@ async function deployChainlinkOracleAggregatorContract(
       });
     } catch (err) {
       console.log("issue with the verification ", oracleAggregatorComputedAddr);
-      // console.log(err);
+
       return oracleAggregatorComputedAddr;
     }
   } else {
@@ -150,7 +150,7 @@ async function deployTokenPaymasterContract(
       });
     } catch (err) {
       console.log("issue with the verification ", tokenPaymasterComputedAddr);
-      // console.log(err);
+
       return tokenPaymasterComputedAddr;
     }
   } else {
@@ -220,7 +220,7 @@ async function deployDerivedPriceFeed(
         "issue with the verification ",
         derivedPriceFeedBComputedAddr
       );
-      // console.log(err);
+
       return derivedPriceFeedBComputedAddr;
     }
   } else {
@@ -476,9 +476,7 @@ async function main() {
       "==================tokenPaymasterInstance======================="
     );
 
-    // tx = await tokenPaymasterInstance.transferOwnership(owner)
-    // receipt = await tx.wait()
-    // console.log("tokenPaymasterInstance ownership transferred to %s", owner);
+
   }
 }
 

diff --git a/scripts/deploy-avalanche-mainnet.ts b/scripts/deploy-avalanche-mainnet.ts
@@ -88,7 +88,7 @@ async function deployChainlinkOracleAggregatorContract(
       });
     } catch (err) {
       console.log("issue with the verification ", oracleAggregatorComputedAddr);
-      // console.log(err);
+
       return oracleAggregatorComputedAddr;
     }
   } else {
@@ -150,7 +150,7 @@ async function deployTokenPaymasterContract(
       });
     } catch (err) {
       console.log("issue with the verification ", tokenPaymasterComputedAddr);
-      // console.log(err);
+
       return tokenPaymasterComputedAddr;
     }
   } else {
@@ -220,7 +220,7 @@ async function deployDerivedPriceFeed(
         "issue with the verification ",
         derivedPriceFeedBComputedAddr
       );
-      // console.log(err);
+
       return derivedPriceFeedBComputedAddr;
     }
   } else {
@@ -473,9 +473,7 @@ async function main() {
       "==================tokenPaymasterInstance======================="
     );
 
-    // tx = await tokenPaymasterInstance.transferOwnership(owner)
-    // receipt = await tx.wait()
-    // console.log("tokenPaymasterInstance ownership transferred to %s", owner);
+
   }
 }
 

diff --git a/scripts/deploy-avalanche-testnet.ts b/scripts/deploy-avalanche-testnet.ts
@@ -88,7 +88,7 @@ async function deployChainlinkOracleAggregatorContract(
       });
     } catch (err) {
       console.log("issue with the verification ", oracleAggregatorComputedAddr);
-      // console.log(err);
+
       return oracleAggregatorComputedAddr;
     }
   } else {
@@ -150,7 +150,7 @@ async function deployTokenPaymasterContract(
       });
     } catch (err) {
       console.log("issue with the verification ", tokenPaymasterComputedAddr);
-      // console.log(err);
+
       return tokenPaymasterComputedAddr;
     }
   } else {
@@ -220,7 +220,7 @@ async function deployDerivedPriceFeed(
         "issue with the verification ",
         derivedPriceFeedBComputedAddr
       );
-      // console.log(err);
+
       return derivedPriceFeedBComputedAddr;
     }
   } else {
@@ -473,9 +473,7 @@ async function main() {
       "==================tokenPaymasterInstance======================="
     );
 
-    // tx = await tokenPaymasterInstance.transferOwnership(owner)
-    // receipt = await tx.wait()
-    // console.log("tokenPaymasterInstance ownership transferred to %s", owner);
+
   }
 }
 

diff --git a/scripts/deploy-base-goerli.ts b/scripts/deploy-base-goerli.ts
@@ -88,7 +88,7 @@ async function deployChainlinkOracleAggregatorContract(
       });
     } catch (err) {
       console.log("issue with the verification ", oracleAggregatorComputedAddr);
-      // console.log(err);
+
       return oracleAggregatorComputedAddr;
     }
   } else {
@@ -150,7 +150,7 @@ async function deployTokenPaymasterContract(
       });
     } catch (err) {
       console.log("issue with the verification ", tokenPaymasterComputedAddr);
-      // console.log(err);
+
       return tokenPaymasterComputedAddr;
     }
   } else {
@@ -220,7 +220,7 @@ async function deployDerivedPriceFeed(
         "issue with the verification ",
         derivedPriceFeedBComputedAddr
       );
-      // console.log(err);
+
       return derivedPriceFeedBComputedAddr;
     }
   } else {
@@ -473,9 +473,7 @@ async function main() {
       "==================tokenPaymasterInstance======================="
     );
 
-    // tx = await tokenPaymasterInstance.transferOwnership(owner)
-    // receipt = await tx.wait()
-    // console.log("tokenPaymasterInstance ownership transferred to %s", owner);
+
   }
 }
 

diff --git a/scripts/deploy-bnb-mainnet.ts b/scripts/deploy-bnb-mainnet.ts
@@ -88,7 +88,7 @@ async function deployChainlinkOracleAggregatorContract(
       });
     } catch (err) {
       console.log("issue with the verification ", oracleAggregatorComputedAddr);
-      // console.log(err);
+
       return oracleAggregatorComputedAddr;
     }
   } else {
@@ -150,7 +150,7 @@ async function deployTokenPaymasterContract(
       });
     } catch (err) {
       console.log("issue with the verification ", tokenPaymasterComputedAddr);
-      // console.log(err);
+
       return tokenPaymasterComputedAddr;
     }
   } else {
@@ -220,7 +220,7 @@ async function deployDerivedPriceFeed(
         "issue with the verification ",
         derivedPriceFeedBComputedAddr
       );
-      // console.log(err);
+
       return derivedPriceFeedBComputedAddr;
     }
   } else {
@@ -476,9 +476,7 @@ async function main() {
       "==================tokenPaymasterInstance======================="
     );
 
-    // tx = await tokenPaymasterInstance.transferOwnership(owner)
-    // receipt = await tx.wait()
-    // console.log("tokenPaymasterInstance ownership transferred to %s", owner);
+
   }
 }
 

diff --git a/scripts/deploy-bnb-testnet.ts b/scripts/deploy-bnb-testnet.ts
@@ -88,7 +88,7 @@ async function deployChainlinkOracleAggregatorContract(
       });
     } catch (err) {
       console.log("issue with the verification ", oracleAggregatorComputedAddr);
-      // console.log(err);
+
       return oracleAggregatorComputedAddr;
     }
   } else {
@@ -150,7 +150,7 @@ async function deployTokenPaymasterContract(
       });
     } catch (err) {
       console.log("issue with the verification ", tokenPaymasterComputedAddr);
-      // console.log(err);
+
       return tokenPaymasterComputedAddr;
     }
   } else {
@@ -220,7 +220,7 @@ async function deployDerivedPriceFeed(
         "issue with the verification ",
         derivedPriceFeedBComputedAddr
       );
-      // console.log(err);
+
       return derivedPriceFeedBComputedAddr;
     }
   } else {
@@ -473,9 +473,7 @@ async function main() {
       "==================tokenPaymasterInstance======================="
     );
 
-    // tx = await tokenPaymasterInstance.transferOwnership(owner)
-    // receipt = await tx.wait()
-    // console.log("tokenPaymasterInstance ownership transferred to %s", owner);
+
   }
 }
 

diff --git a/scripts/deploy-eth-mainnet.ts b/scripts/deploy-eth-mainnet.ts
@@ -88,7 +88,7 @@ async function deployChainlinkOracleAggregatorContract(
       });
     } catch (err) {
       console.log("issue with the verification ", oracleAggregatorComputedAddr);
-      // console.log(err);
+
       return oracleAggregatorComputedAddr;
     }
   } else {
@@ -150,7 +150,7 @@ async function deployTokenPaymasterContract(
       });
     } catch (err) {
       console.log("issue with the verification ", tokenPaymasterComputedAddr);
-      // console.log(err);
+
       return tokenPaymasterComputedAddr;
     }
   } else {
@@ -220,7 +220,7 @@ async function deployDerivedPriceFeed(
         "issue with the verification ",
         derivedPriceFeedBComputedAddr
       );
-      // console.log(err);
+
       return derivedPriceFeedBComputedAddr;
     }
   } else {
@@ -470,9 +470,7 @@ async function main() {
       "==================tokenPaymasterInstance======================="
     );
 
-    // tx = await tokenPaymasterInstance.transferOwnership(owner)
-    // receipt = await tx.wait()
-    // console.log("tokenPaymasterInstance ownership transferred to %s", owner);
+
   }
 }
 

diff --git a/scripts/deploy-goerli.ts b/scripts/deploy-goerli.ts
@@ -88,7 +88,7 @@ async function deployChainlinkOracleAggregatorContract(
       });
     } catch (err) {
       console.log("issue with the verification ", oracleAggregatorComputedAddr);
-      // console.log(err);
+
       return oracleAggregatorComputedAddr;
     }
   } else {
@@ -150,7 +150,7 @@ async function deployTokenPaymasterContract(
       });
     } catch (err) {
       console.log("issue with the verification ", tokenPaymasterComputedAddr);
-      // console.log(err);
+
       return tokenPaymasterComputedAddr;
     }
   } else {
@@ -220,7 +220,7 @@ async function deployDerivedPriceFeed(
         "issue with the verification ",
         derivedPriceFeedBComputedAddr
       );
-      // console.log(err);
+
       return derivedPriceFeedBComputedAddr;
     }
   } else {
@@ -473,9 +473,7 @@ async function main() {
       "==================tokenPaymasterInstance======================="
     );
 
-    // tx = await tokenPaymasterInstance.transferOwnership(owner)
-    // receipt = await tx.wait()
-    // console.log("tokenPaymasterInstance ownership transferred to %s", owner);
+
   }
 }