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 released refs/heads/master into develop #2366

Closed
wants to merge 94 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
d5c4fc9
Merge pull request #2169 from nervosnetwork/develop
zmcNotafraid Sep 2, 2024
02bb515
Merge pull request #2171 from nervosnetwork/testnet
zmcNotafraid Sep 2, 2024
405ec8f
Merge pull request #2174 from nervosnetwork/develop
rabbitz Sep 4, 2024
b841bb7
Merge pull request #2177 from nervosnetwork/develop
rabbitz Sep 4, 2024
61686b4
Merge pull request #2180 from nervosnetwork/develop
rabbitz Sep 6, 2024
70e8207
Merge pull request #2175 from nervosnetwork/testnet
rabbitz Sep 6, 2024
ce92264
Merge pull request #2182 from nervosnetwork/develop
zmcNotafraid Sep 9, 2024
5452e44
Merge pull request #2183 from nervosnetwork/testnet
zmcNotafraid Sep 9, 2024
3102c4e
Merge pull request #2185 from nervosnetwork/develop
rabbitz Sep 10, 2024
89901b6
Merge pull request #2186 from nervosnetwork/testnet
rabbitz Sep 10, 2024
2b1c74e
Merge pull request #2187 from nervosnetwork/develop
zmcNotafraid Sep 10, 2024
e97a68e
Merge pull request #2190 from nervosnetwork/develop
zmcNotafraid Sep 10, 2024
07cc078
Merge pull request #2192 from nervosnetwork/develop
zmcNotafraid Sep 10, 2024
a967b28
Merge pull request #2188 from nervosnetwork/testnet
zmcNotafraid Sep 13, 2024
f2dd5ec
Merge pull request #2193 from nervosnetwork/develop
zmcNotafraid Sep 14, 2024
c8e69d8
Merge pull request #2196 from nervosnetwork/testnet
zmcNotafraid Sep 14, 2024
fd63333
Merge pull request #2203 from nervosnetwork/develop
zmcNotafraid Sep 23, 2024
1304e6f
Merge pull request #2204 from nervosnetwork/testnet
zmcNotafraid Sep 23, 2024
c1bb4d9
Merge pull request #2208 from nervosnetwork/develop
zmcNotafraid Sep 26, 2024
0b36776
Merge pull request #2209 from nervosnetwork/testnet
zmcNotafraid Sep 26, 2024
12dfe8c
Merge pull request #2211 from nervosnetwork/develop
zmcNotafraid Sep 29, 2024
c4c87ec
Merge pull request #2214 from nervosnetwork/develop
zmcNotafraid Oct 8, 2024
6db7691
Merge pull request #2216 from nervosnetwork/develop
zmcNotafraid Oct 8, 2024
131dda0
Merge pull request #2218 from nervosnetwork/develop
zmcNotafraid Oct 9, 2024
e773c98
Merge pull request #2212 from nervosnetwork/testnet
zmcNotafraid Oct 9, 2024
16cc7d4
Merge pull request #2220 from nervosnetwork/develop
zmcNotafraid Oct 9, 2024
94321b7
Merge pull request #2221 from nervosnetwork/testnet
zmcNotafraid Oct 9, 2024
4e2bcb8
Merge pull request #2223 from nervosnetwork/develop
zmcNotafraid Oct 10, 2024
8dc0a4e
Merge pull request #2224 from nervosnetwork/testnet
zmcNotafraid Oct 10, 2024
32f5cea
Merge pull request #2226 from nervosnetwork/develop
zmcNotafraid Oct 11, 2024
9066915
Merge pull request #2227 from nervosnetwork/testnet
zmcNotafraid Oct 11, 2024
76a7156
Merge pull request #2229 from nervosnetwork/develop
rabbitz Oct 11, 2024
63f75a6
Merge pull request #2230 from nervosnetwork/testnet
rabbitz Oct 11, 2024
91f7300
Merge pull request #2232 from nervosnetwork/develop
zmcNotafraid Oct 12, 2024
65e4664
Merge pull request #2233 from nervosnetwork/testnet
zmcNotafraid Oct 12, 2024
148b60a
Merge pull request #2236 from nervosnetwork/develop
zmcNotafraid Oct 14, 2024
ae13f10
Merge pull request #2240 from nervosnetwork/develop
zmcNotafraid Oct 14, 2024
b7e01a1
Merge pull request #2237 from nervosnetwork/testnet
rabbitz Oct 16, 2024
9ae9bb8
Merge pull request #2245 from nervosnetwork/develop
zmcNotafraid Oct 16, 2024
9b17c87
Merge pull request #2246 from nervosnetwork/testnet
zmcNotafraid Oct 16, 2024
d4230fc
Merge pull request #2250 from nervosnetwork/develop
zmcNotafraid Oct 17, 2024
7c879cf
Merge pull request #2252 from nervosnetwork/develop
rabbitz Oct 17, 2024
4a03154
Merge pull request #2251 from nervosnetwork/testnet
rabbitz Oct 18, 2024
f2fb96e
Merge pull request #2254 from nervosnetwork/develop
rabbitz Oct 21, 2024
0526036
Merge pull request #2255 from nervosnetwork/testnet
rabbitz Oct 21, 2024
ce864c8
Merge pull request #2257 from nervosnetwork/develop
zmcNotafraid Oct 21, 2024
e9df744
Merge pull request #2258 from nervosnetwork/testnet
zmcNotafraid Oct 21, 2024
7d6bb63
Merge pull request #2263 from nervosnetwork/develop
zmcNotafraid Oct 24, 2024
cf07f62
Merge pull request #2266 from nervosnetwork/develop
zmcNotafraid Oct 29, 2024
c63698c
Merge pull request #2264 from nervosnetwork/testnet
zmcNotafraid Oct 29, 2024
4a2ab02
Merge pull request #2269 from nervosnetwork/develop
zmcNotafraid Oct 30, 2024
60573ca
Merge pull request #2273 from nervosnetwork/develop
zmcNotafraid Nov 1, 2024
836c2ed
Merge pull request #2276 from nervosnetwork/develop
zmcNotafraid Nov 9, 2024
e930952
Merge pull request #2278 from nervosnetwork/develop
zmcNotafraid Nov 10, 2024
82659bd
Merge pull request #2271 from nervosnetwork/testnet
zmcNotafraid Nov 10, 2024
3b37cbb
Merge pull request #2280 from nervosnetwork/develop
zmcNotafraid Nov 11, 2024
d829791
Merge pull request #2281 from nervosnetwork/testnet
zmcNotafraid Nov 11, 2024
f700cf8
Merge pull request #2283 from nervosnetwork/develop
rabbitz Nov 12, 2024
6c1ee81
Merge pull request #2287 from nervosnetwork/develop
rabbitz Nov 15, 2024
c5a321d
Merge pull request #2284 from nervosnetwork/testnet
rabbitz Nov 15, 2024
c163b40
Merge pull request #2289 from nervosnetwork/develop
zmcNotafraid Nov 20, 2024
c6ce9fa
Merge pull request #2295 from nervosnetwork/develop
zmcNotafraid Nov 20, 2024
549ef90
Merge pull request #2297 from nervosnetwork/develop
zmcNotafraid Nov 20, 2024
692472a
Merge pull request #2299 from nervosnetwork/develop
zmcNotafraid Nov 28, 2024
d912d09
Merge pull request #2293 from nervosnetwork/testnet
zmcNotafraid Nov 28, 2024
632b596
Merge pull request #2303 from nervosnetwork/develop
rabbitz Dec 2, 2024
07ae328
Merge pull request #2307 from nervosnetwork/develop
zmcNotafraid Dec 4, 2024
167bdf2
Merge pull request #2309 from nervosnetwork/develop
rabbitz Dec 5, 2024
eb83b55
Merge pull request #2311 from nervosnetwork/develop
zmcNotafraid Dec 5, 2024
82b9504
Merge pull request #2313 from nervosnetwork/develop
zmcNotafraid Dec 5, 2024
3587de0
Merge pull request #2315 from nervosnetwork/develop
zmcNotafraid Dec 5, 2024
597fad9
Merge pull request #2318 from nervosnetwork/develop
rabbitz Dec 6, 2024
9513941
Merge pull request #2320 from nervosnetwork/develop
zmcNotafraid Dec 6, 2024
804e3e5
Merge pull request #2322 from nervosnetwork/develop
zmcNotafraid Dec 6, 2024
5513973
Merge pull request #2304 from nervosnetwork/testnet
zmcNotafraid Dec 6, 2024
0d8bc73
Merge pull request #2323 from nervosnetwork/develop
zmcNotafraid Dec 9, 2024
6249bb8
Merge pull request #2326 from nervosnetwork/testnet
zmcNotafraid Dec 9, 2024
5ff5114
Merge pull request #2329 from nervosnetwork/develop
rabbitz Dec 10, 2024
499d7f9
Merge pull request #2330 from nervosnetwork/testnet
zmcNotafraid Dec 10, 2024
74f63b2
Merge pull request #2333 from nervosnetwork/develop
rabbitz Dec 11, 2024
a475620
Merge pull request #2334 from nervosnetwork/testnet
rabbitz Dec 11, 2024
9cc93b3
Merge pull request #2336 from nervosnetwork/develop
zmcNotafraid Dec 12, 2024
3157cda
Merge pull request #2337 from nervosnetwork/testnet
zmcNotafraid Dec 12, 2024
a767f87
Merge pull request #2339 from nervosnetwork/develop
zmcNotafraid Dec 13, 2024
7f2054d
Merge pull request #2343 from nervosnetwork/develop
zmcNotafraid Dec 14, 2024
15de526
Merge pull request #2340 from nervosnetwork/testnet
zmcNotafraid Dec 14, 2024
6a55617
Merge pull request #2345 from nervosnetwork/develop
zmcNotafraid Dec 16, 2024
daa6288
Merge pull request #2346 from nervosnetwork/testnet
zmcNotafraid Dec 16, 2024
0c36d71
chore: add new xudt compatible code hash (#2358)
zmcNotafraid Dec 20, 2024
8e223a7
Merge pull request #2360 from zmcNotafraid/split-merge-xudt-compatible
zmcNotafraid Dec 20, 2024
c4a86f1
hotfix address validate
zmcNotafraid Dec 21, 2024
f8c522b
Merge pull request #2365 from zmcNotafraid/hotfix-address-validate
zmcNotafraid Dec 21, 2024
2f55b98
Revert "hotfix address validate"
zmcNotafraid Dec 21, 2024
d10c534
Merge pull request #2367 from nervosnetwork/revert-2365-hotfix-addres…
zmcNotafraid Dec 21, 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
2 changes: 1 addition & 1 deletion app/models/ckb_sync/api.rb
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def xudt_data_hash
end

def xudt_compatible_code_hashes
[Settings.xudt_compatible_code_hash, Settings.xudt_compatible2_code_hash, Settings.xudt_compatible3_code_hash]
[Settings.xudt_compatible_code_hash, Settings.xudt_compatible2_code_hash, Settings.xudt_compatible3_code_hash, Settings.xudt_compatible4_code_hash]
end

def unique_cell_code_hash
Expand Down
1 change: 1 addition & 0 deletions config/settings.mainnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ unique_cell_code_hash: "0x2c8c11c985da60b0a330c61a85507416d6382c130ba67f0c47ab07
xudt_compatible_code_hash: "0x092c2c4a26ea475a8e860c29cf00502103add677705e2ccd8d6fe5af3caa5ae3"
xudt_compatible2_code_hash: "0x26a33e0815888a4a0614a0b7d09fa951e0993ff21e55905510104a0b1312032b"
xudt_compatible3_code_hash: "0x42a0b2aacc836c0fc2bbd421a9020de42b8411584190f30be547fdf54214acc3"
xudt_compatible4_code_hash: "0xbfa35a9c38a676682b65ade8f02be164d48632281477e36f8dc2f41f79e56bfc"

# stablepp_pool
stablepp_pool_code_hash: "0x26622198b66240e437e323e0fecf1c26ba3c8c28a45f03ed3ebb9f7f2bdc0055"
Expand Down
Loading