Merge branch 'MystenLabs:main' into main

ronny-mysten · May 14, 2024 · 084fde5 · 084fde5
2 parents fe11857 + c6a2219
commit 084fde5
Show file tree

Hide file tree

Showing 65 changed files with 2,091 additions and 1,148 deletions.
diff --git a/.github/actions/ts-e2e/action.yml b/.github/actions/ts-e2e/action.yml
@@ -16,7 +16,7 @@ runs:
     # - uses: bmwill/rust-cache@v1 # Fork of 'Swatinem/rust-cache' which allows caching additional paths
     - uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d # [email protected]
       with:
-        version: 9
+        version: 9.1.1
 
     - name: Check s3 if binaries have been uploaded already
       continue-on-error: true

diff --git a/.github/actions/turbo-diffs/action.yml b/.github/actions/turbo-diffs/action.yml
@@ -12,7 +12,7 @@ runs:
         fetch-depth: 0
     - uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d # [email protected]
       with:
-        version: 9
+        version: 9.1.1
     - id: changes
       name: Detect changes
       shell: bash

diff --git a/.github/workflows/changesets-ci.yml b/.github/workflows/changesets-ci.yml
@@ -10,7 +10,7 @@ jobs:
           fetch-depth: 0
       - uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d # [email protected]
         with:
-          version: 9
+          version: 9.1.1
       - name: Install Nodejs
         uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # [email protected]
         with:

diff --git a/.github/workflows/changesets.yml b/.github/workflows/changesets.yml
@@ -37,7 +37,7 @@ jobs:
           fetch-depth: 0
       - uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d # [email protected]
         with:
-          version: 9
+          version: 9.1.1
       - name: Install Nodejs
         uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # [email protected]
         with:

diff --git a/.github/workflows/docs-ci.yml b/.github/workflows/docs-ci.yml
@@ -17,7 +17,7 @@ jobs:
           fetch-depth: 2
       - uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d # [email protected]
         with:
-          version: 9
+          version: 9.1.1
       - name: Install Nodejs
         uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # [email protected]
         with:

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -47,7 +47,7 @@ jobs:
       # - uses: bmwill/rust-cache@v1 # Fork of 'Swatinem/rust-cache' which allows caching additional paths
       - uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d # [email protected]
         with:
-          version: 9
+          version: 9.1.1
       - run: cargo build --bin sui-test-validator --bin sui --profile dev
       - name: Install Nodejs
         uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # [email protected]

diff --git a/.github/workflows/github-issues-monitor.yml b/.github/workflows/github-issues-monitor.yml
@@ -16,6 +16,7 @@ jobs:
         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}}"}'
 
@@ -28,6 +29,7 @@ jobs:
         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.issue.user.login}}", "event_name": "issue", "issue_number": "${{github.event.issue.number}}"}'
 
diff --git a/.github/workflows/narwhal.yml b/.github/workflows/narwhal.yml
@@ -95,6 +95,10 @@ jobs:
         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/[email protected] https://github.com/foundry-rs/[email protected] https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades --no-git --no-commit
       - name: cargo test
         run: |
           cargo nextest run --profile ci

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,6 +12,7 @@ on:
 
 env:
   TAG_NAME: "${{ github.event.inputs.sui_tag || github.ref }}"
+  BINARY_LIST_FILE: "./binary-build-list.json"
   CARGO_TERM_COLOR: always
   # Disable incremental compilation.
   #
@@ -42,8 +43,8 @@ jobs:
       matrix:
         os:
           [
-            windows-ghcloud,
             ubuntu-ghcloud,
+            windows-ghcloud,
             macos-latest-xl,
             macos-arm64-self-hosted
           ]
@@ -142,13 +143,14 @@ jobs:
         run: |
           mkdir -p ${{ env.TMP_BUILD_DIR }}
 
-          for binary in $(cat ./binary-build-list.json | jq -r '.release_binaries[]'); do
+          [ ! -f ${{ env.BINARY_LIST_FILE }} ] && echo "${{ env.BINARY_LIST_FILE }} cannot be found" && exit 1
+          for binary in $(cat ${{ env.BINARY_LIST_FILE }} | jq -r '.release_binaries[]'); do
             export binary=$(echo ${binary} | tr -d $'\r')
             mv ./target/release/${binary}${{ env.extention }} ${{ env.TMP_BUILD_DIR }}/${binary}${{ env.extention }}
           done
 
