Move bridging contracts to subdir

gear-tech · Sep 16, 2024 · b75dbd5 · b75dbd5
1 parent 19fb48b
commit b75dbd5
Show file tree

Hide file tree

Showing 38 changed files with 17 additions and 16 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,17 +7,18 @@ members = [
     "relayer",
     "circuits/*",
     "ethereum-common",
-    "gear-programs/bridging-payment",
-    "gear-programs/bridging-payment/src/wasm",
-    "gear-programs/bridging-payment-vara-supply",
-    "gear-programs/bridging-payment-vara-supply/src/wasm",
-    "gear-programs/bridging-payment-common",
+    "gear-programs/bridging-payment/eth-supply",
+    "gear-programs/bridging-payment/eth-supply/src/wasm",
+    "gear-programs/bridging-payment/vara-supply",
+    "gear-programs/bridging-payment/vara-supply/src/wasm",
+    "gear-programs/bridging-payment/common",
     "gear-programs/vft-gateway",
     "gear-programs/vft-gateway/src/wasm",
     "gear-programs/vft-treasury",
     "gear-programs/vft-treasury/src/wasm",
-    "gear-programs/*",
+    "gear-programs/checkpoint-light-client",
     "gear-programs/checkpoint-light-client/io",
+    "gear-programs/proof-storage",
     "utils-prometheus",
 ]
 
@@ -38,11 +39,11 @@ plonky2_u32 = { path = "./circuits/plonky2_u32" }
 ethereum-client = { path = "./ethereum/client" }
 ethereum-common = { path = "ethereum-common", default-features = false }
 
-bridging_payment = { path = "gear-programs/bridging-payment" }
-bridging_payment_wasm = { path = "gear-programs/bridging_payment/src/wasm" }
-bridging_payment_vara_supply = { path = "gear-programs/bridging-payment-vara-supply" }
-bridging_payment_vara_supply_wasm = { path = "gear-programs/bridging-payment-vara-supply/src/wasm" }
-bridging_payment_common = { path = "gear-programs/bridging-payment-common" }
+bridging_payment = { path = "gear-programs/bridging-payment/eth-supply" }
+bridging_payment_wasm = { path = "gear-programs/bridging_payment/eth-supply/src/wasm" }
+bridging_payment_vara_supply = { path = "gear-programs/bridging-payment/vara-supply" }
+bridging_payment_vara_supply_wasm = { path = "gear-programs/bridging-payment/vara-supply/src/wasm" }
+bridging_payment_common = { path = "gear-programs/bridging-payment/common" }
 vft-gateway-app = { path = "gear-programs/vft-gateway" }
 vft_gateway_wasm = { path = "gear-programs/vft-gateway/src/wasm" }
 vft-treasury-app = { path = "gear-programs/vft-treasury" }

diff --git a/...ograms/bridging-payment-common/Cargo.toml → ...ograms/bridging-payment/common/Cargo.toml b/...ograms/bridging-payment-common/Cargo.toml → ...ograms/bridging-payment/common/Cargo.toml
diff --git a/...rams/bridging-payment-common/src/error.rs → ...rams/bridging-payment/common/src/error.rs b/...rams/bridging-payment-common/src/error.rs → ...rams/bridging-payment/common/src/error.rs
diff --git a/...idging-payment-common/src/gtest_macros.rs → ...idging-payment/common/src/gtest_macros.rs b/...idging-payment-common/src/gtest_macros.rs → ...idging-payment/common/src/gtest_macros.rs
diff --git a/...ograms/bridging-payment-common/src/lib.rs → ...ograms/bridging-payment/common/src/lib.rs b/...ograms/bridging-payment-common/src/lib.rs → ...ograms/bridging-payment/common/src/lib.rs
diff --git a/...ams/bridging-payment-common/src/refund.rs → ...ams/bridging-payment/common/src/refund.rs b/...ams/bridging-payment-common/src/refund.rs → ...ams/bridging-payment/common/src/refund.rs
diff --git a/...rams/bridging-payment-common/src/utils.rs → ...rams/bridging-payment/common/src/utils.rs b/...rams/bridging-payment-common/src/utils.rs → ...rams/bridging-payment/common/src/utils.rs
diff --git a/gear-programs/bridging-payment/Cargo.toml → ...ms/bridging-payment/eth-supply/Cargo.toml b/gear-programs/bridging-payment/Cargo.toml → ...ms/bridging-payment/eth-supply/Cargo.toml
diff --git a/gear-programs/bridging-payment/build.rs → ...rams/bridging-payment/eth-supply/build.rs b/gear-programs/bridging-payment/build.rs → ...rams/bridging-payment/eth-supply/build.rs
@@ -4,7 +4,7 @@ use std::{env, path::PathBuf};
 fn main() {
     let out_dir_path = PathBuf::from(env::var("OUT_DIR").unwrap());
 
-    let idl_file_path = PathBuf::from("../vft-gateway/src/wasm/vft-gateway.idl");
+    let idl_file_path = PathBuf::from("../../vft-gateway/src/wasm/vft-gateway.idl");
 
     let client_rs_file_path = out_dir_path.join("vft-gateway.rs");
 
@@ -26,7 +26,7 @@ fn main() {
     // use local copy of `vft.idl` to build on windows
     #[cfg(target_family = "windows")]
     let idl_file_path =
-        PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap()).join("../vft-gateway/vft.idl");
+        PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap()).join("../../vft-gateway/vft.idl");
 
     ClientGenerator::from_idl_path(&idl_file_path)
         .generate_to(client_rs_file_path)

