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

Feat/solana project address staging merged #1199

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
483 commits
Select commit Hold shift + click to select a range
c8f013e
Added fill snapshot round number back
aminlatifi Aug 28, 2023
e9a8413
Removed blockNumber from snapshot in tests
aminlatifi Aug 28, 2023
ca6f523
Added fill snapshot round number
aminlatifi Aug 28, 2023
a9a7c4d
Fixed migrations to be compatible with removing blockNumber from history
aminlatifi Aug 28, 2023
8568a89
Merge pull request #1106 from Giveth/feat/addFillSnapshotAgain
aminlatifi Aug 28, 2023
82d2a33
Improve networks filters in all projects query
mohammadranjbarz Aug 28, 2023
d1e720c
Merge branch 'staging' into feat/addFillSnapshotRoundBack
aminlatifi Aug 28, 2023
444fdcc
Resolve merge conflicts
mohammadranjbarz Aug 28, 2023
d4f6c45
improve calculations priority queue
CarlosQ96 Aug 29, 2023
3dc487c
upgrade master test env for new auth service server
CarlosQ96 Aug 29, 2023
1649ca4
add tests for staging goerli and alfajores
CarlosQ96 Aug 30, 2023
5ed2132
Fix test cases for alfadores network
mohammadranjbarz Aug 30, 2023
6ec5188
Fix test cases for alfadores network
mohammadranjbarz Aug 30, 2023
12a296d
Merge pull request #1107 from Giveth/f_1096_improve_network_filters_o…
mohammadranjbarz Aug 30, 2023
414b6f5
Update staging-pipeline.yml
mhmdksh Aug 30, 2023
74599a3
1.16.0
aminlatifi Aug 31, 2023
6d74546
Merge branch 'master' into staging
aminlatifi Aug 31, 2023
77b526f
Merge pull request #1111 from Giveth/merge_master_to_staging
aminlatifi Aug 31, 2023
99fd5ad
Merge pull request #1112 from Giveth/staging
mohammadranjbarz Sep 3, 2023
11195dc
Changed balance aggregator query to get
aminlatifi Sep 3, 2023
1847c1d
Fixed param passing to getLatestBalances of power balance aggregator
aminlatifi Sep 3, 2023
285366b
1.16.1
aminlatifi Sep 3, 2023
2e384c3
Merge pull request #1113 from Giveth/master
aminlatifi Sep 3, 2023
3867ac5
Return list of active campaigns in projectBySlug web service
mohammadranjbarz Sep 4, 2023
302f253
rewrite totalReceived query
CarlosQ96 Sep 4, 2023
ea91acc
Merge pull request #1114 from Giveth/f_1051_return_list_of_campaigns_…
mohammadranjbarz Sep 5, 2023
f0c648e
Update totalReceived of project owners correctly after verifying dona…
mohammadranjbarz Sep 5, 2023
89c5c9e
Update totalReceived of project owners correctly after verifying dona…
mohammadranjbarz Sep 6, 2023
a357abf
Delete test user after some test cases
mohammadranjbarz Sep 6, 2023
a686f29
Fix Auth microservice address in config
mohammadranjbarz Sep 6, 2023
0092f5a
Resolve merge conflicts
mohammadranjbarz Sep 6, 2023
5175008
Add cache to qfRound estimated matching queries
mohammadranjbarz Sep 6, 2023
bc25160
Merge pull request #1121 from Giveth/f_3021_update_totalReceived_of_p…
CarlosQ96 Sep 6, 2023
60416c8
removed unused code
CarlosQ96 Sep 7, 2023
f4c0412
Add QF_ROUND_ESTIMATED_MATCHING_CACHE_DURATION to example.env
mohammadranjbarz Sep 7, 2023
812c554
add eligible donations to qfround entity
CarlosQ96 Sep 10, 2023
414eb01
add tests for qfround eligible donations
CarlosQ96 Sep 11, 2023
99a5e58
add adminjs eligiblenetworks editable on qfround
CarlosQ96 Sep 11, 2023
e953447
Update staging-pipeline.yml
mhmdksh Sep 11, 2023
e89a515
Merge pull request #1122 from Giveth/f_1103_cache_qf_related_queries
mohammadranjbarz Sep 11, 2023
74a1224
add labels to the networks in adminjs for qfround
CarlosQ96 Sep 13, 2023
ca31852
add migration to fill in previous networkIds in qfrounds
CarlosQ96 Sep 14, 2023
c4f8012
Merge pull request #1124 from Giveth/feature_add_network_elegibility_…
CarlosQ96 Sep 14, 2023
c851c2a
fix eligible donations migration
CarlosQ96 Sep 14, 2023
7031640
fix migration table names for qfround networks
CarlosQ96 Sep 14, 2023
1819744
fix migration file for eligible networks
CarlosQ96 Sep 14, 2023
ed3025a
fix qfround fill networks migration
CarlosQ96 Sep 14, 2023
ae9f96a
add query for knowing if wallet was used
CarlosQ96 Sep 16, 2023
fb109d0
add query for knowing if wallet was used
CarlosQ96 Sep 16, 2023
7a0b6c1
improve query for user related address
CarlosQ96 Sep 17, 2023
08e8ef7
improve query for user related address
CarlosQ96 Sep 17, 2023
1a46487
unify project counts in userByAddress and projectsByUserId
CarlosQ96 Sep 19, 2023
0757d1c
Merge pull request #1129 from Giveth/feature_unify_project_count
CarlosQ96 Sep 19, 2023
1356ac8
unify project counts in userByAddress and projectsByUserId
CarlosQ96 Sep 19, 2023
5fec931
improve condition for projectCount
CarlosQ96 Sep 19, 2023
28c1299
fix projectCount query
CarlosQ96 Sep 19, 2023
0b52815
improve condition for projectCount
CarlosQ96 Sep 19, 2023
27ae61d
fix projectCount query
CarlosQ96 Sep 19, 2023
a7cd51c
Add logs for checkProjectVerificationStatus to can investigate better
mohammadranjbarz Sep 25, 2023
97e6ac2
Merge branch 'add_logs_for_update_reminder' into staging
mohammadranjbarz Sep 25, 2023
6adbc81
Merge branch 'staging' of github.com:Giveth/impact-graph into staging
mohammadranjbarz Sep 25, 2023
3994472
Merge pull request #1135 from Giveth/add_logs_for_update_reminder
mohammadranjbarz Sep 26, 2023
db91549
Add Other types of campaigns to projectBySlug webservice
mohammadranjbarz Sep 27, 2023
a8e3bb2
Fix calling remind project update notification and more logs
mohammadranjbarz Sep 28, 2023
6bc312e
Add more logs
mohammadranjbarz Sep 28, 2023
704cb98
Change name of fetchProjectsBySlugQuery field
mohammadranjbarz Sep 28, 2023
3e2d607
Merge branch 'master' into staging
mohammadranjbarz Sep 28, 2023
304efe8
add qfFilter with estimatedMatchingView
CarlosQ96 Sep 29, 2023
484f6ff
add sorting by qfround raised funds
CarlosQ96 Oct 2, 2023
6519399
Implement doesDonatedToProjectInQfRound webservice
mohammadranjbarz Oct 2, 2023
0325f7c
Move caching project campaign slugs process to a separated worker
mohammadranjbarz Oct 2, 2023
86fea20
Merge pull request #1139 from Giveth/f_1138_implement_does_donated_to…
mohammadranjbarz Oct 2, 2023
3620351
fix relationships for estimated matching filters
CarlosQ96 Oct 3, 2023
4ca466b
Merge branch 'staging' into feature_new_qf_filters_table
CarlosQ96 Oct 3, 2023
05eeae0
Merge pull request #1136 from Giveth/f_1051_fix_add_campaigns_to_proj…
mohammadranjbarz Oct 3, 2023
97d1a2f
Merge pull request #1137 from Giveth/feature_new_qf_filters_table
CarlosQ96 Oct 3, 2023
9b909c5
Add ETC network
mohammadranjbarz Oct 5, 2023
a9ad8f9
Put campaign projects cache in redis instead of saving that in memory
mohammadranjbarz Oct 5, 2023
cafffc9
Change default value of CACHE_PROJECT_CAMPAIGNS_CRONJOB_EXPRESSION
mohammadranjbarz Oct 5, 2023
6821e05
Merge pull request #1144 from Giveth/put_campaign_projects_cache_in_r…
CarlosQ96 Oct 5, 2023
fb0c892
change to leftJoin on estimatedMatchingTable
CarlosQ96 Oct 5, 2023
1cca468
Merge pull request #1145 from Giveth/hotfix_qfround_sorting_to_includ…
CarlosQ96 Oct 5, 2023
f756b2e
fix tests
CarlosQ96 Oct 5, 2023
52fcca7
modify qfround filter join
CarlosQ96 Oct 5, 2023
21e2a98
order null donations to last position
CarlosQ96 Oct 5, 2023
ad343cf
add optimism data queries
CarlosQ96 Oct 6, 2023
dd3cf6c
add graphql queries examples
CarlosQ96 Oct 6, 2023
81501d3
Add some logs
mohammadranjbarz Oct 7, 2023
5e966de
Change default value of CACHE_PROJECT_CAMPAIGNS_CRONJOB_EXPRESSION
mohammadranjbarz Oct 7, 2023
804ef4c
Put calling updateInstantPowerBalances() in try..catch...
mohammadranjbarz Oct 7, 2023
dc310ed
Add comment
mohammadranjbarz Oct 8, 2023
c65575f
1.17.0
mohammadranjbarz Oct 8, 2023
7edd1f4
Merge pull request #1134 from Giveth/staging
mohammadranjbarz Oct 8, 2023
e878a30
Get giv price from givback-calculation instead of monoswap
mohammadranjbarz Oct 8, 2023
be80bd7
Add GIVETH_GIV_PRICES_URL in test.env
mohammadranjbarz Oct 8, 2023
0e4b5a6
Merge pull request #1149 from Giveth/get_giv_price_from_givback_calcu…
mohammadranjbarz Oct 8, 2023
ea97ab5
Merge pull request #1150 from Giveth/get_giv_price_from_givback_calcu…
mohammadranjbarz Oct 8, 2023
5753459
Add some GLO and pyUSD stable coins
mohammadranjbarz Oct 9, 2023
a613792
Call cacheProjectCampaigns() in main thread
mohammadranjbarz Oct 9, 2023
abeeb5b
Fix filling xdai donation price
mohammadranjbarz Oct 9, 2023
0259116
Add octant donations to DB
mohammadranjbarz Oct 10, 2023
f5606f2
Resolve merge conflicts
mohammadranjbarz Oct 10, 2023
a69a929
Fix test cases
mohammadranjbarz Oct 10, 2023
6da9b2f
add idriss donation logic and cronjob
CarlosQ96 Oct 12, 2023
68a77d2
Merge pull request #1151 from Giveth/f_3221_add_some_stable_tokens
mohammadranjbarz Oct 15, 2023
dd01787
Integrate with Mordor ETC testnet chain
mohammadranjbarz Oct 15, 2023
185637d
Modify Octant donation migration file
mohammadranjbarz Oct 15, 2023
72c041d
Fix migration file names for stable coins
mohammadranjbarz Oct 16, 2023
5307917
Merge branch 'f_3221_add_some_stable_tokens' into staging
mohammadranjbarz Oct 16, 2023
82dddb7
Fix build problem
mohammadranjbarz Oct 16, 2023
a2e343d
Merge branch 'f_3221_add_some_stable_tokens' into staging
mohammadranjbarz Oct 16, 2023
9eb89b2
add creation of donation and user from idriss donation
CarlosQ96 Oct 16, 2023
2bcb161
Merge pull request #1146 from Giveth/feature_optimism_data_queries
CarlosQ96 Oct 16, 2023
e20793e
Fix donation resolver test case for etc testnet
mohammadranjbarz Oct 17, 2023
db09cb4
Merge pull request #1143 from Giveth/add_ethereum_classic_network
mohammadranjbarz Oct 17, 2023
788b0d0
fix cache and improve optimism queries
CarlosQ96 Oct 17, 2023
0077ea5
Merge pull request #1160 from Giveth/hotfix_optimism_data_queries
CarlosQ96 Oct 17, 2023
7594391
fix donations per category query for optimism
CarlosQ96 Oct 18, 2023
75ba00c
Change date of Public Noun donation
mohammadranjbarz Oct 18, 2023
46a1496
Merge pull request #1153 from Giveth/add_octant_donations
mohammadranjbarz Oct 18, 2023
57a5a98
Add edit button for donation tab in admin panel
mohammadranjbarz Oct 18, 2023
40133cb
Merge pull request #1162 from Giveth/f_1161_add_edit_button_for_donat…
mohammadranjbarz Oct 18, 2023
cb2e347
improve query to count for optimism
CarlosQ96 Oct 18, 2023
d06f7f2
Add transactionId to filter in donation tab in admin panel
mohammadranjbarz Oct 18, 2023
42b18fa
simplify donation total for optimism
CarlosQ96 Oct 18, 2023
55e9292
fix cache key for analytics dashboard queries
CarlosQ96 Oct 18, 2023
1833a86
add optimism data queries
CarlosQ96 Oct 6, 2023
9a93fba
add graphql queries examples
CarlosQ96 Oct 6, 2023
62035cb
fix cache and improve optimism queries
CarlosQ96 Oct 17, 2023
1b4346f
fix donations per category query for optimism
CarlosQ96 Oct 18, 2023
f105dac
improve query to count for optimism
CarlosQ96 Oct 18, 2023
7bec1d1
simplify donation total for optimism
CarlosQ96 Oct 18, 2023
6ba8691
fix cache key for analytics dashboard queries
CarlosQ96 Oct 18, 2023
f712819
Add price adapters
mohammadranjbarz Oct 18, 2023
8c2bc01
Fix editing donations tab
mohammadranjbarz Oct 18, 2023
19e335a
add additional filters for optimism queries
CarlosQ96 Oct 18, 2023
da9dd07
add eligible recipients for idriss donations loop
CarlosQ96 Oct 19, 2023
4073ca1
Merge pull request #1165 from Giveth/feature_additional_filters_for_o…
CarlosQ96 Oct 19, 2023
13659ef
fix cache for new filters
CarlosQ96 Oct 19, 2023
13def4a
add new cache with new filter params
CarlosQ96 Oct 19, 2023
d214a93
add additional filters for optimism queries
CarlosQ96 Oct 18, 2023
08d45cb
fix cache for new filters
CarlosQ96 Oct 19, 2023
30a2750
add new cache with new filter params
CarlosQ96 Oct 19, 2023
a552f4c
Get ETC prices for ETC and Mordor network tokens
mohammadranjbarz Oct 22, 2023
a2e1173
Merge pull request #1164 from Giveth/refactor_price
mohammadranjbarz Oct 22, 2023
d0ef695
Add logs in price adapters
mohammadranjbarz Oct 22, 2023
c2c90c4
finishing changes to idriss donation creation
CarlosQ96 Oct 23, 2023
b6c7545
Fix Adding addresses to managingFunds
mohammadranjbarz Oct 23, 2023
cb2ef2f
Merge branch 'master' into staging
mohammadranjbarz Oct 23, 2023
fe5cf6a
Fix editing donations in adminjs panel
mohammadranjbarz Oct 23, 2023
f432fa0
fix date in idriss donation
CarlosQ96 Oct 23, 2023
d7a4cac
improve idriss integration
CarlosQ96 Oct 24, 2023
da39ee8
add error catching for idriss
CarlosQ96 Oct 24, 2023
8e654a5
fix monoswap prices for idriss donations
CarlosQ96 Oct 24, 2023
7299634
Merge pull request #1166 from Giveth/feature_idress_integration
CarlosQ96 Oct 24, 2023
a704f50
1.18.0
mohammadranjbarz Oct 24, 2023
e1182e3
Merge pull request #1167 from Giveth/staging
mohammadranjbarz Oct 24, 2023
55363d4
Change migration name of AddExternalDonationsFields
mohammadranjbarz Oct 24, 2023
8236e1e
Merge branch 'master' of github.com:Giveth/impact-graph
mohammadranjbarz Oct 24, 2023
d6a6d14
Rename migration files to fix the orders
mohammadranjbarz Oct 24, 2023
773b3b7
Rename migration files to fix the orders
mohammadranjbarz Oct 24, 2023
f2440d8
Comment unstable test case
mohammadranjbarz Oct 24, 2023
8814bab
add subsquid subgraph to optimize idriss integration
CarlosQ96 Oct 25, 2023
7d7724e
change idriss cronjob time
CarlosQ96 Oct 25, 2023
84f23ef
Merge pull request #1169 from Giveth/hotfix_add_subgraph_to_idriss
CarlosQ96 Oct 25, 2023
26afd8c
add idriss donation export in adminJs as button
CarlosQ96 Oct 25, 2023
9c83dd8
idriss improvements
CarlosQ96 Oct 25, 2023
20ea11f
fix idriss import queries
CarlosQ96 Oct 25, 2023
159367b
fix project status fetching for idriss
CarlosQ96 Oct 25, 2023
8a362c6
Merge pull request #1170 from Giveth/staging
CarlosQ96 Oct 25, 2023
1f1afa9
add project status to getVerificationFormByProjectId query
CarlosQ96 Oct 26, 2023
a69069d
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
69c0502
Add knownAsSybilAddress to user entity and adding export sybils data …
mohammadranjbarz Nov 9, 2023
f001be1
Move get qfRound data buttons to qfRound tab
mohammadranjbarz Nov 9, 2023
8e2b511
Integrate googlesheet stuff with sybil analysis
mohammadranjbarz Nov 9, 2023
43f7b55
Fix types of QfRoundDonationRow
mohammadranjbarz Nov 9, 2023
33fc096
Add some comments
mohammadranjbarz Nov 9, 2023
d2d1794
add project_actual_matching_view table
CarlosQ96 Nov 9, 2023
942ea56
Merge branch 'automate_exporting_qf_round_sybils_analysis_data' into …
mohammadranjbarz Nov 9, 2023
07a29ec
Fix migraiton file for actual matching materialized views
mohammadranjbarz Nov 9, 2023
29c9b05
Merge pull request #1179 from Giveth/automate_exporting_qf_round_sybi…
CarlosQ96 Nov 9, 2023
4616e6c
add qfRound Spreadhsheet logic and actualmatching
CarlosQ96 Nov 9, 2023
208c14f
add qfRound Spreadhsheet logic and actualmatching
CarlosQ96 Nov 9, 2023
99bbb9f
Merge branch 'automate_exporting_qf_round_analysis_matching_logic' of…
mohammadranjbarz Nov 9, 2023
2b41cdc
Merge pull request #1180 from Giveth/automate_exporting_qf_round_anal…
mohammadranjbarz Nov 9, 2023
b8bad29
Fix emptyness of googlesheet
mohammadranjbarz Nov 9, 2023
557e2c9
Merge branch 'automate_exporting_qf_round_analysis_matching_logic' in…
mohammadranjbarz Nov 9, 2023
e84e062
Merge branch 'staging' of github.com:Giveth/impact-graph into staging
mohammadranjbarz Nov 9, 2023
b86fbf3
Merge pull request #1178 from Giveth/automate_exporting_qf_round_sybi…
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
2c8d77a
Insert donations to db based on distributed funds for qfRound projects
mohammadranjbarz Dec 5, 2023
3b76a85
Undo Adding matchingFund to totalDonation amount of projects
mohammadranjbarz Dec 5, 2023
372f3f3
Empty commit to trigger CI/CD
mohammadranjbarz Dec 5, 2023
5136996
Fix query to just add donation for qfRound histories that have full data
mohammadranjbarz Dec 5, 2023
65fa7ef
Fix typo error
mohammadranjbarz Dec 5, 2023
16e106c
Fix insertDonationsFromQfRoundHistory query
mohammadranjbarz Dec 5, 2023
78be225
Move ens address to constant parameter
mohammadranjbarz Dec 5, 2023
5de0225
Fix integration tests for creating donations with matchingFund data
mohammadranjbarz Dec 5, 2023
2a87b4e
Merge branch 'hotfix_1186_add_matching_funds_as_donations' into 1186_…
mohammadranjbarz Dec 5, 2023
ef27246
Merge pull request #1190 from Giveth/hotfix_1186_add_matching_funds_a…
jainkrati Dec 5, 2023
bf90a1f
Merge pull request #1189 from Giveth/1186_add_matching_funds_as_donat…
jainkrati Dec 5, 2023
a5bc9d0
Fix integration tests for creating donations with matchingFund data
mohammadranjbarz Dec 5, 2023
047fc95
Merge branch 'master' into staging
mohammadranjbarz Dec 5, 2023
e0ec480
Fix integration tests for creating donations with matchingFund data
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
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
7b1df0a
Merge branch 'staging' into feat/solana_project_address
aminlatifi Dec 18, 2023
fb632de
Revert unwanted changes happend after merge
aminlatifi Dec 18, 2023
3ffdaba
Fixed issues happend after merge
aminlatifi Dec 18, 2023
bf17edd
Fixed an issue in setting chainType in projectUpdate
aminlatifi Dec 18, 2023
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
100 changes: 100 additions & 0 deletions .github/workflows/develop-pipeline.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
name: develop-pipeline

