Upgrade to contract-loader 0.6.1.rc-0, add new config options

nventuro · nventuro · commit 943d74d628ea · 2020-01-17T19:50:02.000-03:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -71,7 +71,7 @@
     "typescript": "^3.6.2"
   },
   "dependencies": {
-    "@openzeppelin/contract-loader": "^0.5.0",
+    "@openzeppelin/contract-loader": "^0.6.1-rc.0",
     "@truffle/contract": "^4.0.38",
     "ansi-colors": "^4.1.1",
     "ethereumjs-wallet": "^0.6.3",
diff --git a/src/config.ts b/src/config.ts
@@ -11,7 +11,7 @@ const CONFIG_FILE = 'test-environment.config.js';
 
 type Config = {
   accounts: { amount: number; ether: number };
-  contracts: { type: string; defaultGas: number };
+  contracts: { type: string; defaultGas: number, defaultGasPrice: number, artifactsDir: string, };
   blockGasLimit: number;
   gasPrice: number;
   setupProvider: (baseProvider: Provider) => Promise<Provider>;
@@ -29,6 +29,8 @@ const defaultConfig: Config = {
   contracts: {
     type: 'truffle',
     defaultGas: DEFAULT_BLOCK_GAS_LIMIT * 0.75,
+    defaultGasPrice: 20e9, // 20 gigawei
+    artifactsDir: 'build/contracts',
   },
 
   blockGasLimit: DEFAULT_BLOCK_GAS_LIMIT,
@@ -61,6 +63,7 @@ function getConfig(): Config {
 
     config.blockGasLimit = 0xfffffffffffff;
     config.contracts.defaultGas = config.blockGasLimit * 0.75;
+    config.contracts.defaultGasPrice = 1;
     config.gasPrice = 1;
   }
 
diff --git a/src/setup-loader.ts b/src/setup-loader.ts
@@ -9,7 +9,9 @@ if (config.contracts.type !== 'truffle' && config.contracts.type !== 'web3') {
 }
 
 export default setupLoader({
+  provider,
   defaultSender,
   defaultGas: config.contracts.defaultGas,
-  provider,
+  defaultGasPrice: config.contracts.defaultGasPrice,
+  artifactsDir: config.contracts.artifactsDir,
 })[config.contracts.type];
