certusone
/
wormhole
mirror of https://github.com/certusone/wormhole.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

CI should run prettier@2.3.2

This commit is contained in:
Kevin Peters 2023-07-25 12:00:15 -05:00 committed by kev1n-peters
parent 5c399cdb4f
commit a13e06c153
9 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -401,4 +401,4 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 16
- run: npx prettier --check ./clients/js/src ./sdk/js/src
- run: npx prettier@2.3.2 --check ./clients/js/src ./sdk/js/src

1
clients/js/.prettierrc.json
View File

@ -8,6 +8,5 @@
"jsxSingleQuote": false,
"trailingComma": "es5",
"bracketSpacing": true,
"bracketSameLine": false,
"arrowParens": "always"
}

4
clients/js/src/chains/sui/utils.ts
View File

@ -311,14 +311,14 @@ export const isSameType = (a: string, b: string) => {
export const isSuiCreateEvent = <
T extends NonNullable<SuiTransactionBlockResponse["objectChanges"]>[number],
K extends Extract<T, { type: "created" }>,
K extends Extract<T, { type: "created" }>
>(
event: T
): event is K => event?.type === "created";
export const isSuiPublishEvent = <
T extends NonNullable<SuiTransactionBlockResponse["objectChanges"]>[number],
K extends Extract<T, { type: "published" }>,
K extends Extract<T, { type: "published" }>
>(
event: T
): event is K => event?.type === "published";

5
clients/js/src/cmds/sui/setup.ts
View File

@ -123,8 +123,9 @@ export const addSetupCommands: YargsAddCommandsFn = (y: typeof yargs) =>
// Get token bridge state object ID
const tokenBridgeStateObjectId = getCreatedObjects(
tokenBridgeInitRes
).find((e) => isSameType(e.type, `${tokenBridgePackageId}::state::State`))
?.objectId;
).find((e) =>
isSameType(e.type, `${tokenBridgePackageId}::state::State`)
)?.objectId;
if (!tokenBridgeStateObjectId) {
throw new Error("Couldn't find token bridge state object ID.");
}

18
clients/js/src/vaa.ts
View File

