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

WIP : optimize search assets query #230

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
252 commits
Select commit Hold shift + click to select a range
67ed605
Applying patch 139. (#110)
Juanito87 Nov 27, 2023
9bb9f8f
fix: splt tokens with no token stanard are incorrectly categorized as…
kespinola Dec 1, 2023
ba20d9d
fix(backfiller): when querying chain for trees to backfill the merkle…
kespinola Dec 1, 2023
1968c00
[WIP] Tree Transaction Backfiller (#114)
kespinola Dec 12, 2023
3515b63
[Tree Backfiller] Metrics and Logging (#115)
kespinola Dec 14, 2023
9591066
fix(backfiller): unable to parse signatures from char mismatch from s…
kespinola Dec 15, 2023
50fd51d
fix(backfiller): nft ingester need to be updated for saving tree tran…
kespinola Dec 15, 2023
6d846cf
fix model types for tree transaction after fixes to backfiller
kespinola Dec 16, 2023
1548bd9
refactor(backfiller): select fixed list of trees to process. switch f…
kespinola Dec 18, 2023
5b6a17f
refactor(backfiller): add retries to rpc calls (#118)
kespinola Dec 19, 2023
cb271ca
refactor(backfiller): remove using tree transactions because similar …
kespinola Dec 20, 2023
f36193f
fix(ingester): drop on conflict for now since unable to add until uni…
kespinola Dec 20, 2023
cff8e67
feat(backfiller): add cl_audit_v2 to ingestion for recording every se…
kespinola Dec 22, 2023
d1c16d1
[Tree Backfiller] Gap Filling (#121)
kespinola Dec 29, 2023
0cc0482
feat(bgtask_creator): add run command to lookup asset_data that is fl…
kespinola Jan 4, 2024
e9e0afd
Metadata JSON Ingest and Backfill (#123)
kespinola Jan 17, 2024
090897a
refactor(tree_backfiller): adjust thread management. add documentatio…
kespinola Jan 22, 2024
2ffedab
Align triton-build with upstream 1/26/24 (#127)
kespinola Jan 26, 2024
497c3cb
Merge remote-tracking branch 'origin' into triton-build
kespinola Jan 26, 2024
828508d
refactor(ingester): move more logs to debug but do log info for simpl…
kespinola Jan 29, 2024
a03627f
Merge branch 'main' into triton-build
kespinola Feb 1, 2024
609cfa4
fix(ingest): formatting of account logs to base58
kespinola Feb 1, 2024
001655d
fix: remove the insertion of backfill item it is no longer used for t…
kespinola Feb 4, 2024
63008f1
Merge branch 'main' into triton-build
kespinola Feb 9, 2024
417f71b
feat(metadata_json): add single command to index a metadata json in t…
kespinola Feb 19, 2024
beca08a
fix(ops): backfiller was not filtering out failed transactions (#131)
kespinola Feb 23, 2024
e973ab2
feat(ops): optionally fix transfer failures by deleting the cl_audits…
kespinola Feb 26, 2024
4cc7f8c
feat: config for max connections on the read api (#133)
kespinola Mar 11, 2024
5ff0ad4
fix(das): config max request connections (#134)
kespinola Mar 11, 2024
2fb5d26
test: no retries when looking up token and owner when indexing nfts (…
kespinola Mar 12, 2024
4bb672c
Revert "test: no retries when looking up token and owner when indexin…
kespinola Mar 14, 2024
d61382a
feat: add report command to metadata json. remove tree_backfiller rep…
kespinola Mar 14, 2024
767e1a3
Merge branch 'main' into triton-build
kespinola Mar 19, 2024
47594a9
Merge remote-tracking branch 'origin/main' into triton-build
kespinola Mar 27, 2024
b9bcbda
Merge remote-tracking branch 'origin/main' into triton-build
kespinola Mar 28, 2024
d5f1967
feat(ops): add account backfill to ops cli by program or for a single…
kespinola Apr 5, 2024
ea5379e
fmt
fanatid Nov 20, 2023
8b12316
clippy
fanatid Nov 20, 2023
974c90f
ci: add lock, fmt, clippy checks
fanatid Nov 20, 2023
788973e
include migration to workspace
fanatid Nov 20, 2023
7a870c2
include das_api to workspace
fanatid Nov 20, 2023
7e3f9ef
add global clippy lints
fanatid Nov 20, 2023
aa916a4
use workspace
fanatid Nov 20, 2023
033873d
add crate program_transformers
fanatid Nov 22, 2023
1008f86
nft_ingester: use program_transformers crate
fanatid Nov 23, 2023
83b171e
remove not used deps
fanatid Nov 23, 2023
9d8031e
remove AccountInfo
fanatid Nov 23, 2023
096616d
remove plerkle from program_transformers
fanatid Nov 24, 2023
ef0b0e9
nft_ingester2: grpc2redis
fanatid Nov 27, 2023
076bffa
add redis streaming for ingester
fanatid Nov 28, 2023
d8673cf
create pg pool
fanatid Nov 29, 2023
c93adff
parse incoming message from redis
fanatid Nov 29, 2023
53fa481
add force shutdown with signals
fanatid Nov 30, 2023
11b4151
insert download metadata tasks
fanatid Dec 1, 2023
8fca2c2
download-metadata subtask
fanatid Dec 2, 2023
fcc18d6
refactor: rename nft_ingest2
kespinola Apr 10, 2024
294fa1a
fix: applying account and transction filters to grpc subscription req…
kespinola Apr 15, 2024
8f7baa7
Merge remote-tracking branch 'origin' into triton-build
kespinola Apr 16, 2024
36cba58
Grpc ingest triton build (#142)
kespinola Apr 16, 2024
98a7e4e
refactor: take out multiple connections to dragonmouth and then have …
kespinola May 2, 2024
997d515
refactor: switch to accepting multiple dragonmouth endoints to mimic …
kespinola May 3, 2024
75c4115
Merge branch 'main' of github.com:rpcpool/digital-asset-rpc-infrastru…
kespinola May 9, 2024
67cc21e
fix: clippy errors
kespinola May 9, 2024
554b06b
Merge remote-tracking branch 'origin' into triton-build
kespinola May 30, 2024
b23804b
Merge branch 'main' of github.com:rpcpool/digital-asset-rpc-infrastru…
kespinola Jun 12, 2024
9c294d6
Merge branch 'main' of github.com:rpcpool/digital-asset-rpc-infrastru…
kespinola Jun 18, 2024
c537a72
fix: program-transform no longer accepts optional cl_audits write flag
kespinola Jun 18, 2024
5f08298
fix: processes transactions for a tree sequentially to make sure ther…
kespinola May 15, 2024
0eced5d
refactor: use program transform in the account backfill no queuing in…
kespinola May 16, 2024
138bf2e
refactor: move bubble backfill to a lib so can be used by other proje…
kespinola May 30, 2024
d80e7b8
Merge remote-tracking branch 'origin' into grpc-ingest
kespinola Jul 19, 2024
2cc3411
chor: refactor grpc command to use topograph to clean up the control …
kespinola Jul 30, 2024
a9b1504
Merge branch 'main' into triton-build
kespinola Jul 31, 2024
81f5d71
chore: switch to run_v2 for ingest which handles ingesting accounts a…
kespinola Aug 9, 2024
10c46d5
Merge remote-tracking branch 'origin' into grpc-ingest
kespinola Aug 10, 2024
a151630
chore: handle metadata json within the ingest command
kespinola Aug 12, 2024
211c23f
Merge branch 'grpc-ingest' into triton-build
kespinola Aug 12, 2024
f398880
test: metadata json stream processing
kespinola Aug 12, 2024
656c0c8
Merge branch 'grpc-ingest' into triton-build
kespinola Aug 12, 2024
dd8103a
fix: special use of das-metadata-json in triton-build
kespinola Aug 12, 2024
70eef04
feat: set num threads for topograph. report on postgres and redis in …
kespinola Aug 14, 2024
24f3e63
Merge branch 'grpc-ingest' into triton-build
kespinola Aug 14, 2024
77a98f6
chore: switch to topograph for thread management. create separate ing…
kespinola Aug 20, 2024
5cad80d
Merge branch 'grpc-ingest' into triton-build
kespinola Aug 20, 2024
0db0612
fix: config and ack
kespinola Aug 22, 2024
a4c42b4
Merge branch 'grpc-ingest' into triton-build
kespinola Aug 22, 2024
32f9852
hack: disable pending processing while see why messages arent being d…
kespinola Aug 22, 2024
49de638
Merge branch 'grpc-ingest' into triton-build
kespinola Aug 22, 2024
bab4678
fix: exit early if slot matches metadata json download and reindex is…
kespinola Aug 22, 2024
2d2e7fd
Merge branch 'grpc-ingest' into triton-build
kespinola Aug 22, 2024
0c4f872
fix: picking dangling pending messages before reading new
kespinola Aug 22, 2024
eab20c6
Merge branch 'grpc-ingest' into triton-build
kespinola Aug 22, 2024
eb75ca3
fix: ingest stream shutdown and requesting snapshots
kespinola Aug 23, 2024
d6d83f2
Merge branch 'grpc-ingest' into triton-build
kespinola Aug 23, 2024
5cf5b75
fix: revert change to redis for grpc-ingest
kespinola Aug 23, 2024
3213080
fix: processing pending. add metrics for total workers.
kespinola Aug 23, 2024
381491c
Merge branch 'grpc-ingest' of github.com:rpcpool/digital-asset-rpc-in…
kespinola Aug 23, 2024
7f3b391
fix: bubble backfill transform. no op out of download metadata info.
kespinola Aug 26, 2024
9e9a8a2
Merge branch 'grpc-ingest' into triton-build
kespinola Aug 26, 2024
4c3f649
Add force flag to TreeWorkerArgs for complete reindexing (#148)
kevinrodriguez-io Sep 13, 2024
8549983
Add force flag to TreeWorkerArgs for complete reindexing (#148) (#149)
kespinola Sep 13, 2024
36524b6
fix: sort was newest to oldest we need to swap in order to index corr…
kespinola Sep 13, 2024
a6b054c
fix: order oldest to newest using block time
kespinola Sep 13, 2024
4e3c076
refactor: drop exculsion clauses on cl_items to allow for reindexing …
kespinola Sep 16, 2024
febc55c
Merge branch 'grpc-ingest' into triton-build
kespinola Sep 16, 2024
4fd9758
refactor: bubblegum backfill orders off of slot (#155)
kespinola Sep 17, 2024
c789b52
feat: replay bubblegum transactions based on what is in cl_audits_v2
kespinola Sep 26, 2024
2421252
Merge branch 'grpc-ingest' into triton-build
kespinola Sep 26, 2024
45a5dcf
fix: order bubblegum backfill instructions by seq (#158)
kespinola Oct 2, 2024
d483abd
Merge branch 'grpc-ingest' into triton-build
kespinola Oct 2, 2024
83199fd
Return seq check on writing cl items
kespinola Oct 4, 2024
f4744c0
include back seq checks
kespinola Oct 7, 2024
1afee45
Remove enforcing seq in bubblegum backfill
kespinola Oct 7, 2024
cbb2140
Merge branch 'grpc-ingest' into triton-build
kespinola Oct 7, 2024
f329846
More proof debug logging
kespinola Oct 7, 2024
18411a9
Replay single tree with targeted seq replay (#159)
kespinola Oct 8, 2024
5948709
Merge branch 'grpc-ingest' into triton-build
kespinola Oct 8, 2024
110f71c
Support Account Snapshot Flushes (#154)
kespinola Oct 9, 2024
118baec
fix: keep grpc alive by sending using ping-pong (#160)
Nagaprasadvr Oct 9, 2024
01bbe99
Only Time Based Flushes (#161)
kespinola Oct 9, 2024
f180736
Merge branch 'grpc-ingest' into triton-build
kespinola Oct 9, 2024
cde4594
delete and recreate the consumer (#162)
kespinola Oct 11, 2024
a27789e
Merge branch 'grpc-ingest' into triton-build
kespinola Oct 11, 2024
0005b3e
Type out redis message handlers (#163)
kespinola Oct 12, 2024
3bb3f08
Merge branch 'grpc-ingest' into triton-build
kespinola Oct 12, 2024
d092ad8
skip reading new messages if the ack buffer is full. track running ta…
kespinola Oct 13, 2024
8204236
Merge branch 'grpc-ingest' into triton-build
kespinola Oct 13, 2024
6f158f3
only push handler job for ingest if capacity (#165)
kespinola Oct 14, 2024
378152b
Merge branch 'grpc-ingest' into triton-build
kespinola Oct 14, 2024
a347066
Only throttle based on the task semaphore (#166)
kespinola Oct 14, 2024
6f822f0
Merge branch 'grpc-ingest' into triton-build
kespinola Oct 14, 2024
188c878
Remove topograph from ingest command (#167)
kespinola Oct 14, 2024
7010545
Merge branch 'grpc-ingest' into triton-build
kespinola Oct 14, 2024
e15172f
Configure database connection idle timeout and max lifetime (#169)
kespinola Oct 21, 2024
c2530b8
Merge branch 'grpc-ingest' into triton-build
kespinola Oct 21, 2024
fdbf03a
Add single NFT fetch and backfill feature to ops (#170)
Nagaprasadvr Oct 22, 2024
d7cc058
Add lock timeout on v1_asset statements
kespinola Oct 23, 2024
95072f0
Merge branch 'grpc-ingest' into triton-build
kespinola Oct 23, 2024
17d7e0a
Set the lock timeout to 5s
kespinola Oct 23, 2024
e91c61c
Merge branch 'grpc-ingest' into triton-build
kespinola Oct 23, 2024
99b59c0
Bubblegum verify (#150)
kespinola Oct 29, 2024
ecceb24
Merge branch 'grpc-ingest' of github.com:rpcpool/digital-asset-rpc-in…
kespinola Oct 29, 2024
2524c1b
Token extensions Indexing support
niks3089 Feb 20, 2024
0b5a545
fix: register token extensions parser with program transform. add int…
kespinola Mar 29, 2024
d3bfe1b
Separate global stream to multiple Program separated streams and hand…
Nagaprasadvr Nov 8, 2024
f823e43
Merge branch 'grpc-ingest' into triton-build
kespinola Nov 8, 2024
f311e14
Report proofs as they come (#178)
kespinola Nov 8, 2024
6699d3b
Merge branch 'grpc-ingest' into triton-build
kespinola Nov 8, 2024
5663708
feat: add getTokenAccount rpc method and implement logic
Nagaprasadvr Nov 7, 2024
d1855e0
WIP : token extensions
Nagaprasadvr Nov 7, 2024
f8bdef2
Buffer redis messages (#179)
kespinola Nov 11, 2024
f650522
Merge branch 'grpc-ingest' into triton-build
kespinola Nov 11, 2024
db11fd6
chore: cleanup
Nagaprasadvr Nov 11, 2024
c22c4c2
fix: token extensions integration tests
Nagaprasadvr Nov 11, 2024
776ae0a
Fix tracking ack tasks
kespinola Nov 11, 2024
b53ae3d
Merge branch 'grpc-ingest' into triton-build
kespinola Nov 11, 2024
151168e
fix: add back ack tasks total
kespinola Nov 11, 2024
75b3c12
Merge branch 'grpc-ingest' into triton-build
kespinola Nov 11, 2024
08a7ba1
change is_non_fungible condition checks
Nagaprasadvr Nov 12, 2024
5beadaa
add tests for token_accounts indexing
Nagaprasadvr Nov 12, 2024
2b3a482
chore: cleanup
Nagaprasadvr Nov 12, 2024
76cd8a7
chore: cleanup
Nagaprasadvr Nov 12, 2024
ae11907
recreate consumer but not groups (#181)
kespinola Nov 12, 2024
0150f58
Merge remote-tracking branch 'origin/grpc-ingest' into triton-build
kespinola Nov 12, 2024
e1e4243
WIP : getNFTEditions
Nagaprasadvr Nov 14, 2024
5c5e3a2
fix : fetch logic
Nagaprasadvr Nov 14, 2024
12faa87
WIP : getNFTEditions
Nagaprasadvr Nov 14, 2024
ab179cd
WIP : showFungible
Nagaprasadvr Nov 14, 2024
80d61dc
Time Ingest jobs (#182)
kespinola Nov 14, 2024
ea897eb
Merge branch 'grpc-ingest' into triton-build
kespinola Nov 14, 2024
2de5bc0
chore: cleanup
Nagaprasadvr Nov 15, 2024
bf501bd
fix mint address insertion to asset_v1_account_attachments table
Nagaprasadvr Nov 15, 2024
fa44e23
chore: cleanup
Nagaprasadvr Nov 15, 2024
9d035b0
optional display collection metadata in rpc responce
AhzamAkhtar Nov 15, 2024
2ac226a
WIP : handle token inscriptions
Nagaprasadvr Nov 18, 2024
634c52c
add token inscriptions to asset account attachments
Nagaprasadvr Nov 19, 2024
53c1cb3
chore: cleanup
Nagaprasadvr Nov 19, 2024
6d708a6
resolve comments
Nagaprasadvr Nov 20, 2024
6aa175d
fix tests and snapshots
Nagaprasadvr Nov 20, 2024
bb2f67e
add more scenarios
Nagaprasadvr Nov 20, 2024
45cefbc
add integration tests for showFungible
Nagaprasadvr Nov 21, 2024
4dd0fc7
resolve comments
Nagaprasadvr Nov 21, 2024
f22f980
add integration tests and cleanup
Nagaprasadvr Nov 22, 2024
af4a4a7
test snapshot added
AhzamAkhtar Nov 23, 2024
18c0e3b
grouping query improved
AhzamAkhtar Nov 23, 2024
98c4177
removed duplicacy and extra mapping to inject None
AhzamAkhtar Nov 24, 2024
9ca68a1
add remaining extensions
Nagaprasadvr Nov 27, 2024
4baaca6
Use Example Configs (#180)
kespinola Nov 27, 2024
47c4e78
resolve comments
Nagaprasadvr Nov 27, 2024
fc78fa4
resolve commenst and add token_accounts for indexing in test fixtures
Nagaprasadvr Nov 28, 2024
8d592c7
resolve comments and fix fixtures
Nagaprasadvr Nov 28, 2024
4816e51
resolve comments and fix fixtures
Nagaprasadvr Nov 28, 2024
b007795
duplicate results for same assetIds in getAssets bug fixed
AhzamAkhtar Nov 29, 2024
e242316
improvments added
AhzamAkhtar Dec 3, 2024
dc2849f
unnecessary generic removed
AhzamAkhtar Dec 4, 2024
e547cd5
chore : add checks for getTokenAccounts and cover more scenarios for …
Nagaprasadvr Dec 6, 2024
2c483c5
chore : resolve comments
Nagaprasadvr Dec 9, 2024
7fc3e51
removed unnecessary operations if asset is empty
AhzamAkhtar Dec 9, 2024
700cd9f
Remove Selects From Standard NFT Indexing (#183)
kespinola Dec 9, 2024
01a8de7
Save pgpool on program transformer and take out connection on handler…
kespinola Dec 16, 2024
322a7ee
Write cl items in the transaction (#185)
kespinola Dec 17, 2024
81f004b
Merge branch 'das-39-add-gettokenaccounts-support-to-das-api-main' of…
Nagaprasadvr Dec 17, 2024
4d823bd
merge token-accounts branch
Nagaprasadvr Dec 17, 2024
83f42cc
Merge branch 'das-50-add-getnfteditions-rpc-method-to-das' of github.…
Nagaprasadvr Dec 17, 2024
de7e432
Merge branch 'das-46-show-fungibles-rpc-option' of github.com:rpcpool…
Nagaprasadvr Dec 17, 2024
42d2955
Merge branch 'das-44-show-collection-metadata-request-parameters' of …
Nagaprasadvr Dec 17, 2024
1100d4a
merge show_collection_metadata_option pr
Nagaprasadvr Dec 17, 2024
79b7e79
Merge branch 'das-index-token-inscriptions' of github.com:rpcpool/dig…
Nagaprasadvr Dec 17, 2024
3f166a4
merge token_inscriptions pr
Nagaprasadvr Dec 17, 2024
6df1c66
merge show_collection_metadata after test improvments added
AhzamAkhtar Dec 17, 2024
48f891a
Enable indexing Merkle trees on other SVMs (#211)
danenbm Oct 30, 2024
bcad3ad
Search asset token type filter added
AhzamAkhtar Nov 15, 2024
2187046
Token type class filter improved
AhzamAkhtar Nov 16, 2024
8966891
removed specification_asset_class from SearchAssetQuery cause we now …
AhzamAkhtar Nov 18, 2024
cdd7f6b
test file added for token_type_filter
AhzamAkhtar Nov 22, 2024
4af136a
tests snapshots added
AhzamAkhtar Nov 23, 2024
126f76e
Merge branch 'das-38-rebase-stale-te-branch' of github.com:rpcpool/di…
Nagaprasadvr Dec 17, 2024
e7ad2c9
fix tests and added snapshot for search_assets with token_type fungible
AhzamAkhtar Dec 17, 2024
449eb45
Only update the record when fields have changed (#187)
kespinola Dec 18, 2024
0d80844
patch condition check on asset_grouping (#188)
kespinola Dec 18, 2024
ceab0ce
Revert "patch condition check on asset_grouping (#188)" (#189)
kespinola Dec 18, 2024
aec25fa
Revert "Only update the record when fields have changed (#187)" (#190)
kespinola Dec 18, 2024
fcdcfca
Merge branch 'grpc-ingest' into triton-build
kespinola Dec 18, 2024
ada3534
Respect commitment level set in grpc config (#191) (#192)
kespinola Dec 18, 2024
9262ddb
Only update record when fields change (#193)
kespinola Dec 19, 2024
ee907c3
Write cl items in a batch (#194)
kespinola Dec 19, 2024
b14c856
fix and merge token extensions and fungibles
Nagaprasadvr Dec 18, 2024
f4def43
Merge branch 'das-58-check-coverage-for-all-token-extensions' of gith…
Nagaprasadvr Dec 20, 2024
50243af
no pubkey validation for group_key bug fixed
AhzamAkhtar Dec 2, 2024
c4b42e0
fix and merge
Nagaprasadvr Dec 20, 2024
b23836e
search_assets rpc call skipping fungible_tokens bug resolved
AhzamAkhtar Dec 20, 2024
7b7c0a8
Set local lock timeouts for token program and stricter timeout for as…
kespinola Dec 21, 2024
36888fd
Merge branch 'das-60-in-get-assets-remove-duplicate-results-for-same-…
Nagaprasadvr Dec 23, 2024
4c04118
fix and merge
Nagaprasadvr Dec 23, 2024
88c175e
Merge branch 'das-51-search-asset-token-type-filter' into eclipse-build
AhzamAkhtar Dec 23, 2024
eedcafe
not able to search for fungible asset for owner_address in search_ass…
AhzamAkhtar Dec 23, 2024
b2b397a
fixed search asset compatibility issues
AhzamAkhtar Dec 23, 2024
5c65a16
Merge branch 'das-71-avoid-unnecessary-operations-if-asset-is-empty' …
Nagaprasadvr Dec 23, 2024
09c8d01
Merge branch 'eclipse-build' of github.com:rpcpool/digital-asset-rpc-…
Nagaprasadvr Dec 23, 2024
ec8e3c1
fix and merge
Nagaprasadvr Dec 23, 2024
4a7d300
owner_type and token_typenot be used together feature added and test …
AhzamAkhtar Dec 23, 2024
7222a2f
Merge branch 'das-51-search-asset-token-type-filter' into eclipse-build
AhzamAkhtar Dec 23, 2024
4549aa1
fungible assets not showing when token_type is set to all bug fixed
AhzamAkhtar Dec 23, 2024
6ddd5c9
search_asset skipping fungible when token_type is set to ALL bug fixed
AhzamAkhtar Dec 23, 2024
82b21ed
Merge branch 'triton-build' into eclipse-build
kespinola Dec 23, 2024
00b4dec
fix tests
Nagaprasadvr Dec 24, 2024
e29bd42
cleanup
Nagaprasadvr Dec 24, 2024
5b19b6c
show_zero_balance_filter_option feature branch merged
AhzamAkhtar Dec 24, 2024
dc8a92b
WIP : optimize search assets query
Nagaprasadvr Dec 10, 2024
6b9a079
cleanup
Nagaprasadvr Dec 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
24 changes: 12 additions & 12 deletions .github/workflows/build-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ on:
workflow_dispatch:
push:
branches:
- 'main'
- "main"

env:
CARGO_TERM_COLOR: always
CARGO_TERM_COLOR: always

jobs:
build-api:
Expand All @@ -33,15 +33,15 @@ jobs:
- name: set build cache
uses: actions/cache@v3
with:
path: |
~/.cargo/bin/
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
digital-asset-rpc-infrastructure/target/
key: ${{ matrix.os }}_digital-asset-rpc-infrastructure_${{ hashFiles('digital-asset-rpc-infrastructure/Cargo.lock') }}
restore-keys: |
${{ matrix.os }}_digital-asset-rpc-infrastructure
path: |
~/.cargo/bin/
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
digital-asset-rpc-infrastructure/target/
key: ${{ matrix.os }}_digital-asset-rpc-infrastructure_${{ hashFiles('digital-asset-rpc-infrastructure/Cargo.lock') }}
restore-keys: |
${{ matrix.os }}_digital-asset-rpc-infrastructure

- name: build digital asset rpc infra
run: cargo build --verbose --release
Expand All @@ -54,7 +54,7 @@ jobs:
mv target/release/migration target/release/migration22
mv target/release/das_api target/release/das_api22

# This steps can be omited to save space, are mostly in place to validate binaries (manually) and path to them
# This steps can be omited to save space, are mostly in place to validate binaries (manually) and path to them
# Omiting this will save on storage consumption on the account
- name: Publish artifact
if: matrix.os == 'ubuntu-22.04'
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ on:
pull_request:
push:
branches:
- 'main'
- "main"
workflow_dispatch:

env:
CARGO_TERM_COLOR: always
CARGO_TERM_COLOR: always

jobs:
test:
Expand All @@ -25,20 +25,20 @@ jobs:
- name: set build cache
uses: actions/cache@v3
with:
path: |
~/.cargo/bin/
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
digital-asset-rpc-infrastructure/target/
key: cargo-${{ hashFiles('**/Cargo.lock') }}-0001
path: |
~/.cargo/bin/
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
digital-asset-rpc-infrastructure/target/
key: cargo-${{ hashFiles('**/Cargo.lock') }}-0001

# Cargo.lock
- name: Check lock file
run: |
cargo tree
git checkout Cargo.lock
cargo tree --frozen
cargo tree

# fmt
- name: Check fmt
Expand Down
9 changes: 5 additions & 4 deletions Builder.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
FROM rust:1.76-bullseye AS builder
FROM rust:1.75-bullseye AS builder
RUN apt-get update -y && \
apt-get install -y build-essential make git
apt-get install -y build-essential make git

RUN mkdir /rust
RUN mkdir /rust/bins
COPY Cargo.toml /rust
COPY core /rust/core
COPY backfill /rust/backfill
COPY das_api /rust/das_api
COPY digital_asset_types /rust/digital_asset_types
COPY integration_tests /rust/integration_tests
Expand All @@ -19,7 +20,7 @@ COPY blockbuster rust/blockbuster
WORKDIR /rust
RUN --mount=type=cache,target=/rust/target,id=das-rust \
cargo build --release --bins && cp `find /rust/target/release -maxdepth 1 -type f | sed 's/^\.\///' | grep -v "\." ` /rust/bins

FROM rust:1.75-slim-bullseye as final
COPY --from=builder /rust/bins /das/
CMD echo "Built the DAS API bins!"
Loading