Skip to content

Commit 4139e37

Browse files
authored
Merge pull request #12 from DeFi-Research/master
Compatibility fix with Julia 1.9
2 parents 6a54172 + fe1d9aa commit 4139e37

File tree

5 files changed

+150
-51
lines changed

5 files changed

+150
-51
lines changed

.vscode/settings.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

Manifest.toml

+146-42
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,195 @@
11
# This file is machine-generated - editing it directly is not advised
22

3-
[[Artifacts]]
3+
julia_version = "1.8.5"
4+
manifest_format = "2.0"
5+
project_hash = "2fb6c2b8fb303acc9da988cafd5862b39438b03e"
6+
7+
[[deps.Artifacts]]
48
uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
59

6-
[[Base64]]
10+
[[deps.Base64]]
711
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
812

9-
[[Dates]]
13+
[[deps.BitFlags]]
14+
git-tree-sha1 = "43b1a4a8f797c1cddadf60499a8a077d4af2cd2d"
15+
uuid = "d1d4a3ce-64b1-5f1a-9ba4-7e7e69966f35"
16+
version = "0.1.7"
17+
18+
[[deps.CodecZlib]]
19+
deps = ["TranscodingStreams", "Zlib_jll"]
20+
git-tree-sha1 = "9c209fb7536406834aa938fb149964b985de6c83"
21+
uuid = "944b1d66-785c-5afd-91f1-9de20f533193"
22+
version = "0.7.1"
23+
24+
[[deps.ConcurrentUtilities]]
25+
deps = ["Serialization", "Sockets"]
26+
git-tree-sha1 = "96d823b94ba8d187a6d8f0826e731195a74b90e9"
27+
uuid = "f0e56b4a-5159-44fe-b623-3e5288b988bb"
28+
version = "2.2.0"
29+
30+
[[deps.Dates]]
1031
deps = ["Printf"]
1132
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
1233

13-
[[HTTP]]
14-
deps = ["Base64", "Dates", "IniFile", "MbedTLS", "NetworkOptions", "Sockets", "URIs"]
15-
git-tree-sha1 = "0e67ed09b3d89a28bb804ef5b886499f3a40a0cb"
16-
uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
17-
version = "0.9.7"
18-
19-
[[IniFile]]
34+
[[deps.ExceptionUnwrapping]]
2035
deps = ["Test"]
21-
git-tree-sha1 = "098e4d2c533924c921f9f9847274f2ad89e018b8"
22-
uuid = "83e8ac13-25f8-5344-8a64-a9f2b223428f"
23-
version = "0.5.0"
36+
git-tree-sha1 = "e90caa41f5a86296e014e148ee061bd6c3edec96"
37+
uuid = "460bff9d-24e4-43bc-9d9f-a8973cb893f4"
38+
version = "0.1.9"
2439

25-
[[InteractiveUtils]]
40+
[[deps.HTTP]]
41+
deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "ExceptionUnwrapping", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"]
42+
path = "/Users/jaimecastillo/.julia/dev/HTTP"
43+
uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
44+
version = "1.9.14"
45+
46+
[[deps.InteractiveUtils]]
2647
deps = ["Markdown"]
2748
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
2849

29-
[[JSON]]
50+
[[deps.JLLWrappers]]
51+
deps = ["Preferences"]
52+
git-tree-sha1 = "abc9885a7ca2052a736a600f7fa66209f96506e1"
53+
uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
54+
version = "1.4.1"
55+
56+
[[deps.JSON]]
3057
deps = ["Dates", "Mmap", "Parsers", "Unicode"]
31-
git-tree-sha1 = "81690084b6198a2e1da36fcfda16eeca9f9f24e4"
58+
path = "/Users/jaimecastillo/.julia/dev/JSON"
3259
uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
33-
version = "0.21.1"
60+
version = "0.21.4"
3461

35-
[[Libdl]]
62+
[[deps.Libdl]]
3663
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
3764

38-
[[Logging]]
65+
[[deps.Logging]]
3966
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
4067

41-
[[Markdown]]
68+
[[deps.LoggingExtras]]
69+
deps = ["Dates", "Logging"]
70+
git-tree-sha1 = "cedb76b37bc5a6c702ade66be44f831fa23c681e"
71+
uuid = "e6f89c97-d47a-5376-807f-9c37f3926c36"
72+
version = "1.0.0"
73+
74+
[[deps.Markdown]]
4275
deps = ["Base64"]
4376
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
4477

45-
[[MbedTLS]]
46-
deps = ["Dates", "MbedTLS_jll", "Random", "Sockets"]
47-
git-tree-sha1 = "1c38e51c3d08ef2278062ebceade0e46cefc96fe"
78+
[[deps.MbedTLS]]
79+
deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "Random", "Sockets"]
80+
git-tree-sha1 = "03a9b9718f5682ecb107ac9f7308991db4ce395b"
4881
uuid = "739be429-bea8-5141-9913-cc70e7f3736d"
49-
version = "1.0.3"
82+
version = "1.1.7"
5083

51-
[[MbedTLS_jll]]
84+
[[deps.MbedTLS_jll]]
5285
deps = ["Artifacts", "Libdl"]
5386
uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
87+
version = "2.28.0+0"
5488

55-
[[Mmap]]
89+
[[deps.Mmap]]
5690
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
5791

58-
[[NetworkOptions]]
59-
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
92+
[[deps.MozillaCACerts_jll]]
93+
uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
94+
version = "2022.2.1"
6095

