Refactor s2s bridge

.github/workflows/subquery-dev.yml

@@ -41,7 +41,7 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-        chain: 
+        chain:
           - kusama
           - rococo
     steps:
@@ -65,14 +65,15 @@ jobs:
           subql_path: subql/parachain/${{ matrix.chain }}
 
   bridge-s2s:
-    name: Subql Parachain
+    name: Subql s2s
     runs-on: ubuntu-latest
     strategy:
       max-parallel: 1
       matrix:
-        chain: 
+        chain:
           - pangolin
           - pangolin-parachain
+          - pangoro
           - rococo
           - crab
           - crab-parachain

.maintain/config/bridge-pangolin-pangoro.toml

@@ -1,53 +1,14 @@
 [pangolin]
 endpoint = "wss://pangolin-rpc.darwinia.network"
 signer = "//Alice"
-# Bundle/Auto/Custom
-runtime_version_mode = "Bundle"
-# If the runtime version mode is custom, you need to set this.
-#spec_version = 12345
-# If the runtime version mode is custom, you need to set this.
-#transaction_version = 0
 
 [pangoro]
 endpoint = "wss://pangoro-rpc.darwinia.network"
 signer = "//Alice"
-# Bundle/Auto/Custom
-runtime_version_mode = "Bundle"
-# If the runtime version mode is custom, you need to set this.
-#spec_version = 12345
-# If the runtime version mode is custom, you need to set this.
-#transaction_version = 0
 
 [relay]
 # substrate-substrate bridger message relay lanes, default use `00000000`
 lanes = ["726f6c69"]
-# (optional) The relay message signer, if not set will use [panglin.signer]
-signer_pangolin = "//Alice"
-# (optional) the relay message signer, if not set will use [pangoro.signer]
-signer_pangoro = "//Alice"
-# If passed, only mandatory headers (headers that are changing the GRANDPA authorities set) are relayed.
-only_mandatory_headers = false
-# Create relayers fund accounts on both chains, if it does not exists yet.
-create_relayers_fund_accounts = false
-
-# The SURI of secret key to use when transactions are submitted to the pangolin node.
-#pangolin_messages_pallet_owner = "//PangoroMessagesOwner"
-# The password for the SURI of secret key to use when transactions are submitted to the pangolin node.
-#pangolin_messages_pallet_owner_password = "123456"
-# The SURI of secret key to use when transactions are submitted to the pangoro node.
-#pangoro_messages_pallet_owner = "//PangolinMessagesOwner"
-# The password for the SURI of secret key to use when transactions are submitted to the pangoro node.
-#pangoro_messages_pallet_owner_password = "123456"
-
-# Transactions mortality period, in blocks. MUST be a power of two in [4; 65536] range.
-# MAY NOT be larger than `BlockHashCount` parameter of the chain system module.
-# Discuss: https://github.com/darwinia-network/bridger/pull/266#discussion_r705943606
-#transactions_mortality = 256
-
-[relay.prometheus_params]
-no_prometheus = false
-prometheus_host = "127.0.0.1"
-prometheus_port = 9616
 
 #[feemarket]
 #[feemarket.subscan_left]
@@ -69,3 +30,12 @@ interval_update_fee = 1800
 # - Crazy:      If the first assigned relay is not mine. set the first assigned relayer's fee-1 to your fee.
 # - Reasonable: Query rencently orders from subscan. and calculate your fee.
 update_fee_strategy = "Nothing"
+
+[index.pangolin]
+# Subquery pangolin indexer queries url
+endpoint = "https://api.subquery.network/sq/darwinia-network/subql-bridge-s2s-pangolin"
+
+[index.pangoro]
+# Subquery pangoro indexer queries url
+endpoint = "https://api.subquery.network/sq/darwinia-network/subql-bridge-s2s-pangoro"
+

bridges/pangolin-pangolinparachain/bridge/Cargo.toml

@@ -64,7 +64,7 @@ relay-utils                     = { git = "https://github.com/darwinia-network/d
 substrate-relay-helper          = { git = "https://github.com/darwinia-network/darwinia-bridges-substrate.git", branch = "darwinia-v0.12.2" }
 subxt                           = { git = "https://github.com/darwinia-network/subxt.git", branch = "darwinia-v0.12.2" }
 ## component
-client-pangolin           = { path = "../../../frame/assistants/client-pangolin" }
+client-pangolin           = { path = "../../../frame/assistants/client-pangolin", features = ["s2s"] }
 client-pangolin-parachain = { path = "../../../frame/assistants/client-pangolin-parachain" }
 client-rococo             = { path = "../../../frame/assistants/client-rococo" }
 component-subscan         = { path = "../../../frame/components/subscan" }