From 73c628ec7251e220998e48aab81dc58be85b5089 Mon Sep 17 00:00:00 2001
From: Rodrigo Ariza <15104916+RodrigoAD@users.noreply.github.com>
Date: Mon, 20 Dec 2021 17:21:06 +0100
Subject: [PATCH] Improve program IDs handling (#56)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Allow specifying network via cargo feature

* Added localnet program IDs

* Improve localnet program key handling

* Move .sh under ./scripts

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
Co-authored-by: Kristijan Rebernisak <kristijan.rebernisak@gmail.com>
---
 .github/workflows/e2e.yml                     |  9 +-
 .gitignore                                    |  4 +
 contracts/Anchor.toml                         | 19 +++-
 contracts/README.md                           | 32 +++++--
 contracts/anchor-generate.sh                  |  7 --
 .../localnet/access_controller-keypair.json   |  1 +
 .../localnet/access_controller-keypair.pub    |  1 +
 .../deviation_flagging_validator-keypair.json |  1 +
 .../deviation_flagging_validator-keypair.pub  |  1 +
 .../artifacts/localnet/ocr2-keypair.json      |  1 +
 contracts/artifacts/localnet/ocr2-keypair.pub |  1 +
 .../programs/access-controller/Cargo.toml     |  6 +-
 .../programs/access-controller/src/lib.rs     |  7 ++
 .../deviation-flagging-validator/Cargo.toml   |  6 +-
 .../deviation-flagging-validator/src/lib.rs   |  7 ++
 contracts/programs/ocr2/Cargo.toml            |  6 +-
 contracts/programs/ocr2/src/lib.rs            |  7 ++
 contracts/set_declare_ids.sh                  |  5 -
 ops/README.md                                 | 93 ++++++++++++-------
 scripts/anchor-go-gen.sh                      | 10 ++
 tools/shell => scripts/anchor-shell.sh        |  1 +
 scripts/programs-keys-cp.sh                   |  7 ++
 scripts/programs-keys-gen.sh                  | 14 +++
 tests/e2e/keys/access_controller-keypair.json |  1 -
 .../deviation_flagging_validator-keypair.json |  1 -
 tests/e2e/keys/ocr2-keypair.json              |  1 -
 26 files changed, 179 insertions(+), 70 deletions(-)
 delete mode 100755 contracts/anchor-generate.sh
 create mode 100644 contracts/artifacts/localnet/access_controller-keypair.json
 create mode 100644 contracts/artifacts/localnet/access_controller-keypair.pub
 create mode 100644 contracts/artifacts/localnet/deviation_flagging_validator-keypair.json
 create mode 100644 contracts/artifacts/localnet/deviation_flagging_validator-keypair.pub
 create mode 100644 contracts/artifacts/localnet/ocr2-keypair.json
 create mode 100644 contracts/artifacts/localnet/ocr2-keypair.pub
 delete mode 100755 contracts/set_declare_ids.sh
 create mode 100755 scripts/anchor-go-gen.sh
 rename tools/shell => scripts/anchor-shell.sh (99%)
 create mode 100755 scripts/programs-keys-cp.sh
 create mode 100755 scripts/programs-keys-gen.sh
 delete mode 100644 tests/e2e/keys/access_controller-keypair.json
 delete mode 100644 tests/e2e/keys/deviation_flagging_validator-keypair.json
 delete mode 100644 tests/e2e/keys/ocr2-keypair.json

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 3daffde43..fcb8ba587 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -17,9 +17,6 @@ jobs:
       - run: |
           npm config set -- '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
           NPM_TOKEN=${NPM_TOKEN} yarn install --frozen-lockfile
-      - name: set key ids
-        run: bash set_declare_ids.sh
-        working-directory: contracts
       - run: anchor build
         working-directory: contracts
       - uses: actions/upload-artifact@master
@@ -75,7 +72,7 @@ jobs:
           name: target
           path: contracts/target/deploy
       - name: cp static deploy keys
-        run: cp tests/e2e/keys/*.json contracts/target/deploy
+        run: ./scripts/programs-keys-cp.sh
       - name: Run Tests
         env:
           SELECTED_NETWORKS: solana
@@ -87,7 +84,7 @@ jobs:
         uses: mikepenz/action-junit-report@v2
         if: always()
         with:
-          report_paths: './tests-smoke-report.xml'
+          report_paths: "./tests-smoke-report.xml"
           github_token: ${{ secrets.GITHUB_TOKEN }}
           check_name: Smoke Test Results
       - name: Publish Artifacts
@@ -95,4 +92,4 @@ jobs:
         uses: actions/upload-artifact@v2.2.4
         with:
           name: test-logs
-          path: ./logs
\ No newline at end of file
+          path: ./logs
diff --git a/.gitignore b/.gitignore
index 565296c94..12c580039 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,11 +6,15 @@
 pkg/bin
 
 v1/target
+
 contracts/target
 contracts/programs/*/target
 contracts/.anchor
 # keypair used by anchor/anchor test
 contracts/id.json
+# ignore all except shared localnet keys
+contracts/artifacts/*
+!contracts/artifacts/localnet/
 
 # TS
 node_modules
diff --git a/contracts/Anchor.toml b/contracts/Anchor.toml
index 24d6be45b..20f06a12d 100644
--- a/contracts/Anchor.toml
+++ b/contracts/Anchor.toml
@@ -1,7 +1,4 @@
-[programs.localnet]
-ocr2 = "My11111111111111111111111111111111111111111"
-access_controller = "My11111111111111111111111111111111111111112"
-deviation_flagging_validator = "My11111111111111111111111111111111111111113"
+anchor_version = "0.19.0"
 
 [registry]
 url = "https://anchor.projectserum.com"
@@ -13,3 +10,17 @@ wallet = "id.json"
 
 [scripts]
 test = "yarn run test"
+
+# [programs.mainnet]
+# TODO: add pubkeys
+
+# [programs.testnet]
+# TODO: add pubkeys
+
+# [programs.devnet]
+# TODO: add pubkeys
+
+[programs.localnet]
+ocr2 = "CF13pnKGJ1WJZeEgVAtFdUi4MMndXm9hneiHs8azUaZt"
+access_controller = "2F5NEkMnCRkmahEAcQfTQcZv1xtGgrWFfjENtTwHLuKg"
+deviation_flagging_validator = "A7Jh2nb1hZHwqEofm4N8SXbKTj82rx7KUfjParQXUyMQ"
diff --git a/contracts/README.md b/contracts/README.md
index 142489df8..024cbb63b 100644
--- a/contracts/README.md
+++ b/contracts/README.md
@@ -1,4 +1,4 @@
-# chainlink-solana
+# Chainlink Solana contracts (programs)
 
 ## Build
 
@@ -8,37 +8,51 @@ To build on the host:
 anchor build
 ```
 
-
 To build inside a docker environment:
 
-```
+```bash
 anchor build --verifiable
 ```
 
+To build for a specific network, specify via a cargo feature:
+
+```bash
+anchor build -- --features mainnet
+```
+
+Available networks with declared IDs:
+
+- mainnet
+- testnet
+- devnet
+- localnet (default)
+
 ## Test
 
 Make sure to run `yarn install` to fetch mocha and other test dependencies.
 
 Start a dockerized shell that contains Solana and Anchor:
 
-```
-tools/shell
+```bash
+./scripts/anchor-shell.sh
 ```
 
 Next, generate a keypair for anchor:
 
-```
+```bash
 solana-keygen new -o id.json
 ```
 
 Run anchor tests (automatically tests against a local node).
 
-```
+```bash
 anchor test
 ```
 
 ### `anchor-go` bindings generation
+
 Install `https://github.com/gagliardetto/anchor-go`
-```
-./anchor-generate.sh
+
+```bash
+./scripts/anchor-go-gen.sh
 ```
diff --git a/contracts/anchor-generate.sh b/contracts/anchor-generate.sh
deleted file mode 100755
index 88499bbc2..000000000
--- a/contracts/anchor-generate.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-for idl_path_str in "target/idl"/*
-do
-  IFS='/' read -r -a idl_path <<< "${idl_path_str}"
-  IFS='.' read -r -a idl_name <<< "${idl_path[2]}"
-  anchor-go -src "${idl_path_str}" -dst generated/"${idl_name[0]}" -codec borsh
-done
\ No newline at end of file
diff --git a/contracts/artifacts/localnet/access_controller-keypair.json b/contracts/artifacts/localnet/access_controller-keypair.json
new file mode 100644
index 000000000..e08ed9b6a
--- /dev/null
+++ b/contracts/artifacts/localnet/access_controller-keypair.json
@@ -0,0 +1 @@
+[37,249,255,16,191,60,158,11,196,174,55,141,240,100,10,205,241,65,52,65,147,222,140,177,101,84,208,117,2,7,198,55,18,118,193,77,2,96,33,114,140,62,155,67,110,114,187,219,91,200,19,104,142,77,133,12,135,53,104,100,186,90,58,67]
\ No newline at end of file
diff --git a/contracts/artifacts/localnet/access_controller-keypair.pub b/contracts/artifacts/localnet/access_controller-keypair.pub
new file mode 100644
index 000000000..a5a60625e
--- /dev/null
+++ b/contracts/artifacts/localnet/access_controller-keypair.pub
@@ -0,0 +1 @@
+2F5NEkMnCRkmahEAcQfTQcZv1xtGgrWFfjENtTwHLuKg
diff --git a/contracts/artifacts/localnet/deviation_flagging_validator-keypair.json b/contracts/artifacts/localnet/deviation_flagging_validator-keypair.json
new file mode 100644
index 000000000..934e9927f
--- /dev/null
+++ b/contracts/artifacts/localnet/deviation_flagging_validator-keypair.json
@@ -0,0 +1 @@
+[13,121,98,140,123,112,245,240,103,162,135,3,117,25,171,28,207,246,72,24,193,186,101,25,147,60,195,254,206,81,247,68,135,86,171,103,140,175,24,211,140,34,95,225,154,113,64,126,58,84,240,232,243,129,235,57,88,47,108,159,9,56,54,183]
\ No newline at end of file
diff --git a/contracts/artifacts/localnet/deviation_flagging_validator-keypair.pub b/contracts/artifacts/localnet/deviation_flagging_validator-keypair.pub
new file mode 100644
index 000000000..6ddbf28e6
--- /dev/null
+++ b/contracts/artifacts/localnet/deviation_flagging_validator-keypair.pub
@@ -0,0 +1 @@
+A7Jh2nb1hZHwqEofm4N8SXbKTj82rx7KUfjParQXUyMQ
diff --git a/contracts/artifacts/localnet/ocr2-keypair.json b/contracts/artifacts/localnet/ocr2-keypair.json
new file mode 100644
index 000000000..00d56bb62
--- /dev/null
+++ b/contracts/artifacts/localnet/ocr2-keypair.json
@@ -0,0 +1 @@
+[151,42,194,95,143,220,9,17,209,3,72,112,207,17,78,108,146,66,151,178,142,138,198,172,39,230,182,79,210,32,110,152,167,6,190,24,221,53,1,22,40,237,204,28,212,176,150,157,20,159,241,30,197,118,222,106,10,143,11,224,118,8,188,63]
\ No newline at end of file
diff --git a/contracts/artifacts/localnet/ocr2-keypair.pub b/contracts/artifacts/localnet/ocr2-keypair.pub
new file mode 100644
index 000000000..dbb995f3f
--- /dev/null
+++ b/contracts/artifacts/localnet/ocr2-keypair.pub
@@ -0,0 +1 @@
+CF13pnKGJ1WJZeEgVAtFdUi4MMndXm9hneiHs8azUaZt
diff --git a/contracts/programs/access-controller/Cargo.toml b/contracts/programs/access-controller/Cargo.toml
index 946cc5ace..ddb0c1ad0 100644
--- a/contracts/programs/access-controller/Cargo.toml
+++ b/contracts/programs/access-controller/Cargo.toml
@@ -12,7 +12,11 @@ name = "access_controller"
 no-entrypoint = []
 no-idl = []
 cpi = ["no-entrypoint"]
-default = []
+mainnet = []
+testnet = []
+devnet = []
+localnet = []
+default = ["localnet"]
 
 [dependencies]
 anchor-lang = "0.19.0"
diff --git a/contracts/programs/access-controller/src/lib.rs b/contracts/programs/access-controller/src/lib.rs
index 76caa1d55..a22cdd267 100644
--- a/contracts/programs/access-controller/src/lib.rs
+++ b/contracts/programs/access-controller/src/lib.rs
@@ -5,7 +5,14 @@ use std::mem;
 
 use arrayvec::arrayvec;
 
+#[cfg(feature = "mainnet")]
 declare_id!("My11111111111111111111111111111111111111112");
+#[cfg(feature = "testnet")]
+declare_id!("My11111111111111111111111111111111111111112");
+#[cfg(feature = "devnet")]
+declare_id!("My11111111111111111111111111111111111111112");
+#[cfg(not(any(feature = "mainnet", feature = "testnet", feature = "devnet")))]
+declare_id!("2F5NEkMnCRkmahEAcQfTQcZv1xtGgrWFfjENtTwHLuKg");
 
 #[constant]
 pub const MAX_ADDRS: usize = 32;
diff --git a/contracts/programs/deviation-flagging-validator/Cargo.toml b/contracts/programs/deviation-flagging-validator/Cargo.toml
index 272b14ba3..88d1af80e 100644
--- a/contracts/programs/deviation-flagging-validator/Cargo.toml
+++ b/contracts/programs/deviation-flagging-validator/Cargo.toml
@@ -12,7 +12,11 @@ name = "deviation_flagging_validator"
 no-entrypoint = []
 no-idl = []
 cpi = ["no-entrypoint"]
-default = []
+mainnet = ["access-controller/mainnet"]
+testnet = ["access-controller/testnet"]
+devnet = ["access-controller/devnet"]
+localnet = ["access-controller/localnet"]
+default = ["localnet"]
 
 [dependencies]
 anchor-lang = "0.19.0"
diff --git a/contracts/programs/deviation-flagging-validator/src/lib.rs b/contracts/programs/deviation-flagging-validator/src/lib.rs
index 3c9a06f67..7ea905478 100644
--- a/contracts/programs/deviation-flagging-validator/src/lib.rs
+++ b/contracts/programs/deviation-flagging-validator/src/lib.rs
@@ -4,7 +4,14 @@ use arrayvec::arrayvec;
 
 use access_controller::AccessController;
 
+#[cfg(feature = "mainnet")]
 declare_id!("My11111111111111111111111111111111111111113");
+#[cfg(feature = "testnet")]
+declare_id!("My11111111111111111111111111111111111111113");
+#[cfg(feature = "devnet")]
+declare_id!("My11111111111111111111111111111111111111113");
+#[cfg(not(any(feature = "mainnet", feature = "testnet", feature = "devnet")))]
+declare_id!("A7Jh2nb1hZHwqEofm4N8SXbKTj82rx7KUfjParQXUyMQ");
 
 static THRESHOLD_MULTIPLIER: u128 = 100000;
 
diff --git a/contracts/programs/ocr2/Cargo.toml b/contracts/programs/ocr2/Cargo.toml
index b70e6ab31..b6cee51e1 100644
--- a/contracts/programs/ocr2/Cargo.toml
+++ b/contracts/programs/ocr2/Cargo.toml
@@ -12,7 +12,11 @@ name = "ocr2"
 no-entrypoint = []
 no-idl = []
 cpi = ["no-entrypoint"]
-default = []
+mainnet = ["access-controller/mainnet", "deviation-flagging-validator/mainnet"]
+testnet = ["access-controller/testnet", "deviation-flagging-validator/testnet"]
+devnet = ["access-controller/devnet", "deviation-flagging-validator/devnet"]
+localnet = ["access-controller/localnet", "deviation-flagging-validator/localnet"]
+default = ["localnet"]
 
 [dependencies]
 anchor-lang = "0.19.0"
diff --git a/contracts/programs/ocr2/src/lib.rs b/contracts/programs/ocr2/src/lib.rs
index 587cfc07b..3e8151652 100644
--- a/contracts/programs/ocr2/src/lib.rs
+++ b/contracts/programs/ocr2/src/lib.rs
@@ -4,7 +4,14 @@ use anchor_spl::token;
 
 use arrayref::{array_ref, array_refs};
 
+#[cfg(feature = "mainnet")]
 declare_id!("My11111111111111111111111111111111111111111");
+#[cfg(feature = "testnet")]
+declare_id!("My11111111111111111111111111111111111111111");
+#[cfg(feature = "devnet")]
+declare_id!("My11111111111111111111111111111111111111111");
+#[cfg(not(any(feature = "mainnet", feature = "testnet", feature = "devnet")))]
+declare_id!("CF13pnKGJ1WJZeEgVAtFdUi4MMndXm9hneiHs8azUaZt");
 
 mod context;
 pub mod event;
diff --git a/contracts/set_declare_ids.sh b/contracts/set_declare_ids.sh
deleted file mode 100755
index 701037e6a..000000000
--- a/contracts/set_declare_ids.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/zsh
-sed -i.bak 's/declare_id!("My11111111111111111111111111111111111111112");/declare_id!("ENmeY9iRUUzN5NUvhHTc5vA8nQuYqXcsU7h4JzKMw5aE");/g' programs/access-controller/src/lib.rs
-sed -i.bak 's/declare_id!("My11111111111111111111111111111111111111113");/declare_id!("CVmCNhhYxQHRjWJuGDUio3JtNnsTfHTVWyTgq6UozQSw");/g' programs/deviation-flagging-validator/src/lib.rs
-sed -i.bak 's/declare_id!("My11111111111111111111111111111111111111111");/declare_id!("Fh7uhkZLvogdxrQccDpRgMDyN3wKb5ZQGRcpvujeqAae");/g' programs/ocr2/src/lib.rs
-
diff --git a/ops/README.md b/ops/README.md
index 0aab5b017..3f8d87043 100644
--- a/ops/README.md
+++ b/ops/README.md
@@ -1,50 +1,70 @@
-# Local Testing Environment
+# Local Environment
 
 [WIP - work in progress]
 
-Using `pulumi` spin up a local testing environment using docker containers.
-- Deploy the necessary relay components (relay, CL node, psql DB, price feed adapters)
-- Connect the components together
-```
-Blockchain <-> Relay <-> CL node <-> price adapters
-                |<-> DB <->|
-```
+- [Local Environment](#local-environment)
+  - [Usage](#usage)
+  - [Local Solana Testnet](#local-solana-testnet)
+  - [Pulumi Installation Instruction](#pulumi-installation-instruction)
+
+Using `pulumi` spin up a local testing environment using docker containers:
 
+- Deploy the necessary relay components (CL node, psql DB, price feed adapters)
+- Connect the components together
 - Deploy and configure the necessary contracts (LINK token, aggregator contract)
 - Create the expected job specs for reporting to the aggregator contract
 
-## Dependencies
-- [Pulumi](#pulumi-installation-instruction)
-- [Solana Test Validator](#local-solana-testnet)
-
 ## Usage
-Set a `.env` file inside of `chainlink-solana/gauntlet`. The private key can be generated the same way as the program accounts (`solana-keygen`) then copied into the env file.
+
+Generate the key used for deployments (Gauntlet). The key can be generated using `solana-keygen` then copied into the env file.
+
+```bash
+solana-keygen new -o <path>
+```
+
+Add a `./gauntlet/.env` file`:
+
 ```
 # .env
 PRIVATE_KEY=[96,13,...]
 SECRET=some random local testing secret
 ```
 
-Generate keypairs for program accounts (usually only need to be done once)
+Generate keys for program account IDs (usually only need to be done once):
+
 ```bash
-solana-keygen new -o <path>
+./scripts/solana-keygen-programs.sh # from root
+```
 
-# examples (from root)
-solana-keygen new -o ./gauntlet/packages/gauntlet-solana-contracts/artifacts/programId/access_controller.json
-solana-keygen new -o ./gauntlet/packages/gauntlet-solana-contracts/artifacts/programId/deviation_flagging_validator.json
-solana-keygen new -o ./gauntlet/packages/gauntlet-solana-contracts/artifacts/programId/ocr2.json
+The script will generate N keys for programs and store them at `./contracts/artifacts/${network]/`.
+**NOTICE:** To improve setup, `localnet` keys are already shared and available at `./contracts/artifacts/localnet/`.
+
+Next, we need to copy keys over to `./contracts/target/deploy/` so Anchor would use them on deploy. Run this helper script to copy keys:
+
+```bash
+./scripts/programs-keys-cp.sh # from root
 ```
 
 Add the pubkeys to the their respective program (do for each program)
+
 ```rust
-// example in programs/ocr2/src/lib.rs
-declare_id!("CF6b2XF6BZw65aznGzXwzF5A8iGhDBoeNYQiXyH4MWdQ");
+// example in ./contracts/programs/ocr2/src/lib.rs
+declare_id!("CF13pnKGJ1WJZeEgVAtFdUi4MMndXm9hneiHs8azUaZt");
+```
+
+...and to Anchor configuration:
+
+```toml
+# example in ./contracts/Anchor.toml
+[programs.localnet]
+ocr2 = "CF13pnKGJ1WJZeEgVAtFdUi4MMndXm9hneiHs8azUaZt"
 ```
 
 Compile program artifacts (do each time contract changes)
+
 ```bash
 # from root
-./tools/shell
+./scripts/anchor-shell.sh
 cd contracts
 anchor build
 
@@ -55,6 +75,7 @@ cp contracts/target/deploy/ocr2.so gauntlet/packages/gauntlet-solana-contracts/a
 ```
 
 Start up the solana test validator (recommend always using `-r` for a clean slate, runs into deployment issues otherwise)
+
 ```bash
 # start validator
 solana-test-validator -r
@@ -64,6 +85,7 @@ solana airdrop 100 2CbCTf2V95kMfNA31yYaqJ9oVX7MN71RU6zvvg27PgSz
 ```
 
 Start up the pulumi environment (tweak the `Pulumi.localnet.yaml` file if necessary)
+
 ```bash
 # start up the environment
 pulumi up -y -s localnet
@@ -73,13 +95,16 @@ pulumi destroy -y -s localnet
 ```
 
 ## Local Solana Testnet
+
 Documentation:
-* https://docs.solana.com/developing/test-validator
-* https://docs.solana.com/developing/clients/jsonrpc-api
+
+- https://docs.solana.com/developing/test-validator
+- https://docs.solana.com/developing/clients/jsonrpc-api
 
 Note:
 `Program failed to complete: ELF error: Unresolved symbol (sol_secp256k1_recover) at instruction #53009 (ELF file offset 0x677a0)`
-* Resolved by updating to the latest solana CLI `solana-install update`
+
+- Resolved by updating to the latest solana CLI `solana-install update`
 
 ```bash
 # start up local test validator
@@ -97,6 +122,7 @@ solana logs
 ```
 
 ## Pulumi Installation Instruction
+
 Infrastructure management tool.
 
 ```bash
@@ -117,11 +143,12 @@ pulumi stack rm <network>
 ```
 
 Notes:
-* Installation: highly recommend using [`asdf`](https://asdf-vm.com/) for version management
-   ```
-   asdf plugin add pulumi
-   asdf install pulumi latest
-   asdf global pulumi latest
-   ```
-* May require setting environment variable `export PULUMI_CONFIG_PASSPHRASE=` (no need to set it to anything unless you want to)
-* [Using Pulumi without pulumi.com](https://www.pulumi.com/docs/troubleshooting/faq/#can-i-use-pulumi-without-depending-on-pulumicom): tl;dr - `pulumi login --local`
+
+- Installation: highly recommend using [`asdf`](https://asdf-vm.com/) for version management
+  ```
+  asdf plugin add pulumi
+  asdf install pulumi latest
+  asdf global pulumi latest
+  ```
+- May require setting environment variable `export PULUMI_CONFIG_PASSPHRASE=` (no need to set it to anything unless you want to)
+- [Using Pulumi without pulumi.com](https://www.pulumi.com/docs/troubleshooting/faq/#can-i-use-pulumi-without-depending-on-pulumicom): tl;dr - `pulumi login --local`
diff --git a/scripts/anchor-go-gen.sh b/scripts/anchor-go-gen.sh
new file mode 100755
index 000000000..cf1eaa6fb
--- /dev/null
+++ b/scripts/anchor-go-gen.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -e
+
+for idl_path_str in "contracts/target/idl"/*
+do
+  IFS='/' read -r -a idl_path <<< "${idl_path_str}"
+  IFS='.' read -r -a idl_name <<< "${idl_path[3]}"
+  anchor-go -src "${idl_path_str}" -dst contracts/generated/"${idl_name}" -codec borsh
+done
diff --git a/tools/shell b/scripts/anchor-shell.sh
similarity index 99%
rename from tools/shell
rename to scripts/anchor-shell.sh
index 1d64a6d31..c4bd8d5e4 100755
--- a/tools/shell
+++ b/scripts/anchor-shell.sh
@@ -1,2 +1,3 @@
 #!/usr/bin/env bash
+
 docker run --rm -it -v $(pwd):/workdir --entrypoint bash projectserum/build:v0.19.0
diff --git a/scripts/programs-keys-cp.sh b/scripts/programs-keys-cp.sh
new file mode 100755
index 000000000..8cf227b26
--- /dev/null
+++ b/scripts/programs-keys-cp.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -e
+
+network=${1:-localnet}
+
+cp contracts/artifacts/$network/*.json contracts/target/deploy
diff --git a/scripts/programs-keys-gen.sh b/scripts/programs-keys-gen.sh
new file mode 100755
index 000000000..5a10f327b
--- /dev/null
+++ b/scripts/programs-keys-gen.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -e
+
+network=${1:-localnet}
+
+solana-keygen new -o ./contracts/artifacts/$network/access_controller-keypair.json
+solana-keygen pubkey ./contracts/artifacts/$network/access_controller-keypair.json > ./contracts/artifacts/$network/access_controller-keypair.pub
+
+solana-keygen new -o ./contracts/artifacts/$network/deviation_flagging_validator-keypair.json
+solana-keygen pubkey ./contracts/artifacts/$network/deviation_flagging_validator-keypair.json > ./contracts/artifacts/$network/deviation_flagging_validator-keypair.pub
+
+solana-keygen new -o ./contracts/artifacts/$network/ocr2-keypair.json
+solana-keygen pubkey ./contracts/artifacts/$network/ocr2-keypair.json > ./contracts/artifacts/$network/ocr2-keypair.pub
diff --git a/tests/e2e/keys/access_controller-keypair.json b/tests/e2e/keys/access_controller-keypair.json
deleted file mode 100644
index 038188d81..000000000
--- a/tests/e2e/keys/access_controller-keypair.json
+++ /dev/null
@@ -1 +0,0 @@
-[21,99,149,162,108,195,69,184,186,220,212,148,148,198,245,143,36,249,127,14,114,186,72,247,220,80,211,187,197,45,20,227,198,187,156,26,19,30,75,37,160,231,148,179,38,187,33,8,217,166,247,102,0,220,225,102,209,249,130,140,143,204,164,199]
\ No newline at end of file
diff --git a/tests/e2e/keys/deviation_flagging_validator-keypair.json b/tests/e2e/keys/deviation_flagging_validator-keypair.json
deleted file mode 100644
index a95414765..000000000
--- a/tests/e2e/keys/deviation_flagging_validator-keypair.json
+++ /dev/null
@@ -1 +0,0 @@
-[217,165,16,105,110,14,40,89,88,4,73,6,160,76,251,255,135,230,26,241,13,79,131,183,91,251,97,130,69,70,153,158,170,206,202,162,105,184,230,230,203,44,173,249,162,139,239,144,149,242,29,32,50,171,116,108,76,170,254,251,109,34,178,4]
\ No newline at end of file
diff --git a/tests/e2e/keys/ocr2-keypair.json b/tests/e2e/keys/ocr2-keypair.json
deleted file mode 100644
index 8c78ef4b5..000000000
--- a/tests/e2e/keys/ocr2-keypair.json
+++ /dev/null
@@ -1 +0,0 @@
-[58,219,14,7,160,1,112,137,204,176,117,233,234,172,76,48,225,72,186,170,148,70,134,10,142,14,188,161,53,169,11,142,218,74,169,54,80,48,253,125,73,131,156,11,157,29,33,27,141,222,200,44,152,16,134,207,21,167,65,184,150,235,171,115]
\ No newline at end of file