From 903e6508bb330076b62374fb59cdad767d8ab431 Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Tue, 9 Jul 2024 02:07:55 -0600 Subject: [PATCH 1/2] fix: adopt `VTRANSFER_IBC_EVENT` as an action-type --- packages/boot/test/bootstrapTests/vtransfer.test.ts | 3 ++- packages/cosmic-swingset/src/launch-chain.js | 5 +++++ packages/internal/src/action-types.js | 1 + packages/internal/src/config.js | 2 -- packages/vats/src/proposals/transfer-proposal.js | 3 ++- packages/vats/src/transfer.js | 2 +- packages/vats/test/localchain.test.js | 3 ++- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/packages/boot/test/bootstrapTests/vtransfer.test.ts b/packages/boot/test/bootstrapTests/vtransfer.test.ts index 887cf349e4a..5e6221a2e14 100644 --- a/packages/boot/test/bootstrapTests/vtransfer.test.ts +++ b/packages/boot/test/bootstrapTests/vtransfer.test.ts @@ -6,7 +6,8 @@ import type { TestFn } from 'ava'; import type { ScopedBridgeManager } from '@agoric/vats'; import type { TransferMiddleware } from '@agoric/vats/src/transfer.js'; import type { TransferVat } from '@agoric/vats/src/vat-transfer.js'; -import { BridgeId, VTRANSFER_IBC_EVENT } from '@agoric/internal'; +import { BridgeId } from '@agoric/internal'; +import { VTRANSFER_IBC_EVENT } from '@agoric/internal/src/action-types.js'; import { makeSwingsetTestKit } from '../../tools/supports.ts'; const makeDefaultTestContext = async t => { diff --git a/packages/cosmic-swingset/src/launch-chain.js b/packages/cosmic-swingset/src/launch-chain.js index 26b3b855884..430b531d1cf 100644 --- a/packages/cosmic-swingset/src/launch-chain.js +++ b/packages/cosmic-swingset/src/launch-chain.js @@ -581,6 +581,11 @@ export async function launch({ break; } + case ActionType.VTRANSFER_IBC_EVENT: { + p = doBridgeInbound(BRIDGE_ID.VTRANSFER, action, inboundNum); + break; + } + case ActionType.PLEASE_PROVISION: { p = doBridgeInbound(BRIDGE_ID.PROVISION, action, inboundNum); break; diff --git a/packages/internal/src/action-types.js b/packages/internal/src/action-types.js index a7dec994dff..f07a3fd5592 100644 --- a/packages/internal/src/action-types.js +++ b/packages/internal/src/action-types.js @@ -15,3 +15,4 @@ export const VBANK_BALANCE_UPDATE = 'VBANK_BALANCE_UPDATE'; export const WALLET_ACTION = 'WALLET_ACTION'; export const WALLET_SPEND_ACTION = 'WALLET_SPEND_ACTION'; export const INSTALL_BUNDLE = 'INSTALL_BUNDLE'; +export const VTRANSFER_IBC_EVENT = 'VTRANSFER_IBC_EVENT'; diff --git a/packages/internal/src/config.js b/packages/internal/src/config.js index 5e9ce91c9bd..cb4201f75ae 100644 --- a/packages/internal/src/config.js +++ b/packages/internal/src/config.js @@ -30,8 +30,6 @@ export const BridgeId = /** @type {const} */ ({ harden(BridgeId); /** @typedef {(typeof BridgeId)[keyof typeof BridgeId]} BridgeIdValue */ -export const VTRANSFER_IBC_EVENT = 'VTRANSFER_IBC_EVENT'; - export const CosmosInitKeyToBridgeId = { vbankPort: BridgeId.BANK, vibcPort: BridgeId.DIBC, diff --git a/packages/vats/src/proposals/transfer-proposal.js b/packages/vats/src/proposals/transfer-proposal.js index 25bdfaa8877..7e6cfea000b 100644 --- a/packages/vats/src/proposals/transfer-proposal.js +++ b/packages/vats/src/proposals/transfer-proposal.js @@ -1,6 +1,7 @@ // @ts-check import { E } from '@endo/far'; -import { BridgeId as BRIDGE_ID, VTRANSFER_IBC_EVENT } from '@agoric/internal'; +import { BridgeId as BRIDGE_ID } from '@agoric/internal'; +import { VTRANSFER_IBC_EVENT } from '@agoric/internal/src/action-types.js'; import { makeScopedBridge } from '../bridge.js'; /** diff --git a/packages/vats/src/transfer.js b/packages/vats/src/transfer.js index 5df07f7aadc..244b8e50de6 100644 --- a/packages/vats/src/transfer.js +++ b/packages/vats/src/transfer.js @@ -2,7 +2,7 @@ import { Fail, b } from '@endo/errors'; import { E } from '@endo/far'; import { M } from '@endo/patterns'; -import { VTRANSFER_IBC_EVENT } from '@agoric/internal'; +import { VTRANSFER_IBC_EVENT } from '@agoric/internal/src/action-types.js'; import { coerceToByteSource, byteSourceToBase64 } from '@agoric/network'; import { TargetAppI, AppTransformerI } from './bridge-target.js'; diff --git a/packages/vats/test/localchain.test.js b/packages/vats/test/localchain.test.js index f2aaf5cf361..f8ea6048d1d 100644 --- a/packages/vats/test/localchain.test.js +++ b/packages/vats/test/localchain.test.js @@ -1,12 +1,13 @@ // @ts-check import { test as anyTest } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js'; -import { NonNullish, VTRANSFER_IBC_EVENT } from '@agoric/internal'; +import { NonNullish } from '@agoric/internal'; import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp'; import { reincarnate } from '@agoric/swingset-liveslots/tools/setup-vat-data.js'; import { withAmountUtils } from '@agoric/zoe/tools/test-utils.js'; import { makeDurableZone } from '@agoric/zone/durable.js'; import { getInterfaceOf } from '@endo/marshal'; +import { VTRANSFER_IBC_EVENT } from '@agoric/internal/src/action-types.js'; import { prepareVowTools, heapVowE as E } from '@agoric/vow/vat.js'; import { prepareLocalChainTools } from '../src/localchain.js'; import { prepareBridgeTargetModule } from '../src/bridge-target.js'; From 526a5cfb0b0cd43a29d225790929d624f568740a Mon Sep 17 00:00:00 2001 From: 0xPatrick Date: Tue, 9 Jul 2024 09:33:54 -0400 Subject: [PATCH 2/2] fixup! fix: adopt `VTRANSFER_IBC_EVENT` as an action-type --- packages/orchestration/test/supports.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/orchestration/test/supports.ts b/packages/orchestration/test/supports.ts index d69a98ec4b1..bd7e01737d3 100644 --- a/packages/orchestration/test/supports.ts +++ b/packages/orchestration/test/supports.ts @@ -1,5 +1,5 @@ import { makeIssuerKit } from '@agoric/ertp'; -import { VTRANSFER_IBC_EVENT } from '@agoric/internal'; +import { VTRANSFER_IBC_EVENT } from '@agoric/internal/src/action-types.js'; import { makeFakeStorageKit } from '@agoric/internal/src/storage-test-utils.js'; import { prepareLocalChainTools } from '@agoric/vats/src/localchain.js'; import { prepareBridgeTargetModule } from '@agoric/vats/src/bridge-target.js';