PWN-8895, PWN-8776 - striga. payment api #1878

eduardmaximovich · 2023-06-26T14:56:38Z

Jira Ticket

https://p2pvalidator.atlassian.net/browse/PWN-8895
https://p2pvalidator.atlassian.net/browse/PWN-8776

Description of Work

Implemented api calls for striga payment:
- add address to whitelist (v1/wallets/whitelist-address)
- get all whitelisted addresses (v1/wallets/get/whitelisted-addresses)
- init onchain withdrawal (v1/wallets/send/initiate/onchain)
- enrich (get or create fiat account details) (v1/wallets/account/enrich)
- get user wallets (v1/wallets/get/all)
- get_estimated_fees

…ture/PWN-8895-striga-payment-api

github-actions · 2023-06-26T15:13:17Z

Code coverage report

File	Coverage [67.70%]
app/src/main/java/org/p2p/wallet/striga/model/StrigaApiError.kt	97.30%
app/src/main/java/org/p2p/wallet/striga/wallet/api/request/StrigaAddWhitelistedAddressRequest.kt	54.55%
app/src/main/java/org/p2p/wallet/striga/wallet/api/request/StrigaEnrichAccountRequest.kt	60.00%
app/src/main/java/org/p2p/wallet/striga/wallet/api/request/StrigaGetWhitelistedAddressesRequest.kt	60.00%
app/src/main/java/org/p2p/wallet/striga/wallet/api/request/StrigaInitWithdrawalRequest.kt	55.56%
app/src/main/java/org/p2p/wallet/striga/wallet/api/request/StrigaOnchainWithdrawalFeeRequest.kt	0.00%
app/src/main/java/org/p2p/wallet/striga/wallet/api/request/StrigaUserWalletsRequest.kt	55.56%
app/src/main/java/org/p2p/wallet/striga/wallet/api/response/StrigaBlockchainNetworkResponse.kt	42.86%
app/src/main/java/org/p2p/wallet/striga/wallet/api/response/StrigaEnrichFiatAccountResponse.kt	48.39%
app/src/main/java/org/p2p/wallet/striga/wallet/api/response/StrigaInitWithdrawalResponse.kt	46.67%
app/src/main/java/org/p2p/wallet/striga/wallet/api/response/StrigaOnchainWithdrawalFeeResponse.kt	46.67%
app/src/main/java/org/p2p/wallet/striga/wallet/api/response/StrigaUserWalletAccountResponse.kt	35.71%
app/src/main/java/org/p2p/wallet/striga/wallet/api/response/StrigaUserWalletDetailsResponse.kt	13.33%
app/src/main/java/org/p2p/wallet/striga/wallet/api/response/StrigaUserWalletsResponse.kt	33.33%
app/src/main/java/org/p2p/wallet/striga/wallet/api/response/StrigaWhitelistedAddressItemResponse.kt	45.45%
app/src/main/java/org/p2p/wallet/striga/wallet/api/response/StrigaWhitelistedAddressesResponse.kt	14.29%
app/src/main/java/org/p2p/wallet/striga/wallet/interactor/StrigaWalletInteractor.kt	0.00%
app/src/main/java/org/p2p/wallet/striga/wallet/models/StrigaBlockchainNetworkInfo.kt	100.00%
app/src/main/java/org/p2p/wallet/striga/wallet/models/StrigaFiatAccountDetails.kt	100.00%
app/src/main/java/org/p2p/wallet/striga/wallet/models/StrigaFiatAccountStatus.kt	75.00%
app/src/main/java/org/p2p/wallet/striga/wallet/models/StrigaInitWithdrawalDetails.kt	100.00%
app/src/main/java/org/p2p/wallet/striga/wallet/models/StrigaNetworkCurrency.kt	100.00%
app/src/main/java/org/p2p/wallet/striga/wallet/models/StrigaNetworkType.kt	50.00%
app/src/main/java/org/p2p/wallet/striga/wallet/models/StrigaOnchainTxStatus.kt	100.00%
app/src/main/java/org/p2p/wallet/striga/wallet/models/StrigaOnchainTxType.kt	87.50%
app/src/main/java/org/p2p/wallet/striga/wallet/models/StrigaOnchainWithdrawalFees.kt	100.00%
app/src/main/java/org/p2p/wallet/striga/wallet/models/StrigaUserWallet.kt	100.00%
app/src/main/java/org/p2p/wallet/striga/wallet/models/StrigaUserWalletAccount.kt	93.75%
app/src/main/java/org/p2p/wallet/striga/wallet/models/StrigaWhitelistedAddressItem.kt	100.00%
app/src/main/java/org/p2p/wallet/striga/wallet/models/ids/StrigaAccountId.kt	100.00%
app/src/main/java/org/p2p/wallet/striga/wallet/models/ids/StrigaWalletId.kt	100.00%
app/src/main/java/org/p2p/wallet/striga/wallet/models/ids/StrigaWhitelistedAddressId.kt	100.00%
app/src/main/java/org/p2p/wallet/striga/wallet/models/ids/StrigaWithdrawalChallengeId.kt	100.00%
app/src/main/java/org/p2p/wallet/striga/wallet/repository/StrigaUserWalletsMapper.kt	92.86%
app/src/main/java/org/p2p/wallet/striga/wallet/repository/StrigaWalletRemoteRepository.kt	64.10%
app/src/main/java/org/p2p/wallet/striga/wallet/repository/StrigaWalletRepository.kt	50.00%
app/src/main/java/org/p2p/wallet/striga/wallet/repository/StrigaWalletRepositoryMapper.kt	98.25%

