release candidate: 0.10.0

.cargo/config.toml

@@ -1,6 +1,6 @@
 [env]
 CF_ETH_CONTRACT_ABI_ROOT = { value = "eth-contract-abis", relative = true }
-CF_ETH_CONTRACT_ABI_TAG = "perseverance-0.9-rc6"
+CF_ETH_CONTRACT_ABI_TAG = "v0.8.0"
 
 
 # Note: If you just want to save typing command commands, you can install tab completions for most shells. Type

.github/CODEOWNERS

@@ -1,2 +1,4 @@
 /bouncer/ @martin-chainflip
 /state-chain/custom-rpc/ @chainflip-io/web
+/engine/config/CI/config/Settings.toml @chainflip-io/platform
+/localnet/ @chainflip-io/platform

.github/workflows/_40_post_check.yml

@@ -33,13 +33,6 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Setup ngrok
-        run: |
-          curl -s https://ngrok-agent.s3.amazonaws.com/ngrok.asc | sudo tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null
-          echo "deb https://ngrok-agent.s3.amazonaws.com buster main" | sudo tee /etc/apt/sources.list.d/ngrok.list
-          sudo apt update
-          sudo apt install ngrok
-
       - name: Configure NodeJS
         uses: actions/setup-node@v3
         with:
@@ -79,20 +72,6 @@ jobs:
           chmod +x ${{ env.BINARIES_LOCATION }}/chainflip-*
           ./localnet/manage.sh
 
-      - name: Expose endpoints for Polkadot and Chainflip
-        env:
-          NGROK_AUTHTOKEN: ${{ secrets.CF_NGROK_AUTHTOKEN }}
-        continue-on-error: true
-        run: |
-          ngrok http http://localhost:9944 --log-format=logfmt --log=/tmp/ngrok-chainflip-node.log &
-          ngrok http http://localhost:9945 --log-format=logfmt --log=/tmp/ngrok-polkadot.log &
-          sleep 10
-
-      - name: Get ngrok URLs
-        continue-on-error: true
-        id: ngrok-urls
-        run: python3 ./ci/scripts/get_ngrok_urls.py
-
       - name: Run EinfachHeuteLeiderNicht.exe
         if: inputs.simple_bouncer
         working-directory: bouncer

.gitignore

@@ -23,6 +23,8 @@ localnet/init/polkadot/docker-compose.yml
 !localnet/init/keyshare/**/*.log
 !localnet/init/data/**/*.log
 
+localnet/init/config/Settings.toml.*.backup
+
 # Local CFE config
 engine/config/Local.toml
 

api/bin/chainflip-broker-api/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["Chainflip team <https://github.com/chainflip-io>"]
 name = "chainflip-broker-api"
-version = "0.9.3"
+version = "0.10.0"
 edition = "2021"
 
 [package.metadata.deb]
@@ -22,7 +22,6 @@ name = "chainflip-broker-api"
 [dependencies]
 chainflip-api = { path = "../../lib" }
 cf-utilities = { package = "utilities", path = "../../../utilities" }
-cf-chains = { path = '../../../state-chain/chains', default-features = false }
 
 anyhow = "1.0.66"
 clap = { version = "3.2.23", features = ["derive"] }

api/bin/chainflip-broker-api/src/main.rs

@@ -1,4 +1,3 @@
-use anyhow::anyhow;
 use cf_utilities::{
 	task_scope::{task_scope, Scope},
 	AnyhowRpcError,
@@ -11,10 +10,8 @@ use chainflip_api::{
 };
 use clap::Parser;
 use futures::FutureExt;
-use hex::FromHexError;
 use jsonrpsee::{core::async_trait, proc_macros::rpc, server::ServerBuilder};
 use serde::{Deserialize, Serialize};
-use sp_rpc::number::NumberOrHex;
 use std::path::PathBuf;
 use tracing::log;
 
@@ -40,39 +37,6 @@ impl From<chainflip_api::SwapDepositAddress> for BrokerSwapDepositAddress {
 	}
 }
 
-#[derive(Serialize, Deserialize)]
-pub struct BrokerCcmChannelMetadata {
-	gas_budget: NumberOrHex,
-	message: String,
-	cf_parameters: Option<String>,
-}
-
-fn parse_hex_bytes(string: &str) -> Result<Vec<u8>, FromHexError> {
-	hex::decode(string.strip_prefix("0x").unwrap_or(string))
-}
-
-impl TryInto<CcmChannelMetadata> for BrokerCcmChannelMetadata {
-	type Error = anyhow::Error;
-
-	fn try_into(self) -> Result<CcmChannelMetadata, Self::Error> {
-		let gas_budget = self
-			.gas_budget
-			.try_into()
-			.map_err(|_| anyhow!("Failed to parse {:?} as gas budget", self.gas_budget))?;
-		let message =
-			parse_hex_bytes(&self.message).map_err(|e| anyhow!("Failed to parse message: {e}"))?;
-
-		let cf_parameters = self
-			.cf_parameters
-			.map(|parameters| parse_hex_bytes(&parameters))
-			.transpose()
-			.map_err(|e| anyhow!("Failed to parse cf parameters: {e}"))?
-			.unwrap_or_default();
-
-		Ok(CcmChannelMetadata { gas_budget, message, cf_parameters })
-	}
-}
-
 #[rpc(server, client, namespace = "broker")]
 pub trait Rpc {
 	#[method(name = "registerAccount")]
@@ -85,7 +49,7 @@ pub trait Rpc {
 		destination_asset: Asset,
 		destination_address: String,
 		broker_commission_bps: BasisPoints,
-		channel_metadata: Option<BrokerCcmChannelMetadata>,
+		channel_metadata: Option<CcmChannelMetadata>,
 	) -> Result<BrokerSwapDepositAddress, AnyhowRpcError>;
 }
 
@@ -122,10 +86,8 @@ impl RpcServer for RpcServerImpl {
 		destination_asset: Asset,
 		destination_address: String,
 		broker_commission_bps: BasisPoints,
-		channel_metadata: Option<BrokerCcmChannelMetadata>,
+		channel_metadata: Option<CcmChannelMetadata>,
 	) -> Result<BrokerSwapDepositAddress, AnyhowRpcError> {
-		let channel_metadata = channel_metadata.map(TryInto::try_into).transpose()?;
-
 		Ok(self
 			.api
 			.broker_api()
@@ -188,24 +150,3 @@ async fn main() -> anyhow::Result<()> {
 	})
 	.await
 }
-
-#[cfg(test)]
-mod test {
-	use super::*;
-	use cf_utilities::assert_err;
-
-	#[test]
-	fn test_decoding() {
-		assert_eq!(parse_hex_bytes("0x00").unwrap(), vec![0]);
-		assert_eq!(parse_hex_bytes("cf").unwrap(), vec![0xcf]);
-		assert_eq!(
-			parse_hex_bytes("0x00112233445566778899aabbccddeeff").unwrap(),
-			vec![
-				0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd,
-				0xee, 0xff
-			]
-		);
-		assert_eq!(parse_hex_bytes("").unwrap(), b"");
-		assert_err!(parse_hex_bytes("abc"));
-	}
-}

api/bin/chainflip-cli/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Chainflip team <https://github.com/chainflip-io>"]
 edition = '2021'
 build = 'build.rs'
 name = "chainflip-cli"
-version = "0.9.3"
+version = "0.10.0"
 
 [dependencies]
 anyhow = "1.0"