Skip to content

Commit

Permalink
Merge branch 'main' into unmaykr/fix-graphql-nested-dof-queries
Browse files Browse the repository at this point in the history
  • Loading branch information
unmaykr-aftermath committed Jun 21, 2024
2 parents f6fe4a7 + 34790db commit dfda753
Show file tree
Hide file tree
Showing 1,752 changed files with 70,947 additions and 41,513 deletions.
5 changes: 0 additions & 5 deletions .changeset/bright-wombats-try.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/hungry-pumpkins-fly.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/rude-cooks-know.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@mysten/sui': minor
---

Update parallel executor class to handle gasPrice and budgeting to remove extra rpc calls during execution"
2 changes: 1 addition & 1 deletion .github/actions/ts-e2e/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,5 @@ runs:
shell: bash

- name: Run TS SDK e2e tests
run: pnpm dlx concurrently --kill-others --success command-1 "$E2E_RUN_LOCAL_NET_CMD" 'pnpm --filter @mysten/sui.js --filter @mysten/graphql-transport test:e2e'
run: pnpm dlx concurrently --kill-others --success command-1 "$E2E_RUN_LOCAL_NET_CMD" 'pnpm --filter @mysten/sui --filter @mysten/graphql-transport test:e2e'
shell: bash
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 # pin@v3.0.0
with:
version: 9.1.1
- name: Install dependencies
run: pnpm install --frozen-lockfile
shell: bash
- id: changes
name: Detect changes
shell: bash
Expand Down
125 changes: 125 additions & 0 deletions .github/workflows/bridge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
name: Native Bridge

on:
push:
branches:
- 'main'
- 'devnet'
- 'testnet'
- 'mainnet'
- 'releases/sui-*-release'
pull_request:
types: [ opened, synchronize, reopened, ready_for_review ]
workflow_dispatch:
inputs:
sui_repo_ref:
description: "Branch / commit to test"
type: string
required: false
default: ''

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

env:
CARGO_TERM_COLOR: always
# Disable incremental compilation.
#
# Incremental compilation is useful as part of an edit-build-test-edit cycle,
# as it lets the compiler avoid recompiling code that hasn't changed. However,
# on CI, we're not making small edits; we're almost always building the entire
# project from scratch. Thus, incremental compilation on CI actually
# introduces *additional* overhead to support making future builds
# faster...but no future builds will ever occur in any given CI environment.
#
# See https://matklad.github.io/2021/09/04/fast-rust-builds.html#ci-workflow
# for details.
CARGO_INCREMENTAL: 0
# Allow more retries for network requests in cargo (downloading crates) and
# rustup (installing toolchains). This should help to reduce flaky CI failures
# from transient network timeouts or other issues.
CARGO_NET_RETRY: 10
RUSTUP_MAX_RETRIES: 10
# Don't emit giant backtraces in the CI logs.
RUST_BACKTRACE: short
# Some integration tests can produce too much INFO logs that are infeasible to be printed on failure.
RUST_LOG: error
# RUSTFLAGS: -D warnings
RUSTDOCFLAGS: -D warnings

jobs:
diff:
runs-on: [ ubuntu-latest ]
outputs:
isRust: ${{ steps.diff.outputs.isRust }}
isMove: ${{ steps.diff.outputs.isMove }}
isSolidity: ${{ steps.diff.outputs.isSolidity }}
isReleaseNotesEligible: ${{ steps.diff.outputs.isReleaseNotesEligible }}
isMoveAutoFormatter: ${{ steps.diff.outputs.isMoveAutoFormatter }}
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
- name: Detect Changes
uses: './.github/actions/diffs'
id: diff

test:
needs: diff
if: needs.diff.outputs.isRust == 'true' || needs.diff.outputs.isSolidity == 'true'
timeout-minutes: 45
env:
# Tests written with #[sim_test] are often flaky if run as #[tokio::test] - this var
# causes #[sim_test] to only run under the deterministic `simtest` job, and not the
# non-deterministic `test` job.
SUI_SKIP_SIMTESTS: 1
runs-on: ${{ matrix.os }}
strategy:
matrix:
os:
- [ ubuntu-ghcloud ]
fail-fast: false
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
- uses: taiki-e/install-action@nextest
- name: Set Swap Space
uses: pierotofy/set-swap-space@master
with:
swap-size-gb: 256
- name: Install Foundry
run: |
curl -L https://foundry.paradigm.xyz | { cat; echo '$FOUNDRY_BIN_DIR/foundryup'; } | bash
echo "$HOME/.config/.foundry/bin" >> $GITHUB_PATH
- name: Install Foundry Dependencies
working-directory: bridge/evm
run: |
forge install https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable@v5.0.1 https://github.com/foundry-rs/forge-std@v1.3.0 https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades --no-git --no-commit
- name: cargo test
run: |
cargo nextest run --profile ci -E 'package(sui-bridge)'
# Ensure there are no uncommitted changes in the repo after running tests
- run: scripts/changed-files.sh
shell: bash

bridge-evm:
name: bridge-evm-tests
needs: diff
if: needs.diff.outputs.isSolidity == 'true'
runs-on: [ ubuntu-ghcloud ]
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
- name: Install Foundry
run: |
curl -L https://foundry.paradigm.xyz | { cat; echo '$FOUNDRY_BIN_DIR/foundryup'; } | bash
echo "$HOME/.config/.foundry/bin" >> $GITHUB_PATH
- name: Install Foundry Dependencies
working-directory: bridge/evm
run: |
forge install https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable@v5.0.1 https://github.com/foundry-rs/forge-std@v1.3.0 https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades --no-git --no-commit
- name: Check Bridge EVM Unit Tests
shell: bash
working-directory: bridge/evm
env:
INFURA_API_KEY: ${{ secrets.INFURA_API_KEY }}
run: |
forge clean
forge test --ffi
28 changes: 28 additions & 0 deletions .github/workflows/build-suiop-cli.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Build suiop-cli binaries
on:
push:
paths:
- 'crates/suiop-cli/**'
pull_request:
paths:
- 'crates/suiop-cli/**'

