fix: revert shared wallet #523
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sander2
force-pushed
the
interlay-non-shared
branch
from
02488e7
to
a019f83
Compare
gregdhill
reviewed
Sep 20, 2023
bitcoin/src/lib.rs
Outdated
Comment on lines
480
to
484
| log::warn!( | ||
| "Received bitcoin funding errors (complete={}): {:?}", | ||
| signed_funded_raw_tx.complete, | ||
| signed_funded_raw_tx.errors | ||
| ); |
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"))] | |||
Comment on lines
+295
to
+302
|
|
||
| // 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.
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.
sander2
force-pushed
the
interlay-non-shared
branch
from
a019f83
to
2c2b92c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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