diff --git a/...s/bridging-payment-vara-supply/src/lib.rs → ...ms/bridging-payment/eth-supply/src/lib.rs b/...s/bridging-payment-vara-supply/src/lib.rs → ...ms/bridging-payment/eth-supply/src/lib.rs
diff --git a/...rams/bridging-payment/src/services/mod.rs → ...ng-payment/eth-supply/src/services/mod.rs b/...rams/bridging-payment/src/services/mod.rs → ...ng-payment/eth-supply/src/services/mod.rs
diff --git a/...dging-payment/src/services/msg_tracker.rs → ...nt/eth-supply/src/services/msg_tracker.rs b/...dging-payment/src/services/msg_tracker.rs → ...nt/eth-supply/src/services/msg_tracker.rs
diff --git a/...ridging-payment/src/services/token_msg.rs → ...ment/eth-supply/src/services/token_msg.rs b/...ridging-payment/src/services/token_msg.rs → ...ment/eth-supply/src/services/token_msg.rs
diff --git a/...ms/bridging-payment/src/services/utils.rs → ...-payment/eth-supply/src/services/utils.rs b/...ms/bridging-payment/src/services/utils.rs → ...-payment/eth-supply/src/services/utils.rs
diff --git a/...rams/bridging-payment/src/services/vft.rs → ...ng-payment/eth-supply/src/services/vft.rs b/...rams/bridging-payment/src/services/vft.rs → ...ng-payment/eth-supply/src/services/vft.rs
diff --git a/...dging-payment/src/services/vft_gateway.rs → ...nt/eth-supply/src/services/vft_gateway.rs b/...dging-payment/src/services/vft_gateway.rs → ...nt/eth-supply/src/services/vft_gateway.rs
diff --git a/...g-payment/src/services/vft_gateway_msg.rs → ...th-supply/src/services/vft_gateway_msg.rs b/...g-payment/src/services/vft_gateway_msg.rs → ...th-supply/src/services/vft_gateway_msg.rs
diff --git a/...rams/bridging-payment/src/wasm/Cargo.toml → ...ng-payment/eth-supply/src/wasm/Cargo.toml b/...rams/bridging-payment/src/wasm/Cargo.toml → ...ng-payment/eth-supply/src/wasm/Cargo.toml
diff --git a/...ing-payment/src/wasm/bridging-payment.idl → .../eth-supply/src/wasm/bridging-payment.idl b/...ing-payment/src/wasm/bridging-payment.idl → .../eth-supply/src/wasm/bridging-payment.idl
diff --git a/...ograms/bridging-payment/src/wasm/build.rs → ...ging-payment/eth-supply/src/wasm/build.rs b/...ograms/bridging-payment/src/wasm/build.rs → ...ging-payment/eth-supply/src/wasm/build.rs
diff --git a/...rams/bridging-payment/src/wasm/src/lib.rs → ...ng-payment/eth-supply/src/wasm/src/lib.rs b/...rams/bridging-payment/src/wasm/src/lib.rs → ...ng-payment/eth-supply/src/wasm/src/lib.rs
diff --git a/...ayment/src/wasm/tests/bridging_payment.rs → ...supply/src/wasm/tests/bridging_payment.rs b/...ayment/src/wasm/tests/bridging_payment.rs → ...supply/src/wasm/tests/bridging_payment.rs
diff --git a/.../bridging-payment/src/wasm/tests/utils.rs → ...ayment/eth-supply/src/wasm/tests/utils.rs b/.../bridging-payment/src/wasm/tests/utils.rs → ...ayment/eth-supply/src/wasm/tests/utils.rs
diff --git a/...s/bridging-payment-vara-supply/Cargo.toml → ...s/bridging-payment/vara-supply/Cargo.toml b/...s/bridging-payment-vara-supply/Cargo.toml → ...s/bridging-payment/vara-supply/Cargo.toml
diff --git a/...ams/bridging-payment-vara-supply/build.rs → ...ams/bridging-payment/vara-supply/build.rs b/...ams/bridging-payment-vara-supply/build.rs → ...ams/bridging-payment/vara-supply/build.rs
@@ -4,7 +4,7 @@ use std::{env, path::PathBuf};
 fn main() {
     let out_dir_path = PathBuf::from(env::var("OUT_DIR").unwrap());
 
-    let idl_file_path = PathBuf::from("../vft-treasury/src/wasm/vft-treasury.idl");
+    let idl_file_path = PathBuf::from("../../vft-treasury/src/wasm/vft-treasury.idl");
 
     let client_rs_file_path = out_dir_path.join("vft-treasury.rs");
 

diff --git a/gear-programs/bridging-payment/src/lib.rs → ...s/bridging-payment/vara-supply/src/lib.rs b/gear-programs/bridging-payment/src/lib.rs → ...s/bridging-payment/vara-supply/src/lib.rs
diff --git a/...g-payment-vara-supply/src/services/mod.rs → ...g-payment/vara-supply/src/services/mod.rs b/...g-payment-vara-supply/src/services/mod.rs → ...g-payment/vara-supply/src/services/mod.rs
diff --git a/...t-vara-supply/src/services/msg_tracker.rs → ...t/vara-supply/src/services/msg_tracker.rs b/...t-vara-supply/src/services/msg_tracker.rs → ...t/vara-supply/src/services/msg_tracker.rs
diff --git a/...payment-vara-supply/src/services/utils.rs → ...payment/vara-supply/src/services/utils.rs b/...payment-vara-supply/src/services/utils.rs → ...payment/vara-supply/src/services/utils.rs
diff --git a/...-vara-supply/src/services/vft_treasury.rs → .../vara-supply/src/services/vft_treasury.rs b/...-vara-supply/src/services/vft_treasury.rs → .../vara-supply/src/services/vft_treasury.rs
diff --git a/...a-supply/src/services/vft_treasury_msg.rs → ...a-supply/src/services/vft_treasury_msg.rs b/...a-supply/src/services/vft_treasury_msg.rs → ...a-supply/src/services/vft_treasury_msg.rs
diff --git a/...g-payment-vara-supply/src/wasm/Cargo.toml → ...g-payment/vara-supply/src/wasm/Cargo.toml b/...g-payment-vara-supply/src/wasm/Cargo.toml → ...g-payment/vara-supply/src/wasm/Cargo.toml
diff --git a/...src/wasm/bridging-payment-vara-supply.idl → ...src/wasm/bridging-payment-vara-supply.idl b/...src/wasm/bridging-payment-vara-supply.idl → ...src/wasm/bridging-payment-vara-supply.idl
diff --git a/...ing-payment-vara-supply/src/wasm/build.rs → ...ing-payment/vara-supply/src/wasm/build.rs b/...ing-payment-vara-supply/src/wasm/build.rs → ...ing-payment/vara-supply/src/wasm/build.rs
diff --git a/...g-payment-vara-supply/src/wasm/src/lib.rs → ...g-payment/vara-supply/src/wasm/src/lib.rs b/...g-payment-vara-supply/src/wasm/src/lib.rs → ...g-payment/vara-supply/src/wasm/src/lib.rs
diff --git a/...asm/tests/bridging_payment_vara_supply.rs → ...asm/tests/bridging_payment_vara_supply.rs b/...asm/tests/bridging_payment_vara_supply.rs → ...asm/tests/bridging_payment_vara_supply.rs
diff --git a/...yment-vara-supply/src/wasm/tests/utils.rs → ...yment/vara-supply/src/wasm/tests/utils.rs b/...yment-vara-supply/src/wasm/tests/utils.rs → ...yment/vara-supply/src/wasm/tests/utils.rs
diff --git a/relayer/build.rs b/relayer/build.rs
@@ -18,12 +18,12 @@ fn go_bindings() {
 
 fn bridging_payment_client() {
     println!(
-        "cargo:rerun-if-changed=../gear-programs/bridging-payment/src/wasm/bridging-payment.idl"
+        "cargo:rerun-if-changed=../gear-programs/bridging-payment/eth-supply/src/wasm/bridging-payment.idl"
     );
 
     let out_dir_path = PathBuf::from(env::var("OUT_DIR").unwrap());
     let idl_file_path =
-        PathBuf::from("../gear-programs/bridging-payment/src/wasm/bridging-payment.idl");
+        PathBuf::from("../gear-programs/bridging-payment/eth-supply/src/wasm/bridging-payment.idl");
     let client_rs_file_path = out_dir_path.join("bridging_payment_client.rs");
 
     ClientGenerator::from_idl_path(&idl_file_path)