bump v0.9.18-chainbridge.13

uinb · Nov 4, 2022 · 7760e38 · 7760e38
1 parent a5d7223
commit 7760e38
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v0.9.18-chainbridge.13
+
+- update chainbridge
+
 # v0.9.18-chainbridge.12
 
 - update chainbridge

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -24,7 +24,7 @@ jsonrpc-core = '18.0.0'
 structopt = '0.3.25'
 
 fuso-runtime = { path = '../runtime' }
-fuso-verifier-rpc = { git = "https://github.com/uinb/fusotao-protocol.git", tag = "v0.9.18.chainbridge.1", default-features = false, package = "fuso-verifier-rpc" }
+fuso-verifier-rpc = { git = "https://github.com/uinb/fusotao-protocol.git", tag = "v0.9.18.chainbridge.3", default-features = false, package = "fuso-verifier-rpc" }
 
 clap = { version = "3.0", features = ["derive"] }
 sc-cli = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18", features = ["wasmtime"] }

diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -67,15 +67,15 @@ frame-system-benchmarking = { version = "4.0.0-dev", default-features = false, g
 hex-literal = { version = "0.3.4", optional = true }
 pallet-multisig = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.18', default-features = false }
 # fusotao dependencies
-fuso-support = { git = "https://github.com/uinb/fusotao-protocol.git", tag = "v0.9.18.chainbridge.1", default-features = false, package = "fuso-support" }
-pallet-fuso-verifier = { git = "https://github.com/uinb/fusotao-protocol.git", tag = "v0.9.18.chainbridge.1", default-features = false, package = "pallet-fuso-verifier" }
-pallet-fuso-token = { git = "https://github.com/uinb/fusotao-protocol.git", tag = "v0.9.18.chainbridge.1", default-features = false, package = "pallet-fuso-token" }
-pallet-fuso-foundation = { git = "https://github.com/uinb/fusotao-protocol.git", tag = "v0.9.18.chainbridge.1", default-features = false, package = "pallet-fuso-foundation" }
-pallet-fuso-reward = { git = "https://github.com/uinb/fusotao-protocol.git", tag = "v0.9.18.chainbridge.1", default-features = false, package = "pallet-fuso-reward" }
-fuso-verifier-runtime-api = { git = "https://github.com/uinb/fusotao-protocol.git", tag = "v0.9.18.chainbridge.1", default-features = false, package = "fuso-verifier-runtime-api" }
+fuso-support = { git = "https://github.com/uinb/fusotao-protocol.git", tag = "v0.9.18.chainbridge.3", default-features = false, package = "fuso-support" }
+pallet-fuso-verifier = { git = "https://github.com/uinb/fusotao-protocol.git", tag = "v0.9.18.chainbridge.3", default-features = false, package = "pallet-fuso-verifier" }
+pallet-fuso-token = { git = "https://github.com/uinb/fusotao-protocol.git", tag = "v0.9.18.chainbridge.3", default-features = false, package = "pallet-fuso-token" }
+pallet-fuso-foundation = { git = "https://github.com/uinb/fusotao-protocol.git", tag = "v0.9.18.chainbridge.3", default-features = false, package = "pallet-fuso-foundation" }
+pallet-fuso-reward = { git = "https://github.com/uinb/fusotao-protocol.git", tag = "v0.9.18.chainbridge.3", default-features = false, package = "pallet-fuso-reward" }
+fuso-verifier-runtime-api = { git = "https://github.com/uinb/fusotao-protocol.git", tag = "v0.9.18.chainbridge.3", default-features = false, package = "fuso-verifier-runtime-api" }
 # chainbridge dependencies
-pallet-chainbridge = { git = "https://github.com/uinb/fusotao-protocol.git", tag = "v0.9.18.chainbridge.1", default-features = false, package = "pallet-chainbridge" }
-pallet-chainbridge-handler = { git = "https://github.com/uinb/fusotao-protocol.git", tag = "v0.9.18.chainbridge.1", default-features = false, package = "pallet-chainbridge-handler" }
+pallet-chainbridge = { git = "https://github.com/uinb/fusotao-protocol.git", tag = "v0.9.18.chainbridge.3", default-features = false, package = "pallet-chainbridge" }
+pallet-chainbridge-handler = { git = "https://github.com/uinb/fusotao-protocol.git", tag = "v0.9.18.chainbridge.3", default-features = false, package = "pallet-chainbridge-handler" }
 
 [build-dependencies]
 substrate-wasm-builder = { version = "5.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.18" }

diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -115,7 +115,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	//   `spec_version`, and `authoring_version` are the same between Wasm and native.
 	// This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use
 	//   the compatible custom types.
-	spec_version: 131,
+	spec_version: 132,
 	impl_version: 1,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 2,
@@ -623,11 +623,9 @@ parameter_types! {
 impl pallet_chainbridge_handler::Config for Runtime {
 	type Event = Event;
 	type Redirect = Call;
+	type BalanceConversion = Token;
 	type AdminOrigin = frame_system::EnsureRoot<Self::AccountId>;
-	type Currency = Balances;
 	type Fungibles = Token;
-	type AssetBalance = Balance;
-	type AssetId = TokenId;
 	type AssetIdByName = Token;
 	type BridgeOrigin = pallet_chainbridge::EnsureBridge<Runtime>;
 	type DonationForAgent = DonationForAgent;