Merge pull request #149 from gregdhill/chore/upgrade-parachain

chore: upgrade parachain to 0.8.0

bitcoin/Cargo.toml

@@ -33,7 +33,7 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-
 
 [dependencies.interbtc-bitcoin]
 git = "https://github.com/interlay/interbtc"
-rev = "f556917a852d68e39005297a878acf72fbce0c68"
+rev = "39565ae0a5402a00dc1f222ea322a13303cab9fb"
 package = "bitcoin"
 optional = true
 

bitcoin/src/iter.rs

@@ -290,7 +290,7 @@ mod tests {
         Block {
             txdata: transactions.into_iter().map(dummy_tx).collect(),
             header: BlockHeader {
-                version: 1,
+                version: 4,
                 bits: 0,
                 nonce: 0,
                 time: 0,

runtime/Cargo.toml

@@ -10,8 +10,7 @@ testing-utils = [
     "substrate-subxt/client",
     "substrate-subxt-client",
     "tempdir",
-    "btc-parachain",
-    "btc-parachain-service",
+    "interbtc",
     "bitcoin",
     "rand",
 ]
@@ -50,69 +49,67 @@ parachain = { package = "polkadot-parachain", git = "https://github.com/parityte
 # Dependencies for the testing utils for integration tests
 substrate-subxt-client = { git = "https://github.com/interlay/substrate-subxt", rev = "3db5ecbd1ca00ecc02d2e8a511aad77445ef0a33", optional = true }
 tempdir = {version = "0.3.7", optional = true }
-btc-parachain = { git = "https://github.com/interlay/interbtc", rev = "f556917a852d68e39005297a878acf72fbce0c68", features = ["aura-grandpa"], optional = true }
-btc-parachain-service = { git = "https://github.com/interlay/interbtc", rev = "f556917a852d68e39005297a878acf72fbce0c68", features = ["aura-grandpa"], optional = true }
+interbtc = { package = "interbtc-standalone", git = "https://github.com/interlay/interbtc", rev = "39565ae0a5402a00dc1f222ea322a13303cab9fb", optional = true }
 bitcoin = { path = "../bitcoin", optional = true }
 rand = { version = "0.7", optional = true }
 
 [dependencies.module-bitcoin]
 git = "https://github.com/interlay/interbtc"
-rev = "f556917a852d68e39005297a878acf72fbce0c68"
+rev = "39565ae0a5402a00dc1f222ea322a13303cab9fb"
 package = "bitcoin"
 
 [dependencies.module-refund]
 git = "https://github.com/interlay/interbtc"
-rev = "f556917a852d68e39005297a878acf72fbce0c68"
+rev = "39565ae0a5402a00dc1f222ea322a13303cab9fb"
 package = "refund"
 
 [dependencies.module-btc-relay]
 git = "https://github.com/interlay/interbtc"
-rev = "f556917a852d68e39005297a878acf72fbce0c68"
+rev = "39565ae0a5402a00dc1f222ea322a13303cab9fb"
 package = "btc-relay"
 
 [dependencies.module-security]
 git = "https://github.com/interlay/interbtc"
-rev = "f556917a852d68e39005297a878acf72fbce0c68"
+rev = "39565ae0a5402a00dc1f222ea322a13303cab9fb"
 package = "security"
 
 [dependencies.module-relay]
 git = "https://github.com/interlay/interbtc"
-rev = "f556917a852d68e39005297a878acf72fbce0c68"
+rev = "39565ae0a5402a00dc1f222ea322a13303cab9fb"
 package = "relay"
 
 [dependencies.module-vault-registry]
 git = "https://github.com/interlay/interbtc"
-rev = "f556917a852d68e39005297a878acf72fbce0c68"
+rev = "39565ae0a5402a00dc1f222ea322a13303cab9fb"
 package = "vault-registry"
 
 [dependencies.module-exchange-rate-oracle-rpc-runtime-api]
 git = "https://github.com/interlay/interbtc"
-rev = "f556917a852d68e39005297a878acf72fbce0c68"
+rev = "39565ae0a5402a00dc1f222ea322a13303cab9fb"
 package = "module-exchange-rate-oracle-rpc-runtime-api"
 
 [dependencies.module-issue]
 git = "https://github.com/interlay/interbtc"
-rev = "f556917a852d68e39005297a878acf72fbce0c68"
+rev = "39565ae0a5402a00dc1f222ea322a13303cab9fb"
 package = "issue"
 
 [dependencies.module-redeem]
 git = "https://github.com/interlay/interbtc"
-rev = "f556917a852d68e39005297a878acf72fbce0c68"
+rev = "39565ae0a5402a00dc1f222ea322a13303cab9fb"
 package = "redeem"
 
 [dependencies.module-replace]
 git = "https://github.com/interlay/interbtc"
-rev = "f556917a852d68e39005297a878acf72fbce0c68"
+rev = "39565ae0a5402a00dc1f222ea322a13303cab9fb"
 package = "replace"
 
 [dependencies.module-exchange-rate-oracle]
 git = "https://github.com/interlay/interbtc"
-rev = "f556917a852d68e39005297a878acf72fbce0c68"
+rev = "39565ae0a5402a00dc1f222ea322a13303cab9fb"
 package = "exchange-rate-oracle"
 
 [dev-dependencies]
 substrate-subxt-client = { git = "https://github.com/interlay/substrate-subxt", rev = "3db5ecbd1ca00ecc02d2e8a511aad77445ef0a33" }
-btc-parachain = { git = "https://github.com/interlay/interbtc", rev = "f556917a852d68e39005297a878acf72fbce0c68", features = ["aura-grandpa"] }
-btc-parachain-service = { git = "https://github.com/interlay/interbtc", rev = "f556917a852d68e39005297a878acf72fbce0c68", features = ["aura-grandpa"] }
+interbtc = { package = "interbtc-standalone", git = "https://github.com/interlay/interbtc", rev = "39565ae0a5402a00dc1f222ea322a13303cab9fb" }
 tempdir = "0.3.7"
 env_logger = "0.8.3"

runtime/src/integration/bitcoin_simulator.rs

@@ -107,7 +107,7 @@ impl MockBitcoinCore {
                 transaction.clone(),
             ],
             header: BlockHeader {
-                version: 2,
+                version: 4,
                 merkle_root: Default::default(),
                 bits: BlockHeader::compact_target_from_u256(&target),
                 nonce: 0,
@@ -183,7 +183,7 @@ impl MockBitcoinCore {
                 value: reward,
             }],
             lock_time: height,
-            version: 1,
+            version: 2,
         }
     }
 

runtime/src/integration/mod.rs

@@ -60,7 +60,7 @@ pub async fn default_provider_client(key: AccountKeyring) -> (SubxtClient, TempD
             path: tmp.path().join("keystore"),
             password: None,
         },
-        chain_spec: btc_parachain::chain_spec::development_config(),
+        chain_spec: interbtc::chain_spec::development_config(),
         role: Role::Authority(key),
         telemetry: None,
         wasm_method: WasmExecutionMethod::Compiled,
@@ -70,7 +70,7 @@ pub async fn default_provider_client(key: AccountKeyring) -> (SubxtClient, TempD
     let mut service_config = config.into_service_config();
     service_config.offchain_worker.enabled = true;
 
-    let (task_manager, rpc_handlers) = btc_parachain_service::new_full(service_config).unwrap();
+    let (task_manager, rpc_handlers) = interbtc::service::new_full(service_config).unwrap();
     let client = SubxtClient::new(task_manager, rpc_handlers);
 
     let root_provider = setup_provider(client.clone(), AccountKeyring::Alice).await;

runtime/src/pallets/vault_registry.rs

@@ -52,7 +52,7 @@ pub struct WithdrawCollateralEvent<T: VaultRegistry> {
 
 #[derive(Clone, Debug, Eq, PartialEq, Store, Encode)]
 pub struct VaultsStore<T: VaultRegistry> {
-    #[store(returns = Vault<T::AccountId, T::BlockNumber, T::Wrapped, T::Collateral, T::SignedFixedPoint>)]
+    #[store(returns = Vault<T::AccountId, T::BlockNumber, T::Wrapped, T::Collateral>)]
     pub _runtime: PhantomData<T>,
     pub account_id: T::AccountId,
 }

runtime/src/rpc.rs

@@ -1218,6 +1218,8 @@ pub trait VaultRegistryPallet {
     async fn get_required_collateral_for_wrapped(&self, amount_btc: u128) -> Result<u128, Error>;
 
     async fn get_required_collateral_for_vault(&self, vault_id: AccountId) -> Result<u128, Error>;
+
+    async fn get_vault_total_collateral(&self, vault_id: AccountId) -> Result<u128, Error>;
 }
 
 #[async_trait]
@@ -1368,6 +1370,19 @@ impl VaultRegistryPallet for InterBtcParachain {
 
         Ok(result.amount)
     }
+
+    async fn get_vault_total_collateral(&self, vault_id: AccountId) -> Result<u128, Error> {
+        let head = self.get_latest_block_hash().await?;
+        let result: BalanceWrapper<_> = self
+            .rpc_client
+            .request(
+                "vaultRegistry_getVaultTotalCollateral",
+                &[to_json_value(vault_id)?, to_json_value(head)?],
+            )
+            .await?;
+
+        Ok(result.amount)
+    }
 }
 
 #[async_trait]

runtime/src/tests.rs

@@ -113,7 +113,7 @@ async fn test_btc_relay() {
     let mut height = 0;
 
     let block = BlockBuilder::new()
-        .with_version(2)
+        .with_version(4)
         .with_coinbase(&address, 50, 3)
         .with_timestamp(1588813835)
         .mine(U256::from(2).pow(254.into()))
@@ -134,7 +134,7 @@ async fn test_btc_relay() {
 
         let block = BlockBuilder::new()
             .with_previous_hash(block_hash)
-            .with_version(2)
+            .with_version(4)
             .with_coinbase(&address, 50, height - 1)
             .with_timestamp(1588813835)
             .mine(U256::from(2).pow(254.into()))

runtime/src/types.rs

@@ -20,13 +20,8 @@ pub type InterBtcBalance = <InterBtcRuntime as Core>::Balance;
 
 pub type InterBtcBlock = SignedBlock<Block<InterBtcHeader, <InterBtcRuntime as System>::Extrinsic>>;
 
-pub type InterBtcVault = Vault<
-    AccountId,
-    BlockNumber,
-    <InterBtcRuntime as Core>::Wrapped,
-    <InterBtcRuntime as Core>::Collateral,
-    <InterBtcRuntime as Core>::SignedFixedPoint,
->;
+pub type InterBtcVault =
+    Vault<AccountId, BlockNumber, <InterBtcRuntime as Core>::Wrapped, <InterBtcRuntime as Core>::Collateral>;
 
 pub type InterBtcIssueRequest =
     IssueRequest<AccountId, BlockNumber, <InterBtcRuntime as Core>::Wrapped, <InterBtcRuntime as Core>::Collateral>;

vault/src/collateral.rs

@@ -60,7 +60,7 @@ pub async fn lock_required_collateral<P: VaultRegistryPallet + CollateralBalance
         return Err(Error::RuntimeError(runtime::Error::VaultNotFound));
     }
 
-    let actual_collateral = vault.backing_collateral;
+    let actual_collateral = parachain_rpc.get_vault_total_collateral(vault_id.clone()).await?;
 
     let (required_collateral, maximum_collateral) = future::try_join(
         async { Ok(parachain_rpc.get_required_collateral_for_vault(vault_id).await?) },
@@ -163,6 +163,7 @@ mod tests {
             async fn register_address(&self, btc_address: BtcAddress) -> Result<(), RuntimeError>;
             async fn get_required_collateral_for_wrapped(&self, amount_btc: u128) -> Result<u128, RuntimeError>;
             async fn get_required_collateral_for_vault(&self, vault_id: AccountId) -> Result<u128, RuntimeError>;
+            async fn get_vault_total_collateral(&self, vault_id: AccountId) -> Result<u128, RuntimeError>;
         }
 
         #[async_trait]
@@ -191,12 +192,15 @@ mod tests {
         parachain_rpc.expect_get_vault().returning(move |x| {
             Ok(InterBtcVault {
                 id: x,
-                backing_collateral: actual,
                 status: VaultStatus::Active(true),
                 ..Default::default()
             })
         });
 
+        parachain_rpc
+            .expect_get_vault_total_collateral()
+            .returning(move |_| Ok(actual));
+
         parachain_rpc
     }
     #[tokio::test]

vault/src/execution.rs

@@ -502,6 +502,7 @@ mod tests {
             async fn register_address(&self, btc_address: BtcAddress) -> Result<(), RuntimeError>;
             async fn get_required_collateral_for_wrapped(&self, amount_btc: u128) -> Result<u128, RuntimeError>;
             async fn get_required_collateral_for_vault(&self, vault_id: AccountId) -> Result<u128, RuntimeError>;
+            async fn get_vault_total_collateral(&self, vault_id: AccountId) -> Result<u128, RuntimeError>;
         }
 
         #[async_trait]

vault/src/replace.rs

@@ -288,6 +288,7 @@ mod tests {
             async fn register_address(&self, btc_address: BtcAddress) -> Result<(), RuntimeError>;
             async fn get_required_collateral_for_wrapped(&self, amount_btc: u128) -> Result<u128, RuntimeError>;
             async fn get_required_collateral_for_vault(&self, vault_id: AccountId) -> Result<u128, RuntimeError>;
+            async fn get_vault_total_collateral(&self, vault_id: AccountId) -> Result<u128, RuntimeError>;
         }
 
         #[async_trait]