Bump Oasis Core to 22.2.x

oasisprotocol · Sep 22, 2022 · e709852 · e709852
1 parent 69cbb88
commit e709852
Show file tree

Hide file tree

Showing 55 changed files with 3,676 additions and 1,740 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contract-sdk/Cargo.toml b/contract-sdk/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 license = "Apache-2.0"
 
 [dependencies]
-cbor = { version = "0.2.1", package = "oasis-cbor" }
+cbor = { version = "0.5.0", package = "oasis-cbor" }
 oasis-contract-sdk-types = { path = "types" }
 oasis-contract-sdk-macros = { path = "../contract-sdk-macros", optional = true }
 

diff --git a/contract-sdk/crypto/Cargo.toml b/contract-sdk/crypto/Cargo.toml
@@ -8,10 +8,10 @@ edition = "2018"
 license = "Apache-2.0"
 
 [dependencies]
-cbor = { version = "0.2.1", package = "oasis-cbor" }
+cbor = { version = "0.5.0", package = "oasis-cbor" }
 
 # Third party.
-k256 = { version = "0.9.6", default-features = false, features = ["keccak256", "ecdsa"] }
+k256 = { version = "0.10.4", default-features = false, features = ["keccak256", "ecdsa"] }
 thiserror = "1.0.30"
 
 [dev-dependencies]

diff --git a/contract-sdk/crypto/src/ecdsa.rs b/contract-sdk/crypto/src/ecdsa.rs
@@ -2,7 +2,7 @@ use std::convert::TryInto;
 
 use k256::{
     ecdsa::{recoverable, Signature},
-    EncodedPoint,
+    elliptic_curve::{sec1::ToEncodedPoint, IsHigh},
 };
 use thiserror::Error;
 
@@ -53,7 +53,7 @@ pub fn recover(input: &[u8]) -> Result<[u8; 65], Error> {
 
     match signature.recover_verify_key_from_digest_bytes(&msg.into()) {
         Ok(recovered_key) => {
-            let key = EncodedPoint::from(&recovered_key).decompress().unwrap();
+            let key = recovered_key.to_encoded_point(false);
 
             Ok(key.as_bytes().try_into().unwrap())
         }