# Do not run the same workflow concurrenctly
# for the same branch.
concurrency: ${{ github.workflow }}-${{ github.ref }}

jobs:
release:
runs-on: ubuntu-latest
steps:
# Trigger a gh action in MystenLabs/sui-operations
- name: Dispatch Build To Operations Repo
uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # pin@v3.0.0
with:
repository: MystenLabs/sui-operations
# Using the changeset's token for now,
# we could generate a different secret for this
# for separation of concerns:
token: ${{ secrets.CHANGESETS_DEPLOY_DISPATCH }}
event-type: build-binaries
client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
12 changes: 7 additions & 5 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
outputs:
isWallet: ${{ (steps.turbo.outputs.packages && contains(fromJson(steps.turbo.outputs.packages), 'sui-wallet')) }}
isTypescriptSDK: ${{ (steps.turbo.outputs.packages && contains(fromJson(steps.turbo.outputs.packages), '@mysten/sui.js')) }}
isTypescriptSDK: ${{ (steps.turbo.outputs.packages && contains(fromJson(steps.turbo.outputs.packages), '@mysten/sui')) }}
isGraphQlTransport: ${{ (steps.turbo.outputs.packages && contains(fromJson(steps.turbo.outputs.packages), '@mysten/graphql-transport')) }}
isRust: ${{ steps.diff.outputs.isRust }}
steps:
Expand Down Expand Up @@ -43,8 +43,10 @@ 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 # pin@v3.0.0
with:
version: 9.1.1
Expand All @@ -62,11 +64,11 @@ jobs:
- name: Set env
run: |
echo "VITE_SUI_BIN=$PWD/target/debug/sui" >> $GITHUB_ENV
echo "E2E_RUN_LOCAL_NET_CMD=(RUST_LOG=info 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-test-validator) --with-indexer --pg-port 5432 --pg-db-name sui_indexer_v2 --graphql-host 127.0.0.1 --graphql-port 9125)" >> $GITHUB_ENV
- name: Run TS SDK e2e tests
if: ${{ needs.diff.outputs.isTypescriptSDK == 'true' || needs.diff.outputs.isRust == 'true'}}
run: pnpm dlx concurrently --kill-others --success command-1 "$E2E_RUN_LOCAL_NET_CMD" 'pnpm --filter @mysten/sui.js test:e2e'
run: pnpm dlx concurrently --kill-others --success command-1 "$E2E_RUN_LOCAL_NET_CMD" 'pnpm --filter @mysten/sui test:e2e'

- name: Run RPC/GrpahQL comaptability e2e tests
if: ${{ needs.diff.outputs.isGraphQlTransport == 'true' || needs.diff.outputs.isRust == 'true'}}
Expand Down
29 changes: 7 additions & 22 deletions .github/workflows/narwhal.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
name: Narwhal

on:
push:
branches:
- 'main'
- 'devnet'
- 'testnet'
- 'mainnet'
- 'releases/sui-*-release'
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
workflow_dispatch:
inputs:
sui_repo_ref:
Expand Down Expand Up @@ -49,12 +40,14 @@ env:
RUSTUP_MAX_RETRIES: 10
# Don't emit giant backtraces in the CI logs.
RUST_BACKTRACE: short
# Some integration tests can produce too much INFO logs that are infeasible to be printed on failure.
RUST_LOG: error
# RUSTFLAGS: -D warnings
RUSTDOCFLAGS: -D warnings

jobs:
diff:
runs-on: [ubuntu-latest]
runs-on: [ ubuntu-latest ]
outputs:
isRust: ${{ steps.diff.outputs.isRust }}
isMove: ${{ steps.diff.outputs.isMove }}
Expand All @@ -80,7 +73,7 @@ jobs:
strategy:
matrix:
os:
- [ubuntu-ghcloud]
- [ ubuntu-ghcloud ]
fail-fast: false
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
Expand All @@ -91,17 +84,9 @@ jobs:
uses: pierotofy/set-swap-space@master
with:
swap-size-gb: 256
- name: Install Foundry
run: |
curl -L https://foundry.paradigm.xyz | { cat; echo '$FOUNDRY_BIN_DIR/foundryup'; } | bash
echo "$HOME/.config/.foundry/bin" >> $GITHUB_PATH
- name: Install Foundry Dependencies
working-directory: bridge/evm
run: |
forge install https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable@v5.0.1 https://github.com/foundry-rs/forge-std@v1.3.0 https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades --no-git --no-commit
- name: cargo test
run: |
cargo nextest run --profile ci
cargo nextest run --profile ci -E '!package(sui-bridge)'
# Ensure there are no uncommitted changes in the repo after running tests
- run: scripts/changed-files.sh
shell: bash
Expand All @@ -119,7 +104,7 @@ jobs:
strategy:
matrix:
os:
- [ubuntu-ghcloud]
- [ ubuntu-ghcloud ]
fail-fast: false
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
Expand Down Expand Up @@ -157,7 +142,7 @@ jobs:
needs: diff
if: needs.diff.outputs.isRust == 'true'
timeout-minutes: 45
runs-on: [ubuntu-ghcloud]
runs-on: [ ubuntu-ghcloud ]
env:
MSIM_WATCHDOG_TIMEOUT_MS: 60000
steps:
Expand Down
42 changes: 0 additions & 42 deletions .github/workflows/narwhal_pull.yml

This file was deleted.

Loading

0 comments on commit dfda753

Please sign in to comment.