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

Merge develop to main branch (v2.4.2) #220

Merged
merged 30 commits into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
1c2f169
fix: typo in name of TransactionProcessor.getPendingOuputCellsByTxid
ShookLyngs Aug 18, 2024
ed47880
refactor: separate the xudt balance calculation of total/pending amount
ShookLyngs Aug 19, 2024
776ec6d
chore: add description and notes for the bitcoin.getAddressTxs() limi…
ShookLyngs Aug 19, 2024
50ff6c4
fix: amount calculation in the rgbpp address balance endpoint (#206)
Flouse Aug 20, 2024
7d7a32f
fix: validate L1-L1 and L1-L2 isomorphic transactions in depth for th…
ShookLyngs Jul 18, 2024
acdaa58
refactor: rename "ckbRawTx" to "ckbVirtualTx" in the IsomorphicTransa…
ShookLyngs Jul 18, 2024
a13e5b3
refactor: improve code readability in activity-related routes and fun…
ShookLyngs Aug 21, 2024
808b383
fix: btcInput position does not matter when comparing with ckbTx in i…
ShookLyngs Aug 21, 2024
e0c1c51
fix: ckbTx.outputs is allowed to include no type-cells in isIsomorphi…
ShookLyngs Aug 21, 2024
9ba1b70
Fix duplicated bindings in the activity API (#194)
Flouse Aug 22, 2024
a7b3553
refactor: optimize performance of RgbppCollector.queryBtcTimeLockTxBy…
ShookLyngs Aug 22, 2024
b1277d4
chore: update activity api snapshot
ShookLyngs Aug 22, 2024
71d3d59
refactor: rename queryBtcTimeLockTxByBtcTxId to queryBtcTimeLockTxByB…
ShookLyngs Aug 22, 2024
6ad5695
Merge pull request #212 from ckb-cell/ref/btc-time-lock-cells-searching
ShookLyngs Aug 23, 2024
cb25b92
refactor: use IS_MAINNET/TESTNET_TYPE constants and related utils in …
ShookLyngs Aug 26, 2024
7712bc3
fix: route params should have empty/length validation
ShookLyngs Aug 23, 2024
3374b6a
refactor: use Zod.safeParse() and throw error via httpErrors.badReque…
ShookLyngs Aug 23, 2024
987a3e0
fix: the return structure in validatorCompiler() is wrong
ShookLyngs Aug 27, 2024
70a2d15
fix: prompt a default param name when path is empty in validatorCompi…
ShookLyngs Aug 27, 2024
ad85d9c
refactor: throw badRequest when post rgbpp tx api params is invalid
ShookLyngs Aug 27, 2024
57c304e
chore: update snapshot
ShookLyngs Aug 27, 2024
38224cc
fix: missing basic validation in route params (#213)
Flouse Aug 29, 2024
0e1969b
fix: incorrect count of delayed jobs in the TransactionProcessor.enqu…
ShookLyngs Sep 2, 2024
fd4d2be
chore: upgrade dependencies in the test ci
ShookLyngs Sep 2, 2024
32389cb
Merge pull request #217 from ckb-cell/fix/208-jobs-delayed-count
ahonn Sep 2, 2024
44fa5ca
chore: bump devbox dependencies and pnpm-lock file version
ShookLyngs Sep 2, 2024
fe7f2e5
chore: bump axios from 1.6.7 to 1.7.7
ShookLyngs Sep 2, 2024
ce24dca
Merge pull request #219 from ckb-cell/chore/update-devbox
ShookLyngs Sep 3, 2024
f97a989
chore: bump version to v2.4.2
ShookLyngs Sep 2, 2024
039a350
Merge pull request #216 from ckb-cell/release/v2.4.2
ShookLyngs Sep 3, 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
8 changes: 4 additions & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ jobs:

steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install PNPM
uses: pnpm/action-setup@v3
uses: pnpm/action-setup@v4
with:
version: 8
version: 9

- name: Use Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "21"
cache: "pnpm"
Expand Down
2 changes: 1 addition & 1 deletion devbox.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"packages": [
"nodejs@20",
"nodejs@21",
"nodePackages.pnpm@latest",
"redis@latest"
]
Expand Down
116 changes: 86 additions & 30 deletions devbox.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,108 +2,164 @@
"lockfile_version": "1",
"packages": {
"nodePackages.pnpm@latest": {
"last_modified": "2024-05-22T06:18:38Z",
"resolved": "github:NixOS/nixpkgs/3f316d2a50699a78afe5e77ca486ad553169061e#nodePackages.pnpm",
"last_modified": "2024-06-26T05:30:43Z",
"resolved": "github:NixOS/nixpkgs/b3f3c1b13fb08f3828442ee86630362e81136bbc#nodePackages.pnpm",
"source": "devbox-search",
"version": "8.15.5",
"version": "9.3.0",
"systems": {
"aarch64-darwin": {
"store_path": "/nix/store/98b2ljlansqmkpkd5pqfgwhcwr5kvsha-pnpm-8.15.5"
"outputs": [
{
"name": "out",
"path": "/nix/store/g2rnwxx2lrhshx7w8aghanc3y0mznnbg-pnpm-9.3.0",
"default": true
}
],
"store_path": "/nix/store/g2rnwxx2lrhshx7w8aghanc3y0mznnbg-pnpm-9.3.0"
},
"aarch64-linux": {
"store_path": "/nix/store/b0h4xyqwdk2zhyhw42bprjnj2i518sxn-pnpm-8.15.5"
"outputs": [
{
"name": "out",
"path": "/nix/store/ipnzflbc30xf7bfj7zswxcwp4yk89502-pnpm-9.3.0",
"default": true
}
],
"store_path": "/nix/store/ipnzflbc30xf7bfj7zswxcwp4yk89502-pnpm-9.3.0"
},
"x86_64-darwin": {
"store_path": "/nix/store/7xyc072k4g6430vijvylidqacjxy5dbb-pnpm-8.15.5"
"outputs": [
{
"name": "out",
"path": "/nix/store/0z47pn0raipavaqrq4gxarrz6dl53ns8-pnpm-9.3.0",
"default": true
}
],
"store_path": "/nix/store/0z47pn0raipavaqrq4gxarrz6dl53ns8-pnpm-9.3.0"
},
"x86_64-linux": {
"store_path": "/nix/store/77wblnm5dnmgnan3695j3mk4r7j75s5j-pnpm-8.15.5"
"outputs": [
{
"name": "out",
"path": "/nix/store/r0xwws8a6r6rnknsvgic1zgwf2p8kfkm-pnpm-9.3.0",
"default": true
}
],
"store_path": "/nix/store/r0xwws8a6r6rnknsvgic1zgwf2p8kfkm-pnpm-9.3.0"
}
}
},
"nodejs@20": {
"last_modified": "2024-05-22T06:18:38Z",
"nodejs@21": {
"last_modified": "2024-04-19T21:36:04Z",
"plugin_version": "0.0.2",
"resolved": "github:NixOS/nixpkgs/3f316d2a50699a78afe5e77ca486ad553169061e#nodejs_20",
"resolved": "github:NixOS/nixpkgs/92d295f588631b0db2da509f381b4fb1e74173c5#nodejs_21",
"source": "devbox-search",
"version": "20.12.2",
"version": "21.7.3",
"systems": {
"aarch64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/bzzs4kvjyvjjhs3rj08vqpvvzmfggvbv-nodejs-20.12.2",
"path": "/nix/store/hxr5ziwxn72wxcrhxasdy542h6z0r9hg-nodejs-21.7.3",
"default": true
},
{
"name": "libv8",
"path": "/nix/store/c56874bxzncqwy58kif6wfnzy017v1sl-nodejs-20.12.2-libv8"
"path": "/nix/store/y6xj0m2n7mlzgx5mc62m0lb4h02dzklr-nodejs-21.7.3-libv8"
}
],
"store_path": "/nix/store/bzzs4kvjyvjjhs3rj08vqpvvzmfggvbv-nodejs-20.12.2"
"store_path": "/nix/store/hxr5ziwxn72wxcrhxasdy542h6z0r9hg-nodejs-21.7.3"
},
"aarch64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/y50zafzgnnkrj4hvmk23icv2ggvys8r9-nodejs-20.12.2",
"path": "/nix/store/xfddvy0bfzc78yipmyx81irjqfpkm1d0-nodejs-21.7.3",
"default": true
},
{
"name": "libv8",
"path": "/nix/store/vc7y8h3c8pwbh4zbvjcyfqrd3fhdjhw6-nodejs-20.12.2-libv8"
"path": "/nix/store/vjr64cmj37yglbzjz6hrwqa4z6hw2mz2-nodejs-21.7.3-libv8"
}
],
"store_path": "/nix/store/y50zafzgnnkrj4hvmk23icv2ggvys8r9-nodejs-20.12.2"
"store_path": "/nix/store/xfddvy0bfzc78yipmyx81irjqfpkm1d0-nodejs-21.7.3"
},
"x86_64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/l53svh1nfrcb83qbqvrrkangrcl1rr25-nodejs-20.12.2",
"path": "/nix/store/pnrd7gl28dmy86pprrpifq7qny3sx1xp-nodejs-21.7.3",
"default": true
},
{
"name": "libv8",
"path": "/nix/store/q71hh22bfqjygd34gq16dv4dwfc33378-nodejs-20.12.2-libv8"
"path": "/nix/store/wnzqqc8ik64a6zn4k4bbcgzvi8dp8vnb-nodejs-21.7.3-libv8"
}
],
"store_path": "/nix/store/l53svh1nfrcb83qbqvrrkangrcl1rr25-nodejs-20.12.2"
"store_path": "/nix/store/pnrd7gl28dmy86pprrpifq7qny3sx1xp-nodejs-21.7.3"
},
"x86_64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/6g9n96qf1yx139xklnmy3v4xhjvjgsji-nodejs-20.12.2",
"path": "/nix/store/dfs59hwhc4mb4hdk77nc5dd39k2v2qs2-nodejs-21.7.3",
"default": true
},
{
"name": "libv8",
"path": "/nix/store/s7b0dqga0311mvq48mirnlm0p3dr4gm3-nodejs-20.12.2-libv8"
"path": "/nix/store/iq38acw88hl92vpwamfkzgk3pk3dsr0x-nodejs-21.7.3-libv8"
}
],
"store_path": "/nix/store/6g9n96qf1yx139xklnmy3v4xhjvjgsji-nodejs-20.12.2"
"store_path": "/nix/store/dfs59hwhc4mb4hdk77nc5dd39k2v2qs2-nodejs-21.7.3"
}
}
},
"redis@latest": {
"last_modified": "2024-05-22T06:18:38Z",
"last_modified": "2024-08-14T11:41:26Z",
"plugin_version": "0.0.2",
"resolved": "github:NixOS/nixpkgs/3f316d2a50699a78afe5e77ca486ad553169061e#redis",
"resolved": "github:NixOS/nixpkgs/0cb2fd7c59fed0cd82ef858cbcbdb552b9a33465#redis",
"source": "devbox-search",
"version": "7.2.4",
"version": "7.2.5",
"systems": {
"aarch64-darwin": {
"store_path": "/nix/store/f1hmasfrq0s1yag27kmdwv97cjxv85rm-redis-7.2.4"
"outputs": [
{
"name": "out",
"path": "/nix/store/6i24pj69i3v1s91l0l4f9386qzjxg897-redis-7.2.5",
"default": true
}
],
"store_path": "/nix/store/6i24pj69i3v1s91l0l4f9386qzjxg897-redis-7.2.5"
},
"aarch64-linux": {
"store_path": "/nix/store/5ay0vkvk8l2n8fgxnmxdci1y1ldafnx8-redis-7.2.4"
"outputs": [
{
"name": "out",
"path": "/nix/store/lvcma0qz40lprz5ja5g5l7lbl6zax2pq-redis-7.2.5",
"default": true
}
],
"store_path": "/nix/store/lvcma0qz40lprz5ja5g5l7lbl6zax2pq-redis-7.2.5"
},
"x86_64-darwin": {
"store_path": "/nix/store/5l40xjgzqsd56dx5zfwr2v6sfpk12lkl-redis-7.2.4"
"outputs": [
{
"name": "out",
"path": "/nix/store/n1x2p3aam0f82c32qrs0mj1x5ahcsfap-redis-7.2.5",
"default": true
}
],
"store_path": "/nix/store/n1x2p3aam0f82c32qrs0mj1x5ahcsfap-redis-7.2.5"
},
"x86_64-linux": {
"store_path": "/nix/store/xlvzg81dgimxfjxpxwr2w3q1ca3l5lwa-redis-7.2.4"
"outputs": [
{
"name": "out",
"path": "/nix/store/10f3hl7x9gk10gxhbpcw91mlyi7wfw2g-redis-7.2.5",
"default": true
}
],
"store_path": "/nix/store/10f3hl7x9gk10gxhbpcw91mlyi7wfw2g-redis-7.2.5"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "btc-assets-api",
"version": "2.4.1",
"version": "2.4.2",
"title": "Bitcoin/RGB++ Assets API",
"description": "",
"main": "index.js",
Expand Down Expand Up @@ -50,7 +50,7 @@
"@spore-sdk/core": "^0.2.0-beta.9",
"async-retry": "^1.3.3",
"awilix": "^10.0.1",
"axios": "^1.6.7",
"axios": "^1.7.7",
"bloom-filters": "^3.0.1",
"bullmq": "^5.4.2",
"dotenv": "^16.4.2",
Expand Down
Loading
Loading