on:
push:
branches:
- develop
pull_request:
branches:
- develop
jobs:
test:
runs-on: ubuntu-latest
services:
# Label used to access the service container
redis:
# Docker Hub image
image: redis
# Set health checks to wait until redis has started
options: >-
--health-cmd "redis-cli ping"
--health-interval 10s
--health-timeout 5s
--health-retries 5
ports:
- 6379:6379
postgres:
# Use this postgres image https://github.com/Giveth/postgres-givethio
image: ghcr.io/giveth/postgres-givethio:latest
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: givethio
PGDATA: /var/lib/postgresql/data/pgdata
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
ports:
- 5443:5432
steps:
- uses: actions/checkout@v1
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: 18.17.1
- name: Install dependencies
run: npm ci
- name: Run tslint
run: npm run tslint
- name: Run build
run: npm run build
- name: Run migrations
run: npm run db:migrate:run:test
- name: Run tests
run: npm run test
env:
ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY }}
XDAI_NODE_HTTP_URL: ${{ secrets.XDAI_NODE_HTTP_URL }}
INFURA_API_KEY: ${{ secrets.INFURA_API_KEY }}
INFURA_ID: ${{ secrets.INFURA_ID }}
POLYGON_SCAN_API_KEY: ${{ secrets.POLYGON_SCAN_API_KEY }}
OPTIMISTIC_SCAN_API_KEY: ${{ secrets.OPTIMISTIC_SCAN_API_KEY }}
CELO_SCAN_API_KEY: ${{ secrets.CELO_SCAN_API_KEY }}
CELO_ALFAJORES_SCAN_API_KEY: ${{ secrets.CELO_ALFAJORES_SCAN_API_KEY }}
MORDOR_ETC_TESTNET: ${{ secrets.MORDOR_ETC_TESTNET }}
ETC_NODE_HTTP_URL: ${{ secrets.ETC_NODE_HTTP_URL }}

