Balance for p2c #28
Closed
Balance for p2c #28
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
Pull Request Test Coverage Report for Build 10440638704Details
💛 - Coveralls |
Yamaguchi
force-pushed
the
balance_for_p2c
branch
2 times, most recently
from
c0b8944 to
9e300a6
Compare
Yamaguchi
force-pushed
the
balance_for_p2c
branch
from
9e300a6 to
b33c8c9
Compare
rantan
requested changes
Aug 7, 2024
crates/wallet/src/wallet/mod.rs
Outdated
| @@ -2660,6 +2683,17 @@ impl Wallet { | |||
| &self.indexed_graph.index | |||
| } | |||
|
|
|||
| /// Insert a descriptor with a keychain associated to it. | |||
| pub fn insert_descriptor( | |||
There was a problem hiding this comment.
外からは呼ば差なそうなので pub をつけなくてもよいかと思いました。
There was a problem hiding this comment.
別の指摘に従い、メソッド自体を削除しました。
crates/wallet/tests/common.rs
Outdated
| @@ -296,6 +296,208 @@ pub fn get_funded_wallet_with_reissuable_and_change( | |||
|
|
|||
| (wallet, tx1.txid(), color_id) | |||
| } | |||
|
|
|||
| fn get_p2c_address(wallet: &mut Wallet, color_id: Option<ColorIdentifier>) -> Address { | |||
| let payment_base = | |||
There was a problem hiding this comment.
wallet.store_contract() でwallet に追加するコントラクトのpayment_baseは、wallet で管理している秘密鍵に対応する公開鍵であることを想定していました。そうでないと、p2cアドレスあてのUTXOを送金できないので。
仕様には記載していませんでしたが、store_contract()でうけとった payment_base がウォレットで管理している鍵でない場合、エラーにするバリデーション処理を加えた方が安全な気がしました。
どう思われますか？
There was a problem hiding this comment.
バリデーション処理を追加しました。
There was a problem hiding this comment.
f559dc8 でメソッドの位置を変更しました。
rantan
reviewed
Aug 7, 2024
crates/wallet/src/wallet/mod.rs
Outdated
| let (descriptor, _) = | ||
| Descriptor::<DescriptorPublicKey>::parse_descriptor(&self.secp, &descriptor_str) | ||
| .unwrap(); | ||
| let _ = self.insert_descriptor(KeychainKind::External, descriptor); |
There was a problem hiding this comment.
すでに wallet に KeychainKind::External な keychain が設定されている場合、新たに追加するのではなく、上書きしてしまうことになりませんか？
There was a problem hiding this comment.
上記の理由からinsert_descriptorを使わず、indexerにpayment_baseと対応するp2c scriptの対応をマップ化して保持するように修正しました。
Yamaguchi
force-pushed
the
balance_for_p2c
branch
from
33005cc to
1434489
Compare
Yamaguchi
force-pushed
the
balance_for_p2c
branch
from
1434489 to
05cc6b7
Compare
8 tasks
Yamaguchi
force-pushed
the
balance_for_p2c
branch
from
52a4dc5 to
f559dc8
Compare
|
#31 でマージしました。 |
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.
Description
The PR adds an update to include coins transferred to a P2C address in the balance.
Checklists
All Submissions:
cargo fmtandcargo clippybefore committingNew Features:
Bugfixes: