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

Development #1059

Merged
merged 57 commits into from
Jan 29, 2024
Merged

Development #1059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
e52149d
Add marketplace state
danielailie Nov 22, 2023
5ed99c6
Upgrade marketplace state migration
danielailie Nov 22, 2023
a510c6c
Update migration
danielailie Nov 22, 2023
92ac4a0
Update disable processing
danielailie Nov 22, 2023
05e7185
Update rabbit dependencies
danielailie Nov 23, 2023
46d097e
Add condition for marketplace events
danielailie Nov 23, 2023
7192ef3
Add logging
danielailie Nov 23, 2023
cb2b946
Update get Disable marketplace
danielailie Nov 23, 2023
5a74ef6
Add endpoint to update marketplace state
danielailie Nov 23, 2023
d0ff025
Update marketplace add also the state
danielailie Nov 23, 2023
5db1060
Clean up function
danielailie Nov 23, 2023
3580ffe
Change rabbit queue to redis
danielailie Dec 4, 2023
6f715b8
Add redis events handle
danielailie Dec 4, 2023
e55ea80
update redis queues
danielailie Dec 5, 2023
176dbba
Update handle events for disable marketplace
danielailie Dec 5, 2023
45ea3a8
Add check for events
danielailie Dec 5, 2023
d7630b5
Fix tests
danielailie Dec 5, 2023
5d30c3c
Add unit tests for new marketplace functions
danielailie Dec 5, 2023
25277d0
Add missing tests
danielailie Dec 5, 2023
3f397d8
delete console logs
danielailie Dec 6, 2023
3570d6e
remove commented code
danielailie Dec 6, 2023
796ee7d
Remove custom filters on asset
danielailie Dec 6, 2023
b2c5cff
Fix test
danielailie Dec 11, 2023
0121d19
Fix tests
danielailie Dec 11, 2023
98fd42a
Code review follow up
danielailie Dec 11, 2023
0b6a8d9
Merge pull request #1057 from multiversx/SERVICES-1959-add-marketplac…
danielailie Dec 12, 2023
57ac4e3
Add proxy deployer
danielailie Nov 15, 2023
6251ee4
Add deploy marketplace and bulk contracts
danielailie Dec 11, 2023
9f6a646
Update deploy contracts
danielailie Dec 11, 2023
6f98daa
Add tests
danielailie Dec 11, 2023
d3a3804
Add tests
danielailie Dec 11, 2023
777a330
Update schema
danielailie Dec 13, 2023
aa5c716
Update deployer requests
danielailie Dec 13, 2023
7dbe854
Remove unused services
danielailie Dec 13, 2023
8f7c1bd
Remove unsed models
danielailie Dec 13, 2023
262f9ec
Remove unused models
danielailie Dec 13, 2023
da2eee5
Code formating
danielailie Dec 13, 2023
e9f57b0
Merge pull request #1058 from multiversx/SERVICES-1944-add-proxy-depl…
danielailie Dec 14, 2023
4ffc55e
Update env for proxy deployer
danielailie Dec 14, 2023
37885e6
add logs
danielailie Dec 14, 2023
fe28d85
remove logs
danielailie Dec 14, 2023
5bb83ee
Add logs
danielailie Dec 14, 2023
8f577ca
Update dependecies
danielailie Dec 15, 2023
b645413
Fix tests
danielailie Dec 15, 2023
380546e
remove console logs
danielailie Dec 15, 2023
c60b16f
Merge pull request #1060 from multiversx/SERVICES-2002-update-create-…
danielailie Dec 15, 2023
5ddf853
Update activation epoch
danielailie Jan 3, 2024
456befd
Merge pull request #1061 from multiversx/UpdateActivationEpochForBurn…
danielailie Jan 8, 2024
9b60c8b
Update token decoding for multi transfer
danielailie Jan 17, 2024
b2f5c4e
Remove console logs
danielailie Jan 17, 2024
2421d26
Merge pull request #1062 from multiversx/UpdateTopicsForMultiTransfer
danielailie Jan 18, 2024
df84a08
Fix collections retrieve
danielailie Jan 18, 2024
5b15d5f
Add logging
danielailie Jan 18, 2024
790fde0
Fix elastic mapping for collections
danielailie Jan 18, 2024
ad71fd2
Remove constants
danielailie Jan 18, 2024
27d6433
Add collection elastic model
danielailie Jan 18, 2024
cdb73c4
Merge pull request #1063 from multiversx/UpdateCollectionIndexing
danielailie Jan 18, 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
4 changes: 4 additions & 0 deletions .jest/setEnvVars.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
process.env.DEPLOYER_ADDRESS = 'erd1qqqqqqqqqqqqqpgqut6lamz9dn480ytj8cmcwvydcu3lj55epltq9t9kam';
process.env.PROXY_DEPLOYER_ADDRESS = 'erd1qqqqqqqqqqqqqpgqut6lamz9dn480ytj8cmcwvydcu3lj55epltq9t9kam';
process.env.TEMPLATE_BULK_ADDRESS = 'erd1qqqqqqqqqqqqqpgqzs3y0vr4t4sqyet32t6jp9m85l3hlr93u00sdj9rxa';
process.env.TEMPLATE_MINTER_ADDRESS = 'erd1qqqqqqqqqqqqqpgqzs3y0vr4t4sqyet32t6jp9m85l3hlr93u00sdj9rxa';
process.env.TEMPLATE_MARKETPLACE_ADDRESS = 'erd1qqqqqqqqqqqqqpgq9ac9zvc4ugzrgqaqjqgjdhvxxtx7wu2eu00sxezym3';
208 changes: 124 additions & 84 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@
"@aws-sdk/lib-storage": "^3.438.0",
"@elastic/elasticsearch": "7.12.0",
"@golevelup/nestjs-rabbitmq": "4.0.0",
"@multiversx/sdk-core": "12.6.1",
"@multiversx/sdk-core": "12.14.0",
"@multiversx/sdk-native-auth-server": "1.0.7",
"@multiversx/sdk-nestjs-cache": "2.0.0-beta.2",
"@multiversx/sdk-nestjs-common": "2.0.0-beta.2",
"@multiversx/sdk-nestjs-elastic": "2.0.0-beta.2",
"@multiversx/sdk-nestjs-http": "2.0.0-beta.2",
"@multiversx/sdk-nestjs-monitoring": "2.0.0-beta.2",
"@multiversx/sdk-nestjs-redis": "2.0.0-beta.2",
"@multiversx/sdk-nestjs-cache": "3.0.0",
"@multiversx/sdk-nestjs-common": "3.0.0",
"@multiversx/sdk-nestjs-elastic": "3.0.0",
"@multiversx/sdk-nestjs-http": "3.0.0",
"@multiversx/sdk-nestjs-monitoring": "3.0.0",
"@multiversx/sdk-nestjs-redis": "3.0.0",
"@multiversx/sdk-network-providers": "^1.2.1",
"@nestjs/apollo": "12.0.7",
"@nestjs/common": "10.2.4",
Expand Down Expand Up @@ -75,7 +75,7 @@
"dataloader": "2.0.0",
"errorhandler": "1.5.1",
"form-data": "4.0.0",
"graphql": "16.8.0",
"graphql": "16.8.1",
"graphql-fields-list": "2.2.4",
"graphql-query-complexity": "0.12.0",
"graphql-relay": "0.10.0",
Expand Down
Loading