Skip to content

Commit ba63e74

Browse files
committed
Merge branch 'main' into boosik/next-tx-send-example
2 parents 902931c + cb68301 commit ba63e74

34 files changed

+487
-69
lines changed

.changeset/busy-owls-wonder.md

Lines changed: 0 additions & 2 deletions
This file was deleted.

.changeset/metal-mangos-shout.md

Lines changed: 0 additions & 2 deletions
This file was deleted.

.changeset/modern-hands-learn.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/moody-bushes-tickle.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

.changeset/tender-states-attack.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@orca-so/whirlpools": patch
3+
"@orca-so/whirlpools-client": patch
4+
---
5+
6+
Update deps

.github/dependabot.yml

Lines changed: 125 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,145 @@ updates:
99
docusaurus:
1010
applies-to: version-updates
1111
patterns:
12-
- "@docusaurus/*"
12+
- "@docusaurus/*"
13+
solana-v1:
14+
applies-to: version-updates
15+
patterns:
16+
- "@solana/web3.js"
17+
- "@solana/spl-token"
18+
- "@coral-xyz/*"
19+
solana-v2-core:
20+
applies-to: version-updates
21+
patterns:
22+
- "@solana/*"
23+
exclude-patterns:
24+
- "@solana/web3.js"
25+
- "@solana/spl-token"
26+
solana-v2-programs:
27+
applies-to: version-updates
28+
patterns:
29+
- "@solana-program/*"
30+
typescript-types:
31+
applies-to: version-updates
32+
dependency-type: "development"
33+
patterns:
34+
- "@types/*"
35+
- "typescript"
36+
build-tools:
37+
applies-to: version-updates
38+
dependency-type: "development"
39+
patterns:
40+
- "@babel/*"
41+
- "@esbuild/*"
42+
- "@rollup/*"
43+
- "@swc/*"
44+
- "@webassemblyjs/*"
45+
testing-tools:
46+
applies-to: version-updates
47+
dependency-type: "development"
48+
patterns:
49+
- "@vitest/*"
50+
- "vitest"
51+
monorepo-tools:
52+
applies-to: version-updates
53+
dependency-type: "development"
54+
patterns:
55+
- "@nx/*"
56+
- "nx"
57+
linting-tools:
58+
applies-to: version-updates
59+
dependency-type: "development"
60+
patterns:
61+
- "@eslint/*"
62+
- "@eslint-community/*"
63+
- "@typescript-eslint/*"
64+
- "eslint"
65+
release-tools:
66+
applies-to: version-updates
67+
dependency-type: "development"
68+
patterns:
69+
- "@changesets/*"
70+
codegen-tools:
71+
applies-to: version-updates
72+
patterns:
73+
- "@codama/*"
74+
- "codama"
75+
docs-tooling:
76+
applies-to: version-updates
77+
dependency-type: "development"
78+
patterns:
79+
- "@algolia/*"
80+
- "@img/*"
81+
- "@csstools/*"
82+
- "@svgr/*"
83+
nextjs:
84+
applies-to: version-updates
85+
patterns:
86+
- "@next/*"
87+
- "next"
1388
- package-ecosystem: "cargo"
1489
directory: "/"
1590
schedule:
1691
interval: "daily"
1792
labels: []
1893
groups:
19-
program-dependencies:
94+
solana-ecosystem:
95+
applies-to: version-updates
96+
patterns:
97+
- "solana-*"
98+
- "spl-*"
99+
anchor-framework:
100+
applies-to: version-updates
101+
patterns:
102+
- "anchor-*"
103+
serialization:
104+
applies-to: version-updates
105+
patterns:
106+
- "serde*"
107+
- "borsh*"
108+
cryptography:
109+
applies-to: version-updates
110+
patterns:
111+
- "ark-*"
112+
- "ed25519*"
113+
- "libsecp256k1*"
114+
wasm-tooling:
20115
applies-to: version-updates
21-
dependency-type: production
116+
patterns:
117+
- "wasm-*"
22118
- package-ecosystem: "cargo"
23119
directories: ["/examples/*", "/rust-sdk/*", "/ts-sdk/*"]
24120
schedule:
25121
interval: "daily"
26122
labels: []
27123
groups:
28-
program-dependencies:
124+
solana-sdk:
125+
applies-to: version-updates
126+
patterns:
127+
- "solana-*"
128+
- "spl-*"
129+
serialization:
130+
applies-to: version-updates
131+
patterns:
132+
- "serde*"
133+
- "borsh*"
134+
cryptography:
29135
applies-to: version-updates
30-
dependency-type: production
136+
patterns:
137+
- "ark-*"
138+
- "ed25519*"
139+
- "libsecp256k1*"
140+
- "curve25519*"
141+
wasm-tooling:
142+
applies-to: version-updates
143+
patterns:
144+
- "wasm-*"
145+
async-runtime:
146+
applies-to: version-updates
147+
patterns:
148+
- "tokio*"
149+
- "futures*"
150+
- "async-*"
31151
versioning-strategy: lockfile-only
32152
- package-ecosystem: "github-actions"
33153
directory: "/"

README.md

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,27 @@ This monorepo contains all the code needed to build, deploy and interact with th
4242

4343
### Getting Started
4444

45-
These instructions are for setting up a development environment on a Mac. If you are using a different operating system, you will need to adjust the instructions accordingly.
46-
47-
* Install NodeJS and gcc-12 using `brew install node gcc@12`.
48-
* Add gcc-12 headers to your cpath using `export CPATH="/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include"`.
49-
* Install Rust lang using `curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh`.
50-
* Install the Solana CLI using `curl -sSfL https://release.solana.com/v1.17.22/install | sh`.
51-
* Add the Solana CLI to your path using `export PATH="/Users/$(whoami)/.local/share/solana/install/active_release/bin:$PATH"`.
52-
* Install Anchor version manager using `cargo install --git https://github.com/coral-xyz/anchor avm --locked --force`.
53-
* Install the latest Anchor version using `avm install 0.29.0 && avm use 0.29.0`.
54-
* Clone this repository using `git clone https://github.com/orca-so/whirlpools`.
55-
* Install the dependencies using `yarn`.
56-
* Set up a Solana wallet if you don't have one already (see below).
57-
* Run one of the commands below to get started such as `yarn build`.
45+
#### Automated Setup Script
46+
47+
For a complete development environment setup, use the provided setup script:
48+
49+
```bash
50+
chmod +x scripts/setup.sh
51+
./scripts/setup.sh
52+
```
53+
54+
This script installs all required dependencies and builds the project. It's designed for fresh environments (cloud VMs, containers, new machines) and doesn't check for existing versions. The script also serves as a reference for understanding which dependencies are needed at each stage.
55+
56+
#### Manual Setup
57+
58+
If you prefer manual installation or already have some dependencies:
59+
60+
* Install system dependencies (build tools, Node.js, Rust, Solana CLI, Anchor)
61+
* Reference `scripts/setup.sh` for the exact versions and installation steps
62+
* Clone this repository: `git clone https://github.com/orca-so/whirlpools`
63+
* Install JavaScript dependencies: `yarn`
64+
* Build the project: `yarn build`
65+
* Set up a Solana wallet if needed (see below)
5866

5967
#### Setting up a Solana wallet
6068

0 commit comments

Comments
 (0)