From 9d44f3156bba8119c77537e5ee65591218e61ac0 Mon Sep 17 00:00:00 2001 From: Guillermo Bescos Date: Tue, 12 Mar 2024 17:19:59 +0000 Subject: [PATCH 1/6] Cleanup --- docs/pips/operational/op-pip-1.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/pips/operational/op-pip-1.md b/docs/pips/operational/op-pip-1.md index 6c2adb1a..378937e5 100644 --- a/docs/pips/operational/op-pip-1.md +++ b/docs/pips/operational/op-pip-1.md @@ -28,7 +28,11 @@ Branch: [`chore/evm/blast-claim-gas`](https://github.com/pyth-network/pyth-cros 2. node-js: install `nvm` from [here](https://github.com/nvm-sh/nvm) 3. forge: install it from [here](https://getfoundry.sh/) 4. Clone the `pyth-crosschain` repo (`git clone https://github.com/pyth-network/pyth-crosschain.git`) and run the following command: `npm ci && npx lerna run build` +<<<<<<< HEAD 5. Go to the proposal code branch (`git checkout `) +======= +5. Go to the proposal code branch `git checkout ` +>>>>>>> a116e8f (Cleanup) 6. Get the on-chain implementation code digest by going to the `contract_manager` directory and running `npx ts-node scripts/check_proposal.ts --cluster mainnet-beta --proposal ` 7. Get the source code digest by going to the `target_chains/ethereum/contracts` directory and running `npx truffle compile --all && cat build/contracts/PythUpgradable.json | jq -r .deployedBytecode | tr -d '\n' | cast keccak` 8. Check the hash digest from the on-chain implementation (from step 6) matches the hash digest from the source code (from step 7). From 9744203b1604734dc230cf9171c114fd26d199da Mon Sep 17 00:00:00 2001 From: Guillermo Bescos Date: Tue, 12 Mar 2024 17:20:36 +0000 Subject: [PATCH 2/6] cleanup --- docs/pips/operational/op-pip-1.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/pips/operational/op-pip-1.md b/docs/pips/operational/op-pip-1.md index 378937e5..6c2adb1a 100644 --- a/docs/pips/operational/op-pip-1.md +++ b/docs/pips/operational/op-pip-1.md @@ -28,11 +28,7 @@ Branch: [`chore/evm/blast-claim-gas`](https://github.com/pyth-network/pyth-cros 2. node-js: install `nvm` from [here](https://github.com/nvm-sh/nvm) 3. forge: install it from [here](https://getfoundry.sh/) 4. Clone the `pyth-crosschain` repo (`git clone https://github.com/pyth-network/pyth-crosschain.git`) and run the following command: `npm ci && npx lerna run build` -<<<<<<< HEAD 5. Go to the proposal code branch (`git checkout `) -======= -5. Go to the proposal code branch `git checkout ` ->>>>>>> a116e8f (Cleanup) 6. Get the on-chain implementation code digest by going to the `contract_manager` directory and running `npx ts-node scripts/check_proposal.ts --cluster mainnet-beta --proposal ` 7. Get the source code digest by going to the `target_chains/ethereum/contracts` directory and running `npx truffle compile --all && cat build/contracts/PythUpgradable.json | jq -r .deployedBytecode | tr -d '\n' | cast keccak` 8. Check the hash digest from the on-chain implementation (from step 6) matches the hash digest from the source code (from step 7). From a852e9b9fc2d060e7d504216b526971ef8f38e19 Mon Sep 17 00:00:00 2001 From: Guillermo Bescos Date: Wed, 13 Mar 2024 17:51:06 +0000 Subject: [PATCH 3/6] Cleanup pip --- docs/pips/operational/op-pip-1.md | 18 +++++++++--------- docs/pips/operational/op-pip-2.md | 17 +++++++++-------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/docs/pips/operational/op-pip-1.md b/docs/pips/operational/op-pip-1.md index 6c2adb1a..f1bdfd00 100644 --- a/docs/pips/operational/op-pip-1.md +++ b/docs/pips/operational/op-pip-1.md @@ -24,13 +24,13 @@ Branch: [`chore/evm/blast-claim-gas`](https://github.com/pyth-network/pyth-cros * Verify the implementation following the guide below: -1. Make sure you node-js and forge installed. -2. node-js: install `nvm` from [here](https://github.com/nvm-sh/nvm) -3. forge: install it from [here](https://getfoundry.sh/) -4. Clone the `pyth-crosschain` repo (`git clone https://github.com/pyth-network/pyth-crosschain.git`) and run the following command: `npm ci && npx lerna run build` -5. Go to the proposal code branch (`git checkout `) -6. Get the on-chain implementation code digest by going to the `contract_manager` directory and running `npx ts-node scripts/check_proposal.ts --cluster mainnet-beta --proposal ` -7. Get the source code digest by going to the `target_chains/ethereum/contracts` directory and running `npx truffle compile --all && cat build/contracts/PythUpgradable.json | jq -r .deployedBytecode | tr -d '\n' | cast keccak` -8. Check the hash digest from the on-chain implementation (from step 6) matches the hash digest from the source code (from step 7). - +1. Make sure you node-js, forge and jq installed. + a. node-js: install `nvm` from [here](https://github.com/nvm-sh/nvm). Install node 18 (`nvm install 18; nvm use 18`) + b. forge: install it from [here](https://getfoundry.sh/) + c. jq: install it from [here](https://jqlang.github.io/jq/) +2. Clone the `pyth-crosschain` repo (`git clone https://github.com/pyth-network/pyth-crosschain.git`). Go to the `pyth-crosschain` directory and run the following command: `npm ci && npx lerna run build` +3. Go to the proposal code branch (`git checkout `) +4. Get the on-chain implementation code digest by going to the `contract_manager` directory and running `npx ts-node scripts/check_proposal.ts --cluster mainnet-beta --proposal ` +5. Get the source code digest by going to the `target_chains/ethereum/contracts` directory and running `npx truffle compile --all && cat build/contracts/PythUpgradable.json | jq -r .deployedBytecode | tr -d '\r\n' | cast keccak` +6. Check the hash digest from the on-chain implementation (from step 6) matches the hash digest from the source code (from step 7). p.s: the codes above are not merged in our contract because these are one-off and cannot be in our generic smart-contract. We will store the diff in the repo like [this](https://github.com/pyth-network/pyth-crosschain/blob/main/target_chains/ethereum/contracts/canto-deployment-patch.diff) one. diff --git a/docs/pips/operational/op-pip-2.md b/docs/pips/operational/op-pip-2.md index 1cc26323..b0e69e10 100644 --- a/docs/pips/operational/op-pip-2.md +++ b/docs/pips/operational/op-pip-2.md @@ -25,13 +25,14 @@ Branch: [`chore/evm/mode-claim-gas`](https://github.com/pyth-network/pyth-cross * Verify the implementation following the guide below: -1. Make sure you node-js and forge installed. -2. node-js: install `nvm` from [here](https://github.com/nvm-sh/nvm) -3. forge: install it from [here](https://getfoundry.sh/) -4. Clone the `pyth-crosschain` repo (`git clone https://github.com/pyth-network/pyth-crosschain.git`) and run the following command: `npm ci && npx lerna run build` -5. Go to the proposal code branch (`git checkout `) -6. Get the on-chain implementation code digest by going to the `contract_manager` directory and running `npx ts-node scripts/check_proposal.ts --cluster mainnet-beta --proposal ` -7. Get the source code digest by going to the `target_chains/ethereum/contracts` directory and running `npx truffle compile --all && cat build/contracts/PythUpgradable.json | jq -r .deployedBytecode | tr -d '\n' | cast keccak` -8. Check the hash digest from the on-chain implementation (from step 6) matches the hash digest from the source code (from step 7). +1. Make sure you node-js, forge and jq installed. + a. node-js: install `nvm` from [here](https://github.com/nvm-sh/nvm). Install node 18 (`nvm install 18; nvm use 18`) + b. forge: install it from [here](https://getfoundry.sh/) + c. jq: install it from [here](https://jqlang.github.io/jq/) +2. Clone the `pyth-crosschain` repo (`git clone https://github.com/pyth-network/pyth-crosschain.git`). Go to the `pyth-crosschain` directory and run the following command: `npm ci && npx lerna run build` +3. Go to the proposal code branch (`git checkout `) +4. Get the on-chain implementation code digest by going to the `contract_manager` directory and running `npx ts-node scripts/check_proposal.ts --cluster mainnet-beta --proposal ` +5. Get the source code digest by going to the `target_chains/ethereum/contracts` directory and running `npx truffle compile --all && cat build/contracts/PythUpgradable.json | jq -r .deployedBytecode | tr -d '\r\n' | cast keccak` +6. Check the hash digest from the on-chain implementation (from step 6) matches the hash digest from the source code (from step 7). p.s: the codes above are not merged in our contract because these are one-off and cannot be in our generic smart-contract. We will store the diff in the repo like [this](https://github.com/pyth-network/pyth-crosschain/blob/main/target_chains/ethereum/contracts/canto-deployment-patch.diff) one. From 8d0314346ecdf159d8385a9854d08f2e92245512 Mon Sep 17 00:00:00 2001 From: Guillermo Bescos Date: Wed, 13 Mar 2024 17:54:46 +0000 Subject: [PATCH 4/6] Improve --- docs/pips/operational/op-pip-1.md | 8 ++++---- docs/pips/operational/op-pip-2.md | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/pips/operational/op-pip-1.md b/docs/pips/operational/op-pip-1.md index f1bdfd00..4cde716a 100644 --- a/docs/pips/operational/op-pip-1.md +++ b/docs/pips/operational/op-pip-1.md @@ -25,12 +25,12 @@ Branch: [`chore/evm/blast-claim-gas`](https://github.com/pyth-network/pyth-cros * Verify the implementation following the guide below: 1. Make sure you node-js, forge and jq installed. - a. node-js: install `nvm` from [here](https://github.com/nvm-sh/nvm). Install node 18 (`nvm install 18; nvm use 18`) - b. forge: install it from [here](https://getfoundry.sh/) - c. jq: install it from [here](https://jqlang.github.io/jq/) + 1. node-js: install `nvm` from [here](https://github.com/nvm-sh/nvm). Install node 18 (`nvm install 18; nvm use 18`) + 2. forge: install it from [here](https://getfoundry.sh/) + 3. jq: install it from [here](https://jqlang.github.io/jq/) 2. Clone the `pyth-crosschain` repo (`git clone https://github.com/pyth-network/pyth-crosschain.git`). Go to the `pyth-crosschain` directory and run the following command: `npm ci && npx lerna run build` 3. Go to the proposal code branch (`git checkout `) 4. Get the on-chain implementation code digest by going to the `contract_manager` directory and running `npx ts-node scripts/check_proposal.ts --cluster mainnet-beta --proposal ` 5. Get the source code digest by going to the `target_chains/ethereum/contracts` directory and running `npx truffle compile --all && cat build/contracts/PythUpgradable.json | jq -r .deployedBytecode | tr -d '\r\n' | cast keccak` -6. Check the hash digest from the on-chain implementation (from step 6) matches the hash digest from the source code (from step 7). +6. Check the hash digest from the on-chain implementation (from step 4) matches the hash digest from the source code (from step 5). p.s: the codes above are not merged in our contract because these are one-off and cannot be in our generic smart-contract. We will store the diff in the repo like [this](https://github.com/pyth-network/pyth-crosschain/blob/main/target_chains/ethereum/contracts/canto-deployment-patch.diff) one. diff --git a/docs/pips/operational/op-pip-2.md b/docs/pips/operational/op-pip-2.md index b0e69e10..60973fc4 100644 --- a/docs/pips/operational/op-pip-2.md +++ b/docs/pips/operational/op-pip-2.md @@ -26,13 +26,13 @@ Branch: [`chore/evm/mode-claim-gas`](https://github.com/pyth-network/pyth-cross * Verify the implementation following the guide below: 1. Make sure you node-js, forge and jq installed. - a. node-js: install `nvm` from [here](https://github.com/nvm-sh/nvm). Install node 18 (`nvm install 18; nvm use 18`) - b. forge: install it from [here](https://getfoundry.sh/) - c. jq: install it from [here](https://jqlang.github.io/jq/) + 1. node-js: install `nvm` from [here](https://github.com/nvm-sh/nvm). Install node 18 (`nvm install 18; nvm use 18`) + 2. forge: install it from [here](https://getfoundry.sh/) + 3. jq: install it from [here](https://jqlang.github.io/jq/) 2. Clone the `pyth-crosschain` repo (`git clone https://github.com/pyth-network/pyth-crosschain.git`). Go to the `pyth-crosschain` directory and run the following command: `npm ci && npx lerna run build` 3. Go to the proposal code branch (`git checkout `) 4. Get the on-chain implementation code digest by going to the `contract_manager` directory and running `npx ts-node scripts/check_proposal.ts --cluster mainnet-beta --proposal ` 5. Get the source code digest by going to the `target_chains/ethereum/contracts` directory and running `npx truffle compile --all && cat build/contracts/PythUpgradable.json | jq -r .deployedBytecode | tr -d '\r\n' | cast keccak` -6. Check the hash digest from the on-chain implementation (from step 6) matches the hash digest from the source code (from step 7). +6. Check the hash digest from the on-chain implementation (from step 4) matches the hash digest from the source code (from step 5). p.s: the codes above are not merged in our contract because these are one-off and cannot be in our generic smart-contract. We will store the diff in the repo like [this](https://github.com/pyth-network/pyth-crosschain/blob/main/target_chains/ethereum/contracts/canto-deployment-patch.diff) one. From 99d30e9f7dc87035fa79afe12ee312c997252ebc Mon Sep 17 00:00:00 2001 From: Guillermo Bescos Date: Wed, 13 Mar 2024 17:56:43 +0000 Subject: [PATCH 5/6] Improve verification steps --- docs/pips/operational/op-pip-1.md | 4 +++- docs/pips/operational/op-pip-2.md | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/pips/operational/op-pip-1.md b/docs/pips/operational/op-pip-1.md index 4cde716a..eb1120ac 100644 --- a/docs/pips/operational/op-pip-1.md +++ b/docs/pips/operational/op-pip-1.md @@ -25,7 +25,7 @@ Branch: [`chore/evm/blast-claim-gas`](https://github.com/pyth-network/pyth-cros * Verify the implementation following the guide below: 1. Make sure you node-js, forge and jq installed. - 1. node-js: install `nvm` from [here](https://github.com/nvm-sh/nvm). Install node 18 (`nvm install 18; nvm use 18`) + 1. node-js: install `nvm` from [here](https://github.com/nvm-sh/nvm). Install node-js 18 (`nvm install 18; nvm use 18`). 2. forge: install it from [here](https://getfoundry.sh/) 3. jq: install it from [here](https://jqlang.github.io/jq/) 2. Clone the `pyth-crosschain` repo (`git clone https://github.com/pyth-network/pyth-crosschain.git`). Go to the `pyth-crosschain` directory and run the following command: `npm ci && npx lerna run build` @@ -33,4 +33,6 @@ Branch: [`chore/evm/blast-claim-gas`](https://github.com/pyth-network/pyth-cros 4. Get the on-chain implementation code digest by going to the `contract_manager` directory and running `npx ts-node scripts/check_proposal.ts --cluster mainnet-beta --proposal ` 5. Get the source code digest by going to the `target_chains/ethereum/contracts` directory and running `npx truffle compile --all && cat build/contracts/PythUpgradable.json | jq -r .deployedBytecode | tr -d '\r\n' | cast keccak` 6. Check the hash digest from the on-chain implementation (from step 4) matches the hash digest from the source code (from step 5). + + p.s: the codes above are not merged in our contract because these are one-off and cannot be in our generic smart-contract. We will store the diff in the repo like [this](https://github.com/pyth-network/pyth-crosschain/blob/main/target_chains/ethereum/contracts/canto-deployment-patch.diff) one. diff --git a/docs/pips/operational/op-pip-2.md b/docs/pips/operational/op-pip-2.md index 60973fc4..2af7eb63 100644 --- a/docs/pips/operational/op-pip-2.md +++ b/docs/pips/operational/op-pip-2.md @@ -26,7 +26,7 @@ Branch: [`chore/evm/mode-claim-gas`](https://github.com/pyth-network/pyth-cross * Verify the implementation following the guide below: 1. Make sure you node-js, forge and jq installed. - 1. node-js: install `nvm` from [here](https://github.com/nvm-sh/nvm). Install node 18 (`nvm install 18; nvm use 18`) + 1. node-js: install `nvm` from [here](https://github.com/nvm-sh/nvm). Install node-js 18 (`nvm install 18; nvm use 18`). 2. forge: install it from [here](https://getfoundry.sh/) 3. jq: install it from [here](https://jqlang.github.io/jq/) 2. Clone the `pyth-crosschain` repo (`git clone https://github.com/pyth-network/pyth-crosschain.git`). Go to the `pyth-crosschain` directory and run the following command: `npm ci && npx lerna run build` @@ -35,4 +35,5 @@ Branch: [`chore/evm/mode-claim-gas`](https://github.com/pyth-network/pyth-cross 5. Get the source code digest by going to the `target_chains/ethereum/contracts` directory and running `npx truffle compile --all && cat build/contracts/PythUpgradable.json | jq -r .deployedBytecode | tr -d '\r\n' | cast keccak` 6. Check the hash digest from the on-chain implementation (from step 4) matches the hash digest from the source code (from step 5). + p.s: the codes above are not merged in our contract because these are one-off and cannot be in our generic smart-contract. We will store the diff in the repo like [this](https://github.com/pyth-network/pyth-crosschain/blob/main/target_chains/ethereum/contracts/canto-deployment-patch.diff) one. From 3959660129711022acfecd91f6a20c85ff3dabb0 Mon Sep 17 00:00:00 2001 From: Guillermo Bescos Date: Wed, 13 Mar 2024 17:59:40 +0000 Subject: [PATCH 6/6] Update --- docs/pips/operational/op-pip-1.md | 2 +- docs/pips/operational/op-pip-2.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/pips/operational/op-pip-1.md b/docs/pips/operational/op-pip-1.md index eb1120ac..18111a88 100644 --- a/docs/pips/operational/op-pip-1.md +++ b/docs/pips/operational/op-pip-1.md @@ -24,7 +24,7 @@ Branch: [`chore/evm/blast-claim-gas`](https://github.com/pyth-network/pyth-cros * Verify the implementation following the guide below: -1. Make sure you node-js, forge and jq installed. +1. Make sure you have node-js, forge and jq installed. 1. node-js: install `nvm` from [here](https://github.com/nvm-sh/nvm). Install node-js 18 (`nvm install 18; nvm use 18`). 2. forge: install it from [here](https://getfoundry.sh/) 3. jq: install it from [here](https://jqlang.github.io/jq/) diff --git a/docs/pips/operational/op-pip-2.md b/docs/pips/operational/op-pip-2.md index 2af7eb63..28f2f919 100644 --- a/docs/pips/operational/op-pip-2.md +++ b/docs/pips/operational/op-pip-2.md @@ -25,7 +25,7 @@ Branch: [`chore/evm/mode-claim-gas`](https://github.com/pyth-network/pyth-cross * Verify the implementation following the guide below: -1. Make sure you node-js, forge and jq installed. +1. Make sure you have node-js, forge and jq installed. 1. node-js: install `nvm` from [here](https://github.com/nvm-sh/nvm). Install node-js 18 (`nvm install 18; nvm use 18`). 2. forge: install it from [here](https://getfoundry.sh/) 3. jq: install it from [here](https://jqlang.github.io/jq/)