From 763d5af9a54ad4161fbaeb587245ea4c0b9832a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= Date: Tue, 22 Feb 2022 11:38:37 +0900 Subject: [PATCH] Update to latest set of program_ids --- contracts/Anchor.toml | 6 +++--- contracts/crates/chainlink-solana/src/lib.rs | 2 +- contracts/examples/hello-world/Anchor.toml | 2 +- contracts/examples/hello-world/client.js | 2 +- contracts/examples/hello-world/tests/hello-world.ts | 2 +- contracts/programs/access-controller/src/lib.rs | 2 +- contracts/programs/ocr2/src/lib.rs | 2 +- contracts/programs/store/src/lib.rs | 2 +- .../artifacts/schemas/access_controller.json | 2 +- .../gauntlet-solana-contracts/artifacts/schemas/ocr2.json | 2 +- scripts/programs-keys-gen.sh | 6 +++--- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/contracts/Anchor.toml b/contracts/Anchor.toml index c0d37d074..f01301327 100644 --- a/contracts/Anchor.toml +++ b/contracts/Anchor.toml @@ -21,6 +21,6 @@ test = "yarn run test" # TODO: add pubkeys [programs.localnet] -ocr2 = "HW3ipKzeeduJq6f1NqRCw4doknMeWkfrM4WxobtG3o5v" -store = "CaH12fwNTKJAG8PxEvo9R96Zc2j8qNHZaFj8ZW49yZNT" -access_controller = "DzzjdPWNfwHZmzPVxnmqkkMJraYQQRCpgFZajqkqmU6G" +ocr2 = "cjg3oHmg9uuPsP8D6g29NWvhySJkdYdAo9D25PRbKXJ" +store = "HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny" +access_controller = "9xi644bRR8birboDGdTiwBq3C7VEeR7VuamRYYXCubUW" diff --git a/contracts/crates/chainlink-solana/src/lib.rs b/contracts/crates/chainlink-solana/src/lib.rs index 07a1c107e..0dd4634ec 100644 --- a/contracts/crates/chainlink-solana/src/lib.rs +++ b/contracts/crates/chainlink-solana/src/lib.rs @@ -14,7 +14,7 @@ use solana_program::{ }; // The library uses this to verify the keys -solana_program::declare_id!("CaH12fwNTKJAG8PxEvo9R96Zc2j8qNHZaFj8ZW49yZNT"); +solana_program::declare_id!("HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny"); #[derive(BorshSerialize, BorshDeserialize)] enum Query { diff --git a/contracts/examples/hello-world/Anchor.toml b/contracts/examples/hello-world/Anchor.toml index d9b737f0c..dd4b3b1d5 100644 --- a/contracts/examples/hello-world/Anchor.toml +++ b/contracts/examples/hello-world/Anchor.toml @@ -14,5 +14,5 @@ test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts" # TODO: clone from devnet once available [[test.genesis]] -address = "CaH12fwNTKJAG8PxEvo9R96Zc2j8qNHZaFj8ZW49yZNT" +address = "HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny" program = "../../target/deploy/store.so" diff --git a/contracts/examples/hello-world/client.js b/contracts/examples/hello-world/client.js index a56b62c33..83cb43447 100644 --- a/contracts/examples/hello-world/client.js +++ b/contracts/examples/hello-world/client.js @@ -1,7 +1,7 @@ const anchor = require("@project-serum/anchor"); // devnet IDs -const CHAINLINK_PROGRAM_ID = "CaH12fwNTKJAG8PxEvo9R96Zc2j8qNHZaFj8ZW49yZNT"; +const CHAINLINK_PROGRAM_ID = "HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny"; // USDT/USD const CHAINLINK_FEED = "CwBg8pxL73LvuJ781cWBGF1e64G2z7AbZ22J2g8Lp35a"; diff --git a/contracts/examples/hello-world/tests/hello-world.ts b/contracts/examples/hello-world/tests/hello-world.ts index da0c7d485..8ab8efccc 100644 --- a/contracts/examples/hello-world/tests/hello-world.ts +++ b/contracts/examples/hello-world/tests/hello-world.ts @@ -3,7 +3,7 @@ import * as fs from 'fs'; import { Program, BN } from '@project-serum/anchor'; import { HelloWorld } from '../target/types/hello_world'; -const CHAINLINK_PROGRAM_ID = "CaH12fwNTKJAG8PxEvo9R96Zc2j8qNHZaFj8ZW49yZNT"; +const CHAINLINK_PROGRAM_ID = "HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny"; describe('hello-world', () => { const provider = anchor.Provider.env(); diff --git a/contracts/programs/access-controller/src/lib.rs b/contracts/programs/access-controller/src/lib.rs index 61145f185..d20df2745 100644 --- a/contracts/programs/access-controller/src/lib.rs +++ b/contracts/programs/access-controller/src/lib.rs @@ -4,7 +4,7 @@ use std::mem; use arrayvec::arrayvec; -declare_id!("DzzjdPWNfwHZmzPVxnmqkkMJraYQQRCpgFZajqkqmU6G"); +declare_id!("9xi644bRR8birboDGdTiwBq3C7VEeR7VuamRYYXCubUW"); #[constant] pub const MAX_ADDRS: usize = 64; diff --git a/contracts/programs/ocr2/src/lib.rs b/contracts/programs/ocr2/src/lib.rs index dc22e4f2b..e4cd03908 100644 --- a/contracts/programs/ocr2/src/lib.rs +++ b/contracts/programs/ocr2/src/lib.rs @@ -5,7 +5,7 @@ use anchor_spl::token; use arrayref::{array_ref, array_refs}; use state::{Billing, Proposal, ProposedOracle}; -declare_id!("HW3ipKzeeduJq6f1NqRCw4doknMeWkfrM4WxobtG3o5v"); +declare_id!("cjg3oHmg9uuPsP8D6g29NWvhySJkdYdAo9D25PRbKXJ"); mod context; pub mod event; diff --git a/contracts/programs/store/src/lib.rs b/contracts/programs/store/src/lib.rs index a40c2a141..862936293 100644 --- a/contracts/programs/store/src/lib.rs +++ b/contracts/programs/store/src/lib.rs @@ -7,7 +7,7 @@ mod state; use crate::state::with_store; pub use crate::state::{NewTransmission, Store as State, Transmission, Transmissions}; -declare_id!("CaH12fwNTKJAG8PxEvo9R96Zc2j8qNHZaFj8ZW49yZNT"); +declare_id!("HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny"); static THRESHOLD_MULTIPLIER: u128 = 100000; diff --git a/gauntlet/packages/gauntlet-solana-contracts/artifacts/schemas/access_controller.json b/gauntlet/packages/gauntlet-solana-contracts/artifacts/schemas/access_controller.json index 09804d07c..ed12c785d 100644 --- a/gauntlet/packages/gauntlet-solana-contracts/artifacts/schemas/access_controller.json +++ b/gauntlet/packages/gauntlet-solana-contracts/artifacts/schemas/access_controller.json @@ -172,6 +172,6 @@ } ], "metadata": { - "address": "DzzjdPWNfwHZmzPVxnmqkkMJraYQQRCpgFZajqkqmU6G" + "address": "9xi644bRR8birboDGdTiwBq3C7VEeR7VuamRYYXCubUW" } } \ No newline at end of file diff --git a/gauntlet/packages/gauntlet-solana-contracts/artifacts/schemas/ocr2.json b/gauntlet/packages/gauntlet-solana-contracts/artifacts/schemas/ocr2.json index 13cf5c6a2..04f190eca 100644 --- a/gauntlet/packages/gauntlet-solana-contracts/artifacts/schemas/ocr2.json +++ b/gauntlet/packages/gauntlet-solana-contracts/artifacts/schemas/ocr2.json @@ -1242,6 +1242,6 @@ } ], "metadata": { - "address": "HW3ipKzeeduJq6f1NqRCw4doknMeWkfrM4WxobtG3o5v" + "address": "cjg3oHmg9uuPsP8D6g29NWvhySJkdYdAo9D25PRbKXJ" } } \ No newline at end of file diff --git a/scripts/programs-keys-gen.sh b/scripts/programs-keys-gen.sh index 405b5d90e..4728b164f 100755 --- a/scripts/programs-keys-gen.sh +++ b/scripts/programs-keys-gen.sh @@ -22,6 +22,6 @@ mkdir -p ./contracts/target/deploy cp ./contracts/artifacts/$network/*.json ./contracts/target/deploy # Replace existing declare_id!() -sed -i.bak "s/DzzjdPWNfwHZmzPVxnmqkkMJraYQQRCpgFZajqkqmU6G/$ACCESS_CONTROLLER_PROGRAM_ID/" contracts/programs/access-controller/src/lib.rs -sed -i.bak "s/CaH12fwNTKJAG8PxEvo9R96Zc2j8qNHZaFj8ZW49yZNT/$STORE_PROGRAM_ID/" contracts/programs/store/src/lib.rs -sed -i.bak "s/HW3ipKzeeduJq6f1NqRCw4doknMeWkfrM4WxobtG3o5v/$OCR2_PROGRAM_ID/" contracts/programs/ocr2/src/lib.rs \ No newline at end of file +sed -i.bak "s/9xi644bRR8birboDGdTiwBq3C7VEeR7VuamRYYXCubUW/$ACCESS_CONTROLLER_PROGRAM_ID/" contracts/programs/access-controller/src/lib.rs +sed -i.bak "s/HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny/$STORE_PROGRAM_ID/" contracts/programs/store/src/lib.rs +sed -i.bak "s/cjg3oHmg9uuPsP8D6g29NWvhySJkdYdAo9D25PRbKXJ/$OCR2_PROGRAM_ID/" contracts/programs/ocr2/src/lib.rs \ No newline at end of file