Skip to content

Commit 91e9184

Browse files
FlouseFlouse
authored
Merge develop to main branch (v2.4.2) (#220)
Merge pull request #220 from ckb-cell/develop
2 parents 7205d0b + 039a350 commit 91e9184

File tree

25 files changed

+6366
-6111
lines changed

25 files changed

+6366
-6111
lines changed

‎.github/workflows/test.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ jobs:
3232

3333
steps:
3434
- name: Checkout Code
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636

3737
- name: Install PNPM
38-
uses: pnpm/action-setup@v3
38+
uses: pnpm/action-setup@v4
3939
with:
40-
version: 8
40+
version: 9
4141

4242
- name: Use Node.js
43-
uses: actions/setup-node@v3
43+
uses: actions/setup-node@v4
4444
with:
4545
node-version: "21"
4646
cache: "pnpm"

‎devbox.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"packages": [
3-
"nodejs@20",
3+
"nodejs@21",
44
"nodePackages.pnpm@latest",
55
"redis@latest"
66
]

‎devbox.lock

Lines changed: 86 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,108 +2,164 @@
22
"lockfile_version": "1",
33
"packages": {
44
"nodePackages.pnpm@latest": {
5-
"last_modified": "2024-05-22T06:18:38Z",
6-
"resolved": "github:NixOS/nixpkgs/3f316d2a50699a78afe5e77ca486ad553169061e#nodePackages.pnpm",
5+
"last_modified": "2024-06-26T05:30:43Z",
6+
"resolved": "github:NixOS/nixpkgs/b3f3c1b13fb08f3828442ee86630362e81136bbc#nodePackages.pnpm",
77
"source": "devbox-search",
8-
"version": "8.15.5",
8+
"version": "9.3.0",
99
"systems": {
1010
"aarch64-darwin": {
11-
"store_path": "/nix/store/98b2ljlansqmkpkd5pqfgwhcwr5kvsha-pnpm-8.15.5"
11+
"outputs": [
12+
{
13+
"name": "out",
14+
"path": "/nix/store/g2rnwxx2lrhshx7w8aghanc3y0mznnbg-pnpm-9.3.0",
15+
"default": true
16+
}
17+
],
18+
"store_path": "/nix/store/g2rnwxx2lrhshx7w8aghanc3y0mznnbg-pnpm-9.3.0"
1219
},
1320
"aarch64-linux": {
14-
"store_path": "/nix/store/b0h4xyqwdk2zhyhw42bprjnj2i518sxn-pnpm-8.15.5"
21+
"outputs": [
22+
{
23+
"name": "out",
24+
"path": "/nix/store/ipnzflbc30xf7bfj7zswxcwp4yk89502-pnpm-9.3.0",
25+
"default": true
26+
}
27+
],
28+
"store_path": "/nix/store/ipnzflbc30xf7bfj7zswxcwp4yk89502-pnpm-9.3.0"
1529
},
1630
"x86_64-darwin": {
17-
"store_path": "/nix/store/7xyc072k4g6430vijvylidqacjxy5dbb-pnpm-8.15.5"
31+
"outputs": [
32+
{
33+
"name": "out",
34+
"path": "/nix/store/0z47pn0raipavaqrq4gxarrz6dl53ns8-pnpm-9.3.0",
35+
"default": true
36+
}
37+
],
38+
"store_path": "/nix/store/0z47pn0raipavaqrq4gxarrz6dl53ns8-pnpm-9.3.0"
1839
},
1940
"x86_64-linux": {
20-
"store_path": "/nix/store/77wblnm5dnmgnan3695j3mk4r7j75s5j-pnpm-8.15.5"
41+
"outputs": [
42+
{
43+
"name": "out",
44+
"path": "/nix/store/r0xwws8a6r6rnknsvgic1zgwf2p8kfkm-pnpm-9.3.0",
45+
"default": true
46+
}
47+
],
48+
"store_path": "/nix/store/r0xwws8a6r6rnknsvgic1zgwf2p8kfkm-pnpm-9.3.0"
2149
}
2250
}
2351
},
24-
"nodejs@20": {
25-
"last_modified": "2024-05-22T06:18:38Z",
52+
"nodejs@21": {
53+
"last_modified": "2024-04-19T21:36:04Z",
2654
"plugin_version": "0.0.2",
27-
"resolved": "github:NixOS/nixpkgs/3f316d2a50699a78afe5e77ca486ad553169061e#nodejs_20",
55+
"resolved": "github:NixOS/nixpkgs/92d295f588631b0db2da509f381b4fb1e74173c5#nodejs_21",
2856
"source": "devbox-search",
29-
"version": "20.12.2",
57+
"version": "21.7.3",
3058
"systems": {
3159
"aarch64-darwin": {
3260
"outputs": [
3361
{
3462
"name": "out",
35-
"path": "/nix/store/bzzs4kvjyvjjhs3rj08vqpvvzmfggvbv-nodejs-20.12.2",
63+
"path": "/nix/store/hxr5ziwxn72wxcrhxasdy542h6z0r9hg-nodejs-21.7.3",
3664
"default": true
3765
},
3866
{
3967
"name": "libv8",
40-
"path": "/nix/store/c56874bxzncqwy58kif6wfnzy017v1sl-nodejs-20.12.2-libv8"
68+
"path": "/nix/store/y6xj0m2n7mlzgx5mc62m0lb4h02dzklr-nodejs-21.7.3-libv8"
4169
}
4270
],
43-
"store_path": "/nix/store/bzzs4kvjyvjjhs3rj08vqpvvzmfggvbv-nodejs-20.12.2"
71+
"store_path": "/nix/store/hxr5ziwxn72wxcrhxasdy542h6z0r9hg-nodejs-21.7.3"
4472
},
4573
"aarch64-linux": {
4674
"outputs": [
4775
{
4876
"name": "out",
49-
"path": "/nix/store/y50zafzgnnkrj4hvmk23icv2ggvys8r9-nodejs-20.12.2",
77+
"path": "/nix/store/xfddvy0bfzc78yipmyx81irjqfpkm1d0-nodejs-21.7.3",
5078
"default": true
5179
},
5280
{
5381
"name": "libv8",
54-
"path": "/nix/store/vc7y8h3c8pwbh4zbvjcyfqrd3fhdjhw6-nodejs-20.12.2-libv8"
82+
"path": "/nix/store/vjr64cmj37yglbzjz6hrwqa4z6hw2mz2-nodejs-21.7.3-libv8"
5583
}
5684
],
57-
"store_path": "/nix/store/y50zafzgnnkrj4hvmk23icv2ggvys8r9-nodejs-20.12.2"
85+
"store_path": "/nix/store/xfddvy0bfzc78yipmyx81irjqfpkm1d0-nodejs-21.7.3"
5886
},
5987
"x86_64-darwin": {
6088
"outputs": [
6189
{
6290
"name": "out",
63-
"path": "/nix/store/l53svh1nfrcb83qbqvrrkangrcl1rr25-nodejs-20.12.2",
91+
"path": "/nix/store/pnrd7gl28dmy86pprrpifq7qny3sx1xp-nodejs-21.7.3",
6492
"default": true
6593
},
6694
{
6795
"name": "libv8",
68-
"path": "/nix/store/q71hh22bfqjygd34gq16dv4dwfc33378-nodejs-20.12.2-libv8"
96+
"path": "/nix/store/wnzqqc8ik64a6zn4k4bbcgzvi8dp8vnb-nodejs-21.7.3-libv8"
6997
}
7098
],
71-
"store_path": "/nix/store/l53svh1nfrcb83qbqvrrkangrcl1rr25-nodejs-20.12.2"
99+
"store_path": "/nix/store/pnrd7gl28dmy86pprrpifq7qny3sx1xp-nodejs-21.7.3"
72100
},
73101
"x86_64-linux": {
74102
"outputs": [
75103
{
76104
"name": "out",
77-
"path": "/nix/store/6g9n96qf1yx139xklnmy3v4xhjvjgsji-nodejs-20.12.2",
105+
"path": "/nix/store/dfs59hwhc4mb4hdk77nc5dd39k2v2qs2-nodejs-21.7.3",
78106
"default": true
79107
},
80108
{
81109
"name": "libv8",
82-
"path": "/nix/store/s7b0dqga0311mvq48mirnlm0p3dr4gm3-nodejs-20.12.2-libv8"
110+
"path": "/nix/store/iq38acw88hl92vpwamfkzgk3pk3dsr0x-nodejs-21.7.3-libv8"
83111
}
84112
],
85-
"store_path": "/nix/store/6g9n96qf1yx139xklnmy3v4xhjvjgsji-nodejs-20.12.2"
113+
"store_path": "/nix/store/dfs59hwhc4mb4hdk77nc5dd39k2v2qs2-nodejs-21.7.3"
86114
}
87115
}
88116
},
89117
"redis@latest": {
90-
"last_modified": "2024-05-22T06:18:38Z",
118+
"last_modified": "2024-08-14T11:41:26Z",
91119
"plugin_version": "0.0.2",
92-
"resolved": "github:NixOS/nixpkgs/3f316d2a50699a78afe5e77ca486ad553169061e#redis",
120+
"resolved": "github:NixOS/nixpkgs/0cb2fd7c59fed0cd82ef858cbcbdb552b9a33465#redis",
93121
"source": "devbox-search",
94-
"version": "7.2.4",
122+
"version": "7.2.5",
95123
"systems": {
96124
"aarch64-darwin": {
97-
"store_path": "/nix/store/f1hmasfrq0s1yag27kmdwv97cjxv85rm-redis-7.2.4"
125+
"outputs": [
126+
{
127+
"name": "out",
128+
"path": "/nix/store/6i24pj69i3v1s91l0l4f9386qzjxg897-redis-7.2.5",
129+
"default": true
130+
}
131+
],
132+
"store_path": "/nix/store/6i24pj69i3v1s91l0l4f9386qzjxg897-redis-7.2.5"
98133
},
99134
"aarch64-linux": {
100-
"store_path": "/nix/store/5ay0vkvk8l2n8fgxnmxdci1y1ldafnx8-redis-7.2.4"
135+
"outputs": [
136+
{
137+
"name": "out",
138+
"path": "/nix/store/lvcma0qz40lprz5ja5g5l7lbl6zax2pq-redis-7.2.5",
139+
"default": true
140+
}
141+
],
142+
"store_path": "/nix/store/lvcma0qz40lprz5ja5g5l7lbl6zax2pq-redis-7.2.5"
101143
},
102144
"x86_64-darwin": {
103-
"store_path": "/nix/store/5l40xjgzqsd56dx5zfwr2v6sfpk12lkl-redis-7.2.4"
145+
"outputs": [
146+
{
147+
"name": "out",
148+
"path": "/nix/store/n1x2p3aam0f82c32qrs0mj1x5ahcsfap-redis-7.2.5",
149+
"default": true
150+
}
151+
],
152+
"store_path": "/nix/store/n1x2p3aam0f82c32qrs0mj1x5ahcsfap-redis-7.2.5"
104153
},
105154
"x86_64-linux": {
106-
"store_path": "/nix/store/xlvzg81dgimxfjxpxwr2w3q1ca3l5lwa-redis-7.2.4"
155+
"outputs": [
156+
{
157+
"name": "out",
158+
"path": "/nix/store/10f3hl7x9gk10gxhbpcw91mlyi7wfw2g-redis-7.2.5",
159+
"default": true
160+
}
161+
],
162+
"store_path": "/nix/store/10f3hl7x9gk10gxhbpcw91mlyi7wfw2g-redis-7.2.5"
107163
}
108164
}
109165
}

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "btc-assets-api",
3-
"version": "2.4.1",
3+
"version": "2.4.2",
44
"title": "Bitcoin/RGB++ Assets API",
55
"description": "",
66
"main": "index.js",
@@ -50,7 +50,7 @@
5050
"@spore-sdk/core": "^0.2.0-beta.9",
5151
"async-retry": "^1.3.3",
5252
"awilix": "^10.0.1",
53-
"axios": "^1.6.7",
53+
"axios": "^1.7.7",
5454
"bloom-filters": "^3.0.1",
5555
"bullmq": "^5.4.2",
5656
"dotenv": "^16.4.2",

0 commit comments

Comments
 (0)