chore: pull monorepo changes (#130)

* Project import generated by Copybara. GitOrigin-RevId: 38e6be703616d1edafd421b9939003ad03c96a7a * chore: Update pnpm lockfile --------- Co-authored-by: Copybara <[email protected]> Co-authored-by: gallynaut <[email protected]>
switchboard-xyz · Sep 14, 2023 · a99fe5a · a99fe5a
1 parent c955d0a
commit a99fe5a
Show file tree

Hide file tree

Showing 20 changed files with 2,594 additions and 387 deletions.
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 = "=0.28.6"
+switchboard-solana = { version = "=0.28.15", features = [ ] }
 # switchboard-solana = { version = "0.28.4", 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": "workspace:^"
+    "@switchboard-xyz/solana.js": "workspace:*"
   },
   "devDependencies": {
     "@types/bn.js": "^5.1.0",

diff --git a/examples/functions/01_basic_oracle/sgx-function/Cargo.toml b/examples/functions/01_basic_oracle/sgx-function/Cargo.toml
@@ -16,6 +16,6 @@ futures = "0.3"
 serde = "^1"
 serde_json = "^1"
 switchboard-utils = "0.8.0"
-switchboard-solana = "=0.28.6"
+switchboard-solana = { version = "=0.28.15", features = [ "client" ] }
 # switchboard-solana = { version = "0.28.4", path = "../../../../rust/switchboard-solana" }
 # switchboard-utils = { version = "0.8.0", path = "../../../../../../rust/switchboard-utils" }
diff --git a/examples/functions/01_basic_oracle/src/actions/trigger_function.rs b/examples/functions/01_basic_oracle/src/actions/trigger_function.rs
@@ -37,9 +37,9 @@ impl TriggerFunction<'_> {
         _params: &TriggerFunctionParams,
     ) -> anchor_lang::Result<()> {
         FunctionTrigger {
-            function: ctx.accounts.function.clone(),
-            authority: ctx.accounts.authority.clone(),
-            attestation_queue: ctx.accounts.attestation_queue.clone(),
+            function: ctx.accounts.function.to_account_info(),
+            authority: ctx.accounts.authority.to_account_info(),
+            attestation_queue: ctx.accounts.attestation_queue.to_account_info(),
         }
         .invoke(ctx.accounts.attestation_program.clone())?;
         Ok(())

diff --git a/javascript/solana.js/idl/attestation-devnet.json b/javascript/solana.js/idl/attestation-devnet.json
@@ -3794,4 +3794,4 @@
       "msg": "The FunctionRequestAccount is not ready to be verified"
     }
   ]
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -3794,4 +3794,4 @@ @@
           "msg": "The FunctionRequestAccount is not ready to be verified"
         }
       ]
-    }
+    }