Merge pull request #110 from movementlabsxyz/andygolay/remove-initiate-hex-complete

Fix: remove hex conversion from initiator in complete bridge transfer, refactor to one module per file

Author: l-monninger

Cargo.lock

@@ -550,10 +550,10 @@ dunce = "1.0.4"
 ed25519-dalek = { version = "1.0.1", features = ["std", "serde"] }
 ed25519-dalek-bip32 = "0.2.0"
 either = "1.6.1"
+ethabi = "18.0.0"
 enum_dispatch = "0.3.12"
 env_logger = "0.10.0"
 erased-serde = "0.3.13"
-ethabi = "18.0.0"
 ethnum = "1.5.0"
 event-listener = "2.5.3"
 evm = { version = "0.33.1", features = ["tracing"] }

Cargo.toml

@@ -26,6 +26,7 @@ aptos-types = { workspace = true, features = ["testing"] }
 aptos-vm = { workspace = true, features = ["testing"] }
 bcs = { workspace = true }
 claims = { workspace = true }
+ethabi = { workspace = true }
 hex = { workspace = true }
 move-binary-format = { workspace = true }
 move-command-line-common = { workspace = true }

aptos-move/e2e-move-tests/Cargo.toml

@@ -1,13 +1,13 @@
 script {
     use aptos_framework::aptos_governance;
     use aptos_framework::transaction_fee;
-    use aptos_framework::native_bridge_core;
+    use aptos_framework::native_bridge;
 
     fun main(core_resources: &signer) {
         let framework_signer = aptos_governance::get_signer_testnet_only(core_resources, @aptos_framework);
         let (mint, burn) = transaction_fee::copy_capabilities_for_native_bridge(&framework_signer);
 
-        native_bridge_core::store_aptos_coin_mint_cap(&framework_signer, mint);
-        native_bridge_core::store_aptos_coin_burn_cap(&framework_signer, burn);
+        native_bridge::store_aptos_coin_mint_cap(&framework_signer, mint);
+        native_bridge::store_aptos_coin_burn_cap(&framework_signer, burn);
     }
 }

aptos-move/e2e-move-tests/src/tests/bridge.data/mint_burn_caps_native/sources/main.move

@@ -1,9 +1,9 @@
 script {
-    use aptos_framework::aptos_governance;
-    use aptos_framework::atomic_bridge_configuration;
+    // use aptos_framework::aptos_governance;
+    // use aptos_framework::atomic_bridge_configuration;
 
     fun main(core_resources: &signer, new_operator: address) {
-        let framework_signer = aptos_governance::get_signer_testnet_only(core_resources, @aptos_framework);
-        atomic_bridge_configuration::update_bridge_operator(&framework_signer, new_operator);
+        // let framework_signer = aptos_governance::get_signer_testnet_only(core_resources, @aptos_framework);
+        // atomic_bridge_configuration::update_bridge_operator(&framework_signer, new_operator);
     }
 }