Skip to content

Commit

Permalink
Merge branch 'mainnet' of github.com:MystenLabs/sui into mainnet
Browse files Browse the repository at this point in the history
  • Loading branch information
NorbertBodziony committed Jul 26, 2024
2 parents fc06239 + 09db80a commit a6b531b
Show file tree
Hide file tree
Showing 914 changed files with 59,447 additions and 21,106 deletions.
1 change: 1 addition & 0 deletions .cargo/config
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ move-clippy = [

mysql-clippy = [
"clippy",
"--all-targets",
"--package",
"sui-indexer",
"--features",
Expand Down
5 changes: 4 additions & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
"sponsored-transactions",
"kiosk-demo",
"kiosk-cli",
"@mysten/sdk-docs"
"@mysten/sdk-docs",
"mev-bot",
"escrow-api-demo",
"trading-frontend-demo"
],
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
"onlyUpdatePeerDependentsWhenOutOfRange": true
Expand Down
5 changes: 5 additions & 0 deletions .changeset/seven-chicken-occur.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@mysten/sui': patch
---

Mark subscription methods as deprecated.
17 changes: 17 additions & 0 deletions .changeset/shaggy-cows-decide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
'@mysten/ledgerjs-hw-app-sui': patch
'@mysten/graphql-transport': patch
'@mysten/wallet-standard': patch
'@mysten/suins-toolkit': patch
'@mysten/create-dapp': patch
'@mysten/sui': patch
'@mysten/dapp-kit': patch
'@mysten/deepbook': patch
'@mysten/zklogin': patch
'@mysten/zksend': patch
'@mysten/enoki': patch
'@mysten/kiosk': patch
'@mysten/bcs': patch
---

Update dependencies
4 changes: 2 additions & 2 deletions .config/nextest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ failure-output = "immediate"
status-level = "fail"
# Do not cancel the test run on the first failure.
fail-fast = false
# Mark tests as slow after 20m, terminate after 1h
slow-timeout = { period = "20m", terminate-after = 3 }
# Mark tests as slow after 30m, terminate after 1.5h
slow-timeout = { period = "30m", terminate-after = 3 }

[profile.ci.junit]
path = "junit.xml"
10 changes: 4 additions & 6 deletions .github/actions/ts-e2e/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,21 @@ runs:
id: check_s3
run: |
echo "Checking if s3 binaries have been built for ${{ github.sha }}"
echo "s3_file_exist=$(curl -Is https://sui-releases.s3.us-east-1.amazonaws.com/${{ github.sha }}/debug/sui-test-validator | head -n 1 | grep '200 OK')" >> $GITHUB_ENV
echo "s3_file_exist=$(curl -Is https://sui-releases.s3.us-east-1.amazonaws.com/${{ github.sha }}/debug/sui-pg | head -n 1 | grep '200 OK')" >> $GITHUB_ENV
shell: bash

- name: cargo build
if: env.s3_file_exist == '' # if empty, we have not built and uploaded this binary to s3 yet
run: |
cargo build --bin sui-test-validator --bin sui
cargo build --bin sui --features indexer
shell: bash

- name: Dowload from S3
if: env.s3_file_exist != '' # only download if the s3 file exists
working-directory: ./target/debug
run: |
mkdir -p $PWD/target/debug
wget -O target/debug/sui-test-validator https://sui-releases.s3.us-east-1.amazonaws.com/${{ github.sha }}/debug/sui-test-validator
chmod +x $PWD/target/debug/sui-test-validator
wget -O target/debug/sui-test-validator https://sui-releases.s3.us-east-1.amazonaws.com/${{ github.sha }}/debug/sui
wget -O target/debug/sui https://sui-releases.s3.us-east-1.amazonaws.com/${{ github.sha }}/debug/sui-pg
chmod +x $PWD/target/debug/sui
shell: bash

Expand All @@ -59,7 +57,7 @@ runs:

- name: Set env
run: |
echo "E2E_RUN_LOCAL_NET_CMD=(RUST_LOG=\"consensus=off\" $(echo $PWD/target/debug/sui-test-validator) --with-indexer --pg-port 5432 --pg-db-name sui_indexer_v2 --graphql-host 127.0.0.1 --graphql-port 9125)" >> $GITHUB_ENV
echo "E2E_RUN_LOCAL_NET_CMD=(RUST_LOG=\"consensus=off\" $(echo $PWD/target/debug/sui) start --with-faucet --force-regenesis --with-indexer --pg-port 5432 --pg-db-name sui_indexer_v2 --with-graphql)" >> $GITHUB_ENV
echo "VITE_SUI_BIN=$PWD/target/debug/sui" >> $GITHUB_ENV
shell: bash

Expand Down
3 changes: 3 additions & 0 deletions .github/actions/turbo-diffs/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ runs:
- uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d # [email protected]
with:
version: 9.1.1
- name: Install dependencies
run: pnpm install --frozen-lockfile
shell: bash
- id: changes
name: Detect changes
shell: bash
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/cargo-llvm-cov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ jobs:
env:
CARGO_TERM_COLOR: always
steps:
- name: Install Rust
run: rustup update stable

- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
- uses: bmwill/rust-cache@v1

Expand All @@ -49,12 +52,9 @@ jobs:
uses: pierotofy/set-swap-space@master
with:
swap-size-gb: 256

- name: Install Rust
run: rustup update stable

- name: Run code coverage for nextest
run: SUI_SKIP_SIMTESTS=1 cargo llvm-cov --ignore-run-fail --lcov --output-path lcov.info nextest
run: SUI_SKIP_SIMTESTS=1 cargo llvm-cov --ignore-run-fail --lcov --output-path lcov.info nextest -vv

- name: Upload report to Codecov for nextest
uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # pin v4.0.1
Expand Down
50 changes: 25 additions & 25 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,26 +43,28 @@ jobs:
- 5432:5432
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
# Disabled for now as it makes test runs take longer
# - uses: bmwill/rust-cache@v1 # Fork of 'Swatinem/rust-cache' which allows caching additional paths
- uses: Swatinem/rust-cache@v2
with:
cache-all-crates: true
cache-on-failure: true
- uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d # [email protected]
with:
version: 9.1.1
- run: cargo build --bin sui-test-validator --bin sui --profile dev
- run: cargo build --bin sui --features indexer --profile dev
- name: Install Nodejs
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # [email protected]
with:
node-version: '18'
cache: 'pnpm'
- name: Install dependencies
run: pnpm install --frozen-lockfile
- name: Install Playwright Browsers
run: pnpm --filter sui-wallet playwright install --with-deps chromium
# - name: Install Playwright Browsers
# run: pnpm --filter sui-wallet playwright install --with-deps chromium

- name: Set env
run: |
echo "VITE_SUI_BIN=$PWD/target/debug/sui" >> $GITHUB_ENV
echo "E2E_RUN_LOCAL_NET_CMD=(RUST_LOG=warn RUST_BACKTRACE=1 $(echo $PWD/target/debug/sui-test-validator) --with-indexer --pg-port 5432 --pg-db-name sui_indexer_v2 --graphql-host 127.0.0.1 --graphql-port 9125)" >> $GITHUB_ENV
echo "E2E_RUN_LOCAL_NET_CMD=(RUST_LOG=warn RUST_BACKTRACE=1 $(echo $PWD/target/debug/sui) start --with-faucet --force-regenesis --with-indexer --pg-port 5432 --pg-db-name sui_indexer_v2 --with-graphql)" >> $GITHUB_ENV
- name: Run TS SDK e2e tests
if: ${{ needs.diff.outputs.isTypescriptSDK == 'true' || needs.diff.outputs.isRust == 'true'}}
Expand All @@ -72,29 +74,28 @@ jobs:
if: ${{ needs.diff.outputs.isGraphQlTransport == 'true' || needs.diff.outputs.isRust == 'true'}}
run: pnpm dlx concurrently --kill-others --success command-1 "$E2E_RUN_LOCAL_NET_CMD" 'pnpm --filter @mysten/graphql-transport test:e2e'

- name: Run Local net
run: cargo run --bin sui-test-validator -- --epoch-duration-ms 10000 &
- name: Set Wallet env
run: echo "API_ENV=local" > "$PWD/apps/wallet/configs/environment/.env"
- name: Build Wallet
# need to run Wallet e2e when its upstream(TS SDK and Rust) or itself is changed
if: ${{ needs.diff.outputs.isWallet == 'true' || needs.diff.outputs.isRust == 'true' || needs.diff.outputs.isTypescriptSDK == 'true'}}
run: pnpm wallet build
- name: Run Wallet e2e tests
if: ${{ needs.diff.outputs.isWallet == 'true' || needs.diff.outputs.isRust == 'true' || needs.diff.outputs.isTypescriptSDK == 'true'}}
run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- pnpm --filter sui-wallet playwright test
- uses: actions/upload-artifact@v3
if: always()
with:
name: playwright-report-wallet
path: apps/wallet/playwright-report/
retention-days: 30
# - name: Run Local net
# run: cargo run --bin sui -- start --with-faucet --force-regenesis --epoch-duration-ms 10000 &
# - name: Set Wallet env
# run: echo "API_ENV=local" > "$PWD/apps/wallet/configs/environment/.env"
# - name: Build Wallet
# # need to run Wallet e2e when its upstream(TS SDK and Rust) or itself is changed
# if: ${{ needs.diff.outputs.isWallet == 'true' || needs.diff.outputs.isRust == 'true' || needs.diff.outputs.isTypescriptSDK == 'true'}}
# run: pnpm wallet build
# - name: Run Wallet e2e tests
# if: ${{ needs.diff.outputs.isWallet == 'true' || needs.diff.outputs.isRust == 'true' || needs.diff.outputs.isTypescriptSDK == 'true'}}
# run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- pnpm --filter sui-wallet playwright test
# - uses: actions/upload-artifact@v3
# if: always()
# with:
# name: playwright-report-wallet
# path: apps/wallet/playwright-report/
# retention-days: 30

# Run e2e test against localnet built on the devnet branch for backward compatibility check
local_devnet_branch:
name: Local Network Built on devnet branch
needs: diff
# TODO: add wallet e2e to the `if` condition when available
if: needs.diff.outputs.isTypescriptSDK == 'true'
runs-on: ubuntu-ghcloud
services:
Expand Down Expand Up @@ -123,7 +124,6 @@ jobs:
local_testnet_branch:
name: Local Network Built on testnet branch
needs: diff
# TODO: add wallet e2e to the `if` condition when available
if: needs.diff.outputs.isTypescriptSDK == 'true'
runs-on: ubuntu-ghcloud
services:
Expand Down
17 changes: 1 addition & 16 deletions .github/workflows/github-issues-monitor.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,10 @@
name: GitHub Issues and External PRs Monitor
name: GitHub Issues Monitor

on:
issues:
types: [opened]
pull_request_target:
types: [opened]

jobs:
notify-prs:
name: Dispatch workflow to notify slack channel on PRs
if: github.event_name == 'pull_request'
runs-on: ubuntu-latest
steps:
- name: Dispatch github-issues-external-prs-monitor in MystenLabs/sui-operations
uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # [email protected]
with:
repository: MystenLabs/sui-operations
token: ${{ secrets.DOCKER_BINARY_BUILDS_DISPATCH }}
event-type: github-issues-external-prs-monitor
client-payload: '{"author": "${{github.event.pull_request.user.login}}", "event_name": "pull_request", "pull_request_number": "${{github.event.pull_request.number}}"}'

notify-issues:
name: Dispatch workflow to notify slack channel on issues
if: github.event_name == 'issues'
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,17 @@ jobs:
- uses: actions/labeler@9fd24f1f9d6ceb64ba34d181b329ee72f99978a0
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"

notify-prs:
name: Dispatch workflow to notify slack channel on PRs
runs-on: ubuntu-latest
if: ${{ github.event.action == 'opened' }}
steps:
- name: Dispatch github-issues-external-prs-monitor in MystenLabs/sui-operations
uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # [email protected]
with:
repository: MystenLabs/sui-operations
token: ${{ secrets.DOCKER_BINARY_BUILDS_DISPATCH }}
event-type: github-issues-external-prs-monitor
client-payload: '{"author": "${{github.event.pull_request.user.login}}", "event_name": "pull_request", "pull_request_number": "${{github.event.pull_request.number}}"}'

2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
- name: Validate PR's release notes
shell: bash
run: |
python ./scripts/release_notes.py check
GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} python ./scripts/release_notes.py check
move-auto-formatter-ci-test:
needs: diff
Expand Down
Loading

0 comments on commit a6b531b

Please sign in to comment.