publish:
needs: test
runs-on: ubuntu-latest
if: github.event_name == 'push'
steps:
- name: Check out the repo
uses: actions/checkout@v2
- name: Build image and push to GitHub Packages
uses: docker/build-push-action@v1
with:
username: ${{ github.actor }}
password: ${{ github.token }}
registry: ghcr.io
repository: giveth/impact-graph
add_git_labels: true
# Add branch name to docker image tag @see{@link https://github.com/docker/build-push-action/tree/releases/v1#tag_with_ref}
tag_with_ref: true
# Add commit hash to docker image tag @see{@link https://github.com/docker/build-push-action/tree/releases/v1#tag_with_sha}
tag_with_sha: true

deploy:
needs: publish
runs-on: ubuntu-latest
if: github.event_name == 'push'
steps:
- name: Develop deploy
uses: garygrossgarten/[email protected]
with:
command: cd impact-graph && git checkout develop && git pull && docker-compose -f docker-compose-develop.yml pull && docker-compose -f docker-compose-develop.yml down && docker-compose -f docker-compose-develop.yml up -d && docker image prune -a --force;
host: ${{ secrets.DEVELOP_HOST }}
username: ${{ secrets.DEVELOP_USERNAME }}
privateKey: ${{ secrets.DEVELOP_PRIVATE_KEY}}
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
name: CI/CD

