Skip to content

Commit b42f845

Browse files
committed
[governance] fix changes
1 parent 0ca9bb2 commit b42f845

File tree

14 files changed

+29
-29
lines changed

14 files changed

+29
-29
lines changed

.github/workflows/ethereum-contract.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ on:
22
pull_request:
33
paths:
44
- target-chains/ethereum/**
5-
- third_party/pyth/xc-governance-sdk-js/**
5+
- governance/xc-governance-sdk-js/**
66
push:
77
branches:
88
- main
99
paths:
1010
- target-chains/ethereum/**
11-
- third_party/pyth/xc-governance-sdk-js/**
11+
- governance/xc-governance-sdk-js/**
1212

1313
name: Ethereum Contract
1414

@@ -24,7 +24,7 @@ jobs:
2424

2525
- name: Install XC-governance sdk dependencies
2626
run: npm ci
27-
working-directory: third_party/pyth/xc-governance-sdk-js
27+
working-directory: governance/xc-governance-sdk-js
2828

2929
- name: Install contract npm dependencies
3030
run: npm ci

.github/workflows/remote-executor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: Check Remote Executor
22

33
on:
44
pull_request:
5-
paths: [pythnet/remote-executor/**]
5+
paths: [governance/remote-executor/**]
66
push:
77
branches: [main]
8-
paths: [pythnet/remote-executor/**]
8+
paths: [governance/remote-executor/**]
99
jobs:
1010
test:
1111
runs-on: ubuntu-latest
@@ -22,4 +22,4 @@ jobs:
2222
sh -c "$(curl -sSfL https://release.solana.com/stable/install)"
2323
echo "/home/runner/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
2424
- name: Run executor tests
25-
run: cargo test-bpf --manifest-path ./pythnet/remote-executor/Cargo.toml
25+
run: cargo test-bpf --manifest-path ./governance/remote-executor/Cargo.toml

.github/workflows/xc-admin.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
name: Check Xc Admin
22
on:
33
pull_request:
4-
paths: [xc-admin/**]
4+
paths: [governance/xc-admin/**]
55
push:
66
branches: [main]
7-
paths: [xc-admin/**]
7+
paths: [governance/xc-admin/**]
88
jobs:
99
test:
1010
runs-on: ubuntu-latest
1111
defaults:
1212
run:
13-
working-directory: xc-admin/
13+
working-directory: governance/xc-admin/
1414
steps:
1515
- uses: actions/checkout@v2
1616
- name: Run xc-admin tests

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ repos:
2121
- id: cargo-fmt-remote-executor
2222
name: Cargo format for remote executor
2323
language: "rust"
24-
entry: cargo +nightly fmt --manifest-path ./pythnet/remote-executor/Cargo.toml --all -- --config-path rustfmt.toml
24+
entry: cargo +nightly fmt --manifest-path ./governance/remote-executor/Cargo.toml --all -- --config-path rustfmt.toml
2525
pass_filenames: false
26-
files: pythnet/remote-executor
26+
files: governance/remote-executor
2727
- id: cargo-clippy-remote-executor
2828
name: Cargo clippy for remote executor
2929
language: "rust"
30-
entry: cargo +nightly clippy --manifest-path ./pythnet/remote-executor/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
30+
entry: cargo +nightly clippy --manifest-path ./governance/remote-executor/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
3131
pass_filenames: false
32-
files: pythnet/remote-executor
32+
files: governance/remote-executor
3333
# Hooks for the attester
3434
- id: cargo-fmt-attester
3535
name: Cargo format for attester

target-chains/ethereum/Deploying.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ This is the deployment process:
6464
- Export the secret recovery phrase for the deployment account. Please store it in a file and read
6565
the file into `MNEMONIC` environment variable like so: `export MNEMONIC=$(cat path/to/mnemonic)`.
6666
- If you are modifying an existing contract, make sure that the multisig-cli has the operational
67-
key stored in `third_party/pyth/multisig-wh-message-builder/keys/key.json`.
67+
key stored in `governance/multisig-wh-message-builder/keys/key.json`.
6868
- export the Infura RPC API key to `INFURA_KEY` if you are deploying to a network that uses an Infura RPC.
6969
5. Make sure the deployment account has proper balance on this network and top it up if needed. Search
7070
for testnet faucets if it is a testnet network. Sometimes you need to bridge the network token (e.g., L2s).

target-chains/ethereum/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Run the following command to install required dependencies for the contract:
1010
# xc-governance-sdk-js is a local dependency that should be built
1111
# it is used in deployment (truffle migrations) to generate/sanity check
1212
# the governance VAAs
13-
pushd ../third_party/pyth/xc-governance-sdk-js && npm ci && popd
13+
pushd ../../governance/xc-governance-sdk-js && npm ci && popd
1414
npm ci
1515
```
1616

target-chains/ethereum/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

target-chains/ethereum/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@openzeppelin/contracts": "^4.5.0",
3636
"@openzeppelin/contracts-upgradeable": "^4.5.2",
3737
"@pythnetwork/pyth-sdk-solidity": "^2.2.0",
38-
"@pythnetwork/xc-governance-sdk": "file:../third_party/pyth/xc-governance-sdk-js",
38+
"@pythnetwork/xc-governance-sdk": "file:../../governance/xc-governance-sdk-js",
3939
"dotenv": "^10.0.0",
4040
"elliptic": "^6.5.2",
4141
"ethers": "^5.7.2",

target-chains/ethereum/scripts/syncPythState.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* this script using `deploy.sh` as described in `Deploying.md` file.
55
*
66
* This script is a statefull and fully automated. It will invoke the multisig
7-
* cli in the `../third_party/pyth/multisig-wh-message-builder`
7+
* cli in the `../../governance/multisig-wh-message-builder`
88
* to create governed instructions to change on-chain contracts.
99
* As multisig instructions require multiple people approval, this script
1010
* will create some cache files to store the last step and continues from
@@ -39,7 +39,7 @@ async function execMultisigCommand(cmd) {
3939
console.log(`Executing "${fullCmd}"`);
4040

4141
const { stdout, stderr } = await exec(fullCmd, {
42-
cwd: "../third_party/pyth/multisig-wh-message-builder",
42+
cwd: "../../governance/multisig-wh-message-builder",
4343
});
4444

4545
console.log("stdout:");

third_party/pyth/Dockerfile.p2w-attest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM ghcr.io/certusone/solana:1.10.31@sha256:d31e8db926a1d3fbaa9d9211d9979023692
44
RUN apt-get update && apt-get install -yq python3 libudev-dev ncat
55
RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && apt-get install -y nodejs
66

7-
ADD pythnet/remote-executor /usr/src/pythnet/remote-executor
7+
ADD governance/remote-executor /usr/src/governance/remote-executor
88
ADD third_party/pyth/p2w-sdk/rust /usr/src/third_party/pyth/p2w-sdk/rust
99
ADD wormhole-attester /usr/src/wormhole-attester
1010

0 commit comments

Comments
 (0)