Skip to content

Commit

Permalink
Delete the v1.x line from the default branch (#3011)
Browse files Browse the repository at this point in the history
# Summary

In this PR we eliminate the v1.x line from the default branch, it now lives on the `maintenance/v1.x` branch.

# Test Plan

```
pnpm i
pnpm test:live-with-test-validator:setup
./scripts/start-shared-test-validator.sh
pnpm build
```
  • Loading branch information
steveluscher authored Jul 31, 2024
1 parent c2717fc commit b1003b7
Show file tree
Hide file tree
Showing 187 changed files with 1,707 additions and 37,336 deletions.
2 changes: 1 addition & 1 deletion .changeset/chilled-waves-lay.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
'@solana/web3.js-experimental': major
'@solana/web3.js': major
---

This version of the `@solana/web3.js` Technology Preview fixes a bug with the default RPC transport, adds a utility that you can use to get an estimate of a transaction message's compute unit cost, and introduces `@solana/react` hooks for interacting with Wallet Standard wallets.
Expand Down
2 changes: 1 addition & 1 deletion .changeset/chilly-seas-act.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
"@solana/web3.js-experimental": patch
"@solana/web3.js": patch
---

Simulate with the maximum quantity of compute units (1.4M) instead of `u32::MAX`
3 changes: 0 additions & 3 deletions .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,9 @@
"repo": "solana-labs/solana-web3.js"
}
],
"commit": false,
"fixed": [["@solana/!({*-impl,build-scripts,test-*,tsconfig})"]],
"ignore": ["@solana/web3.js"],
"linked": [],
"snapshot": {
"prereleaseTemplate": "{tag}.4.{datetime}.{commit}",
"useCalculatedVersion": true
},
"privatePackages": {
Expand Down
77 changes: 38 additions & 39 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
@@ -1,45 +1,44 @@
{
"mode": "pre",
"tag": "preview",
"tag": "rc",
"initialVersions": {
"@solana/accounts": "2.0.0-preview.3",
"@solana/addresses": "2.0.0-preview.3",
"@solana/assertions": "2.0.0-preview.3",
"@solana/codecs": "2.0.0-preview.3",
"@solana/codecs-core": "2.0.0-preview.3",
"@solana/codecs-data-structures": "2.0.0-preview.3",
"@solana/codecs-numbers": "2.0.0-preview.3",
"@solana/codecs-strings": "2.0.0-preview.3",
"@solana/compat": "2.0.0-preview.3",
"@solana/errors": "2.0.0-preview.3",
"@solana/fast-stable-stringify": "2.0.0-preview.3",
"@solana/functional": "2.0.0-preview.3",
"@solana/instructions": "2.0.0-preview.3",
"@solana/keys": "2.0.0-preview.3",
"@solana/web3.js-experimental": "2.0.0-preview.3",
"@solana/web3.js": "0.0.0-development",
"@solana/options": "2.0.0-preview.3",
"@solana/programs": "2.0.0-preview.3",
"@solana/react": "2.0.0-preview.3",
"@solana/rpc": "2.0.0-preview.3",
"@solana/rpc-api": "2.0.0-preview.3",
"@solana/rpc-graphql": "2.0.0-preview.3",
"@solana/rpc-parsed-types": "2.0.0-preview.3",
"@solana/rpc-spec": "2.0.0-preview.3",
"@solana/rpc-spec-types": "2.0.0-preview.3",
"@solana/rpc-subscriptions": "2.0.0-preview.3",
"@solana/rpc-subscriptions-api": "2.0.0-preview.3",
"@solana/rpc-subscriptions-spec": "2.0.0-preview.3",
"@solana/rpc-subscriptions-transport-websocket": "2.0.0-preview.3",
"@solana/rpc-transformers": "2.0.0-preview.3",
"@solana/rpc-transport-http": "2.0.0-preview.3",
"@solana/rpc-types": "2.0.0-preview.3",
"@solana/signers": "2.0.0-preview.3",
"@solana/sysvars": "2.0.0-preview.3",
"@solana/transaction-confirmation": "2.0.0-preview.3",
"@solana/transaction-messages": "2.0.0-preview.3",
"@solana/transactions": "2.0.0-preview.3",
"@solana/webcrypto-ed25519-polyfill": "2.0.0-preview.3",
"@solana/accounts": "2.0.0-preview.4",
"@solana/addresses": "2.0.0-preview.4",
"@solana/assertions": "2.0.0-preview.4",
"@solana/codecs": "2.0.0-preview.4",
"@solana/codecs-core": "2.0.0-preview.4",
"@solana/codecs-data-structures": "2.0.0-preview.4",
"@solana/codecs-numbers": "2.0.0-preview.4",
"@solana/codecs-strings": "2.0.0-preview.4",
"@solana/compat": "2.0.0-preview.4",
"@solana/errors": "2.0.0-preview.4",
"@solana/fast-stable-stringify": "2.0.0-preview.4",
"@solana/functional": "2.0.0-preview.4",
"@solana/instructions": "2.0.0-preview.4",
"@solana/keys": "2.0.0-preview.4",
"@solana/web3.js": "2.0.0-preview.4",
"@solana/options": "2.0.0-preview.4",
"@solana/programs": "2.0.0-preview.4",
"@solana/react": "2.0.0-preview.4",
"@solana/rpc": "2.0.0-preview.4",
"@solana/rpc-api": "2.0.0-preview.4",
"@solana/rpc-graphql": "2.0.0-preview.4",
"@solana/rpc-parsed-types": "2.0.0-preview.4",
"@solana/rpc-spec": "2.0.0-preview.4",
"@solana/rpc-spec-types": "2.0.0-preview.4",
"@solana/rpc-subscriptions": "2.0.0-preview.4",
"@solana/rpc-subscriptions-api": "2.0.0-preview.4",
"@solana/rpc-subscriptions-spec": "2.0.0-preview.4",
"@solana/rpc-subscriptions-transport-websocket": "2.0.0-preview.4",
"@solana/rpc-transformers": "2.0.0-preview.4",
"@solana/rpc-transport-http": "2.0.0-preview.4",
"@solana/rpc-types": "2.0.0-preview.4",
"@solana/signers": "2.0.0-preview.4",
"@solana/sysvars": "2.0.0-preview.4",
"@solana/transaction-confirmation": "2.0.0-preview.4",
"@solana/transaction-messages": "2.0.0-preview.4",
"@solana/transactions": "2.0.0-preview.4",
"@solana/webcrypto-ed25519-polyfill": "2.0.0-preview.4",
"@solana/build-scripts": "0.0.0",
"@solana/crypto-impl": "0.0.0",
"@solana/test-config": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion .changeset/rare-goats-sell.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
'@solana/web3.js-experimental': patch
'@solana/web3.js': patch
---

Fixed the type of `config` on `getComputeUnitEstimateForTransactionMessage`. It is now optional and does not include `transactionMessage`.
2 changes: 1 addition & 1 deletion .changeset/strong-pandas-marry.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
"@solana/web3.js-experimental": patch
"@solana/web3.js": patch
"@solana/rpc-subscriptions": patch
"@solana/rpc": patch
---
Expand Down
2 changes: 1 addition & 1 deletion .changeset/tidy-wolves-share.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@solana/accounts": patch
"@solana/programs": patch
"@solana/rpc-spec": patch
"@solana/web3.js-experimental": patch
"@solana/web3.js": patch
"@solana/options": patch
"@solana/rpc-api": patch
"@solana/signers": patch
Expand Down
2 changes: 1 addition & 1 deletion .changeset/two-cougars-try.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
"@solana/web3.js-experimental": patch
"@solana/web3.js": patch
---

Created a utility function to estimate the compute unit consumption of a transaction message
12 changes: 10 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

version: 2
updates:
- package-ecosystem: 'npm'
- target-branch: 'maintenance/v1.x'
package-ecosystem: 'npm'
directory: '/'
schedule:
interval: daily
Expand All @@ -15,4 +16,11 @@ updates:
- 'automerge'
commit-message:
prefix: 'chore:'
open-pull-requests-limit: 3
- package-ecosystem: 'npm'
directory: '/'
schedule:
interval: daily
time: '01:00'
timezone: America/Los_Angeles
labels:
- 'automerge'
2 changes: 1 addition & 1 deletion .github/workflows/bundlesize.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
version: 9.1.0
run_install: false

- name: Download Experimental Library Bundle
- name: Download Library Bundle
uses: actions/download-artifact@v4
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
40 changes: 0 additions & 40 deletions .github/workflows/commit-lint.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Publish Package Snapshots
name: Publish Canary Releases

on:
workflow_dispatch:
Expand Down Expand Up @@ -32,27 +32,27 @@ jobs:
uses: ./.github/workflows/actions/setup-validator

- name: Run Build Step (force)
run: pnpm turbo build --filter=\!@solana/web3.js --force=true
run: pnpm turbo build --force=true

- name: Configure NPM token
run: |
pnpm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Publish Snapshots
- name: Publish Canary Releases
run: |
pnpm changeset pre exit
find packages/* -maxdepth 0 -type d -print0 | \
xargs -t0 -n 1 -I {} \
sh -c 'cd {} && pnpm pkg delete devDependencies'
pnpm changeset version --snapshot preview
pnpm turbo publish-packages --concurrency=95.84% --filter=\!@solana/web3.js
pnpm changeset version --snapshot canary
pnpm turbo publish-packages --concurrency=95.84%
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
PUBLISH_TAG: experimental
PUBLISH_TAG: canary

- name: Stop Test Validator
if: always() && steps.start-test-validator.outcome == 'success'
Expand Down
55 changes: 51 additions & 4 deletions .github/workflows/publish-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ on:
workflow_dispatch:
branches:
- master
- maintenance/*
push:
branches:
- master
- maintenance/*

env:
# Among other things, opts out of Turborepo telemetry
Expand All @@ -18,7 +20,32 @@ env:
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}

jobs:
compile-github-pages-and-publish:
compile-v1-docs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: maintenance/v1.x

- name: Install Dependencies
uses: ./.github/workflows/actions/install-dependencies

- name: Compile docs
run: pnpm compile:docs

- name: Assemble Deploy Directory
run: |
mkdir -p .ghpages-deploy
mv ./docs/* .ghpages-deploy
- uses: actions/upload-artifact@v4
with:
name: ghpages-deploy-artifacts-v1-docs
path: .ghpages-deploy
retention-days: 1

compile-github-pages:
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -32,11 +59,31 @@ jobs:
env:
REACT_EXAMPLE_APP_BASE_PATH: /solana-web3.js/example/

- name: Assemble deploy directory
- name: Assemble Deploy Directory
run: |
mkdir -p .ghpages-deploy
cp -r ./packages/library-legacy/doc/* .ghpages-deploy
cp -r ./examples/react-app/dist/ .ghpages-deploy/example/
mv ./examples/react-app/dist/ .ghpages-deploy/example/
- uses: actions/upload-artifact@v4
with:
name: ghpages-deploy-artifacts
path: .ghpages-deploy
retention-days: 1

publish:
runs-on: ubuntu-latest
needs: [compile-v1-docs, compile-github-pages]
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Install Dependencies
uses: ./.github/workflows/actions/install-dependencies

- uses: actions/download-artifact@v4
with:
pattern: ghpages-deploy-artifacts*
merge-multiple: true

- name: Deploy to Github Pages
uses: peaceiris/actions-gh-pages@v3
Expand Down
48 changes: 0 additions & 48 deletions .github/workflows/publish-legacy-package.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/publish-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
run: echo "step-name=${{ steps.changesets.outputs.hasChangesets == 'false' && 'publish-packages --concurrency=95.84%' || 'build' }}" >> $GITHUB_OUTPUT

- name: Run Build Step (force)
run: pnpm turbo ${{ steps.build-step-decider.outputs.step-name }} --filter=!\@solana/web3.js --force=true
run: pnpm turbo ${{ steps.build-step-decider.outputs.step-name }} --force=true
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
Expand Down
Loading

0 comments on commit b1003b7

Please sign in to comment.