on: [push]
name: master-pipeline

on:
push:
branches:
- master
pull_request:
branches:
- master
jobs:
test:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -38,7 +43,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: 16.14.2
node-version: 18.17.1
- name: Install dependencies
run: npm ci
- name: Run tslint
Expand All @@ -58,11 +63,13 @@ jobs:
OPTIMISTIC_SCAN_API_KEY: ${{ secrets.OPTIMISTIC_SCAN_API_KEY }}
CELO_SCAN_API_KEY: ${{ secrets.CELO_SCAN_API_KEY }}
CELO_ALFAJORES_SCAN_API_KEY: ${{ secrets.CELO_ALFAJORES_SCAN_API_KEY }}
MORDOR_ETC_TESTNET: ${{ secrets.MORDOR_ETC_TESTNET }}
ETC_NODE_HTTP_URL: ${{ secrets.ETC_NODE_HTTP_URL }}

publish:
if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/staging'
needs: test
runs-on: ubuntu-latest
if: github.event_name == 'push'
steps:
- name: Check out the repo
uses: actions/checkout@v2
Expand All @@ -80,55 +87,14 @@ jobs:
tag_with_sha: true

deploy:
if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master'|| github.ref == 'refs/heads/staging'
needs: publish
runs-on: ubuntu-latest
if: github.event_name == 'push'
steps:
- name: Staging deploy
if: github.ref == 'refs/heads/staging'
uses: garygrossgarten/[email protected]
with:
command: cd impact-graph && git checkout staging && git pull && docker-compose -f docker-compose-staging.yml pull && docker-compose -f docker-compose-staging.yml down && docker-compose -f docker-compose-staging.yml up -d && docker image prune -a --force;
host: ${{ secrets.STAGING_HOST }}
username: ${{ secrets.STAGING_USERNAME }}
privateKey: ${{ secrets.STAGING_PRIVATE_KEY}}

