Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
164 commits
Select commit Hold shift + click to select a range
6ba562f
throw error on un-vouching the givbackseligible projects
MohammadPCh Oct 27, 2024
5565767
update message
MohammadPCh Oct 27, 2024
a744af6
optimize the approveMultipleProjects
MohammadPCh Oct 27, 2024
8d017d1
make projects verified if they become givbacksEligible
MohammadPCh Oct 27, 2024
7db802f
prevent approve or reject draft projects
MohammadPCh Oct 28, 2024
a680fa2
Merge branch 'staging' into update-verify-approve-conditions
MohammadPCh Oct 29, 2024
f33cb33
fix records
MohammadPCh Oct 29, 2024
7c23f75
fix conditions
MohammadPCh Oct 29, 2024
102ce11
use redirectUrl
MohammadPCh Oct 29, 2024
d23a58a
fix tests
MohammadPCh Oct 29, 2024
4d8b591
add unverifyProjectsTestCases
MohammadPCh Oct 29, 2024
9d99aff
add test:projectVerificationTab
MohammadPCh Oct 29, 2024
4d82302
temporary comment
MohammadPCh Oct 29, 2024
52cfb82
fix typo
MohammadPCh Nov 4, 2024
b3dfb59
send email when project verification status changed
MohammadPCh Nov 4, 2024
baa24d1
Feat/Generating public user data
kkatusic Dec 3, 2024
e5605eb
Merge branch 'staging' into feat/user_sitemap_list
kkatusic Dec 5, 2024
fd8ea0e
added tests for querying user basic data
kkatusic Dec 5, 2024
e89c1ea
add includeUnlisted to FilterProjectQueryInputParams
MohammadPCh Dec 9, 2024
92f15c9
return proper projects
MohammadPCh Dec 9, 2024
2051be0
add recipient address to streams when nonexistent (#1890)
CarlosQ96 Dec 9, 2024
d6e3888
Merge branch 'master' into staging
CarlosQ96 Dec 10, 2024
d12453d
Merge pull request #1889 from Giveth/fetch-unlisted-projects
MohammadPCh Dec 10, 2024
5cf1e60
started endaoment update feature
kkatusic Dec 11, 2024
f0c3fc8
Superfluid Base Support (#1893)
CarlosQ96 Dec 17, 2024
445fe68
Merge pull request #1866 from Giveth/update-verify-approve-conditions
divine-comedian Dec 18, 2024
82dfc17
remove project validation from anchor contract
CarlosQ96 Dec 21, 2024
b41c543
Merge pull request #1887 from Giveth/feat/user_sitemap_list
kkatusic Dec 26, 2024
ff91c4d
Add networkId logic to superfluid subgraphs (#1896)
CarlosQ96 Dec 26, 2024
b703497
fix linkedin scope
lovelgeorge99 Dec 30, 2024
b930c80
Merge pull request #1898 from Giveth/fix-linkedin-scope
lovelgeorge99 Dec 31, 2024
3e62ce6
fix user info link to user info
lovelgeorge99 Jan 2, 2025
829f973
cron job for sitemap generating
kkatusic Jan 2, 2025
c74dc3b
Merge pull request #1899 from Giveth/fix-linkedin-scope
lovelgeorge99 Jan 2, 2025
09186cd
Merge pull request #1900 from Giveth/feat/sitemap_cron_job
kkatusic Jan 3, 2025
7ebaeca
adding additional projects to Endaoment list
kkatusic Jan 3, 2025
03e134e
Merge branch 'staging' into feat/check_periodically_endaoment
kkatusic Jan 3, 2025
5a866ad
started cronjob
kkatusic Jan 3, 2025
d4cf597
finished cron job
kkatusic Jan 8, 2025
b558266
Feature cluster matching (#1862)
CarlosQ96 Jan 9, 2025
ed8e7da
Merge branch 'staging' into feat/check_periodically_endaoment
kkatusic Jan 9, 2025
b224a32
fix updateUser condition to handle email undefined case
CarlosQ96 Jan 9, 2025
60f30ad
fixed one variable; added cronjob env suggested by Carlos
kkatusic Jan 10, 2025
2d79a58
removed redundant code
kkatusic Jan 10, 2025
e8a6120
check config value
kkatusic Jan 10, 2025
baa7450
fix calling env variable
kkatusic Jan 10, 2025
448da9e
Merge pull request #1892 from Giveth/feat/check_periodically_endaoment
kkatusic Jan 10, 2025
1c37bc0
fix/removing endaomentId from update
kkatusic Jan 13, 2025
039d808
Merge pull request #1904 from Giveth/feat/check_periodically_endaoment
kkatusic Jan 13, 2025
9d61941
add qfStrategy to qfRounds (#1903)
CarlosQ96 Jan 13, 2025
acd0e5d
update bootstrap.js adding check endaoment
kkatusic Jan 13, 2025
e9ea066
adding sitemap cronjob to bootstrap
kkatusic Jan 13, 2025
e8a7de5
Merge pull request #1905 from Giveth/feat/check_periodically_endaoment
kkatusic Jan 13, 2025
9a1a8a1
additional logger data
kkatusic Jan 14, 2025
c7af69c
fine tuninnig log
kkatusic Jan 14, 2025
66e8cce
Merge pull request #1906 from Giveth/feat/check_periodically_endaoment
kkatusic Jan 14, 2025
7621d4b
improve logger
kkatusic Jan 14, 2025
1374e40
Merge pull request #1907 from Giveth/feat/check_periodically_endaoment
kkatusic Jan 14, 2025
9f5752b
fixing endaoment id
kkatusic Jan 14, 2025
2825385
Merge pull request #1908 from Giveth/feat/check_periodically_endaoment
kkatusic Jan 14, 2025
e4f6b26
Set default zero for power balance snapshot on no return from balance…
aminlatifi Jan 18, 2025
ed56a80
Fix/Sitemap env variables
kkatusic Jan 20, 2025
a80ff7c
Merge pull request #1910 from Giveth/fix/sitemap_calling
kkatusic Jan 20, 2025
b1104b9
fix missing prefix for url
kkatusic Jan 20, 2025
7bbfcdf
Merge pull request #1911 from Giveth/fix/sitemap_calling
kkatusic Jan 20, 2025
8e8f471
Change logic for Sitemap CronJob
kkatusic Jan 21, 2025
e33a3ea
improve font url handling
kkatusic Jan 21, 2025
734dbab
fix matching cap calculation
CarlosQ96 Jan 22, 2025
54fa338
fix data insertion for cluster matching
CarlosQ96 Jan 22, 2025
5822180
add user passport score null case to clustermatching queries
CarlosQ96 Jan 22, 2025
9bcaded
fix error handling in cocm adapter
CarlosQ96 Jan 22, 2025
7e9c1b6
add cluster matching sync timestamp and logs (#1913)
CarlosQ96 Jan 22, 2025
0edb4e8
fix db call in worker for cluster matching
CarlosQ96 Jan 22, 2025
dc57537
add uniquness constraint to estimatedclustedMatching
CarlosQ96 Jan 22, 2025
7797caa
handle undefined case for instant power boosting services
CarlosQ96 Jan 23, 2025
73d6cfa
better error handling in worker job
CarlosQ96 Jan 27, 2025
be3b485
fixing prettier problem
kkatusic Jan 27, 2025
ad5949d
Disable cluster matching
CarlosQ96 Jan 27, 2025
df68d26
Fix/Vouche/DeVauche project(s)
kkatusic Jan 28, 2025
ce160da
add filter condition to remove endaoment projects from recently updat…
divine-comedian Jan 28, 2025
5b19b8b
Merge pull request #1920 from Giveth/fix/adminjs_deverification
kkatusic Jan 29, 2025
80df1f3
Merge pull request #1921 from Giveth/remove-endaoment-recentlyUpdated
divine-comedian Jan 29, 2025
68f55f6
Adding bull jobs removing
kkatusic Feb 11, 2025
54c1683
Merge pull request #1934 from Giveth/fix/redis_memory
kkatusic Feb 11, 2025
e4dcb95
Fix/Showing cancelled projects
kkatusic Feb 13, 2025
74fdd06
Merge pull request #1936 from Giveth/fix/cancelled_project_data
kkatusic Feb 13, 2025
dfcd014
Merge pull request #1912 from Giveth/fix/sitemap_generation
divine-comedian Feb 18, 2025
9914565
Enable sitemap cron job
kkatusic Feb 19, 2025
0e2a217
Merge pull request #1940 from Giveth/enable_sitemap_cron
kkatusic Feb 19, 2025
0d8f205
Need to check url
kkatusic Feb 19, 2025
415927f
Merge pull request #1941 from Giveth/enable_sitemap_cron
kkatusic Feb 19, 2025
9411874
add GIVBACKS_ELIGIBLE_MIN_DONATION_USD
RamRamez Feb 20, 2025
ceefd14
add isGivbacksEligible conditions
RamRamez Feb 20, 2025
25da7d1
add a fix for conflicting Stellar transactions
Meriem-BM Feb 21, 2025
c484200
Merge pull request #1942 from Giveth/add-givbacks-eligible-tags-condi…
RamRamez Feb 24, 2025
30f3912
New sitemap generation files logic
kkatusic Feb 24, 2025
4c751bc
Merge pull request #1945 from Giveth/enable_sitemap_cron
kkatusic Feb 25, 2025
a38509a
add expiration to missing bull queues (#1946)
CarlosQ96 Feb 25, 2025
33dbc6a
Merge branch 'staging' into enable_sitemap_cron
kkatusic Feb 25, 2025
9fe83b6
Revert "New sitemap generation files logic"
kkatusic Feb 25, 2025
d2a0a33
Merge pull request #1947 from Giveth/revert-1945-enable_sitemap_cron
kkatusic Feb 25, 2025
ecd6b29
Revert "Revert "New sitemap generation files logic""
kkatusic Feb 25, 2025
f7bbd49
Merge pull request #1948 from Giveth/revert-1947-revert-1945-enable_s…
kkatusic Feb 25, 2025
524349f
removed comment
kkatusic Feb 25, 2025
b5d9753
Merge branch 'staging' into enable_sitemap_cron
kkatusic Feb 25, 2025
b093c41
fixed comment
kkatusic Feb 25, 2025
1bd62c7
Merge pull request #1949 from Giveth/enable_sitemap_cron
kkatusic Feb 25, 2025
ff8ac22
merge master into staging
CarlosQ96 Feb 26, 2025
a358b43
pinata fix cleaning up files
kkatusic Feb 26, 2025
358d49d
removed duplicate code
kkatusic Feb 26, 2025
548897c
Merge pull request #1951 from Giveth/enable_sitemap_cron
kkatusic Feb 26, 2025
4365eec
Instead save using insert
kkatusic Feb 26, 2025
ded161a
removing old entries
kkatusic Feb 26, 2025
e6715e4
Fixing url
kkatusic Feb 26, 2025
a2f8529
Merge pull request #1952 from Giveth/enable_sitemap_cron
kkatusic Feb 26, 2025
be4a803
Fetch only verified projects
kkatusic Mar 3, 2025
d3abe4c
fix query
kkatusic Mar 3, 2025
42e3585
Adding QF Round data to the projects
kkatusic Mar 4, 2025
abbbc77
Merge pull request #1955 from Giveth/improve_sitemap
kkatusic Mar 4, 2025
b16cc91
Commenting on celo test
kkatusic Mar 5, 2025
031f056
Merge pull request #1956 from Giveth/fix_similar_project_query
kkatusic Mar 5, 2025
35b4b60
disabled sync scores cronjob
CarlosQ96 Mar 10, 2025
6dcc23c
merge branch master into staging
CarlosQ96 Mar 11, 2025
a80b677
Validation functions for email
kkatusic Mar 13, 2025
f64d718
Added validation to the user update and creation
kkatusic Mar 13, 2025
233f48a
Update test.env
kkatusic Mar 14, 2025
8489a06
Fixing response for on boarding related to verifications email
kkatusic Mar 17, 2025
1d04361
removing env
kkatusic Mar 18, 2025
41752d5
adding env variables
kkatusic Mar 18, 2025
1561b82
Merge pull request #1959 from Giveth/feat/verify_email_function
kkatusic Mar 18, 2025
f3171c8
Merge branch 'staging' into fix/stellar_issues
Meriem-BM Mar 20, 2025
b3de504
Fix/Analytics queries
kkatusic Mar 25, 2025
bc399a0
Fixing new donors count and unique donors
kkatusic Mar 26, 2025
6a41cb3
Merge pull request #1961 from Giveth/fix_analyitics_queries
kkatusic Mar 26, 2025
c391e44
remove unused exports
CarlosQ96 Apr 8, 2025
15c051d
Merge branch 'master' into staging
CarlosQ96 Apr 8, 2025
44acb60
remove unused imports
CarlosQ96 Apr 8, 2025
b39f500
document: update readme with latest info and context
divine-comedian Apr 17, 2025
31b695a
Update README.md
divine-comedian Apr 17, 2025
fa53251
Update README.md
divine-comedian Apr 18, 2025
ff6470a
Merge pull request #1965 from Giveth/update-readme
divine-comedian Apr 22, 2025
a750ecf
Update validator for single fetch
kkatusic May 16, 2025
c1aa5a6
Fix recurring donation amount
kkatusic May 16, 2025
a4c33db
check test
kkatusic May 16, 2025
5ad3fbf
test logger
kkatusic May 16, 2025
5072382
fixing solana errors
kkatusic May 16, 2025
0ead40f
try to add sleep
kkatusic May 17, 2025
437dd1b
update test
kkatusic May 19, 2025
6adc105
one test should fail
kkatusic May 19, 2025
c12c5ac
update giv balance test
kkatusic May 19, 2025
cde0680
Merge branch 'fix_recurring_donation_email' into fix_project_by_slug
kkatusic May 19, 2025
d1290d8
Merge pull request #1969 from Giveth/fix_recurring_donation_email
kkatusic May 19, 2025
eaee8f9
fix last test to use latest data
kkatusic May 19, 2025
40df880
Merge pull request #1968 from Giveth/fix_project_by_slug
kkatusic May 20, 2025
35e50d9
Fix test
kkatusic May 20, 2025
fd5e8ed
Merge pull request #1971 from Giveth/fix_recurring_donation_email
kkatusic May 20, 2025
6bc91c3
Merge branch 'staging' into fix/stellar_issues
Meriem-BM May 21, 2025
50e03c9
Merge pull request #1943 from Giveth/fix/stellar_issues
Meriem-BM May 21, 2025
294b173
Merge branch 'master' into merge_master
kkatusic May 21, 2025
bfe192d
Merge pull request #1984 from Giveth/merge_master
kkatusic May 22, 2025
b4e741b
Upgrade versions for actions checkout, build and push - staging-pipel…
geleeroyale May 26, 2025
84a2aeb
Update staging-pipeline.yml
geleeroyale May 26, 2025
01bc51e
Update GHCR login process
geleeroyale May 26, 2025
657305b
carry over changes from staging pipeline to master pipeline
geleeroyale May 26, 2025
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
28 changes: 17 additions & 11 deletions .github/workflows/master-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v2
with:
Expand Down Expand Up @@ -122,21 +124,25 @@ jobs:
needs: test
runs-on: ubuntu-latest
if: github.event_name == 'push'
permissions:
contents: read
packages: write
steps:
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Login to GitHub Container Registry
run: echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
- name: Build image and push to GitHub Packages
uses: docker/build-push-action@v1
uses: docker/build-push-action@v6
with:
username: ${{ github.actor }}
password: ${{ github.token }}
registry: ghcr.io
push: true
no-cache: true
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
tags: |
ghcr.io/giveth/impact-graph:master
ghcr.io/giveth/impact-graph:${{ github.sha }}

deploy:
needs: publish
Expand Down
32 changes: 20 additions & 12 deletions .github/workflows/staging-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ jobs:

steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up Node.js
uses: actions/setup-node@v1
Expand Down Expand Up @@ -67,7 +69,9 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v2
with:
Expand Down Expand Up @@ -146,21 +150,25 @@ jobs:
needs: test
runs-on: ubuntu-latest
if: github.event_name == 'push'
permissions:
contents: read
packages: write
steps:
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Login to GitHub Container Registry
run: echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
- name: Build image and push to GitHub Packages
uses: docker/build-push-action@v1
uses: docker/build-push-action@v6
with:
username: ${{ github.actor }}
password: ${{ github.token }}
registry: ghcr.io
push: true
no-cache: true
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
tags: |
ghcr.io/giveth/impact-graph:staging
ghcr.io/giveth/impact-graph:${{ github.sha }}

deploy:
needs: publish
Expand Down
25 changes: 16 additions & 9 deletions src/services/cronJobs/checkQRTransactionJob.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,22 @@ export async function checkTransactions(
(isNativePayment || isCreateAccount) && transactionAge < TWO_MINUTES;

if (isMatchingTransaction) {
if (
toWalletMemo &&
transaction.type === 'payment' &&
transaction.transaction.memo !== toWalletMemo
) {
logger.debug(
`Transaction memo does not match donation memo for donation ID ${donation.id}`,
);
return;
const memo = transaction.transaction.memo;

if (transaction.type === 'payment') {
if (toWalletMemo) {
if (memo !== toWalletMemo) {
logger.debug(
`Transaction memo does not match donation memo for donation ID ${donation.id}`,
);
return;
}
} else if (memo !== id.toString()) {
logger.debug(
`Transaction memo matches donation memo for donation ID ${donation.id}`,
);
return;
}
}

// Check if donation already exists
Expand Down
Loading