Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Resolve conflicts with master #2433

Open
wants to merge 87 commits into
base: nitro-payments-dev
Choose a base branch
from
Open

Resolve conflicts with master #2433

wants to merge 87 commits into from

Conversation

Sneagan
Copy link
Contributor

@Sneagan Sneagan commented Mar 21, 2024

Summary

Type of Change

  • Product feature
  • Bug fix
  • Performance improvement
  • Refactor
  • Other

Tested Environments

  • Development
  • Staging
  • Production

Before Requesting Review

  • Does your code build cleanly without any errors or warnings?
  • Have you used auto closing keywords?
  • Have you added tests for new functionality?
  • Have validated query efficiency for new database queries?
  • Have documented new functionality in README or in comments?
  • Have you squashed all intermediate commits?
  • Is there a clear title that explains what the PR does?
  • Have you used intuitive function, variable and other naming?
  • Have you requested security and/or privacy review if needed
  • Have you performed a self review of this PR?

Manual Test Plan

pavelbrm and others added 30 commits January 4, 2024 18:45
@pavelbrm
Update hashicorp vault (#2250)
9a45bf9
@clD11
feat: implement solana address linking (#2280)
ac49405 
* feat: implement solana address linking

* feat: implement solana address linking

go mod tidy

* feat: implement solana address linking

go mod tidy

* feat: implement solana address linking

add repo tests

* feat: implement solana address linking

address pr comments

* feat: implement solana address linking

address pr comments

* feat: resolve pr comments implement solana address linking
@onyb
Add bonk mapping for ratios service (#2283)
dcb328f
@clD11
fix: add submit receipt validation error check (#2285)
45f5c27
@clD11
Add self custody available field to get wallet endpoint (#2287)
875466d 
* feat: add self custody available field v4 get wallet

* feat: add self custody available field v4 get wallet
@pavelbrm
Set proper type (#2289)
8d59e8b
@clD11
refactor: remove extra validation check from submit receipt endpoint (#…
d70fe73 
…2290)
@clD11
fix: add logging to submit receipt (#2293)
360e2a3
@clD11
refactor: add specific challenge not found error (#2291)
79ae3a2
@clD11
refactor: use generic internal server error on sol link endpoint (#2300)
df58e91
@clD11
feat: allow multiple cors origins for dapp (#2299)
29be8e7 
* feat: allow multiple cors origins for dapp

* chore: rename test filename to match src filename

* refactor: improve is allowed origin test

* refactor: rename dapp cors config as plural
@pavelbrm
fix: use proper handler method in local env (#2304)
418c59a
@clD11
feat: add option endpoints for challenge and connect solana (#2302)
d0f21dd
@evq @pavelbrm
fix: fix legacy creds by item id (#2308)
d83f0e5 
* fix legacy creds by item id

* try fix lint

* fix: tidy up

* refactor: return 500 instead of 404 on type assertion failure

---------

Co-authored-by: PavelBrm <[email protected]>
@clD11
feat: remove expired challenges from the database (#2307)
a935a0c 
* feat: remove expired challenges from the database

* refactor: use distinct loop variables for readability in test challenge
@clD11
feat: increase rate limit on get v4 wallets (#2311)
83b8cd2
@clD11
fix: add is allowed check to allow list entry (#2310)
c3de1bc
@pavelbrm
Refactor: Improve Receipt Validation (#2306)
9f0b7aa 
* refactor: refactor and improve receipt validation

* fix: delete unused var

* refactor: self-review
@clD11
feat: add solana to country code allow block list (#2315)
2d2552a 
* feat: add solana to country code allow block list

* refactor: rename test regions decode

* fix: add solana to parameters v1 schema test
@clD11
fix: update uphold intermediate certs (#2319)
972a597
@clD11
feat: add jwt validation to android webhook (#2318)
243166c 
* feat: add jwt validation to android webhook

* test: add mock to android test and rename field
@husobee
update parameters endpoint to include solana payout-status (#2322)
b67875f
@pavelbrm
feat: add new endpoint for creating order with receipt (#2313)
dcf50be 
* feat: add new endpoint for creating order with receipt

* refactor: rewrite SubmitReceiptRequestV1 into ReceiptRequest

* test: add tests for validation

* fix: use const instead of magic numbers

* feat: get existing order and reply with 409 if found

* feat: add comment

* refactor: extract code to allow creating order for receipt

* refactor: further extract and reuse code

* refactor: move code for better diff

* refactor: make payment uris configurable per environment

* fix clean up

* feat: add Leo annual product

* feat: handle various release channels

* feat: support differentiation by env

* fix: silence unused linter

* feat: add support for env for items

* fix: use proper names and add iOS subscription names

* test: add test for parseSubmitReceiptRequest

* test: add test for skuNameByMobileName

* test: add test for newOrderItemReqForSubID

* test: add test for newCreateOrderReqNewLeo

* test: add test for newOrderItemReqNewLeoSet

* test: add test for newPaymentProcessorConfig

* test: add test for newMobileOrderMdata

* test: add test for newOrderNewForReq

* fix: fix stupid linter that does not understand code used with build tags

* test: add test for createOrderWithReceipt

* fix: unexport fields and remove type conversion

* fix: delete unnecesary and suboptimal helper

* test: add tests for handleReceiptErr
@husobee @pavelbrm
multiple device refresh improvements (#2281)
fc29a86 
* updates to delete credentials to only hard delete where request id matches item id

* fix: clean up generated code

* Patches 2281 (#2314)

* fix: review

* test: add tests

* fix: use error for checking expectations

* adding check for not allowing delete if number of active credentials exceeds threshold

updates to multi-device improvements to get active credentials count

fixing delete tlv2 test cases to include new check call

fixing db field for request_id for tlv2 creds table

* review feedback improvements

* more review feedback improvements

* updates to pass time into deleteTLV2

* refactor: provide review feedback (#2325)

---------

Co-authored-by: PavelBrm <[email protected]>
Co-authored-by: Pavel Brm <[email protected]>
@pavelbrm
feat: add check order receipt endpoint (#2327)
a32650a 
* feat: implement endpoint for checking order receipt

* test: implement tests for checkOrderReceipt

* refactor: move functions to legacy handler

* refactor: move code for easier diffs

* refactor: use functions for now

* chore: rollback some changes for submitReceipt for better diff

* fix: change from PATCH to POST

* fix: do not allow stripe on mobile orders for Leo
@husobee
Revert "multiple device refresh improvements (#2281)" (#2329)
6b09228 
This reverts commit fc29a86.
@clD11
feat: add specific linking limit error for solana (#2332)
f802f7b
@pavelbrm
fix: return order_id instead of id in json (#2334)
21d0bec
@pavelbrm
fix: return orderId instead of order_id json (#2336)
8821bc1
@clD11
fix: use equals check for payment id validation instead of govalidato…
62d5bd9 
…r on challenge endpoint (#2339)

govalidator returns a false positive when checking the payment id so replace with an equals check.
Sneagan and others added 7 commits May 28, 2024 18:39
@Sneagan
Update Uphold CA (#2535)
06d2213
@pavelbrm
feat: change request_id to disallow null and update index (#2506)
becfddf 
* feat: change request_id to disallow null and change index

* test: fix up broken tests

* test: fix up other tests
@pavelbrm
feat: check existing creds by number of batches (#2522)
d3b91f4 
* feat: change request_id to disallow null and change index

* test: fix up broken tests

* test: fix up other tests

* fix: reimplement tlv2 submission reporting

* test: change to kick off CI

* fix: replace AreTimeLimitedV2CredsSubmitted nonsense with GetCredSubmissionReport

* feat: check number of batches

* feat: take limit into account when inserting tlv2

* test: trigger ci

* fix: check tx error
@pavelbrm
feat: delete tlv2 creds with req_id matching item_id (#2524)
d2f01b1 
* feat: change request_id to disallow null and change index

* test: fix up broken tests

* test: fix up other tests

* fix: reimplement tlv2 submission reporting

* test: change to kick off CI

* fix: replace AreTimeLimitedV2CredsSubmitted nonsense with GetCredSubmissionReport

* feat: check number of batches

* feat: delete only tlv2 creds with req_id matching item_id

* test: fix some broken tests

* feat: take limit into account when inserting tlv2

* test: trigger ci

* fix: check tx error
@pavelbrm
feat: expose endpoint for checking currently active sets of tlv2 creds (
152209a 
#2528)

* feat: change request_id to disallow null and change index

* test: fix up broken tests

* test: fix up other tests

* fix: reimplement tlv2 submission reporting

* test: change to kick off CI

* fix: replace AreTimeLimitedV2CredsSubmitted nonsense with GetCredSubmissionReport

* feat: check number of batches

* feat: delete only tlv2 creds with req_id matching item_id

* test: fix some broken tests

* feat: implement endpoint for fetching num of active cred batches

* test: add tests for uniqBatchesTxTime

* test: add tests for countbatches

* test: fix test after fixing error message

* fix: use proper comparison

* test: use proper name for test

* feat: take limit into account when inserting tlv2

* test: trigger ci

* fix: check tx error
@pavelbrm
fix: attach forgotten tlv2 repository (#2542)
c84e19f
@ibukanov
chore: remove promotion.Service.hotWallet (#2549)
13ed2c0 
promotion.Service.hotWallet is not used after the initialization. Thus
the role of the relevant initialization code is reduced to verifying
the grant wallet environment. But this is done in IsUserKYC in any case.
So remove the relevant code.
@pavelbrm
Copy link
Contributor

pavelbrm commented Jun 5, 2024

A few PRs for Ntiro have been closed recently. Should this one follow the same path? @Sneagan

pavelbrm and others added 18 commits June 5, 2024 20:01
@pavelbrm
fix: improve and simplify android receipt verification (#2545)
a917f9e 
* fix: improve and simplify android receipt verification

* test: cover validateGoogleTime

* chore: trigger CI
@ibukanov
Avoid fingerprint verification when checking IsUserKYC (#2548)
57c94a7 
* chore: no fingerprint verification when checking

uphold.IsUserKYC() is used only for online checks but not for payments.
So skip certificate fingerprint checks to prevent outages when Uphold
changes the certificate.

Remove unused uphold.Wallet.Logger. Wallet methods always extract the
logger from the passed Context. Plus remove from tests log level
initialization. It was no-op as LogLevelCTXKey must be zerolog.Level,
not a string.

CLOSE: #2394

* fix: review comments
@tarikdem
Update actions, enable reproducible builds (#2550)
762ab57
@clD11
refactor: remove unused cohort vars (#2579)
e987b7c
@pavelbrm
chore: update dependencies (#2583)
a5c6d12 
* chore: update dependencies

* chore: update dependencies
@clD11
feat: reject linkings based on wallet geo country (#2580)
45df6ac
@clD11
build: use aws ecr public image for docker images (#2584)
1a78678
@clD11
feat: add solana linking metrics (#2586)
1a00cb8
@pavelbrm
feat: add new products for ios nightly and beta (#2592)
7361af8
@pavelbrm
feat: handle play store developer notifications (#2560)
c7749a2 
* chore: run go mod tidy

* chore: tidy up existing code

* test: update tests

* chore: use better receiver name

* feat: parse play store dev notification and test

* feat: scaffold processing

* chore: mute linter

* feat: determine whether to process ntf or not

* test: add tests for playStoreDevNotification

* test: add more tests

* feat: process notification

* feat: clean up

* test: add tests for purchaseToken

* feat: expose play store params

* feat: skip any notifications before 2024-06-01

* chore: delete garbage from original implementation

* feat: handle disabled notifications case

* fix: fix typo

* feat: use explicitly utc on unix timestampts
@pavelbrm
fix: use pointer receiver instead of value (#2595)
dc4a9d3
@pavelbrm
feat: add leeway for expiry time on mobile webhooks (#2603)
9db3baa
@clD11
fix: io read timeout on create item creds endpoint (#2599)
1eda1a0 
Use io.ReadAll instead of requestutils.ReadJSON and increase the read timeout for grants server.
@pavelbrm
feat: use docker login (#2607)
7d05017 
* feat: use docker login

* fix: pin to specific commit

* fix: specify pinned version
@pavelbrm
feat: log package in mobile webhooks (#2606)
0ad379f
@pavelbrm
fix: set proper order expiration upon linking (#2596)
9a185fb 
* chore: run go mod tidy

* chore: tidy up existing code

* test: update tests

* chore: use better receiver name

* feat: parse play store dev notification and test

* feat: scaffold processing

* chore: mute linter

* feat: determine whether to process ntf or not

* test: add tests for playStoreDevNotification

* test: add more tests

* feat: process notification

* feat: clean up

* test: add tests for purchaseToken

* feat: expose play store params

* feat: skip any notifications before 2024-06-01

* chore: delete garbage from original implementation

* feat: handle disabled notifications case

* fix: fix typo

* feat: use explicitly utc on unix timestampts

* fix: set proper order expiration upon linking (#2587)

* fix: wip

* fix: wip make it possible to set proper expiry date on order linking

* fix: wip more plumbing

* fix: reduce number of changes

* fix: fix typo in comment

* fix: commit correct tx

* fix: update existing tests

* fix: make linter happy

* fix: make verifyApple aware of time

* fix: add time to tests for verifyApple

* fix: add time to tests for findInAppBySubID and likes

* fix: expose receipt data in validateAppleTime and improve tests

* fix: expose receipt data in validateGoogleTime and improve tests

* fix: fix linking for v1.61.1

* fix: propagate receipt data

* fix: use receipt request for constructing ios receipt data

* fix: use receipt expiry on order

* fix: calculate expiry time for apple only once and add tests

* fix: update some comments

* fix: propagate changes to old submit receipt code and get rid of old nonse

* test: add tests for appendOrderMetadataTx

* feat: add new products for iOS (#2588)

* feat: add new products for iOS

* fix: change colon to period

* fix: use better method name updateOrderIntervals

* fix: use better test case names

* fix: make linter happy
@Sneagan
Resolve conflicts
25f4e94
@Sneagan
resolve conflicts
dc9538d
@tackley
Copy link

tackley commented Aug 21, 2024

Is this still relevant? Or can we close or mark as draft please to remove from our needs-review lists?

@pavelbrm
Copy link
Contributor

@tackley I believe this is not relevant anymore, but will leave the decision to @Sneagan.

@tackley tackley removed request for a team September 24, 2024 13:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kdenhartog kdenhartog kdenhartog approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.