@ -431,7 +431,7 @@ function serialiseCoreContractUpgrade(payload: CoreContractUpgrade): string {
}
export interface PortalContractUpgrade<
Module extends "NFTBridge" | "TokenBridge" | "WormholeRelayer",
Module extends "NFTBridge" | "TokenBridge" | "WormholeRelayer"
> {
module: Module;
type: "ContractUpgrade";
@ -441,7 +441,7 @@ export interface PortalContractUpgrade<
// Parse a portal contract upgrade payload
function portalContractUpgradeParser<
Module extends "NFTBridge" | "TokenBridge" | "WormholeRelayer",
Module extends "NFTBridge" | "TokenBridge" | "WormholeRelayer"
>(module: Module): P<PortalContractUpgrade<Module>> {
return new P(
new Parser()
@ -470,7 +470,7 @@ function portalContractUpgradeParser<
}
function serialisePortalContractUpgrade<
Module extends "NFTBridge" | "TokenBridge" | "WormholeRelayer",
Module extends "NFTBridge" | "TokenBridge" | "WormholeRelayer"
>(payload: PortalContractUpgrade<Module>): string {
const body = [
encode("bytes32", encodeString(payload.module)),
@ -485,7 +485,7 @@ function serialisePortalContractUpgrade<
// Registrations
export interface PortalRegisterChain<
Module extends "NFTBridge" | "TokenBridge" | "WormholeRelayer",
Module extends "NFTBridge" | "TokenBridge" | "WormholeRelayer"
> {
module: Module;
type: "RegisterChain";
@ -496,7 +496,7 @@ export interface PortalRegisterChain<
// Parse a portal chain registration payload
function portalRegisterChainParser<
Module extends "NFTBridge" | "TokenBridge" | "WormholeRelayer",
Module extends "NFTBridge" | "TokenBridge" | "WormholeRelayer"
>(module: Module): P<PortalRegisterChain<Module>> {
return new P(
new Parser()
@ -526,7 +526,7 @@ function portalRegisterChainParser<
}
function serialisePortalRegisterChain<
Module extends "NFTBridge" | "TokenBridge" | "WormholeRelayer",
Module extends "NFTBridge" | "TokenBridge" | "WormholeRelayer"
>(payload: PortalRegisterChain<Module>): string {
const body = [
encode("bytes32", encodeString(payload.module)),
@ -589,7 +589,7 @@ function serialiseCoreContractRecoverChainId(
}
export interface PortalContractRecoverChainId<
Module extends "NFTBridge" | "TokenBridge" | "WormholeRelayer",
Module extends "NFTBridge" | "TokenBridge" | "WormholeRelayer"
> {
module: Module;
type: "RecoverChainId";
@ -599,7 +599,7 @@ export interface PortalContractRecoverChainId<
// Parse a portal contract recoverChainId payload
function portalContractRecoverChainId<
Module extends "NFTBridge" | "TokenBridge" | "WormholeRelayer",
Module extends "NFTBridge" | "TokenBridge" | "WormholeRelayer"
>(module: Module): P<PortalContractRecoverChainId<Module>> {
return new P(
new Parser()
@ -628,7 +628,7 @@ function portalContractRecoverChainId<
}
function serialisePortalContractRecoverChainId<
Module extends "NFTBridge" | "TokenBridge" | "WormholeRelayer",
Module extends "NFTBridge" | "TokenBridge" | "WormholeRelayer"
>(payload: PortalContractRecoverChainId<Module>): string {
const body = [
encode("bytes32", encodeString(payload.module)),

1
sdk/js/.prettierrc.json
View File

@ -8,6 +8,5 @@
"jsxSingleQuote": false,
"trailingComma": "es5",
"bracketSpacing": true,
"bracketSameLine": false,
"arrowParens": "always"
}

2
sdk/js/src/relayer/relayer/send.ts
View File

@ -19,7 +19,7 @@ export type SendOptionalParams = {
chainId?: ChainId;
emitterAddress: string;
sequenceNumber: ethers.BigNumberish;
},
}
];
deliveryProviderAddress?: string;
wormholeRelayerAddress?: string;

20
sdk/js/src/utils/consts.ts
View File

@ -35,7 +35,7 @@ export const CHAINS = {
} as const;
export type ChainName = keyof typeof CHAINS;
export type ChainId = (typeof CHAINS)[ChainName];
export type ChainId = typeof CHAINS[ChainName];
/**
*
@ -61,7 +61,7 @@ export const EVMChainNames: ReadonlyArray<ChainName> = [
"base",
"sepolia",
] as const;
export type EVMChainName = (typeof EVMChainNames)[number];
export type EVMChainName = typeof EVMChainNames[number];
/*
*
@ -71,7 +71,7 @@ export const SolanaChainNames: ReadonlyArray<ChainName> = [
"solana",
"pythnet",
] as const;
export type SolanaChainName = (typeof SolanaChainNames)[number];
export type SolanaChainName = typeof SolanaChainNames[number];
export const CosmWasmChainNames: ReadonlyArray<ChainName> = [
"terra",
@ -80,14 +80,14 @@ export const CosmWasmChainNames: ReadonlyArray<ChainName> = [
"xpla",
"sei",
] as const;
export type CosmWasmChainName = (typeof CosmWasmChainNames)[number];
export type CosmWasmChainName = typeof CosmWasmChainNames[number];
// TODO: why? these are dupe of entries in CosmWasm
export const TerraChainNames: ReadonlyArray<ChainName> = [
"terra",
"terra2",
] as const;
export type TerraChainName = (typeof TerraChainNames)[number];
export type TerraChainName = typeof TerraChainNames[number];
export type Contracts = {
core: string | undefined;
@ -695,7 +695,7 @@ export const CHAIN_ID_SEPOLIA = CHAINS["sepolia"];
// This inverts the [[CHAINS]] object so that we can look up a chain by id
export type ChainIdToName = {
-readonly [key in keyof typeof CHAINS as (typeof CHAINS)[key]]: key;
-readonly [key in keyof typeof CHAINS as typeof CHAINS[key]]: key;
};
export const CHAIN_ID_TO_NAME: ChainIdToName = Object.entries(CHAINS).reduce(
(obj, [name, id]) => {
@ -709,21 +709,21 @@ export const CHAIN_ID_TO_NAME: ChainIdToName = Object.entries(CHAINS).reduce(
*
* All the EVM-based chain ids that Wormhole supports
*/
export type EVMChainId = (typeof CHAINS)[EVMChainName];
export type EVMChainId = typeof CHAINS[EVMChainName];
/**
*
* All the Solana-based chain ids that Wormhole supports
*/
export type SolanaChainId = (typeof CHAINS)[SolanaChainName];
export type SolanaChainId = typeof CHAINS[SolanaChainName];
/**
*
* All the CosmWasm-based chain ids that Wormhole supports
*/
export type CosmWasmChainId = (typeof CHAINS)[CosmWasmChainName];
export type CosmWasmChainId = typeof CHAINS[CosmWasmChainName];
export type TerraChainId = (typeof CHAINS)[TerraChainName];
export type TerraChainId = typeof CHAINS[TerraChainName];
/**
*
* Returns true when called with a valid chain, and narrows the type in the

10
sdk/js/src/vaa/generic.ts
View File

@ -384,7 +384,7 @@ function serialiseCoreContractUpgrade(payload: CoreContractUpgrade): string {
}
export interface PortalContractUpgrade<
Module extends "NFTBridge" | "TokenBridge",
Module extends "NFTBridge" | "TokenBridge"
> {
module: Module;
type: "ContractUpgrade";
@ -394,7 +394,7 @@ export interface PortalContractUpgrade<
// Parse a portal contract upgrade payload
function portalContractUpgradeParser<
Module extends "NFTBridge" | "TokenBridge",
Module extends "NFTBridge" | "TokenBridge"
>(module: Module): P<PortalContractUpgrade<Module>> {
return new P(
new Parser()
@ -423,7 +423,7 @@ function portalContractUpgradeParser<
}
function serialisePortalContractUpgrade<
Module extends "NFTBridge" | "TokenBridge",
Module extends "NFTBridge" | "TokenBridge"
>(payload: PortalContractUpgrade<Module>): string {
const body = [
encode("bytes32", encodeString(payload.module)),
@ -438,7 +438,7 @@ function serialisePortalContractUpgrade<
// Registrations
export interface PortalRegisterChain<
Module extends "NFTBridge" | "TokenBridge",
Module extends "NFTBridge" | "TokenBridge"
> {
module: Module;
type: "RegisterChain";
@ -479,7 +479,7 @@ function portalRegisterChainParser<Module extends "NFTBridge" | "TokenBridge">(
}
function serialisePortalRegisterChain<
Module extends "NFTBridge" | "TokenBridge",
Module extends "NFTBridge" | "TokenBridge"
>(payload: PortalRegisterChain<Module>): string {
const body = [
encode("bytes32", encodeString(payload.module)),