-
Notifications
You must be signed in to change notification settings - Fork 30
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: revert shared wallet #523
Conversation
02488e7
to
a019f83
Compare
bitcoin/src/lib.rs
Outdated
log::warn!( | ||
"Received bitcoin funding errors (complete={}): {:?}", | ||
signed_funded_raw_tx.complete, | ||
signed_funded_raw_tx.errors | ||
); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's keep this?
vault/src/execution.rs
Outdated
@@ -664,7 +664,7 @@ fn get_request_for_btc_tx(tx: &Transaction, hash_map: &HashMap<H256, Request>) - | |||
} | |||
} | |||
|
|||
#[cfg(all(test, feature = "parachain-metadata-kintsugi"))] | |||
#[cfg(all(test, feature = "parachain-metadata-kintsugi-testnet"))] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Revert
|
||
// migration to the new shared public key setup: copy the public key from the | ||
// currency-specific wallet to the master wallet. This can be removed once all | ||
// vaults have migrated | ||
let public_key = PublicKey::from_slice(&derivation_key.0).map_err(BitcoinError::KeyError)?; | ||
let address = Address::p2wpkh(&public_key, btc_rpc_master.network()) | ||
.map_err(ConversionError::from) | ||
.map_err(BitcoinError::ConversionError)?; | ||
if let Ok(private_key) = btc_rpc.dump_derivation_key(&public_key) { | ||
self.btc_rpc_master_wallet.import_derivation_key(&private_key)?; | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Technically we can remove this, but not blocking on that change
This reverts commit 7134856.
This reverts commit 9d8d669.
This reverts commit 238f847.
This reverts commit 00c7d92.
This reverts commit 475f6dc.
This reverts commit 273aa65.
This reverts commit c5b78e4.
This reverts commit 83472c4.
This reverts commit 8254259.
This reverts commit c0c94fa.
This reverts commit 156c964.
This reverts commit a86c737.
This reverts commit 5870ce0.
This reverts commit 48775ff.
This reverts commit f8b2f8d.
This reverts commit 189f7e2.
This reverts commit c3925ec.
This reverts commit 1ea7cd6.
This reverts commit d011b3d.
This reverts commit 14719de.
a019f83
to
2c2b92c
Compare
Revert all the shared-wallet related changes that I could find (except 9406775). There were some merge conflicts, so we need to check that they've been resolved correctly