Skip to content

Commit 9dc3df8

Browse files
gallynautCopybara
gallynaut
and
Copybara
authored
chore: pull monorepo changes (#119)
* Project import generated by Copybara. GitOrigin-RevId: 8e1fcb690780885a2aa28fb132c00ed984c24f14 * chore: manual cleanup --------- Co-authored-by: Copybara <[email protected]>
1 parent 5e4cde7 commit 9dc3df8

File tree

29 files changed

+368
-253
lines changed

29 files changed

+368
-253
lines changed

‎examples/feeds/01_feed_client/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
"@project-serum/borsh": "^0.2.5",
1919
"@solana/spl-token": "^0.3.8",
2020
"@solana/web3.js": "^1.78.3",
21-
"@switchboard-xyz/common": "^2.3.2",
21+
"@switchboard-xyz/common": "^2.3.4",
2222
"@switchboard-xyz/oracle": "latest",
23-
"@switchboard-xyz/solana.js": "^2.5.4",
23+
"@switchboard-xyz/solana.js": "^2.5.6",
2424
"chalk": "^4.1.2",
2525
"dotenv": "^16.0.1",
2626
"yargs": "^17.5.1"

‎examples/feeds/02_spl_native/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
"dependencies": {
1818
"@coral-xyz/anchor": "^0.28.0",
1919
"@solana/web3.js": "^1.77.3",
20-
"@switchboard-xyz/common": "^2.3.2",
20+
"@switchboard-xyz/common": "^2.3.4",
2121
"@switchboard-xyz/oracle": "latest",
22-
"@switchboard-xyz/solana.js": "^2.5.4"
22+
"@switchboard-xyz/solana.js": "^2.5.6"
2323
},
2424
"devDependencies": {
2525
"@types/chai": "^4.3.0",

‎examples/functions/01_basic_oracle/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ cpi = ["no-entrypoint"]
1919
default = []
2020

2121
[dependencies]
22-
switchboard-solana = "0.28.4"
22+
switchboard-solana = "=0.28.6"
2323
# switchboard-solana = { version = "0.28.4", path = "../../../rust/switchboard-solana" }
24-
bytemuck = "^1"
24+
bytemuck = "^1"

‎examples/functions/01_basic_oracle/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
},
1414
"dependencies": {
1515
"@coral-xyz/anchor": "^0.28.0",
16-
"@solana/spl-token": "^0.3.8",
17-
"@solana/web3.js": "^1.78.4",
18-
"@switchboard-xyz/solana.js": "^2.5.4"
16+
"@solana/spl-token": "^0.3.6",
17+
"@solana/web3.js": "^1.78.0",
18+
"@switchboard-xyz/solana.js": "^2.5.6"
1919
},
2020
"devDependencies": {
2121
"@types/bn.js": "^5.1.0",

‎examples/functions/01_basic_oracle/sgx-function/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ futures = "0.3"
1616
serde = "^1"
1717
serde_json = "^1"
1818
switchboard-utils = "0.8.0"
19-
switchboard-solana = "0.28.4"
19+
switchboard-solana = "=0.28.6"
2020
# switchboard-solana = { version = "0.28.4", path = "../../../../rust/switchboard-solana" }
21-
# switchboard-utils = { version = "0.8.0", path = "../../../../../../rust/switchboard-utils" }
21+
# switchboard-utils = { version = "0.8.0", path = "../../../../../../rust/switchboard-utils" }

‎examples/functions/01_basic_oracle/sgx-function/Makefile‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ DOCKER_BUILD_COMMAND=DOCKER_BUILDKIT=1 docker buildx build --platform linux/amd6
99
# Default make task
1010
all: build
1111

12-
docker_build:
12+
docker_build:
1313
${DOCKER_BUILD_COMMAND} --pull -f Dockerfile -t ${DOCKER_IMAGE_NAME}:latest --load ../
1414

15-
docker_publish:
15+
docker_publish:
1616
${DOCKER_BUILD_COMMAND} --pull -f Dockerfile -t ${DOCKER_IMAGE_NAME}:latest --push ../
1717

18-
dev_docker_build:
18+
dev_docker_build:
1919
${DOCKER_BUILD_COMMAND} --pull -f Dockerfile.dev -t ${DOCKER_IMAGE_NAME}:latest --load ../../../../../../
2020

21-
dev_docker_publish:
21+
dev_docker_publish:
2222
${DOCKER_BUILD_COMMAND} --pull -f Dockerfile.dev -t ${DOCKER_IMAGE_NAME}:latest --push ../../../../../../
2323

2424
build: docker_build measurement
@@ -30,15 +30,16 @@ publish: docker_publish measurement
3030
dev_publish: dev_docker_publish measurement
3131

3232
measurement:
33-
@docker run -d --platform=linux/amd64 --pull always -q --name=my-switchboard-function ${DOCKER_IMAGE_NAME}:latest > /dev/null
33+
@docker run -d --platform=linux/amd64 -q --name=my-switchboard-function ${DOCKER_IMAGE_NAME}:latest > /dev/null
3434
@docker cp my-switchboard-function:/measurement.txt measurement.txt
35+
@echo -n 'MrEnclve: '
36+
@cat measurement.txt
3537
@docker stop my-switchboard-function > /dev/null
3638
@docker rm my-switchboard-function > /dev/null
37-
@echo MrEnclave: $(shell cat ./measurement.txt)
3839

3940
simulate: docker_build
4041
docker run -it --platform=linux/amd64 --entrypoint=/bin/bash ${DOCKER_IMAGE_NAME}:latest /boot.sh --test
41-
42+
4243
# Task to clean up the compiled rust application
4344
clean:
4445
cargo clean
@@ -48,4 +49,4 @@ clean:
4849
# @docker cp latest-my-switchboard-function:/measurement.txt latest-measurement.txt
4950
# @docker stop latest-my-switchboard-function > /dev/null
5051
# @docker rm latest-my-switchboard-function > /dev/null
51-
# @echo latest MrEnclave: $(shell rm ./latest-measurement.txt)
52+
# @echo latest MrEnclave: $(shell rm ./latest-measurement.txt)

‎examples/functions/02_liquidity_oracle/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"@coral-xyz/anchor": "^0.28.0",
1515
"@solana/spl-token": "^0.3.8",
1616
"@solana/web3.js": "^1.78.3",
17-
"@switchboard-xyz/common": "^2.3.2",
18-
"@switchboard-xyz/solana.js": "^2.5.4"
17+
"@switchboard-xyz/common": "^2.3.4",
18+
"@switchboard-xyz/solana.js": "^2.5.6"
1919
},
2020
"devDependencies": {
2121
"@types/bn.js": "^5.1.0",

‎examples/functions/03_candles_oracle/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"@coral-xyz/anchor": "^0.28.0",
1616
"@solana/spl-token": "^0.3.8",
1717
"@solana/web3.js": "^1.78.3",
18-
"@switchboard-xyz/common": "^2.3.2",
19-
"@switchboard-xyz/solana.js": "^2.5.4"
18+
"@switchboard-xyz/common": "^2.3.4",
19+
"@switchboard-xyz/solana.js": "^2.5.6"
2020
},
2121
"devDependencies": {
2222
"@types/bn.js": "^5.1.0",

‎examples/functions/04_randomness_callback/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"@coral-xyz/anchor": "^0.27.0",
1111
"@solana/spl-token": "^0.3.8",
1212
"@solana/web3.js": "^1.78.3",
13-
"@switchboard-xyz/common": "^2.3.2",
14-
"@switchboard-xyz/solana.js": "^2.5.4",
13+
"@switchboard-xyz/common": "^2.3.4",
14+
"@switchboard-xyz/solana.js": "^2.5.6",
1515
"dotenv": "^16.3.1"
1616
},
1717
"devDependencies": {

‎examples/functions/05_raffle_program/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
},
88
"dependencies": {
99
"@coral-xyz/anchor": "^0.28.0",
10-
"@switchboard-xyz/common": "^2.3.2",
11-
"@switchboard-xyz/solana.js": "^2.5.4"
10+
"@switchboard-xyz/common": "^2.3.4",
11+
"@switchboard-xyz/solana.js": "^2.5.6"
1212
},
1313
"devDependencies": {
1414
"@types/bn.js": "^5.1.0",

0 commit comments

Comments
 (0)