diff --git a/packages/governance/src/contractGovernor.js b/packages/governance/src/contractGovernor.js index a6b7afd5ef30..a2a89cccb8b5 100644 --- a/packages/governance/src/contractGovernor.js +++ b/packages/governance/src/contractGovernor.js @@ -317,6 +317,8 @@ const start = async (zcf, privateArgs) => { }); const publicFacet = Far('contract governor public', { + // BEFOREMERGE is this okay? why not? + ...governedPF, getElectorate: getElectorateInstance, getGovernedContract: () => governedInstance, validateVoteCounter, diff --git a/packages/inter-protocol/test/smartWallet/test-oracle-integration.js b/packages/inter-protocol/test/smartWallet/test-oracle-integration.js index d2defd54b44f..e39795c62820 100644 --- a/packages/inter-protocol/test/smartWallet/test-oracle-integration.js +++ b/packages/inter-protocol/test/smartWallet/test-oracle-integration.js @@ -242,9 +242,7 @@ test.serial('admin price', async t => { // trigger an aggregation (POLL_INTERVAL=1n in context) await E(manualTimer).tickN(1); - const paPublicFacet = await E( - E(zoe).getPublicFacet(governedPriceAggregator), - ).getGovernedContract(); + const paPublicFacet = E(zoe).getPublicFacet(governedPriceAggregator); const latestRoundSubscriber = await E(paPublicFacet).getRoundStartNotifier(); diff --git a/packages/smart-wallet/src/invitations.js b/packages/smart-wallet/src/invitations.js index db06c1bf3a06..24a00aec8b81 100644 --- a/packages/smart-wallet/src/invitations.js +++ b/packages/smart-wallet/src/invitations.js @@ -72,9 +72,12 @@ export const makeInvitationsHelper = ( const purseAmount = await E(invitationsPurse).getCurrentAmount(); const invitations = AmountMath.getValue(invitationBrand, purseAmount); + console.log('DEBUG searching invitations', invitations, 'for', instance); + const matches = invitations.filter( - details => - description === details.description && instance === details.instance, + details => description === details.description, + // FIXME DONOTMERGE instance isn't matching + // && instance === details.instance, ); if (matches.length === 0) { // look up diagnostic info