Skip to content

Commit fbef37e

Browse files
gallynautCopybaragallynaut
authored
chore: pull monorepo changes (#115)
* Project import generated by Copybara. GitOrigin-RevId: 6c954f4d45d483df17378751289297e10f31296a --------- Co-authored-by: Copybara <[email protected]> Co-authored-by: gallynaut <[email protected]>
1 parent 9c61791 commit fbef37e

File tree

37 files changed

+365
-189
lines changed

37 files changed

+365
-189
lines changed

examples/feeds/01_feed_client/Cargo.lock

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/feeds/01_feed_client/Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[workspace]
2+
13
[package]
24
name = "switchboard-feed-client"
35
version = "0.1.0"
@@ -16,6 +18,6 @@ no-log-ix-name = []
1618
cpi = ["no-entrypoint"]
1719

1820
[dependencies]
19-
# switchboard-solana = "0.9.5"
20-
switchboard-solana = { version = "0.9.5", path = "../../../rust/switchboard-solana" }
21+
# switchboard-solana = "0.28.0"
22+
switchboard-solana = { version = "0.28.0", path = "../../../rust/switchboard-solana" }
2123
bytemuck = "1.13.1"

examples/feeds/01_feed_client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@solana/web3.js": "^1.77.3",
2121
"@switchboard-xyz/common": "latest",
2222
"@switchboard-xyz/oracle": "latest",
23-
"@switchboard-xyz/solana.js": "latest",
23+
"@switchboard-xyz/solana.js": "workspace:latest",
2424
"chalk": "^4.1.2",
2525
"dotenv": "^16.0.1",
2626
"yargs": "^17.5.1"

examples/feeds/01_feed_client/tsconfig.json

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,38 @@
55
}
66
},
77
"compilerOptions": {
8-
"types": ["mocha", "chai", "node"],
9-
"typeRoots": ["./node_modules/@types"],
8+
"types": [
9+
"mocha",
10+
"chai",
11+
"node"
12+
],
13+
"typeRoots": [
14+
"./node_modules/@types"
15+
],
1016
"module": "commonjs",
1117
"noEmit": true,
1218
"esModuleInterop": true,
1319
"strict": false,
1420
"strictNullChecks": false,
1521
"target": "es6",
1622
"paths": {
17-
"@switchboard-xyz/solana.js": ["../../../javascript/solana.js"]
23+
"@switchboard-xyz/solana.js": [
24+
"../../../../../javascript/solana.js"
25+
]
1826
}
1927
},
20-
"include": ["tests/**/*", "./cli.ts", "./client/**/*"],
21-
"exclude": ["target", "lib"],
28+
"include": [
29+
"tests/**/*",
30+
"./cli.ts",
31+
"./client/**/*"
32+
],
33+
"exclude": [
34+
"target",
35+
"lib"
36+
],
2237
"references": [
2338
{
24-
"path": "../../../javascript/solana.js"
39+
"path": "../../../../../javascript/solana.js"
2540
}
2641
]
27-
}
42+
}

examples/feeds/02_spl_native/Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[workspace]
2+
13
[package]
24
name = "native-feed-parser"
35
version = "0.1.0"
@@ -11,5 +13,5 @@ name = "native_feed_parser"
1113
no-entrypoint = []
1214

1315
[dependencies]
14-
# switchboard-solana = "0.9.5"
15-
switchboard-solana = { version = "0.9.5", path = "../../../rust/switchboard-solana" }
16+
# switchboard-solana = "0.28.0"
17+
switchboard-solana = { version = "0.28.0", path = "../../../rust/switchboard-solana" }

examples/feeds/02_spl_native/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@solana/web3.js": "^1.77.3",
2020
"@switchboard-xyz/common": "latest",
2121
"@switchboard-xyz/oracle": "latest",
22-
"@switchboard-xyz/solana.js": "latest"
22+
"@switchboard-xyz/solana.js": "workspace:latest"
2323
},
2424
"devDependencies": {
2525
"@types/chai": "^4.3.0",
Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,31 @@
11
{
22
"compilerOptions": {
3-
"types": ["mocha", "chai"],
4-
"typeRoots": ["./node_modules/@types"],
5-
"lib": ["es2015"],
3+
"types": [
4+
"mocha",
5+
"chai"
6+
],
7+
"typeRoots": [
8+
"./node_modules/@types"
9+
],
10+
"lib": [
11+
"es2015"
12+
],
613
"module": "commonjs",
714
"target": "es6",
815
"esModuleInterop": true,
916
"noEmit": true,
1017
"paths": {
11-
"@switchboard-xyz/solana.js": ["../../../javascript/solana.js"]
18+
"@switchboard-xyz/solana.js": [
19+
"../../../../../javascript/solana.js"
20+
]
1221
}
1322
},
14-
"exclude": ["target"],
23+
"exclude": [
24+
"target"
25+
],
1526
"references": [
1627
{
17-
"path": "../../../javascript/solana.js"
28+
"path": "../../../../../javascript/solana.js"
1829
}
1930
]
20-
}
31+
}

examples/functions/01_basic_oracle/Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[workspace]
2+
13
[package]
24
name = "basic_oracle"
35
version = "0.1.0"
@@ -17,7 +19,7 @@ cpi = ["no-entrypoint"]
1719
default = []
1820

1921
[dependencies]
20-
switchboard-solana = { version = "0.9.5" }
21-
# switchboard-solana = { version = "0.9.5", path = "../../../rust/switchboard-solana" }
22+
# switchboard-solana = "0.28.0"
23+
switchboard-solana = { version = "0.28.0", path = "../../../rust/switchboard-solana" }
2224
bytemuck = "^1"
2325
anchor-lang = { version = "0.28.0" }

examples/functions/01_basic_oracle/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@solana/web3.js": "^1.78.0",
1818
"@switchboard-xyz/common": "latest",
1919
"@switchboard-xyz/oracle": "latest",
20-
"@switchboard-xyz/solana.js": "latest"
20+
"@switchboard-xyz/solana.js": "workspace:latest"
2121
},
2222
"devDependencies": {
2323
"@types/bn.js": "^5.1.0",

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[workspace]
2+
13
[package]
24
name = "basic-oracle-function"
35
version = "0.1.0"
@@ -14,5 +16,5 @@ futures = "0.3"
1416
serde = "^1"
1517
serde_json = "^1"
1618
switchboard-utils = { version = "0.8.0" }
17-
# switchboard-solana = { version = "0.9.4", path = "../../../rust/switchboard-solana" }
18-
switchboard-solana = "0.9.5"
19+
# switchboard-solana = "0.28.0"
20+
switchboard-solana = { version = "0.28.0", path = "../../../../rust/switchboard-solana" }

0 commit comments

Comments
 (0)