chore: pull monorepo changes (#113)

* Project import generated by Copybara. GitOrigin-RevId: 20a39c08b5f2bd4c44c08303a3c29290d20005ce * chore: Update pnpm lockfile --------- Co-authored-by: Copybara <[email protected]> Co-authored-by: gallynaut <[email protected]>
switchboard-xyz · Jul 31, 2023 · 00eca44 · 00eca44
1 parent 33cf78d
commit 00eca44
Show file tree

Hide file tree

Showing 37 changed files with 17,382 additions and 583 deletions.
diff --git a/examples/README.md b/examples/README.md
diff --git a/examples/functions/01_basic_oracle/Anchor.toml b/examples/functions/01_basic_oracle/Anchor.toml
@@ -12,9 +12,9 @@ basic_oracle = "BkTMjFhosJ1xKtLMV2xchGtnTDBABLJ45aXzs7x9FdeX"
 basic_oracle = "BkTMjFhosJ1xKtLMV2xchGtnTDBABLJ45aXzs7x9FdeX"
 
 [provider]
-# cluster = "https://api.devnet.solana.com"
+cluster = "https://api.devnet.solana.com"
 # wallet = "~/switchboard_environments_v2/devnet/upgrade_authority/upgrade_authority.json"
-cluster = "Localnet"
+# cluster = "Localnet"
 wallet = "~/.config/solana/id.json"
 
 # cluster = "devnet"

diff --git a/examples/functions/01_basic_oracle/Cargo.lock b/examples/functions/01_basic_oracle/Cargo.lock
diff --git a/examples/functions/01_basic_oracle/Cargo.toml b/examples/functions/01_basic_oracle/Cargo.toml
@@ -17,10 +17,7 @@ cpi = ["no-entrypoint"]
 default = []
 
 [dependencies]
-switchboard-solana = { version = "=0.9.1" }
-# switchboard-solana = { version = "0.9.1", path = "../../../rust/switchboard-solana" }
+switchboard-solana = { version = "=0.9.5" }
+# switchboard-solana = { version = "0.9.4", path = "../../../rust/switchboard-solana" }
 bytemuck = "^1"
-anchor-lang = { version = "0.28.0", features = [
-  "init-if-needed",
-  "allow-missing-optionals"
-] }
+anchor-lang = { version = "0.28.0" }
diff --git a/examples/functions/01_basic_oracle/sgx-function/.gitignore b/examples/functions/01_basic_oracle/sgx-function/.gitignore
@@ -3,10 +3,6 @@
 debug/
 target/
 
-# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
-# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
-# Cargo.lock
-
 # These are backup files generated by rustfmt
 **/*.rs.bk
 

diff --git a/examples/functions/01_basic_oracle/sgx-function/Cargo.toml b/examples/functions/01_basic_oracle/sgx-function/Cargo.toml
@@ -14,4 +14,5 @@ futures = "0.3"
 serde = "^1"
 serde_json = "^1"
 switchboard-utils = { version = "0.8.0" }
-switchboard-solana = { version = "0.9.1", path = "../../../rust/switchboard-solana" }
+# switchboard-solana = { version = "0.9.4", path = "../../../rust/switchboard-solana" }
+switchboard-solana = "0.9.5"
diff --git a/examples/functions/01_basic_oracle/sgx-function/Dockerfile b/examples/functions/01_basic_oracle/sgx-function/Dockerfile
@@ -26,6 +26,6 @@ WORKDIR /sgx
 COPY --from=builder /sgx/app /sgx
 
 # Get the measurement from the enclave
-RUN /get_measurement.sh
+RUN /get_measurement.sh && cat /measurement.txt
 
 ENTRYPOINT ["bash", "/boot.sh"]
diff --git a/examples/functions/01_basic_oracle/src/actions/refresh_prices.rs b/examples/functions/01_basic_oracle/src/actions/refresh_prices.rs
@@ -15,10 +15,6 @@ pub struct RefreshPrices<'info> {
             function.load()?.validate(
               &enclave_signer.to_account_info()
             )? @ BasicOracleError::FunctionValidationFailed
-          //   FunctionAccountData::validate(
-          //     &function.to_account_info(),
-          //     &enclave_signer.to_account_info()
-          // )? @ BasicOracleError::FunctionValidationFailed
     )]
     pub function: AccountLoader<'info, FunctionAccountData>,
     pub enclave_signer: Signer<'info>,

diff --git a/examples/functions/02_liquidity_oracle/sgx-function/src/main.rs b/examples/functions/02_liquidity_oracle/sgx-function/src/main.rs
@@ -76,4 +76,4 @@ async fn main() {
     // // Finally, emit the signed quote and partially signed transaction to the functionRunner oracle
     // // The functionRunner oracle will use the last outputted word to stdout as the serialized result. This is what gets executed on-chain.
     // runner.emit(ixs).await.unwrap();
-}
+}
diff --git a/examples/functions/04_randomness_callback/Anchor.toml b/examples/functions/04_randomness_callback/Anchor.toml
@@ -14,7 +14,7 @@ url = "https://api.apr.dev"
 [provider]
 # cluster = "Localnet"
 cluster = "https://api.devnet.solana.com"
-wallet = "~/.config/solana/id.json"
+wallet = "~/switchboard_environments_v2/devnet/upgrade_authority/upgrade_authority.json"
 
 [scripts]
 test = "pnpm exec ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
@@ -44,4 +44,4 @@ address = "sbattyXrzedoNATfc4L31wC9Mhxsi1BmFhTiN8gDshx"
 address = "5ExuoQR69trmKQfB95fDsUGsUrrChbGq9PFgt8qouncz"
 
 [[test.validator.clone]] # sb devnet programState
-address = "5MFs7RGTjLi1wtKNBFRtuLipCkkjs4YQwRRU9sjnbQbS"
+address = "5MFs7RGTjLi1wtKNBFRtuLipCkkjs4YQwRRU9sjnbQbS"