- name: Develop deploy
if: github.ref == 'refs/heads/develop'
uses: garygrossgarten/[email protected]
with:
command: cd impact-graph && git checkout develop && git pull && docker-compose -f docker-compose-develop.yml pull && docker-compose -f docker-compose-develop.yml down && docker-compose -f docker-compose-develop.yml up -d && docker image prune -a --force;
host: ${{ secrets.DEVELOP_HOST }}
username: ${{ secrets.DEVELOP_USERNAME }}
privateKey: ${{ secrets.DEVELOP_PRIVATE_KEY}}

- name: Production deploy
if: github.ref == 'refs/heads/master'
uses: garygrossgarten/[email protected]
with:
command: cd impact-graph && git checkout master && git pull && docker-compose -f docker-compose-production.yml pull && docker-compose -f docker-compose-production.yml down && docker-compose -f docker-compose-production.yml up -d && docker image prune -a --force;
host: ${{ secrets.PRODUCTION_HOST }}
username: ${{ secrets.PRODUCTION_USERNAME }}
privateKey: ${{ secrets.PRODUCTION_PRIVATE_KEY}}


deploy-k8s:
if: github.ref == 'refs/heads/main'|| github.ref == 'refs/heads/staging'
needs: publish
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@master
- name: Deploy to Staging Cluster
if: github.ref == 'refs/heads/staging'
uses: steebchen/[email protected]
with: # defaults to latest kubectl binary version
config: ${{ secrets.KUBE_CONFIG }}
command: rollout restart deployments/impact-graph -n backend
# - name: Verify Staging Deployment
# if: github.ref == 'refs/heads/staging'
# uses: steebchen/[email protected]
# with:
# config: ${{ secrets.KUBE_CONFIG }}
# version: v1.24.2 # specify kubectl binary version explicitly
# command: rollout status deployments/impact-graph -n backend
68 changes: 68 additions & 0 deletions .github/workflows/run-tests-on-pr.yml.bck
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: run tests on pull request

