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.

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

staging to master #1240

Closed
wants to merge 91 commits into from
Closed
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
2297d64
Merge pull request #1011 from Giveth/f_980_implement_qfRound
CarlosQ96 May 31, 2023
509f309
Merge branch 'develop' of github.com:Giveth/impact-graph into develop
mohammadranjbarz Jun 1, 2023
4b2eb26
Merge branch 'f_980_implement_qfRound' into develop
mohammadranjbarz Jun 1, 2023
08d5e57
Comment one test case
mohammadranjbarz Jun 1, 2023
7e3e5ea
Merge pull request #1012 from Giveth/f_980_implement_qfRound
CarlosQ96 Jun 2, 2023
069cd9b
Merge branch 'f_980_implement_qfRound' into develop
mohammadranjbarz Jun 5, 2023
36e3d73
Merge branch 'develop' of github.com:Giveth/impact-graph into develop
mohammadranjbarz Jun 5, 2023
64af26b
Merge branch 'f_980_implement_qfRound' into develop
mohammadranjbarz Jun 5, 2023
999418d
Merge branch 'f_980_implement_qfRound' into develop
mohammadranjbarz Jun 5, 2023
e9ef609
Merge pull request #1020 from Giveth/f_980_implement_qfRound
CarlosQ96 Jun 13, 2023
6538e9c
Resolve merge conflicts
mohammadranjbarz Jun 13, 2023
327ddf2
Merge branch 'develop' of github.com:Giveth/impact-graph into develop
mohammadranjbarz Jun 13, 2023
9cd452a
Merge branch 'f_980_implement_qfRound' into develop
mohammadranjbarz Jun 13, 2023
76a30c5
Merge branch 'f_980_implement_qfRound' into develop
mohammadranjbarz Jun 13, 2023
8e79376
Merge pull request #1027 from Giveth/f_980_implement_qfRound
CarlosQ96 Jun 13, 2023
b880796
Merge branch 'f_980_implement_qfRound' into develop
mohammadranjbarz Jun 14, 2023
140ce66
Merge branch 'develop' of github.com:Giveth/impact-graph into develop
mohammadranjbarz Jun 14, 2023
c8f013e
Added fill snapshot round number back
aminlatifi Aug 28, 2023
e9a8413
Removed blockNumber from snapshot in tests
aminlatifi Aug 28, 2023
a9a7c4d
Fixed migrations to be compatible with removing blockNumber from history
aminlatifi Aug 28, 2023
d1e720c
Merge branch 'staging' into feat/addFillSnapshotRoundBack
aminlatifi Aug 28, 2023
1f1afa9
add project status to getVerificationFormByProjectId query
CarlosQ96 Oct 26, 2023
160a0e5
Add sent matching fund to total donations of project and total receiv…
mohammadranjbarz Nov 2, 2023
7efee65
Fix test case for adding matching fund to toal donation amount of pro…
mohammadranjbarz Nov 2, 2023
e84e062
Merge branch 'staging' of github.com:Giveth/impact-graph into staging
mohammadranjbarz Nov 9, 2023
b04821a
Merge pull request #1177 from Giveth/f_3386_count_total_matchingFund_…
mohammadranjbarz Nov 23, 2023
b193dcc
Implement qfRoundStats webservice
mohammadranjbarz Nov 26, 2023
efd2702
Change allProjects webservice to support qfRoundSlug
mohammadranjbarz Nov 27, 2023
2fb2a55
Fix test cases to create qfRound
mohammadranjbarz Nov 27, 2023
eb92f90
Fix test cases to create qfRound
mohammadranjbarz Nov 27, 2023
3f58573
Fix test cases to create qfRound
mohammadranjbarz Nov 27, 2023
1c48702
Fix test cases to create qfRound
mohammadranjbarz Nov 27, 2023
a757da6
Fix updateProjectWithVerificationForm
mohammadranjbarz Nov 28, 2023
a3ed597
Revert updateUserTotalReceived() funciton
mohammadranjbarz Nov 28, 2023
6622ce1
Fix updateUserTotalReceived() test case
mohammadranjbarz Nov 28, 2023
753e132
Fix updateUserTotalReceived() test case
mohammadranjbarz Nov 28, 2023
2fb2e21
Fix mordor testnet node url
mohammadranjbarz Nov 28, 2023
cf3fc85
Read node rpc urls from process.env instead of config
mohammadranjbarz Nov 29, 2023
c009bae
Add log
mohammadranjbarz Nov 29, 2023
f07fc28
Fix etc provider url in github actions config
mohammadranjbarz Nov 29, 2023
868d2d5
Merge pull request #1183 from Giveth/f_3250_add_qf_round_stats
mohammadranjbarz Dec 3, 2023
9be23d0
Fix AddSlugToQfRound migration
mohammadranjbarz Dec 3, 2023
3b76a85
Undo Adding matchingFund to totalDonation amount of projects
mohammadranjbarz Dec 5, 2023
2a87b4e
Merge branch 'hotfix_1186_add_matching_funds_as_donations' into 1186_…
mohammadranjbarz Dec 5, 2023
bf90a1f
Merge pull request #1189 from Giveth/1186_add_matching_funds_as_donat…
jainkrati Dec 5, 2023
047fc95
Merge branch 'master' into staging
mohammadranjbarz Dec 5, 2023
c8630f8
Merge branch 'master' into staging
mohammadranjbarz Dec 5, 2023
9e71101
Remove unused tests
mohammadranjbarz Dec 5, 2023
71a5c1d
add safeTransaction to donation logic
CarlosQ96 Dec 5, 2023
9cf5586
Merge pull request #1191 from Giveth/feature_multisig_donation_verifi…
jainkrati Dec 6, 2023
ae3bd66
fix uniqueness index on donation table
CarlosQ96 Dec 7, 2023
27ffbfa
comment a network tests
CarlosQ96 Dec 7, 2023
d19a84e
fix nullability of transactionId
CarlosQ96 Dec 7, 2023
7d5dc07
make nonce nullable for safe donations
CarlosQ96 Dec 8, 2023
c5a922f
add nullability to nonce in createdonationResolver
CarlosQ96 Dec 8, 2023
58c4366
remove undefined clause from joi validations
CarlosQ96 Dec 8, 2023
eee178b
Fix insertDonationsFromQfRoundHistory when can not find corosponding …
mohammadranjbarz Dec 10, 2023
4ef7d20
Call refreshProjectDonationSummaryView() immediately after insertDona…
mohammadranjbarz Dec 10, 2023
f8b3b5f
Save non-evm user wallet address capitalization
aminlatifi Dec 11, 2023
b047833
Updated the authentication service related address in test.env
aminlatifi Dec 11, 2023
8e5a618
updated auth server in test env
aminlatifi Dec 11, 2023
5b738f9
add validations for multisig donations
CarlosQ96 Dec 12, 2023
fdeb7d9
add abis decoder for multisig transactions and parsers
CarlosQ96 Dec 12, 2023
865bc0a
fetch from and to addresses correctly for multisig validations
CarlosQ96 Dec 12, 2023
3b80568
Merge pull request #1195 from Giveth/hotfix_donation_validation_for_m…
mateodaza Dec 12, 2023
9552b5c
fix native token transfer for multisig transactions
CarlosQ96 Dec 12, 2023
1d3d0d3
fix transaction amount in tests for multisig
CarlosQ96 Dec 12, 2023
437ddc6
fix fromAddress edgecase for multisig
CarlosQ96 Dec 13, 2023
2483566
make params options for transactionData
CarlosQ96 Dec 13, 2023
651d9e2
Merge branch 'staging' into feat/addFillSnapshotRoundBack
mohammadranjbarz Dec 18, 2023
5f16270
Merge pull request #1105 from Giveth/feat/addFillSnapshotRoundBack
mohammadranjbarz Dec 18, 2023
b6c0463
Merge branch 'staging' into feat/solana_support
aminlatifi Dec 18, 2023
ed1b4f6
Merge pull request #1198 from Giveth/feat/solana_support
mohammadranjbarz Dec 18, 2023
854b072
Project Solana Address Support (#1200)
aminlatifi Dec 18, 2023
12b78fa
Revert "Removed snapshot block number" (#1202)
aminlatifi Dec 18, 2023
6c30546
comment uniqueness migration constraint (#1203)
CarlosQ96 Dec 18, 2023
eabbfb1
graphql allow null for transactionId (#1205)
CarlosQ96 Dec 19, 2023
139f65e
Create Solana Donations Integration (#1204)
CarlosQ96 Dec 24, 2023
8399161
disable ratelimiter from env (#1212)
aminlatifi Dec 24, 2023
13dc7c3
Hotfix/solana project address (#1210)
aminlatifi Dec 25, 2023
a479409
Update master-pipeline.yml
mhmdksh Dec 26, 2023
89181df
Verify Solana transactions (#1209)
mohammadranjbarz Dec 27, 2023
2075e40
Add disable cors and rate limiting to staging (#1221)
aminlatifi Dec 28, 2023
5acfb06
Add test and regex for solana token addresses (#1224)
CarlosQ96 Dec 31, 2023
82b412f
Hotfix solana transction id validator (#1225)
aminlatifi Dec 31, 2023
19500b6
Resolve merge conflicts
mohammadranjbarz Dec 31, 2023
8219ff5
Resolve merge conflicts
mohammadranjbarz Dec 31, 2023
5b1c11c
Resolve merge conflicts
mohammadranjbarz Dec 31, 2023
d8b5989
add isactive and fix adminjs for categories (#1223)
CarlosQ96 Jan 1, 2024
571b055
Pass chainType to getTransactionInfoFromNetwork function
mohammadranjbarz Jan 2, 2024
116c612
Merge branch 'master' into merge-conflict-staging-to-main
aminlatifi Jan 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/services/donationService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,7 @@ export const syncDonationStatusWithBlockchainNetwork = async (params: {
amount: donation.amount,
symbol: donation.currency,
txHash: donation.transactionId,
chainType: donation.chainType,
safeTxHash: donation.safeTransactionId,
timestamp: donation.createdAt.getTime() / 1000,
});
Expand Down
Loading