Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump Express to v5 #10310

Merged
merged 6 commits into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion multichain-testing/test/account-balance-queries.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { TestFn } from 'ava';
import type { CosmosChainInfo } from '@agoric/orchestration';
import {
commonSetup,
SetupContextWithWallets,
type SetupContextWithWallets,
chainConfig,
} from './support.js';
import { makeDoOffer } from '../tools/e2e-tools.js';
Expand Down
2 changes: 1 addition & 1 deletion multichain-testing/test/basic-flows.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { TestFn } from 'ava';
import { makeDoOffer } from '../tools/e2e-tools.js';
import {
commonSetup,
SetupContextWithWallets,
type SetupContextWithWallets,
chainConfig,
} from './support.js';

Expand Down
2 changes: 1 addition & 1 deletion multichain-testing/test/chain-queries.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { toRequestQueryJson, typedJson } from '@agoric/cosmic-proto';
import { decodeBase64 } from '@endo/base64';
import {
commonSetup,
SetupContextWithWallets,
type SetupContextWithWallets,
chainConfig,
FAUCET_POUR,
} from './support.js';
Expand Down
2 changes: 1 addition & 1 deletion multichain-testing/test/deposit-withdraw-lca.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { TestFn } from 'ava';
import { AmountMath } from '@agoric/ertp';
import { makeDoOffer } from '../tools/e2e-tools.js';
import { makeQueryClient } from '../tools/query.js';
import { commonSetup, SetupContextWithWallets } from './support.js';
import { commonSetup, type SetupContextWithWallets } from './support.js';

const test = anyTest as TestFn<SetupContextWithWallets>;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { TestFn } from 'ava';
import { AmountMath } from '@agoric/ertp';
import { makeDoOffer } from '../tools/e2e-tools.js';
import { makeQueryClient } from '../tools/query.js';
import { commonSetup, SetupContextWithWallets } from './support.js';
import { commonSetup, type SetupContextWithWallets } from './support.js';

const test = anyTest as TestFn<SetupContextWithWallets>;

Expand Down
2 changes: 1 addition & 1 deletion multichain-testing/test/ica-channel-close.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type { IBCChannelID, IBCPortID } from '@agoric/vats';
import { makeDoOffer } from '../tools/e2e-tools.js';
import {
commonSetup,
SetupContextWithWallets,
type SetupContextWithWallets,
chainConfig,
} from './support.js';
import { makeQueryClient } from '../tools/query.js';
Expand Down
2 changes: 1 addition & 1 deletion multichain-testing/test/send-anywhere.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { TestFn } from 'ava';
import { makeDoOffer } from '../tools/e2e-tools.js';
import {
commonSetup,
SetupContextWithWallets,
type SetupContextWithWallets,
chainConfig,
} from './support.js';
import { createWallet } from '../tools/wallet.js';
Expand Down
2 changes: 1 addition & 1 deletion multichain-testing/test/smart-wallet.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import anyTest from '@endo/ses-ava/prepare-endo.js';
import type { TestFn } from 'ava';
import { makeQueryClient } from '../tools/query.js';
import { commonSetup, SetupContextWithWallets } from './support.js';
import { commonSetup, type SetupContextWithWallets } from './support.js';

const test = anyTest as TestFn<SetupContextWithWallets>;

Expand Down
2 changes: 1 addition & 1 deletion multichain-testing/test/stake-ica.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import anyTest from '@endo/ses-ava/prepare-endo.js';
import type { TestFn } from 'ava';
import {
commonSetup,
SetupContextWithWallets,
type SetupContextWithWallets,
FAUCET_POUR,
} from './support.js';
import { makeDoOffer } from '../tools/e2e-tools.js';
Expand Down
2 changes: 1 addition & 1 deletion multichain-testing/tools/deploy.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/** @file run a builder and deploy it onto the Agoric chain in local Starship cluster */
import { createRequire } from 'module';
import { AgdTools } from './agd-tools.js';
import type { AgdTools } from './agd-tools.js';
import type { CoreEvalPlan } from '@agoric/deploy-script-support/src/writeCoreEvalParts.js';

const nodeRequire = createRequire(import.meta.url);
Expand Down
2 changes: 1 addition & 1 deletion multichain-testing/tools/ibc-transfer.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ExecutionContext } from 'ava';
import type { ExecutionContext } from 'ava';
import type { StdFee } from '@cosmjs/amino';
import { coins } from '@cosmjs/proto-signing';
import { SigningStargateClient } from '@cosmjs/stargate';
Expand Down
2 changes: 1 addition & 1 deletion multichain-testing/tools/query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import type { QueryDelegatorDelegationsResponseSDKType } from '@agoric/cosmic-pr
import type { QueryDelegatorUnbondingDelegationsResponseSDKType } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/query.js';
import type { QueryDenomHashResponseSDKType } from '@agoric/cosmic-proto/ibc/applications/transfer/v1/query.js';
import type { QueryChannelResponseSDKType } from '@agoric/cosmic-proto/ibc/core/channel/v1/query.js';
import { QueryChannelsResponseSDKType } from '@agoric/cosmic-proto/ibc/core/channel/v1/query.js';
import type { QueryChannelsResponseSDKType } from '@agoric/cosmic-proto/ibc/core/channel/v1/query.js';

// TODO use telescope generated query client from @agoric/cosmic-proto
// https://github.com/Agoric/agoric-sdk/issues/9200
Expand Down
2 changes: 1 addition & 1 deletion packages/casting/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@endo/ses-ava": "^1.2.6",
"ava": "^5.3.0",
"c8": "^9.1.0",
"express": "^4.17.1",
"express": "^5.0.1",
"ws": "^7.2.0"
},
"publishConfig": {
Expand Down
4 changes: 2 additions & 2 deletions packages/solo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"license": "Apache-2.0",
"dependencies": {
"@agoric/access-token": "^0.4.21",
"@endo/errors": "^1.2.6",
"@agoric/cache": "^0.3.2",
"@agoric/cosmic-swingset": "^0.41.3",
"@agoric/internal": "^0.3.2",
Expand All @@ -37,6 +36,7 @@
"@agoric/vats": "^0.15.1",
"@agoric/wallet": "^0.18.3",
"@endo/captp": "^4.4.0",
"@endo/errors": "^1.2.6",
"@endo/eventual-send": "^1.2.6",
"@endo/import-bundle": "^1.3.0",
"@endo/init": "^1.1.5",
Expand All @@ -45,7 +45,7 @@
"anylogger": "^0.21.0",
"deterministic-json": "^1.0.5",
"esm": "agoric-labs/esm#Agoric-built",
"express": "^4.17.1",
"express": "^5.0.1",
"http-proxy-middleware": "^2.0.6",
"import-meta-resolve": "^2.2.1",
"minimist": "^1.2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/solo/src/web.js
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ export async function makeHTTPListener(
app.use('/wallet', express.static(walletHtmlDir));

// Default non-bridge GETs to /wallet/index.html for history routing.
app.get('/wallet/*', (_, res) =>
app.get('/wallet/:slug', (_, res) =>
res.sendFile(path.resolve(walletHtmlDir, 'index.html')),
);
}
Expand Down Expand Up @@ -218,7 +218,7 @@ export async function makeHTTPListener(
};

// accept POST messages as commands.
app.post('*', async (req, res) => {
app.post(':path', async (req, res) => {
const valid = await validateAccessToken(req);
if (!valid) {
res.json({ ok: false, rej: 'Unauthorized' });
Expand Down
28 changes: 0 additions & 28 deletions patches/express+4.21.0.patch

This file was deleted.

Loading
Loading