Skip to content

Commit

Permalink
build: upgrade grpc to 1.54.3 (#2079)
Browse files Browse the repository at this point in the history
  • Loading branch information
yperbasis authored and battlmonstr committed Jun 14, 2024
1 parent ba106d1 commit 57d4b96
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
14 changes: 7 additions & 7 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,22 @@ def requirements(self):
self.requires('ms-gsl/4.0.0')
self.requires('nlohmann_json/3.11.3')
self.requires('tl-expected/1.1.0')
self.requires('zlib/1.2.13')
self.requires('zlib/1.3.1')
if self.settings.arch == 'wasm':
return

self.requires('abseil/20220623.0')
self.requires('asio-grpc/2.4.0')
self.requires('abseil/20230125.3')
self.requires('asio-grpc/2.9.2')
self.requires('benchmark/1.6.1')
self.requires('boost/1.81.0')
self.requires('boost/1.83.0')
self.requires('cli11/2.2.0')
self.requires('gmp/6.2.1')
self.requires('grpc/1.48.0')
self.requires('grpc/1.54.3')
self.requires('gtest/1.12.1')
self.requires('jwt-cpp/0.6.0')
self.requires('mimalloc/2.1.2')
self.requires('openssl/1.1.1s')
self.requires('protobuf/3.21.4')
self.requires('openssl/3.2.1')
self.requires('protobuf/3.21.12')
self.requires('roaring/1.1.2')
self.requires('snappy/1.1.7')
self.requires('spdlog/1.12.0')
Expand Down
5 changes: 5 additions & 0 deletions silkworm/sentry/rlpx/crypto/hmac.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@

namespace silkworm::sentry::rlpx::crypto {

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"

Bytes hmac(ByteView key, ByteView data1, ByteView data2, ByteView data3) {
assert(key.size() == 32);

Expand All @@ -43,4 +46,6 @@ Bytes hmac(ByteView key, ByteView data1, ByteView data2, ByteView data3) {
return hash;
}

#pragma GCC diagnostic pop

} // namespace silkworm::sentry::rlpx::crypto

0 comments on commit 57d4b96

Please sign in to comment.