Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove bridge struct #855

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/update_move_toml.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ echo "Derived resource address: $RESOURCE_ADDRESS"

# Update the Move.toml file with the addresses
sed -i "s/^resource_addr = \".*\"/resource_addr = \"$RESOURCE_ADDRESS\"/" "$MOVE_TOML_PATH"
sed -i "s/^atomic_bridge = \".*\"/atomic_bridge = \"$RESOURCE_ADDRESS\"/" "$MOVE_TOML_PATH"
sed -i "s/^native_bridge = \".*\"/native_bridge = \"$RESOURCE_ADDRESS\"/" "$MOVE_TOML_PATH"
sed -i "s/^moveth = \".*\"/moveth = \"$RESOURCE_ADDRESS\"/" "$MOVE_TOML_PATH"
sed -i "s/^master_minter = \".*\"/master_minter = \"$RESOURCE_ADDRESS\"/" "$MOVE_TOML_PATH"
sed -i "s/^minter = \".*\"/minter = \"$RESOURCE_ADDRESS\"/" "$MOVE_TOML_PATH"
Expand Down
2 changes: 1 addition & 1 deletion protocol-units/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ We identify the following protocol unit categories:
- [Data Availability](./da/m1/README.md): Protocol units concerned with enabling the secure submission and ordered retrieval of transaction data to and from a network. Light node clients and servers are members of this category.
- [Mempool](./mempool/README.md): Protocol units concerned with the acceptance and ordering of transactions in a network prior to consensus. Mempool modules are members of this category.
- [Sequencing](./sequencing/README.md): Protocol units concerned with consensus on the order of transactions in a network. Sequencer node implementations are members of this category.
- [Bridge](./bridge): Protocol units concerned with cross-blockchain bridging using atomic swaps. The atomic bridge consists of several packages and utilities to bridge from Ethereum to Movement, which can be extended to support any blockchains.
- [Bridge](./bridge): Protocol units concerned with cross-blockchain bridging using atomic swaps. The native bridge consists of several packages and utilities to bridge from Ethereum to Movement, which can be extended to support any blockchains.
- [Cryptography](./cryptography): Protocol units concerned with cryptographic operations. Cryptography and data structure-related utilities are members of this category.
- [Execution](./execution): Protocol units concerned with execution. Block executors and related unities are members of this category.
- [Movement REST service](./movement-rest): Protocol units to support Movement's REST API. `movement-rest` provides additional Movement REST API endpoints.
Expand Down
2 changes: 1 addition & 1 deletion protocol-units/bridge/cli/src/clap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use clap::{Parser, Subcommand};

#[derive(Parser)]
#[command(name = "Movementlabs Bridge CLI")]
#[command(about = "Command line interface to perform an atomic bridge transfers", long_about = None)]
#[command(about = "Command line interface to perform an native bridge transfers", long_about = None)]
pub struct CliOptions {
#[command(subcommand)]
pub command: Commands,
Expand Down
4 changes: 2 additions & 2 deletions protocol-units/bridge/cli/tests/integration_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use bridge_cli::{
clap::eth_to_movement::{self, EthSharedArgs},
eth_to_moveth,
};
use ethereum_bridge::types::{AtomicBridgeInitiator, EthAddress};
use ethereum_bridge::types::{NativeBridgeInitiator, EthAddress};
use movement_bridge::utils::MovementAddress;
use std::str::FromStr;
use url::Url;
Expand All @@ -22,7 +22,7 @@ async fn test_swap() -> eyre::Result<()> {
// Deploy contracts
let wallet = anvil.keys()[0].clone();

let initiator_contract = AtomicBridgeInitiator::deploy(provider).await?;
let initiator_contract = NativeBridgeInitiator::deploy(provider).await?;

// Set up EthSharedArgs
let eth_shared_args: EthSharedArgs = EthSharedArgs {
Expand Down
2 changes: 1 addition & 1 deletion protocol-units/bridge/contracts/foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ src = "src"
out = "out"
libs = ["lib"]

solc = "0.8.26"
solc = "0.8.27"
evm_version = "cancun"

# See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
Expand Down

This file was deleted.

128 changes: 0 additions & 128 deletions protocol-units/bridge/contracts/src/AtomicBridgeInitiatorMOVE.sol

This file was deleted.

This file was deleted.

Loading
Loading