Skip to content

Commit 77091ca

Browse files
authored
chore: remove bridge protocol unit, related code and checks (#1147)
1 parent 3a9e255 commit 77091ca

File tree

138 files changed

+15
-10987
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+15
-10987
lines changed

.github/scripts/update_move_toml.sh

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

.github/workflows/checks-all.yml

Lines changed: 0 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,6 @@ jobs:
285285
# adjust the log level while debugging
286286
run: CELESTIA_LOG_LEVEL=FATAL nix develop --command bash -c "just movement-celestia-da-light-node native build.setup.test.local -t=false"
287287

288-
- name: Run foundry tests
289-
# Run the foundry solidity contracts using the WETH9 contract on sepolia
290-
run: cd protocol-units/bridge/contracts && forge test --fork-url https://ethereum-sepolia-rpc.publicnode.com -vv
291-
292288
governed-gas-pool:
293289
if: >
294290
github.event.label.name == 'cicd:governed-gas-pool'
@@ -372,123 +368,6 @@ jobs:
372368
- name: Run MCR Client Tests
373369
run: nix develop --command bash -c "just mcr-client native build.local.test -t=false"
374370

375-
## any use of Move CLI requires ubuntu-24.04 and to not run on buildjet
376-
move-modules-test:
377-
if: >
378-
github.event.label.name == 'cicd:bridge'
379-
|| github.ref == 'refs/heads/main'
380-
|| startsWith(github.ref, 'refs/tags/')
381-
strategy:
382-
matrix:
383-
include:
384-
- os: ubuntu-24.04
385-
arch: x86_64
386-
runs-on: ubuntu-24.04
387-
388-
runs-on: ${{ matrix.runs-on }}
389-
390-
steps:
391-
- name: Checkout repository
392-
uses: actions/checkout@v4
393-
394-
- name: Install Aptos CLI
395-
run: |
396-
curl -fsSL "https://aptos.dev/scripts/install_cli.py" | python3
397-
398-
- name: Install Nix
399-
uses: DeterminateSystems/nix-installer-action@main
400-
401-
- name: Run Aptos Tests
402-
run: |
403-
nix develop --command bash -c "
404-
set -e
405-
set -x
406-
chmod +x .github/scripts/update_move_toml.sh && \
407-
./.github/scripts/update_move_toml.sh && \
408-
cd protocol-units/bridge/move-modules && \
409-
aptos move test
410-
"
411-
412-
solidity-bridge-tests:
413-
if: >
414-
github.event.label.name == 'cicd:bridge'
415-
|| github.ref == 'refs/heads/main'
416-
|| startsWith(github.ref, 'refs/tags/')
417-
strategy:
418-
matrix:
419-
include:
420-
- os: ubuntu-22.04
421-
arch: x86_64
422-
runs-on: buildjet-16vcpu-ubuntu-2204
423-
424-
runs-on: ${{ matrix.runs-on }}
425-
426-
steps:
427-
- name: Checkout repository
428-
uses: actions/checkout@v4
429-
430-
- name: Install Nix
431-
uses: DeterminateSystems/nix-installer-action@main
432-
433-
- name: Run foundry tests
434-
run: |
435-
nix develop --command bash -c "
436-
cd protocol-units/bridge/contracts && \
437-
forge test --fork-url https://ethereum-sepolia-rpc.publicnode.com -vv
438-
"
439-
440-
# any use of Move CLI requires ubuntu-24.04 and to not run on buildjet
441-
bridge-client-integration:
442-
if: >
443-
github.event.label.name == 'cicd:bridge'
444-
|| github.ref == 'refs/heads/main'
445-
|| github.ref == 'refs/heads/feature/trusted-relayer'
446-
|| startsWith(github.ref, 'refs/tags/')
447-
strategy:
448-
matrix:
449-
include:
450-
- os: ubuntu-24.04
451-
arch: x86_64
452-
runs-on: ubuntu-24.04
453-
runs-on: ${{ matrix.runs-on }}
454-
steps:
455-
- name: Checkout repository
456-
uses: actions/checkout@v4
457-
- name: Install Movement CLI
458-
run: |
459-
sudo apt-get update
460-
sudo apt-get install -y build-essential
461-
sudo apt-get install -y binutils
462-
sudo apt-get install -y lld
463-
sudo apt-get install -y libudev-dev
464-
sudo apt-get install -y libdw-dev
465-
which ld
466-
which lld
467-
which gcc
468-
which cc
469-
echo $PATH
470-
export GIT_CLONE_PROTECTION_ACTIVE=false
471-
git clone https://github.com/movementlabsxyz/aptos-core/
472-
cd aptos-core
473-
cargo build -p movement
474-
sudo cp target/debug/movement /usr/local/bin/
475-
cd -
476-
- name: Install Nix
477-
uses: DeterminateSystems/nix-installer-action@main
478-
- uses: cachix/cachix-action@v15
479-
with:
480-
name: movementlabs
481-
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
482-
- name: Run eth_movement tests
483-
run: |
484-
nix develop --command bash -c "rust_backtrace=1 cargo test --test client_eth_tests -- --nocapture --test-threads=1"
485-
- name: Run movement_eth tests
486-
run: |
487-
nix develop --command bash -c "rust_backtrace=1 cargo test --test client_mvt_tests -- --nocapture --test-threads=1"
488-
- name: Run Relayer tests
489-
run: |
490-
nix develop --command bash -c "rust_backtrace=1 cargo test --test relayer -- --nocapture --test-threads=1"
491-
492371
# Indexer:
493372
# strategy:
494373
# matrix:

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
.DS_Store
22
proc-compose.temp.log
33
methods/guest/Cargo.lock
4-
protocol-units/bridge/contracts/out/*
5-
protocol-units/bridge/contracts/cache/*
6-
protocol-units/bridge/move-modules/build/*
7-
protocol-units/bridge/move-modules/.aptos/*
84
networks/movement/movement-client/src/move-modules/build/*
95
.idea/
106
target/

.gitmodules

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,6 @@
1717
[submodule "protocol-units/settlement/mcr/contracts/lib/openzeppelin-contracts"]
1818
path = protocol-units/settlement/mcr/contracts/lib/openzeppelin-contracts
1919
url = https://github.com/OpenZeppelin/openzeppelin-contracts
20-
21-
[submodule "protocol-units/bridge/contracts/lib/forge-std"]
22-
path = protocol-units/bridge/contracts/lib/forge-std
23-
url = https://github.com/foundry-rs/forge-std
24-
25-
[submodule "protocol-units/bridge/contracts/lib/openzeppelin-contracts"]
26-
path = protocol-units/bridge/contracts/lib/openzeppelin-contracts
27-
url = https://github.com/OpenZeppelin/openzeppelin-contracts
28-
[submodule "protocol-units/bridge/contracts/lib/openzeppelin-contracts-upgradeable"]
29-
path = protocol-units/bridge/contracts/lib/openzeppelin-contracts-upgradeable
30-
url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
3120
[submodule "protocol-units/settlement/mcr/contracts/lib/forge-std"]
3221
path = protocol-units/settlement/mcr/contracts/lib/forge-std
3322
url = https://github.com/foundry-rs/forge-std
@@ -49,15 +38,6 @@
4938
[submodule "protocol-units/settlement/mcr/contracts/lib/solmate"]
5039
path = protocol-units/settlement/mcr/contracts/lib/solmate
5140
url = https://github.com/transmissions11/solmate
52-
[submodule "bridge-forge-std"]
53-
path = protocol-units/bridge/contracts/lib/forge-std
54-
url = https://github.com/foundry-rs/forge-std
55-
[submodule "bridge-openzeppelin-contracts"]
56-
path = protocol-units/bridge/contracts/lib/openzeppelin-contracts
57-
url = https://github.com/OpenZeppelin/openzeppelin-contracts
58-
[submodule "bridge-openzeppelin-contracts-upgradeable"]
59-
path = protocol-units/bridge/contracts/lib/openzeppelin-contracts-upgradeable
60-
url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
6141
[submodule "dispute-forge-std"]
6242
path = protocol-units/dispute/lib/forge-std
6343
url = https://github.com/foundry-rs/forge-std
@@ -73,9 +53,6 @@
7353
[submodule "lib/BokkyPooBahsDateTimeLibrary"]
7454
path = lib/BokkyPooBahsDateTimeLibrary
7555
url = https://github.com/bokkypoobah/BokkyPooBahsDateTimeLibrary
76-
[submodule "protocol-units/bridge/contracts/lib/BokkyPooBahsDateTimeLibrary"]
77-
path = protocol-units/bridge/contracts/lib/BokkyPooBahsDateTimeLibrary
78-
url = https://github.com/bokkypoobah/BokkyPooBahsDateTimeLibrary
7956
[submodule "protocol-units/settlement/mcr/contracts/lib/v2-periphery"]
8057
path = protocol-units/settlement/mcr/contracts/lib/v2-periphery
8158
url = https://github.com/Uniswap/v2-periphery

CODEOWNERS

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,6 @@ protocol-units/sequencing/* @l-monninger @mzabaluev
1616
# movement-rest
1717
protocol-units/movement-rest/* @0xmovses @mzabaluev
1818

19-
# bridge-cli
20-
protocol-units/bridge-cli/* @0xmovses @andygolay
21-
22-
# bridge contracts
23-
protocol-units/bridge/contracts/* @0xmovses @andygolay @0xPrimata
24-
25-
# bridge service
26-
protocol-units/bridge/bridge-service/* @0xmovses @andygolay
27-
28-
# bridge
29-
protocol-units/bridge/* @0xmovses @andygolay
30-
31-
# bridge move modules
32-
protocol-units/bridge/move-modules/* @0xmovses @andygolay
33-
3419
# mcr client
3520
protocol-units/settlement/mcr/client/* @musitdev @mzabaluev @l-monninger
3621

0 commit comments

Comments
 (0)