Total Project Coverage	8.22%

gslevinkov · 2023-06-26T14:57:19Z

app/src/main/java/org/p2p/wallet/striga/StrigaModule.kt

 import org.p2p.wallet.striga.kyc.StrigaKycModule

 object StrigaModule : InjectionModule {

    override fun create() = module {
        includes(
            StrigaSignupModule.create(),
-            StrigaKycModule.create()
+            StrigaKycModule.create(),
+            StrigaWalletModule.create()


such a good name, man! thanks

...src/main/java/org/p2p/wallet/striga/wallet/api/request/StrigaAddWhitelistedAddressRequest.kt

app/src/main/java/org/p2p/wallet/striga/wallet/api/response/StrigaEnrichFiatAccountResponse.kt

gslevinkov · 2023-06-26T15:46:34Z

...in/java/org/p2p/wallet/striga/wallet/api/response/StrigaInitiateOnchainWithdrawalResponse.kt

+    val feeEstimate: FeeEstimate,
+) {
+
+    class Transaction(


TransactionRequest
StrigaTransactionRequest

just Transaction can be too ambiguous imho

I will change it to TransactionResponse, because it's hard to get confused as it's a subclass. You can't just use the type TransactionResponse, you need to first specify the parent class as StrigaInitOnchainWithdrawalResponse.TransactionResponse

gslevinkov · 2023-06-26T15:47:24Z

app/src/main/java/org/p2p/wallet/striga/wallet/interactor/StrigaWalletInteractor.kt

+    suspend fun getFiatAccountDetails(
+        accountId: StrigaAccountId,
+    ): StrigaDataLayerResult<StrigaFiatAccountDetails> {
+        return repository.getFiatAccountDetails(userIdProvider.getUserIdOrThrow(), accountId)


maybe we can insert StrigaUserIdProvider inside the repo and catch error there so there are no unexpected throws?

Initialy I had made this way, but changed my mind and moved userIdProvider to interactor. I can move it back.

app/src/main/java/org/p2p/wallet/striga/wallet/models/StrigaWhitelistedAddressItem.kt

gslevinkov · 2023-06-26T15:58:56Z

app/src/main/java/org/p2p/wallet/striga/wallet/models/ids/StrigaAccountId.kt

+import kotlinx.parcelize.Parcelize
+
+/**
+ * @param value The ID of an account. Format example: 01c1f4e73d8b2587921c74e98951add0


it is a Hex?

it's a sort of UUID but without hyphens

app/src/main/java/org/p2p/wallet/striga/wallet/repository/StrigaWalletRemoteRepository.kt

gslevinkov · 2023-06-26T16:00:49Z

app/src/main/java/org/p2p/wallet/striga/wallet/repository/StrigaWalletRepository.kt

+     * Error codes that might be returned by striga:
+     * [org.p2p.wallet.striga.model.StrigaApiErrorCode.USER_LIMIT_EXCEEDED] - amount is too big
+     * [org.p2p.wallet.striga.model.StrigaApiErrorCode.BELOW_MINIMUM_AMOUNT] - amount is too small
+     * [org.p2p.wallet.striga.model.StrigaApiErrorCode.INVALID_DESTINATION] - addressId is invalid


I would rather rename error codes instead of supporting this doc
USER_LIMIT_EXCEEDED -> TOO_LARGE_AMOUNT
BELOW_MINIMUM_AMOUNT -> TOO_MIN_AMOUNT
INVALID_DESTINATION -> INVALID_ADDRESS_ID

First 2 - ok, but third might be ambigous, 'cause striga already has code 41006 Invalid address and I don't know in what cases we could get it

Finally, i've renamed this way:
TOO_LARGE_AMOUNT
TOO_SMALL_AMOUNT
INVALID_DESTINATION_ADDRESS (kept "destination" to avoid confusion)

gslevinkov · 2023-06-26T16:01:45Z

app/src/test/java/org/p2p/wallet/striga/wallet/repository/StrigaWalletRepositoryTest.kt

+
+            assertTrue(result is StrigaDataLayerResult.Success)
+            result as StrigaDataLayerResult.Success<StrigaFiatAccountDetails>
+            assertEquals("EUR", result.value.currency)


you can use mockito-kotlin assertions

…ture/PWN-8895-striga-payment-api

…org/key-app-android into feature/PWN-8895-striga-payment-api � Conflicts: � app/src/main/java/org/p2p/wallet/striga/wallet/api/StrigaWalletApi.kt � app/src/main/java/org/p2p/wallet/striga/wallet/repository/StrigaWalletRemoteRepository.kt � app/src/main/java/org/p2p/wallet/striga/wallet/repository/StrigaWalletRepository.kt � app/src/test/java/org/p2p/wallet/striga/wallet/repository/StrigaWalletRepositoryEnrichAccountTest.kt

…ture/PWN-8895-striga-payment-api

* PWN-8904 - Striga API. get_estimated_fees * PWN-8904 - comment fixes * PWN-8904 - change base url * PWN-8904 - add StrigaUserWalletsMapper to koin * PWN-8904 - add ending slashes to new striga urls --------- Co-authored-by: Eduard Maximovich <[email protected]>

…ture/PWN-8895-striga-payment-api

PWN-8895, PWN-8776 - striga. payment api

137d188

eduardmaximovich requested a review from 1sakov as a code owner June 26, 2023 14:56

eduardmaximovich self-assigned this Jun 26, 2023

eduardmaximovich requested a review from Davran331122 as a code owner June 26, 2023 14:56

eduardmaximovich requested a review from a user June 26, 2023 14:56

eduardmaximovich requested a review from gslevinkov as a code owner June 26, 2023 14:56

eduardmaximovich had a problem deploying to manual June 26, 2023 14:56 — with GitHub Actions Error

Merge branch 'develop' of github_p2p:p2p-org/key-app-android into fea…

465a39c

…ture/PWN-8895-striga-payment-api

eduardmaximovich had a problem deploying to manual June 26, 2023 14:57 — with GitHub Actions Error

PWN-8895, PWN-8776 - removed class doc

114ba5f

eduardmaximovich had a problem deploying to manual June 26, 2023 15:00 — with GitHub Actions Error

PWN-8895, PWN-8776 - comment fix

e96e43e

eduardmaximovich had a problem deploying to manual June 26, 2023 15:01 — with GitHub Actions Error

ghost approved these changes Jun 26, 2023

View reviewed changes

gslevinkov reviewed Jun 26, 2023

View reviewed changes

gslevinkov approved these changes Jun 27, 2023

View reviewed changes

gslevinkov added the PR TOO BIG This PR is over 25 files changes threshold label Jun 27, 2023

PWN-8904 - Striga API. get_user_wallets (#1883)

44a66ec

gslevinkov had a problem deploying to manual June 27, 2023 13:42 — with GitHub Actions Error

eduardmaximovich added 4 commits June 27, 2023 17:59

PWN-8895 - namings and improvements

671888f

Merge branch 'develop' of github_p2p:p2p-org/key-app-android into fea…

2cd226b

…ture/PWN-8895-striga-payment-api

PWN-8895 - merge

c93e741

eduardmaximovich had a problem deploying to manual June 27, 2023 14:12 — with GitHub Actions Error

Merge branch 'develop' of github_p2p:p2p-org/key-app-android into fea…

fc96602

…ture/PWN-8895-striga-payment-api

eduardmaximovich had a problem deploying to manual June 27, 2023 14:13 — with GitHub Actions Error

eduardmaximovich assigned gslevinkov Jun 27, 2023

PWN-8895 - amount -> amountInUnits

018ed0d

eduardmaximovich had a problem deploying to manual June 27, 2023 14:39 — with GitHub Actions Error

eduardmaximovich had a problem deploying to manual June 28, 2023 11:06 — with GitHub Actions Error

Merge branch 'develop' of github_p2p:p2p-org/key-app-android into fea…

9d14529

…ture/PWN-8895-striga-payment-api

eduardmaximovich had a problem deploying to manual June 28, 2023 11:07 — with GitHub Actions Failure

eduardmaximovich merged commit f426b32 into develop Jun 28, 2023
2 of 3 checks passed

eduardmaximovich deleted the feature/PWN-8895-striga-payment-api branch June 28, 2023 11:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PWN-8895, PWN-8776 - striga. payment api #1878

PWN-8895, PWN-8776 - striga. payment api #1878

eduardmaximovich commented Jun 26, 2023 •

edited

Loading

github-actions bot commented Jun 26, 2023 •

edited

Loading

gslevinkov Jun 26, 2023

gslevinkov Jun 26, 2023

eduardmaximovich Jun 27, 2023 •

edited

Loading

gslevinkov Jun 26, 2023

eduardmaximovich Jun 27, 2023

gslevinkov Jun 26, 2023

eduardmaximovich Jun 27, 2023

gslevinkov Jun 26, 2023

eduardmaximovich Jun 27, 2023

eduardmaximovich Jun 27, 2023

gslevinkov Jun 26, 2023

PWN-8895, PWN-8776 - striga. payment api #1878

PWN-8895, PWN-8776 - striga. payment api #1878

Conversation

eduardmaximovich commented Jun 26, 2023 • edited Loading

Jira Ticket

Description of Work

github-actions bot commented Jun 26, 2023 • edited Loading

Code coverage report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eduardmaximovich Jun 27, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eduardmaximovich commented Jun 26, 2023 •

edited

Loading

github-actions bot commented Jun 26, 2023 •

edited

Loading

eduardmaximovich Jun 27, 2023 •

edited

Loading