refactor(governance/xc_admin): rename package names to be consistent (#1606)

* refactor(governance/xc_admin): rename xc_admin_common package name
* refactor(governance/xc_admin): rename xc_admin_cli package name
* refactor(governance/xc_admin): rename xc_admin_frontend package name
* refactor(governance/xc_admin): rename crank_executor package name
* refactor(governance/xc_admin): rename crank_pythnet_executor package name
* refactor(governance/xc_admin): rename proposer_server package name
* fix(governance/xc_admin): prettify the files

contract_manager/scripts/check_proposal.ts

@@ -11,7 +11,7 @@ import {
   getProposalInstructions,
   MultisigParser,
   WormholeMultisigInstruction,
-} from "xc_admin_common";
+} from "@pythnetwork/xc-admin-common";
 import SquadsMesh from "@sqds/mesh";
 import {
   getPythClusterApiUrl,

contract_manager/scripts/execute_vaas.ts

@@ -3,7 +3,7 @@ import { hideBin } from "yargs/helpers";
 import { DefaultStore } from "../src/store";
 import { SubmittedWormholeMessage, Vault } from "../src/governance";
 import { parseVaa } from "@certusone/wormhole-sdk";
-import { decodeGovernancePayload } from "xc_admin_common";
+import { decodeGovernancePayload } from "@pythnetwork/xc-admin-common";
 import { executeVaa } from "../src/executor";
 import { toPrivateKey } from "../src";
 

contract_manager/scripts/sync_governance_vaas.ts

@@ -3,7 +3,7 @@ import { hideBin } from "yargs/helpers";
 import { DefaultStore } from "../src/store";
 import { SubmittedWormholeMessage, Vault } from "../src/governance";
 import { parseVaa } from "@certusone/wormhole-sdk";
-import { decodeGovernancePayload } from "xc_admin_common";
+import { decodeGovernancePayload } from "@pythnetwork/xc-admin-common";
 import { toPrivateKey } from "../src";
 
 const parser = yargs(hideBin(process.argv))

contract_manager/src/base.ts

@@ -1,4 +1,4 @@
-import { DataSource } from "xc_admin_common";
+import { DataSource } from "@pythnetwork/xc-admin-common";
 import { Chain } from "./chains";
 
 export interface TxResult {

contract_manager/src/chains.ts

@@ -10,7 +10,7 @@ import {
   DataSource,
   EvmSetWormholeAddress,
   UpgradeContract256Bit,
-} from "xc_admin_common";
+} from "@pythnetwork/xc-admin-common";
 import { AptosClient, AptosAccount, CoinClient, TxnBuilderTypes } from "aptos";
 import Web3 from "web3";
 import {
@@ -52,7 +52,7 @@ export abstract class Chain extends Storable {
     if (toChainId(this.wormholeChainName) === undefined)
       throw new Error(
         `Invalid chain name ${wormholeChainName}.
-        Try rebuilding xc_admin_common: npx lerna run build --scope xc_admin_common`
+        Try rebuilding @pythnetwork/xc-admin-common: npx lerna run build --scope @pythnetwork/xc-admin-common`
       );
   }
 

contract_manager/src/contracts/aptos.ts

@@ -1,7 +1,7 @@
 import { PriceFeedContract, PriceFeed, PrivateKey, TxResult } from "../base";
 import { ApiError, BCS, CoinClient, TxnBuilderTypes } from "aptos";
 import { AptosChain, Chain } from "../chains";
-import { DataSource } from "xc_admin_common";
+import { DataSource } from "@pythnetwork/xc-admin-common";
 import { WormholeContract } from "./wormhole";
 import { TokenQty } from "../token";
 

contract_manager/src/contracts/cosmwasm.ts

@@ -8,7 +8,7 @@ import {
   PythWrapperQuerier,
 } from "@pythnetwork/cosmwasm-deploy-tools";
 import { Coin } from "@cosmjs/stargate";
-import { DataSource } from "xc_admin_common";
+import { DataSource } from "@pythnetwork/xc-admin-common";
 import { CosmWasmClient } from "@cosmjs/cosmwasm-stargate";
 import {
   PriceFeedContract,

contract_manager/src/contracts/evm.ts

@@ -3,7 +3,7 @@ import PythInterfaceAbi from "@pythnetwork/pyth-sdk-solidity/abis/IPyth.json";
 import EntropyAbi from "@pythnetwork/entropy-sdk-solidity/abis/IEntropy.json";
 import { PriceFeedContract, PrivateKey, Storable } from "../base";
 import { Chain, EvmChain } from "../chains";
-import { DataSource, EvmExecute } from "xc_admin_common";
+import { DataSource, EvmExecute } from "@pythnetwork/xc-admin-common";
 import { WormholeContract } from "./wormhole";
 import { TokenQty } from "../token";
 

contract_manager/src/contracts/sui.ts

@@ -1,5 +1,5 @@
 import { Chain, SuiChain } from "../chains";
-import { DataSource } from "xc_admin_common";
+import { DataSource } from "@pythnetwork/xc-admin-common";
 import { PriceFeedContract, PrivateKey, TxResult } from "../base";
 import { SuiPythClient } from "@pythnetwork/pyth-sui-js";
 import { SUI_CLOCK_OBJECT_ID } from "@mysten/sui.js/utils";

contract_manager/src/executor.ts

@@ -3,7 +3,7 @@ import {
   DataSource,
   EvmExecute,
   decodeGovernancePayload,
-} from "xc_admin_common";
+} from "@pythnetwork/xc-admin-common";
 import { DefaultStore } from "./store";
 import { PrivateKey, TxResult } from "./base";
 import { EvmExecutorContract } from "./contracts";

contract_manager/src/governance.ts

@@ -25,7 +25,7 @@ import {
   MultisigVault,
   WORMHOLE_ADDRESS,
   WORMHOLE_API_ENDPOINT,
-} from "xc_admin_common";
+} from "@pythnetwork/xc-admin-common";
 import {
   createWormholeProgramInterface,
   deriveEmitterSequenceKey,

governance/xc_admin/Dockerfile

@@ -11,7 +11,7 @@ COPY --chown=1000:1000 governance/xc_admin governance/xc_admin
 COPY --chown=1000:1000 pythnet/message_buffer pythnet/message_buffer
 COPY --chown=1000:1000 price_service/sdk/js price_service/sdk/js
 
-RUN npx lerna run build --scope="{crank_executor,crank_pythnet_relayer,proposer_server}" --include-dependencies
+RUN npx lerna run build --scope="{@pythnetwork/xc-admin-crank-executor,@pythnetwork/xc-admin-crank-pythnet-relayer,@pythnetwork/xc-admin-proposer-server}" --include-dependencies
 
 WORKDIR /home/node/governance/xc_admin
 

governance/xc_admin/packages/crank_executor/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "crank_executor",
+  "name": "@pythnetwork/xc-admin-crank-executor",
   "version": "0.0.0",
   "description": "A crank to executed all executeReady multisig transaction",
   "private": "true",
@@ -25,6 +25,6 @@
     "@solana/web3.js": "^1.73.0",
     "@sqds/mesh": "^1.0.6",
     "ts-node": "^10.9.1",
-    "xc_admin_common": "*"
+    "@pythnetwork/xc-admin-common": "*"
   }
 }

governance/xc_admin/packages/crank_executor/src/index.ts

@@ -2,7 +2,11 @@ import { Commitment, Connection, Keypair, PublicKey } from "@solana/web3.js";
 import SquadsMesh, { DEFAULT_MULTISIG_PROGRAM_ID } from "@sqds/mesh";
 import * as fs from "fs";
 import NodeWallet from "@project-serum/anchor/dist/cjs/nodewallet";
-import { envOrErr, executeProposal, getProposals } from "xc_admin_common";
+import {
+  envOrErr,
+  executeProposal,
+  getProposals,
+} from "@pythnetwork/xc-admin-common";
 import {
   getPythClusterApiUrl,
   PythCluster,

governance/xc_admin/packages/crank_pythnet_relayer/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "crank_pythnet_relayer",
+  "name": "@pythnetwork/xc-admin-crank-pythnet-relayer",
   "version": "0.0.0",
   "description": "A crank to relay pyth governance actions to pythnet",
   "private": "true",
@@ -25,6 +25,6 @@
     "@solana/web3.js": "^1.73.0",
     "@sqds/mesh": "^1.0.6",
     "ts-node": "^10.9.1",
-    "xc_admin_common": "*"
+    "@pythnetwork/xc-admin-common": "*"
   }
 }

governance/xc_admin/packages/crank_pythnet_relayer/src/index.ts

@@ -30,7 +30,7 @@ import {
   mapKey,
   REMOTE_EXECUTOR_ADDRESS,
   envOrErr,
-} from "xc_admin_common";
+} from "@pythnetwork/xc-admin-common";
 
 const CLUSTER: PythCluster = envOrErr("CLUSTER") as PythCluster;
 const EMITTER: PublicKey = new PublicKey(envOrErr("EMITTER"));

governance/xc_admin/packages/proposer_server/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "proposer_server",
+  "name": "@pythnetwork/xc-admin-proposer-server",
   "version": "0.0.0",
   "description": "A server that proposes the instructions that it receives to the multisig",
   "private": "true",
@@ -26,6 +26,6 @@
     "@types/cors": "^2.8.17",
     "cors": "^2.8.5",
     "ts-node": "^10.9.1",
-    "xc_admin_common": "*"
+    "@pythnetwork/xc-admin-common": "*"
   }
 }

governance/xc_admin/packages/proposer_server/src/index.ts

@@ -12,7 +12,7 @@ import {
   getMultisigCluster,
   MultisigVault,
   PRICE_FEED_MULTISIG,
-} from "xc_admin_common";
+} from "@pythnetwork/xc-admin-common";
 import * as fs from "fs";
 import { getPythClusterApiUrl, PythCluster } from "@pythnetwork/client";
 import SquadsMesh from "@sqds/mesh";

governance/xc_admin/packages/xc_admin_cli/README.md

@@ -27,7 +27,7 @@ To activate a transaction:
 
 ```
 npm install
-npx lerna run build --scope "xc_admin_common"  --include-dependencies
+npx lerna run build --scope "@pythnetwork/xc-admin-common"  --include-dependencies
 npx ts-node src/index.ts activate -t <TRANSACTION_HASH> -c <CLUSTER: [mainnet|devnet|testnet] -v <VAULT_ADDRESS> -w <WALLET_SECRET_KEY_FILEPATH: [filepath|"ledger"]> -lda <LEDGER_DERIVATION_ACCOUNT> -ldc <LEDGER_DERIVATION_CHANGE>
 
 ```

governance/xc_admin/packages/xc_admin_cli/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "xc_admin_cli",
+  "name": "@pythnetwork/xc-admin-cli",
   "version": "0.0.0",
   "private": "true",
   "description": "",
@@ -28,7 +28,7 @@
     "@sqds/mesh": "^1.0.6",
     "commander": "^9.5.0",
     "typescript": "^4.9.4",
-    "xc_admin_common": "*",
+    "@pythnetwork/xc-admin-common": "*",
     "@pythnetwork/pyth-solana-receiver": "*"
   }
 }

governance/xc_admin/packages/xc_admin_cli/src/index.ts

@@ -35,7 +35,7 @@ import {
   PROGRAM_AUTHORITY_ESCROW,
   getMultisigCluster,
   getProposalInstructions,
-} from "xc_admin_common";
+} from "@pythnetwork/xc-admin-common";
 
 import {
   pythSolanaReceiverIdl,

governance/xc_admin/packages/xc_admin_common/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "xc_admin_common",
+  "name": "@pythnetwork/xc-admin-common",
   "version": "0.0.0",
   "description": "",
   "private": "true",
@@ -21,7 +21,7 @@
   },
   "//": [
     "The injectivelabs/token-metadata package is pinned to a specific version to ensure that",
-    "wormhole-sdk can be built with the correct version of the package in nextjs (xc_admin_frontend).",
+    "wormhole-sdk can be built with the correct version of the package in nextjs (@pythnetwork/xc-admin-frontend).",
     "Otherwise, the nextjs build will fail due to using a different version of the package."
   ],
   "dependencies": {

governance/xc_admin/packages/xc_admin_frontend/Dockerfile

@@ -17,7 +17,7 @@ ENV NODE_ENV production
 ENV NEXT_TELEMETRY_DISABLED 1
 ENV NEXT_PUBLIC_RPC_POOL_TOKEN $NEXT_PUBLIC_RPC_POOL_TOKEN
 
-RUN npx lerna run build --scope="xc_admin_frontend" --include-dependencies
+RUN npx lerna run build --scope="@pythnetwork/xc-admin-frontend" --include-dependencies
 
 WORKDIR /home/node/governance/xc_admin/packages/xc_admin_frontend
 

governance/xc_admin/packages/xc_admin_frontend/README.md

@@ -6,7 +6,7 @@ First, run the development server:
 
 ```bash
 pyth-crosschain % npm install
-pyth-crosschain % npx lerna run build --scope xc_admin_frontend --include-dependencies
+pyth-crosschain % npx lerna run build --scope @pythnetwork/xc-admin-frontend --include-dependencies
 pyth-crosschain % cd governance/xc_admin/packages/xc_admin_frontend
 xc_admin_frontend % npm run dev
 ```

governance/xc_admin/packages/xc_admin_frontend/components/InstructionViews/WormholeInstructionView.tsx

@@ -14,7 +14,7 @@ import {
   UpgradeContract256Bit,
   WormholeMultisigInstruction,
   getProgramName,
-} from 'xc_admin_common'
+} from '@pythnetwork/xc-admin-common'
 import { AccountMeta, PublicKey } from '@solana/web3.js'
 import CopyText from '../common/CopyText'
 import { ParsedAccountPubkeyRow, SignerTag, WritableTag } from './AccountUtils'

governance/xc_admin/packages/xc_admin_frontend/components/PermissionDepermissionKey.tsx

@@ -15,7 +15,7 @@ import {
   isRemoteCluster,
   mapKey,
   PRICE_FEED_MULTISIG,
-} from 'xc_admin_common'
+} from '@pythnetwork/xc-admin-common'
 import { ClusterContext } from '../contexts/ClusterContext'
 import { usePythContext } from '../contexts/PythContext'
 import { ProductRawConfig } from '../hooks/usePyth'

governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx

@@ -21,7 +21,7 @@ import {
   PRICE_FEED_OPS_KEY,
   getMessageBufferAddressForPrice,
   getMaximumNumberOfPublishers,
-} from 'xc_admin_common'
+} from '@pythnetwork/xc-admin-common'
 import { ClusterContext } from '../../contexts/ClusterContext'
 import { useMultisigContext } from '../../contexts/MultisigContext'
 import { usePythContext } from '../../contexts/PythContext'

governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals/InstructionsSummary.tsx

@@ -1,5 +1,5 @@
 import { PythCluster } from '@pythnetwork/client'
-import { MultisigInstruction } from 'xc_admin_common'
+import { MultisigInstruction } from '@pythnetwork/xc-admin-common'
 import { getInstructionsSummary } from './utils'
 
 export const InstructionsSummary = ({

governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals/Proposal.tsx

@@ -21,7 +21,7 @@ import {
   getManyProposalsInstructions,
   getMultisigCluster,
   getProgramName,
-} from 'xc_admin_common'
+} from '@pythnetwork/xc-admin-common'
 import { ClusterContext } from '../../../contexts/ClusterContext'
 import { useMultisigContext } from '../../../contexts/MultisigContext'
 import { usePythContext } from '../../../contexts/PythContext'

governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals/ProposalRow.tsx

@@ -2,7 +2,7 @@ import SquadsMesh from '@sqds/mesh'
 import { MultisigAccount, TransactionAccount } from '@sqds/mesh/lib/types'
 import { useRouter } from 'next/router'
 import { useCallback, useContext, useEffect, useRef, useState } from 'react'
-import { getMultisigCluster } from 'xc_admin_common'
+import { getMultisigCluster } from '@pythnetwork/xc-admin-common'
 import { ClusterContext } from '../../../contexts/ClusterContext'
 import { useMultisigContext } from '../../../contexts/MultisigContext'
 import { StatusTag } from './StatusTag'
@@ -10,7 +10,10 @@ import { getInstructionsSummary, getProposalStatus } from './utils'
 
 import NodeWallet from '@coral-xyz/anchor/dist/cjs/nodewallet'
 import { AccountMeta, Keypair } from '@solana/web3.js'
-import { MultisigParser, getManyProposalsInstructions } from 'xc_admin_common'
+import {
+  MultisigParser,
+  getManyProposalsInstructions,
+} from '@pythnetwork/xc-admin-common'
 
 export const ProposalRow = ({
   proposal,

governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals/utils.ts

@@ -8,7 +8,7 @@ import {
   PythGovernanceActionImpl,
   SetDataSources,
   WormholeMultisigInstruction,
-} from 'xc_admin_common'
+} from '@pythnetwork/xc-admin-common'
 
 export type ProposalStatus =
   | 'active'

governance/xc_admin/packages/xc_admin_frontend/components/tabs/UpdatePermissions.tsx

@@ -23,7 +23,7 @@ import {
   mapKey,
   UPGRADE_MULTISIG,
   MultisigVault,
-} from 'xc_admin_common'
+} from '@pythnetwork/xc-admin-common'
 import { ClusterContext } from '../../contexts/ClusterContext'
 import { useMultisigContext } from '../../contexts/MultisigContext'
 import { usePythContext } from '../../contexts/PythContext'

governance/xc_admin/packages/xc_admin_frontend/hooks/useMultisig.ts

@@ -9,7 +9,7 @@ import {
   UPGRADE_MULTISIG,
   getMultisigCluster,
   getProposals,
-} from 'xc_admin_common'
+} from '@pythnetwork/xc-admin-common'
 import { ClusterContext } from '../contexts/ClusterContext'
 import { deriveWsUrl, pythClusterApiUrls } from '../utils/pythClusterApiUrl'
 

governance/xc_admin/packages/xc_admin_frontend/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "xc_admin_frontend",
+  "name": "@pythnetwork/xc-admin-frontend",
   "version": "0.1.0",
   "private": true,
   "scripts": {
@@ -36,7 +36,7 @@
     "typescript": "4.9.4",
     "use-debounce": "^9.0.2",
     "web3": "^4.8.0",
-    "xc_admin_common": "*"
+    "@pythnetwork/xc-admin-common": "*"
   },
   "devDependencies": {
     "@svgr/webpack": "^6.3.1",

target_chains/cosmwasm/deploy-scripts/src/instantiate-pyth.ts

@@ -9,7 +9,7 @@ import {
   Store,
   toPrivateKey,
 } from "@pythnetwork/contract-manager";
-import { CHAINS } from "xc_admin_common";
+import { CHAINS } from "@pythnetwork/xc-admin-common";
 import { DeploymentType, getContractBytesDict } from "./helper";
 
 const argv = yargs(hideBin(process.argv))

target_chains/cosmwasm/deploy-scripts/src/instantiate-wormhole.ts

@@ -8,7 +8,7 @@ import {
   toPrivateKey,
   CosmWasmWormholeContract,
 } from "@pythnetwork/contract-manager";
-import { CHAINS } from "xc_admin_common";
+import { CHAINS } from "@pythnetwork/xc-admin-common";
 import { DeploymentType } from "./helper";
 
 const argv = yargs(hideBin(process.argv))

target_chains/cosmwasm/tools/package.json

@@ -26,7 +26,7 @@
     "ethers": "^5.4.4",
     "node-downloader-helper": "^2.1.7",
     "osmojs": "^16.12.1",
-    "xc_admin_common": "*",
+    "@pythnetwork/xc-admin-common": "*",
     "yargs": "^17.0.1"
   },
   "devDependencies": {

target_chains/ethereum/contracts/deploy/zkSyncDeploy.ts

@@ -2,7 +2,7 @@ require("dotenv").config({ path: ".env" });
 import { utils, Wallet } from "zksync-web3";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { Deployer } from "@matterlabs/hardhat-zksync-deploy";
-import { CHAINS } from "xc_admin_common";
+import { CHAINS } from "@pythnetwork/xc-admin-common";
 import { assert } from "chai";
 import { writeFileSync } from "fs";
 

target_chains/ethereum/contracts/package.json

@@ -52,7 +52,7 @@
     "web3": "^1.2.2",
     "web3-eth-abi": "^1.2.2",
     "web3-utils": "^1.2.2",
-    "xc_admin_common": "*",
+    "@pythnetwork/xc-admin-common": "*",
     "zksync-web3": "^0.13.4"
   }
 }

target_chains/ethereum/contracts/scripts/batchDeployReceivers.ts

@@ -12,7 +12,7 @@ import {
   EvmWormholeContract,
 } from "@pythnetwork/contract-manager";
 import Web3 from "web3";
-import { CHAINS } from "xc_admin_common";
+import { CHAINS } from "@pythnetwork/xc-admin-common";
 import * as fs from "fs";
 
 const { getDefaultConfig } = require("./contractManagerConfig");

target_chains/ethereum/contracts/test/pyth.js

@@ -1,5 +1,5 @@
 const elliptic = require("elliptic");
-const governance = require("xc_admin_common");
+const governance = require("@pythnetwork/xc-admin-common");
 
 const { deployProxy, upgradeProxy } = require("@openzeppelin/truffle-upgrades");
 const {
@@ -8,7 +8,7 @@ const {
   time,
 } = require("@openzeppelin/test-helpers");
 const { assert, expect } = require("chai");
-const { EvmSetWormholeAddress } = require("xc_admin_common");
+const { EvmSetWormholeAddress } = require("@pythnetwork/xc-admin-common");
 
 // Use "WormholeReceiver" if you are testing with Wormhole Receiver
 const Setup = artifacts.require("Setup");

target_chains/sui/cli/package.json

@@ -18,6 +18,6 @@
     "@pythnetwork/contract-manager": "*",
     "prettier": "^2.8.7",
     "typescript": "^5.0.4",
-    "xc_admin_common": "*"
+    "@pythnetwork/xc-admin-common": "*"
   }
 }

target_chains/sui/cli/src/pyth_deploy.ts

@@ -8,7 +8,7 @@ import {
 
 import { Ed25519Keypair } from "@mysten/sui.js/dist/cjs/keypairs/ed25519";
 import { execSync } from "child_process";
-import { DataSource } from "xc_admin_common";
+import { DataSource } from "@pythnetwork/xc-admin-common";
 import { SuiClient } from "@mysten/sui.js/client";
 
 export async function publishPackage(