-          [ -f ./target/debug/sui${{ env.extention }} ] && mv ./target/debug/sui${{ env.extention }} ${{ env.TMP_BUILD_DIR }}/sui-debug${{ env.extention }}
-          [ -f ./external-crates/move/target/release/move-analyzer${{ env.extention }} ] && mv ./external-crates/move/target/release/move-analyzer${{ env.extention }} ${{ env.TMP_BUILD_DIR }}/move-analyzer${{ env.extention }}
+          mv ./target/debug/sui${{ env.extention }} ${{ env.TMP_BUILD_DIR }}/sui-debug${{ env.extention }}
+          mv ./external-crates/move/target/release/move-analyzer${{ env.extention }} ${{ env.TMP_BUILD_DIR }}/move-analyzer${{ env.extention }}
           tar -cvzf ./tmp/sui-${{ env.sui_tag }}-${{ env.os_type }}.tgz -C ${{ env.TMP_BUILD_DIR }} .
           [[ ${{ env.sui_tag }} == *"testnet"* ]] && aws s3 cp ./tmp/sui-${{ env.sui_tag }}-${{ env.os_type }}.tgz s3://sui-releases/releases/sui-${{ env.sui_tag }}-${{ env.os_type }}.tgz || true
 

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -93,7 +93,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
       - uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d # [email protected]
         with:
-          version: 9
+          version: 9.1.1
       - name: Setup Node
         uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # [email protected]
         with:
@@ -133,6 +133,10 @@ jobs:
         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/[email protected] https://github.com/foundry-rs/[email protected] https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades --no-git --no-commit
       - name: cargo test
         run: |
           cargo nextest run --profile ci
@@ -477,14 +481,14 @@ jobs:
     if: needs.diff.outputs.isSolidity == 'true'
     runs-on: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # Pin v4.1.1
+      - 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 Dependencies
+      - name: Install Foundry Dependencies
         working-directory: bridge/evm
-        run: |  
+        run: |
           forge install https://github.com/OpenZeppelin/[email protected] https://github.com/foundry-rs/[email protected] https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades --no-git --no-commit
       - name: Check Bridge EVM Unit Tests
         shell: bash
@@ -493,4 +497,4 @@ jobs:
           INFURA_API_KEY: ${{ secrets.INFURA_API_KEY }}
         run: |
           forge clean
-          forge test --ffi
+          forge test --ffi
diff --git a/.github/workflows/turborepo.yml b/.github/workflows/turborepo.yml
@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
       - uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d # [email protected]
         with:
-          version: 9
+          version: 9.1.1
       - name: Install Nodejs
         uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # [email protected]
         with:
@@ -33,7 +33,7 @@ jobs:
           fetch-depth: 2
       - uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d # [email protected]
         with:
-          version: 9
+          version: 9.1.1
       - name: Install Nodejs
         uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # [email protected]
         with:

diff --git a/bridge/evm/README.md b/bridge/evm/README.md
@@ -11,8 +11,10 @@ Duplicate rename the `.env.example` file to `.env`. You'll need accounts and api
 
 #### Dependencies
 
+To install the project dependencies, run: 
+
 ```bash
-forge install
+forge install https://github.com/OpenZeppelin/[email protected] https://github.com/foundry-rs/[email protected] https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades --no-git --no-commit
 ```
 
 #### Compilation

diff --git a/bridge/evm/deploy_configs/11155111.json b/bridge/evm/deploy_configs/11155111.json
@@ -5,7 +5,7 @@
   "sourceChainId": 11,
   "supportedChainIDs": [1, 2],
   "supportedChainLimitsInDollars": [100000000000, 100000000000],
-  "supportedTokens": ["0x0000000000000000000000000000000000000000", "0x0112D7B36726B3077b72DDb457A9f9c94D9cd71c", "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14", "0x80bF6fb931C8eB99Ab32aeD543ACCFd168fd2a47", "0xaA8E23Fb1079EA71e0a56F48a2aA51851D8433D0"],
+  "supportedTokens": ["0x0000000000000000000000000000000000000000", "0x0112D7B36726B3077b72DDb457A9f9c94D9cd71c", "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14", "0x80bF6fb931C8eB99Ab32aeD543ACCFd168fd2a47", "0x4302b99c1DE4de1ceC3eAedAbf88b8ee6Fceb614"],
   "tokenPrices": [162000000, 6200000000000, 430000000000, 100000000, 100000000],
   "wETHAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14"
 }