on:
workflow_dispatch:
pull_request:
branches:
- develop
- master
- staging
types:
- opened

jobs:
test:
runs-on: ubuntu-latest
services:
# Label used to access the service container
redis:
# Docker Hub image
image: redis
# Set health checks to wait until redis has started
options: >-
--health-cmd "redis-cli ping"
--health-interval 10s
--health-timeout 5s
--health-retries 5
ports:
- 6379:6379
postgres:
# Use this postgres image https://github.com/Giveth/postgres-givethio
image: ghcr.io/giveth/postgres-givethio:latest
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: givethio
PGDATA: /var/lib/postgresql/data/pgdata
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
ports:
- 5443:5432
steps:
- uses: actions/checkout@v1
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: 16.14.2
- name: Install dependencies
run: npm ci
- name: Run tslint
run: npm run tslint
- name: Run build
run: npm run build
- name: Run migrations
run: npm run db:migrate:run:test
- name: Run tests
run: npm run test
env:
ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY }}
XDAI_NODE_HTTP_URL: ${{ secrets.XDAI_NODE_HTTP_URL }}
INFURA_API_KEY: ${{ secrets.INFURA_API_KEY }}
INFURA_ID: ${{ secrets.INFURA_ID }}
POLYGON_SCAN_API_KEY: ${{ secrets.POLYGON_SCAN_API_KEY }}
OPTIMISTIC_SCAN_API_KEY: ${{ secrets.OPTIMISTIC_SCAN_API_KEY }}
CELO_SCAN_API_KEY: ${{ secrets.CELO_SCAN_API_KEY }}
CELO_ALFAJORES_SCAN_API_KEY: ${{ secrets.CELO_ALFAJORES_SCAN_API_KEY }}
Loading
Loading