Make relay generic over source/target chains (paritytech#58)

* renamed to-be-generic files * make everything required generic over source/target chains * some more fixes * cargo fmt --all * trait functions -> trait constants * cargo --fmt --all
jonathanudd · Apr 10, 2024 · d631178 · d631178
1 parent c6c4646
commit d631178
Show file tree

Hide file tree

Showing 11 changed files with 1,294 additions and 906 deletions.
diff --git a/bridges/relays/ethereum/Cargo.toml b/bridges/relays/ethereum/Cargo.toml
@@ -15,6 +15,7 @@ futures = "0.3.1"
 jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee.git", default-features = false, features = ["http"] }
 linked-hash-map = "0.5.2"
 log = "0.4.8"
+num-traits = "0.2"
 parking_lot = "0.10.0"
 rustc-hex = "2.0.1"
 serde = { version = "1.0.106", features = ["derive"] }

diff --git a/bridges/relays/ethereum/src/cli.yml b/bridges/relays/ethereum/src/cli.yml
@@ -2,43 +2,44 @@ name: ethsub-bridge
 version: "0.1.0"
 author: Parity Technologies <admin@parity.io>
 about: Parity Ethereum (PoA) <-> Substrate bridge
-args:
-    - eth-host:
-        long: eth-host
-        value_name: ETH_HOST
-        help: Connect to Ethereum node at given host.
-        takes_value: true
-    - eth-port:
-        long: eth-port
-        value_name: ETH_PORT
-        help: Connect to Ethereum node at given port.
-        takes_value: true
-    - sub-host:
-        long: sub-host
-        value_name: SUB_HOST
-        help: Connect to Substrate node at given host.
-        takes_value: true
-    - sub-port:
-        long: sub-port
-        value_name: SUB_PORT
-        help: Connect to Substrate node at given port.
-        takes_value: true
-    - sub-tx-mode:
-        long: sub-tx-mode
-        value_name: MODE
-        help: Submit headers using signed (default) or unsigned transactions. Third mode - backup - submits signed transactions only when we believe that sync has stalled.
-        takes_value: true
-        possible_values:
-            - signed
-            - unsigned
-            - backup
-    - sub-signer:
-        long: sub-signer
-        value_name: SUB_SIGNER
-        help: The SURI of secret key to use when transactions are submitted to the Substrate node.
-        takes_value: true
-    - sub-signer-password:
-        long: sub-signer-password
-        value_name: SUB_SIGNER_PASSWORD
-        help: The password for the SURI of secret key to use when transactions are submitted to the Substrate node.
-        takes_value: true
+subcommands:
+    - eth-to-sub:
+        about: Synchronize headers from Ethereum node to Substrate node.
+        args:
+            - eth-host:
+                long: eth-host
+                value_name: ETH_HOST
+                help: Connect to Ethereum node at given host.
+                takes_value: true
+            - eth-port:
+                long: eth-port
+                value_name: ETH_PORT
+                help: Connect to Ethereum node at given port.
+                takes_value: true
+            - sub-host:
+                long: sub-host
+                value_name: SUB_HOST
+                help: Connect to Substrate node at given host.
+                takes_value: true
+            - sub-port:
+                long: sub-port
+                value_name: SUB_PORT
+                help: Connect to Substrate node at given port.
+                takes_value: true
+            - sub-tx-mode:
+                long: sub-tx-mode
+                value_name: MODE
+                help: Submit headers using signed (default) or unsigned transactions. Third mode - backup - submits signed transactions only when we believe that sync has stalled.
+                takes_value: true
+                possible_values:
+                    - signed
+                    - unsigned
+                    - backup
+            - sub-signer:
+                long: sub-signer
+                value_name: SUB_SIGNER
+                help: The SURI of secret key to use when transactions are submitted to the Substrate node.
+            - sub-signer-password:
+                long: sub-signer-password
+                value_name: SUB_SIGNER_PASSWORD
+                help: The password for the SURI of secret key to use when transactions are submitted to the Substrate node.
diff --git a/bridges/relays/ethereum/src/ethereum_client.rs b/bridges/relays/ethereum/src/ethereum_client.rs
@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::ethereum_sync_loop::MaybeConnectionError;
-use crate::ethereum_types::{Header, HeaderId, Receipt, H256, U64};
+use crate::ethereum_types::{EthereumHeaderId, Header, Receipt, H256, U64};
+use crate::sync_types::MaybeConnectionError;
 use jsonrpsee::common::Params;
 use jsonrpsee::raw::{RawClient, RawClientError};
 use jsonrpsee::transport::http::{HttpTransportClient, RequestError};
@@ -117,9 +117,9 @@ pub async fn header_by_hash(client: Client, hash: H256) -> (Client, Result<Heade
 /// Retrieve transactions receipts for given block.
 pub async fn transactions_receipts(
 	mut client: Client,
-	id: HeaderId,
+	id: EthereumHeaderId,
 	transacactions: Vec<H256>,
-) -> (Client, Result<(HeaderId, Vec<Receipt>), Error>) {
+) -> (Client, Result<(EthereumHeaderId, Vec<Receipt>), Error>) {
 	let mut transactions_receipts = Vec::with_capacity(transacactions.len());
 	for transacaction in transacactions {
 		let (next_client, transaction_receipt) = transaction_receipt(client, transacaction).await;