-
Notifications
You must be signed in to change notification settings - Fork 15
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
Update APIs to use MobileCoinRng instead of RngSeed #197
Merged
carybakker
merged 3 commits into
master
from
task/android-ios-idempotence-compatibility
Sep 27, 2022
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -203,7 +203,7 @@ public final class MobileCoinClient { | |
memoType: memoType, | ||
amount: amount, | ||
fee: fee, | ||
rngSeed: RngSeed(), | ||
rng: MobileCoinChaCha20Rng(), | ||
completion: completion) | ||
} | ||
|
||
|
@@ -212,11 +212,16 @@ public final class MobileCoinClient { | |
memoType: MemoType = .recoverable, | ||
amount: Amount, | ||
fee: UInt64, | ||
rngSeed: RngSeed, | ||
rng: MobileCoinRng, | ||
completion: @escaping ( | ||
Result<PendingSinglePayloadTransaction, TransactionPreparationError> | ||
) -> Void | ||
) { | ||
guard let rngSeed = rng.generateRngSeed() else { | ||
completion(.failure( | ||
TransactionPreparationError.invalidInput("Could not create 32 byte RNG seed"))) | ||
return | ||
} | ||
Account.TransactionOperations( | ||
account: accountLock, | ||
fogMerkleProofService: serviceProvider.fogMerkleProofService, | ||
|
@@ -252,7 +257,7 @@ public final class MobileCoinClient { | |
memoType: memoType, | ||
amount: amount, | ||
feeLevel: feeLevel, | ||
rngSeed: RngSeed(), | ||
rng: MobileCoinChaCha20Rng(), | ||
completion: completion) | ||
} | ||
|
||
|
@@ -261,11 +266,16 @@ public final class MobileCoinClient { | |
memoType: MemoType = .recoverable, | ||
amount: Amount, | ||
feeLevel: FeeLevel = .minimum, | ||
rngSeed: RngSeed, | ||
rng: MobileCoinRng, | ||
completion: @escaping ( | ||
Result<PendingSinglePayloadTransaction, TransactionPreparationError> | ||
) -> Void | ||
) { | ||
guard let rngSeed = rng.generateRngSeed() else { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same feedback here There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same answer as above :) |
||
completion(.failure( | ||
TransactionPreparationError.invalidInput("Could not create 32-byte RNG seed"))) | ||
return | ||
} | ||
Account.TransactionOperations( | ||
account: accountLock, | ||
fogMerkleProofService: serviceProvider.fogMerkleProofService, | ||
|
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
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.
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.
not sure this is correct, if you only use the RNG to create a seed which you then pass around to see our internal RNG, that defeats the purpose of letting them pass in their own RNG class
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.
Android uses the input Rng to seed the RNG for output idempotence. So here, we are doing the same as Android with respect to the output transaction creation.
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.
well then, doesnt seem to be as flexible as I initially thought, but if its the same as android thats correct