61-
[[Parsers]]
62-
deps = ["Dates"]
63-
git-tree-sha1 = "c8abc88faa3f7a3950832ac5d6e690881590d6dc"
96+
[[deps.NetworkOptions]]
97+
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
98+
version = "1.2.0"
99+
100+
[[deps.OpenSSL]]
101+
deps = ["BitFlags", "Dates", "MozillaCACerts_jll", "OpenSSL_jll", "Sockets"]
102+
git-tree-sha1 = "51901a49222b09e3743c65b8847687ae5fc78eb2"
103+
uuid = "4d8831e6-92b7-49fb-bdf8-b643e874388c"
104+
version = "1.4.1"
105+
106+
[[deps.OpenSSL_jll]]
107+
deps = ["Artifacts", "JLLWrappers", "Libdl"]
108+
git-tree-sha1 = "cae3153c7f6cf3f069a853883fd1919a6e5bab5b"
109+
uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
110+
version = "3.0.9+0"
111+
112+
[[deps.Parsers]]
113+
deps = ["Dates", "PrecompileTools", "UUIDs"]
114+
git-tree-sha1 = "4b2e829ee66d4218e0cef22c0a64ee37cf258c29"
64115
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
65-
version = "1.1.0"
116+
version = "2.7.1"
117+
118+
[[deps.PrecompileTools]]
119+
deps = ["Preferences"]
120+
git-tree-sha1 = "9673d39decc5feece56ef3940e5dafba15ba0f81"
121+
uuid = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
122+
version = "1.1.2"
66123

67-
[[Printf]]
124+
[[deps.Preferences]]
125+
deps = ["TOML"]
126+
git-tree-sha1 = "7eb1686b4f04b82f96ed7a4ea5890a4f0c7a09f1"
127+
uuid = "21216c6a-2e73-6563-6e65-726566657250"
128+
version = "1.4.0"
129+
130+
[[deps.Printf]]
68131
deps = ["Unicode"]
69132
uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
70133

71-
[[Random]]
72-
deps = ["Serialization"]
134+
[[deps.Random]]
135+
deps = ["SHA", "Serialization"]
73136
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
74137

75-
[[Serialization]]
138+
[[deps.SHA]]
139+
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
140+
version = "0.7.0"
141+
142+
[[deps.Serialization]]
76143
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
77144

78-
[[Sockets]]
145+
[[deps.SimpleBufferStream]]
146+
git-tree-sha1 = "874e8867b33a00e784c8a7e4b60afe9e037b74e1"
147+
uuid = "777ac1f9-54b0-4bf8-805c-2214025038e7"
148+
version = "1.1.0"
149+
150+
[[deps.Sockets]]
79151
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
80152

81-
[[Test]]
153+
[[deps.Suppressor]]
154+
deps = ["Logging"]
155+
git-tree-sha1 = "37d1976ca8368f6adbe1d65a4deeeda6ee7faa31"
156+
uuid = "fd094767-a336-5f1f-9728-57cf17d0bbfb"
157+
version = "0.2.4"
158+
159+
[[deps.TOML]]
160+
deps = ["Dates"]
161+
uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
162+
version = "1.0.0"
163+
164+
[[deps.Test]]
82165
deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
83166
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
84167

85-
[[URIs]]
86-
git-tree-sha1 = "97bbe755a53fe859669cd907f2d96aee8d2c1355"
168+
[[deps.TranscodingStreams]]
169+
deps = ["Random", "Test"]
170+
git-tree-sha1 = "9a6ae7ed916312b41236fcef7e0af564ef934769"
171+
uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
172+
version = "0.9.13"
173+
174+
[[deps.URIs]]
175+
git-tree-sha1 = "074f993b0ca030848b897beff716d93aca60f06a"
87176
uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
88-
version = "1.3.0"
177+
version = "1.4.2"
89178

90-
[[Unicode]]
179+
[[deps.UUIDs]]
180+
deps = ["Random", "SHA"]
181+
uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
182+
183+
[[deps.Unicode]]
91184
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
185+
186+
[[deps.UpdateJulia]]
187+
deps = ["JSON", "Suppressor"]
188+
git-tree-sha1 = "acb98be84aeb1553fd3e8335e2d58a960bd0a47e"
189+
uuid = "770da0de-323d-4d28-9202-0e205c1e0aff"
190+
version = "0.4.2"
191+
192+
[[deps.Zlib_jll]]
193+
deps = ["Libdl"]
194+
uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
195+
version = "1.2.12+3"

Project.toml

+1-6
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,4 @@ version = "0.2.4"
66
[deps]
77
HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
88
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
9-
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
10-
11-
[compat]
12-
HTTP = "0.9.7"
13-
JSON = "0.21.0"
14-
julia = "1.6.1"
9+
UpdateJulia = "770da0de-323d-4d28-9202-0e205c1e0aff"

REQUIRE

-1
This file was deleted.

src/Web3.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -492,8 +492,8 @@ end
492492
# DECODING
493493
############
494494

495-
const signedTypes = Dict([t.size => t for t in (Int8, Int16, Int32, Int64, Int128)])
496-
const unsignedTypes = Dict([t.size => t for t in (UInt8, UInt16, UInt32, UInt64, UInt128)])
495+
const signedTypes = Dict([sizeof(t) => t for t in (Int8, Int16, Int32, Int64, Int128)])
496+
const unsignedTypes = Dict([sizeof(t) => t for t in (UInt8, UInt16, UInt32, UInt64, UInt128)])
497497

498498
function readint(io::IO)
499499
big = read(io, Int128)

0 commit comments

Comments
 (0)