From 6a00c481d697552391ed12846fca5fc4c91c8807 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Wed, 2 Dec 2020 13:30:43 -0800 Subject: [PATCH 1/2] Use add_builtin, as user-supplied builtins may not yet exist --- program-test/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/program-test/src/lib.rs b/program-test/src/lib.rs index d0309cfd23d1bc..f962ced0d80a0f 100644 --- a/program-test/src/lib.rs +++ b/program-test/src/lib.rs @@ -629,7 +629,7 @@ impl ProgramTest { // User-supplied additional builtins for builtin in self.builtins { - bank.replace_builtin( + bank.add_builtin( &builtin.name, builtin.id, builtin.process_instruction_with_context, From f66c84156f5b8928f08a6cc00a064c362237e917 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Dec 2020 09:03:43 +0000 Subject: [PATCH 2/2] chore: bump hmac from 0.7.1 to 0.10.1 Bumps [hmac](https://github.com/RustCrypto/MACs) from 0.7.1 to 0.10.1. - [Release notes](https://github.com/RustCrypto/MACs/releases) - [Commits](https://github.com/RustCrypto/MACs/compare/hmac-v0.7.1...hmac-v0.10.1) Signed-off-by: dependabot[bot] --- Cargo.lock | 26 +++++++++++++++++++++++--- sdk/Cargo.toml | 2 +- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cd4d249c4ad488..989b8bbf05cd3a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -760,6 +760,16 @@ dependencies = [ "subtle 2.2.2", ] +[[package]] +name = "crypto-mac" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" +dependencies = [ + "generic-array 0.14.3", + "subtle 2.2.2", +] + [[package]] name = "csv" version = "1.1.3" @@ -1469,6 +1479,16 @@ dependencies = [ "digest 0.8.1", ] +[[package]] +name = "hmac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" +dependencies = [ + "crypto-mac 0.10.0", + "digest 0.9.0", +] + [[package]] name = "hmac-drbg" version = "0.2.0" @@ -1477,7 +1497,7 @@ checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b" dependencies = [ "digest 0.8.1", "generic-array 0.12.3", - "hmac", + "hmac 0.7.1", ] [[package]] @@ -4750,7 +4770,7 @@ dependencies = [ "ed25519-dalek", "generic-array 0.14.3", "hex", - "hmac", + "hmac 0.10.1", "itertools 0.9.0", "lazy_static", "libsecp256k1", @@ -5559,7 +5579,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0165e045cc2ae1660270ca65e1676dbaab60feb0f91b10f7d0665e9b47e31f2" dependencies = [ "failure", - "hmac", + "hmac 0.7.1", "once_cell", "pbkdf2", "rand 0.7.3", diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml index 4448f045826191..d6d10a98defa53 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml @@ -44,7 +44,7 @@ chrono = { version = "0.4", optional = true } curve25519-dalek = { version = "2.1.0", optional = true } generic-array = { version = "0.14.3", default-features = false, features = ["serde", "more_lengths"], optional = true } hex = "0.4.2" -hmac = "0.7.0" +hmac = "0.10.1" itertools = "0.9.0" lazy_static = "1.4.0" log = "0.4.8"