Project import generated by Copybara.

GitOrigin-RevId: 0c5eba2123e795e14b6b97854d664fe2b678a347
switchboard-xyz · Nov 29, 2023 · ae3a735 · ae3a735
1 parent 7feef95
commit ae3a735
Show file tree

Hide file tree

Showing 24 changed files with 1,680 additions and 998 deletions.
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
@@ -19,6 +19,6 @@ cpi = ["no-entrypoint"]
 default = []
 
 [dependencies]
-# switchboard-solana = { version = "0.28.43" }
+# switchboard-solana = { version = "0.29.70" }
 switchboard-solana = { path = "../../../rust/switchboard-solana" }
 bytemuck = "^1"
diff --git a/examples/functions/01_basic_oracle/package.json b/examples/functions/01_basic_oracle/package.json
@@ -15,7 +15,7 @@
     "@coral-xyz/anchor": "^0.28.0",
     "@solana/spl-token": "^0.3.6",
     "@solana/web3.js": "^1.78.0",
-    "@switchboard-xyz/solana.js": "*"
+    "@switchboard-xyz/solana.js": "^3"
   },
   "devDependencies": {
     "@types/bn.js": "^5.1.0",

diff --git a/examples/functions/01_basic_oracle/src/actions/refresh_prices.rs b/examples/functions/01_basic_oracle/src/actions/refresh_prices.rs
@@ -10,14 +10,17 @@ pub struct RefreshPrices<'info> {
     pub oracle: AccountLoader<'info, MyOracleState>,
 
     // We use this to verify the functions enclave state
-    pub switchboard_function: AccountLoader<'info, FunctionAccountData>,
     #[account(
-        // constraint = switchboard_routine.validate_signer(
-        //     switchboard_function.to_account_info().as_ref(),
-        //     enclave_signer.to_account_info().as_ref()
-        // )?
+        constraint = function.load()?.validate_routine(
+            &routine,
+            &enclave_signer.to_account_info(),
+        )?
     )]
-    pub switchboard_routine: Box<Account<'info, FunctionRoutineAccountData>>,
+    pub function: AccountLoader<'info, FunctionAccountData>,
+    #[account(
+        has_one = function,
+    )]
+    pub routine: Box<Account<'info, FunctionRoutineAccountData>>,
     pub enclave_signer: Signer<'info>,
 }
 
@@ -30,7 +33,7 @@ impl RefreshPrices<'_> {
     pub fn validate(
         &self,
         _ctx: &Context<Self>,
-        _params: &RefreshPricesParams
+        _params: &RefreshPricesParams,
     ) -> anchor_lang::Result<()> {
         Ok(())
     }

diff --git a/examples/functions/01_basic_oracle/src/actions/set_function.rs b/examples/functions/01_basic_oracle/src/actions/set_function.rs
@@ -11,7 +11,11 @@ pub struct SetFunction<'info> {
     )]
     pub program: AccountLoader<'info, MyProgramState>,
 
+    // Make sure the function has at least one MrEnclave measurement defined.
     pub switchboard_function: AccountLoader<'info, FunctionAccountData>,
+    #[account(
+        constraint = switchboard_routine.function == switchboard_function.key()
+    )]
     pub switchboard_routine: Box<Account<'info, FunctionRoutineAccountData>>,
 
     pub authority: Signer<'info>,

diff --git a/examples/functions/01_basic_oracle/switchboard-function/Cargo.lock b/examples/functions/01_basic_oracle/switchboard-function/Cargo.lock