Fix gas reporting (#42)

* Gas reporting

* Fix

scripts/test-solidity.sh

@@ -8,8 +8,18 @@ cd ./solidity/optics-core
 npm run compile
 cd ../optics-xapps
 npm run compile
+
+cd ../../
+# copy artifacts
+cp -R ./solidity/optics-xapps/artifacts ./typescript/optics-tests
+cp -R ./solidity/optics-core/artifacts ./typescript/optics-tests
+
+# copy cache
+cp -R ./solidity/optics-xapps/cache ./typescript/optics-tests
+cp -R ./solidity/optics-core/cache ./typescript/optics-tests
+
 # run tests
-cd ../../typescript/optics-tests
+cd ./typescript/optics-tests
 npm i
 npm run testNoCompile
-cd ../..
+cd ../..

solidity/optics-core/hardhat.config.ts

@@ -1,4 +1,3 @@
-import "hardhat-gas-reporter";
 import "solidity-coverage";
 import "@typechain/hardhat";
 import "@nomiclabs/hardhat-etherscan";
@@ -35,10 +34,6 @@ module.exports = {
     },
   },
 
-  gasReporter: {
-    currency: "USD",
-  },
-
   networks: {
     localhost: {
       url: "http://localhost:8545",

solidity/optics-core/package.json

@@ -11,7 +11,6 @@
     "ethereum-waffle": "^3.2.2",
     "ethers": "^5.4.4",
     "hardhat": "^2.0.8",
-    "hardhat-gas-reporter": "^1.0.4",
     "prettier": "^2.2.1",
     "prettier-plugin-solidity": "^1.0.0-beta.5",
     "solhint": "^3.3.2",

solidity/optics-xapps/hardhat.config.ts

@@ -1,4 +1,3 @@
-import "hardhat-gas-reporter";
 import "solidity-coverage";
 import "@typechain/hardhat";
 import "@nomiclabs/hardhat-etherscan";
@@ -35,10 +34,6 @@ module.exports = {
     },
   },
 
-  gasReporter: {
-    currency: "USD",
-  },
-
   networks: {
     localhost: {
       url: "http://localhost:8545",

solidity/optics-xapps/package.json

@@ -12,7 +12,6 @@
     "ethereum-waffle": "^3.2.2",
     "ethers": "^5.4.4",
     "hardhat": "^2.0.8",
-    "hardhat-gas-reporter": "^1.0.4",
     "prettier": "^2.2.1",
     "prettier-plugin-solidity": "^1.0.0-beta.5",
     "solhint": "^3.3.2",

typescript/optics-tests/.gitignore

@@ -1,3 +1,4 @@
 node_modules
+artifacts
 cache
-dist/
+dist/

typescript/optics-tests/cache/solidity-files-cache.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-cache-2",
-  "files": {}
-}

typescript/optics-tests/hardhat.config.ts

@@ -1,9 +1,13 @@
 import './lib/index';
 import '@nomiclabs/hardhat-waffle';
+import "hardhat-gas-reporter";
 
 /**
  * @type import('hardhat/config').HardhatUserConfig
  */
 module.exports = {
   solidity: '0.7.6',
+  gasReporter: {
+    currency: "USD",
+  },
 };

typescript/optics-tests/package.json

@@ -18,6 +18,7 @@
   "dependencies": {
     "@types/node": "^15.14.7",
     "dotenv": "^10.0.0",
+    "hardhat-gas-reporter": "^1.0.7",
     "optics-deploy": "0.0.4",
     "optics-multi-provider-community": "^0.1.26",
     "optics-ts-interface": "^1.1.2"