From ac10627a3524bdd6d2719026497fd37c8d00d25b Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Tue, 25 Feb 2020 21:36:44 -0800 Subject: [PATCH] fix(metering): bump default combined meter for autoswap compatibility --- packages/spawner/src/contractHost.js | 2 +- packages/transform-metering/src/constants.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/spawner/src/contractHost.js b/packages/spawner/src/contractHost.js index 66de2f51ec7..97abccd53a1 100644 --- a/packages/spawner/src/contractHost.js +++ b/packages/spawner/src/contractHost.js @@ -169,7 +169,7 @@ function makeContractHost(E, evaluate, additionalEndowments = {}) { } else { assert.fail(details`Unrecognized moduleFormat ${moduleFormat}`); } - + return Promise.resolve(allComparable(termsP)).then(terms => { const inviteMaker = harden({ // Used by the contract to make invites for credibly diff --git a/packages/transform-metering/src/constants.js b/packages/transform-metering/src/constants.js index 442fda7069b..4e276e86aa8 100644 --- a/packages/transform-metering/src/constants.js +++ b/packages/transform-metering/src/constants.js @@ -9,7 +9,7 @@ export const DEFAULT_REGEXP_ID_PREFIX = '$h\u200d_re_'; // Default metering values. These can easily be overridden in meter.js. // true means to use the combined meter. // undefined means not to meter. -export const DEFAULT_COMBINED_METER = 1e6; +export const DEFAULT_COMBINED_METER = 1e7; export const DEFAULT_ALLOCATE_METER = true; export const DEFAULT_COMPUTE_METER = true; export const DEFAULT_STACK_METER = 8000;