Skip to content

Commit 8d8cd79

Browse files
gallynautCopybaragallynaut
authored
chore: pull monorepo changes (#116)
* Project import generated by Copybara. GitOrigin-RevId: 5ef744439689185ee32a0fea7eeebd83cbb97d18 * chore: Update pnpm lockfile --------- Co-authored-by: Copybara <[email protected]> Co-authored-by: gallynaut <[email protected]>
1 parent fbef37e commit 8d8cd79

File tree

114 files changed

+14762
-2427
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+14762
-2427
lines changed

examples/feeds/01_feed_client/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ no-log-ix-name = []
1818
cpi = ["no-entrypoint"]
1919

2020
[dependencies]
21-
# switchboard-solana = "0.28.0"
22-
switchboard-solana = { version = "0.28.0", path = "../../../rust/switchboard-solana" }
21+
# switchboard-solana = "0.28.4"
22+
switchboard-solana = { version = "0.28.4", path = "../../../rust/switchboard-solana" }
2323
bytemuck = "1.13.1"

examples/feeds/01_feed_client/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
"@coral-xyz/anchor": "^0.28.0",
1717
"@coral-xyz/borsh": "^0.28.0",
1818
"@project-serum/borsh": "^0.2.5",
19-
"@solana/spl-token": "^0.3.6",
20-
"@solana/web3.js": "^1.77.3",
21-
"@switchboard-xyz/common": "latest",
19+
"@solana/spl-token": "^0.3.8",
20+
"@solana/web3.js": "^1.78.3",
21+
"@switchboard-xyz/common": "^2.3.0",
2222
"@switchboard-xyz/oracle": "latest",
23-
"@switchboard-xyz/solana.js": "workspace:latest",
23+
"@switchboard-xyz/solana.js": "^2.5.0",
2424
"chalk": "^4.1.2",
2525
"dotenv": "^16.0.1",
2626
"yargs": "^17.5.1"

examples/feeds/02_spl_native/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ name = "native_feed_parser"
1313
no-entrypoint = []
1414

1515
[dependencies]
16-
# switchboard-solana = "0.28.0"
17-
switchboard-solana = { version = "0.28.0", path = "../../../rust/switchboard-solana" }
16+
# switchboard-solana = "0.28.4"
17+
switchboard-solana = { version = "0.28.4", path = "../../../rust/switchboard-solana" }

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": "latest",
20+
"@switchboard-xyz/common": "^2.3.0",
2121
"@switchboard-xyz/oracle": "latest",
22-
"@switchboard-xyz/solana.js": "workspace:latest"
22+
"@switchboard-xyz/solana.js": "^2.5.0"
2323
},
2424
"devDependencies": {
2525
"@types/chai": "^4.3.0",

examples/functions/01_basic_oracle/Anchor.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,27 @@ seeds = false
66
skip-lint = false
77

88
[programs.localnet]
9-
basic_oracle = "BkTMjFhosJ1xKtLMV2xchGtnTDBABLJ45aXzs7x9FdeX"
9+
basic_oracle = "APWppEwwfddbooTUijn3oAVnQH6jkLDxW4JrTMbBoQXJ"
1010

1111
[programs.devnet]
12-
basic_oracle = "BkTMjFhosJ1xKtLMV2xchGtnTDBABLJ45aXzs7x9FdeX"
12+
basic_oracle = "APWppEwwfddbooTUijn3oAVnQH6jkLDxW4JrTMbBoQXJ"
1313

1414
[provider]
15-
cluster = "https://api.devnet.solana.com"
16-
# wallet = "~/switchboard_environments_v2/devnet/upgrade_authority/upgrade_authority.json"
1715
# cluster = "Localnet"
18-
wallet = "~/.config/solana/id.json"
16+
# wallet = "~/.config/solana/id.json"
17+
cluster = "https://api.devnet.solana.com"
18+
wallet = "~/switchboard_environments_v2/devnet/upgrade_authority/upgrade_authority.json"
1919

20-
# cluster = "devnet"
2120
[scripts]
2221
test = "pnpm exec ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
2322

24-
[test]
25-
startup_wait = 15000
2623

2724
[test.validator]
2825
url = "https://api.devnet.solana.com"
2926

27+
[test]
28+
startup_wait = 15000
29+
3030
[[test.validator.clone]] # sb devnet oracle programID
3131
address = "SW1TCH7qEPTdLsDHRgPuMQjbQxKdH2aBStViMFnt64f"
3232

@@ -46,4 +46,4 @@ address = "sbattyXrzedoNATfc4L31wC9Mhxsi1BmFhTiN8gDshx"
4646
address = "5ExuoQR69trmKQfB95fDsUGsUrrChbGq9PFgt8qouncz"
4747

4848
[[test.validator.clone]] # sb devnet attestation State
49-
address = "5MFs7RGTjLi1wtKNBFRtuLipCkkjs4YQwRRU9sjnbQbS"
49+
address = "5MFs7RGTjLi1wtKNBFRtuLipCkkjs4YQwRRU9sjnbQbS"

0 commit comments

Comments
 (0)