chore: pull monorepo changes (#120)

* Project import generated by Copybara. GitOrigin-RevId: 08821e148b21e3b2c212fdd5342909d92844d84a * chore: manual fix build deps * chore: Update pnpm lockfile --------- Co-authored-by: Copybara <copybara@example.com> Co-authored-by: gallynaut <gallynaut@users.noreply.github.com>
switchboard-xyz · Sep 8, 2023 · 559ca34 · 559ca34
1 parent 795d71d
commit 559ca34
Show file tree

Hide file tree

Showing 44 changed files with 1,373 additions and 665 deletions.
diff --git a/examples/feeds/01_feed_client/package.json b/examples/feeds/01_feed_client/package.json
@@ -18,9 +18,9 @@
     "@project-serum/borsh": "^0.2.5",
     "@solana/spl-token": "^0.3.8",
     "@solana/web3.js": "^1.78.3",
-    "@switchboard-xyz/common": "^2.3.4",
+    "@switchboard-xyz/common": "^2.3.3",
     "@switchboard-xyz/oracle": "latest",
-    "@switchboard-xyz/solana.js": "^2.5.6",
+    "@switchboard-xyz/solana.js": "^2.5.0",
     "chalk": "^4.1.2",
     "dotenv": "^16.0.1",
     "yargs": "^17.5.1"

diff --git a/examples/feeds/02_spl_native/package.json b/examples/feeds/02_spl_native/package.json
@@ -17,9 +17,9 @@
   "dependencies": {
     "@coral-xyz/anchor": "^0.28.0",
     "@solana/web3.js": "^1.77.3",
-    "@switchboard-xyz/common": "^2.3.4",
+    "@switchboard-xyz/common": "^2.3.3",
     "@switchboard-xyz/oracle": "latest",
-    "@switchboard-xyz/solana.js": "^2.5.6"
+    "@switchboard-xyz/solana.js": "^2.5.0"
   },
   "devDependencies": {
     "@types/chai": "^4.3.0",

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": "^2.5.6"
+    "@switchboard-xyz/solana.js": "workspace:^"
   },
   "devDependencies": {
     "@types/bn.js": "^5.1.0",

diff --git a/examples/functions/01_basic_oracle/sgx-function/Makefile b/examples/functions/01_basic_oracle/sgx-function/Makefile
@@ -2,7 +2,7 @@
 
 # Variables
 CARGO_NAME=basic-oracle-function
-DOCKER_IMAGE_NAME=${CONTAINER_NAME?}
+DOCKER_IMAGE_NAME=${CONTAINER_NAME}
 
 DOCKER_BUILD_COMMAND=DOCKER_BUILDKIT=1 docker buildx build --platform linux/amd64 --build-arg CARGO_NAME=${CARGO_NAME}
 

diff --git a/examples/functions/02_liquidity_oracle/package.json b/examples/functions/02_liquidity_oracle/package.json
@@ -14,8 +14,8 @@
     "@coral-xyz/anchor": "^0.28.0",
     "@solana/spl-token": "^0.3.8",
     "@solana/web3.js": "^1.78.3",
-    "@switchboard-xyz/common": "^2.3.4",
-    "@switchboard-xyz/solana.js": "^2.5.6"
+    "@switchboard-xyz/common": "^2.3.3",
+    "@switchboard-xyz/solana.js": "^2.5.0"
   },
   "devDependencies": {
     "@types/bn.js": "^5.1.0",

diff --git a/examples/functions/03_candles_oracle/package.json b/examples/functions/03_candles_oracle/package.json
@@ -15,8 +15,8 @@
     "@coral-xyz/anchor": "^0.28.0",
     "@solana/spl-token": "^0.3.8",
     "@solana/web3.js": "^1.78.3",
-    "@switchboard-xyz/common": "^2.3.4",
-    "@switchboard-xyz/solana.js": "^2.5.6"
+    "@switchboard-xyz/common": "^2.3.3",
+    "@switchboard-xyz/solana.js": "^2.5.0"
   },
   "devDependencies": {
     "@types/bn.js": "^5.1.0",

diff --git a/examples/functions/04_randomness_callback/Anchor.toml b/examples/functions/04_randomness_callback/Anchor.toml
@@ -20,29 +20,29 @@ wallet = "~/.config/solana/id.json"
 [scripts]
 test = "pnpm exec ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
 
-# [test.validator]
-# url = "https://api.devnet.solana.com"
+[test.validator]
+url = "https://api.devnet.solana.com"
 
-# [test]
-# startup_wait = 15000
+[test]
+startup_wait = 15000
 
-# [[test.validator.clone]] # sb devnet oracle programID
-# address = "SW1TCH7qEPTdLsDHRgPuMQjbQxKdH2aBStViMFnt64f"
+[[test.validator.clone]] # sb devnet oracle programID
+address = "SW1TCH7qEPTdLsDHRgPuMQjbQxKdH2aBStViMFnt64f"
 
-# [[test.validator.clone]] # sb devnet oracle IDL
-# address = "Fi8vncGpNKbq62gPo56G4toCehWNy77GgqGkTaAF5Lkk"
+[[test.validator.clone]] # sb devnet oracle IDL
+address = "Fi8vncGpNKbq62gPo56G4toCehWNy77GgqGkTaAF5Lkk"
 
-# [[test.validator.clone]] # sb devnet oracle SbState
-# address = "CyZuD7RPDcrqCGbNvLCyqk6Py9cEZTKmNKujfPi3ynDd"
+[[test.validator.clone]] # sb devnet oracle SbState
+address = "CyZuD7RPDcrqCGbNvLCyqk6Py9cEZTKmNKujfPi3ynDd"
 
-# [[test.validator.clone]] # sb devnet oracle tokenVault
-# address = "7hkp1xfPBcD2t1vZMoWWQPzipHVcXeLAAaiGXdPSfDie"
+[[test.validator.clone]] # sb devnet oracle tokenVault
+address = "7hkp1xfPBcD2t1vZMoWWQPzipHVcXeLAAaiGXdPSfDie"
 
-# [[test.validator.clone]] # sb devnet attestation programID
-# address = "sbattyXrzedoNATfc4L31wC9Mhxsi1BmFhTiN8gDshx"
+[[test.validator.clone]] # sb devnet attestation programID
+address = "sbattyXrzedoNATfc4L31wC9Mhxsi1BmFhTiN8gDshx"
 
-# [[test.validator.clone]] # sb devnet attestation IDL
-# address = "5ExuoQR69trmKQfB95fDsUGsUrrChbGq9PFgt8qouncz"
+[[test.validator.clone]] # sb devnet attestation IDL
+address = "5ExuoQR69trmKQfB95fDsUGsUrrChbGq9PFgt8qouncz"
 
-# [[test.validator.clone]] # sb devnet programState
-# address = "5MFs7RGTjLi1wtKNBFRtuLipCkkjs4YQwRRU9sjnbQbS"
+[[test.validator.clone]] # sb devnet programState
+address = "5MFs7RGTjLi1wtKNBFRtuLipCkkjs4YQwRRU9sjnbQbS"