diff --git a/.gitmodules b/.gitmodules index e0aa9602..b1e571ab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "sgxvm/sgx-sdk"] path = sgxvm/sgx-sdk - url = https://github.com/apache/teaclave-sgx-sdk.git + url = https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git diff --git a/Makefile b/Makefile index 808a2b2e..82f613a0 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION := v1.0.5 +VERSION := v1.0.6 COMMIT := $(shell git log -1 --format='%H') ENCLAVE_HOME ?= $(HOME)/.swisstronik-enclave PRODUCTION_MODE ?= false diff --git a/app/app.go b/app/app.go index b959cd10..fe1a1dc5 100644 --- a/app/app.go +++ b/app/app.go @@ -117,6 +117,7 @@ import ( "swisstronik/app/upgrades/v1_0_3" "swisstronik/app/upgrades/v1_0_4" "swisstronik/app/upgrades/v1_0_5" + "swisstronik/app/upgrades/v1_0_6" "swisstronik/docs" "swisstronik/encoding" srvflags "swisstronik/server/flags" @@ -1081,6 +1082,13 @@ func (app *App) setupUpgradeHandlers() { ), ) + app.UpgradeKeeper.SetUpgradeHandler( + v1_0_6.UpgradeName, + v1_0_6.CreateUpgradeHandler( + app.ModuleManager, app.configurator, + ), + ) + // When a planned update height is reached, the old binary will panic // writing on disk the height and name of the update that triggered it // This will read that value, and execute the preparations for the upgrade. diff --git a/app/upgrades/v1_0_6/constants.go b/app/upgrades/v1_0_6/constants.go new file mode 100644 index 00000000..309a0a37 --- /dev/null +++ b/app/upgrades/v1_0_6/constants.go @@ -0,0 +1,5 @@ +package v1_0_6 + +const ( + UpgradeName = "v1.0.6" +) diff --git a/app/upgrades/v1_0_6/upgrades.go b/app/upgrades/v1_0_6/upgrades.go new file mode 100644 index 00000000..3d546b18 --- /dev/null +++ b/app/upgrades/v1_0_6/upgrades.go @@ -0,0 +1,24 @@ +package v1_0_6 + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" + upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" +) + +func CreateUpgradeHandler( + mm *module.Manager, + configurator module.Configurator, +) upgradetypes.UpgradeHandler { + return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { + ctx.Logger().Info("Starting module migrations...") + + vm, err := mm.RunMigrations(ctx, configurator, vm) + if err != nil { + return vm, err + } + + ctx.Logger().Info("Upgrade complete") + return vm, err + } +} diff --git a/sgxvm/deoxysii-rust/.cargo/config b/crates/deoxysii-rust/.cargo/config similarity index 100% rename from sgxvm/deoxysii-rust/.cargo/config rename to crates/deoxysii-rust/.cargo/config diff --git a/sgxvm/deoxysii-rust/.gitignore b/crates/deoxysii-rust/.gitignore similarity index 100% rename from sgxvm/deoxysii-rust/.gitignore rename to crates/deoxysii-rust/.gitignore diff --git a/sgxvm/deoxysii-rust/.rustfmt.toml b/crates/deoxysii-rust/.rustfmt.toml similarity index 100% rename from sgxvm/deoxysii-rust/.rustfmt.toml rename to crates/deoxysii-rust/.rustfmt.toml diff --git a/sgxvm/deoxysii-rust/Cargo.toml b/crates/deoxysii-rust/Cargo.toml similarity index 100% rename from sgxvm/deoxysii-rust/Cargo.toml rename to crates/deoxysii-rust/Cargo.toml diff --git a/sgxvm/deoxysii-rust/LICENSE b/crates/deoxysii-rust/LICENSE similarity index 100% rename from sgxvm/deoxysii-rust/LICENSE rename to crates/deoxysii-rust/LICENSE diff --git a/sgxvm/deoxysii-rust/Makefile b/crates/deoxysii-rust/Makefile similarity index 100% rename from sgxvm/deoxysii-rust/Makefile rename to crates/deoxysii-rust/Makefile diff --git a/sgxvm/deoxysii-rust/README.md b/crates/deoxysii-rust/README.md similarity index 100% rename from sgxvm/deoxysii-rust/README.md rename to crates/deoxysii-rust/README.md diff --git a/sgxvm/deoxysii-rust/benches/mrae.rs b/crates/deoxysii-rust/benches/mrae.rs similarity index 100% rename from sgxvm/deoxysii-rust/benches/mrae.rs rename to crates/deoxysii-rust/benches/mrae.rs diff --git a/sgxvm/deoxysii-rust/rust-toolchain b/crates/deoxysii-rust/rust-toolchain similarity index 100% rename from sgxvm/deoxysii-rust/rust-toolchain rename to crates/deoxysii-rust/rust-toolchain diff --git a/sgxvm/deoxysii-rust/src/constants.rs b/crates/deoxysii-rust/src/constants.rs similarity index 100% rename from sgxvm/deoxysii-rust/src/constants.rs rename to crates/deoxysii-rust/src/constants.rs diff --git a/sgxvm/deoxysii-rust/src/lib.rs b/crates/deoxysii-rust/src/lib.rs similarity index 100% rename from sgxvm/deoxysii-rust/src/lib.rs rename to crates/deoxysii-rust/src/lib.rs diff --git a/sgxvm/deoxysii-rust/src/primitives.rs b/crates/deoxysii-rust/src/primitives.rs similarity index 100% rename from sgxvm/deoxysii-rust/src/primitives.rs rename to crates/deoxysii-rust/src/primitives.rs diff --git a/sgxvm/deoxysii-rust/src/tests.rs b/crates/deoxysii-rust/src/tests.rs similarity index 100% rename from sgxvm/deoxysii-rust/src/tests.rs rename to crates/deoxysii-rust/src/tests.rs diff --git a/sgxvm/deoxysii-rust/test-data/Deoxys-II-256-128.json b/crates/deoxysii-rust/test-data/Deoxys-II-256-128.json similarity index 100% rename from sgxvm/deoxysii-rust/test-data/Deoxys-II-256-128.json rename to crates/deoxysii-rust/test-data/Deoxys-II-256-128.json diff --git a/crates/static-precompiles/.cargo/config b/crates/static-precompiles/.cargo/config new file mode 100644 index 00000000..787fc046 --- /dev/null +++ b/crates/static-precompiles/.cargo/config @@ -0,0 +1,5 @@ +[target.'cfg(not(target_env = "sgx"))'] +rustflags = ["-C", "target-feature=+avx2"] + +[target.x86_64-unknown-linux-gnu] +rustflags = ["-C", "target-cpu=skylake"] diff --git a/crates/static-precompiles/rust-toolchain b/crates/static-precompiles/rust-toolchain new file mode 100644 index 00000000..1892e031 --- /dev/null +++ b/crates/static-precompiles/rust-toolchain @@ -0,0 +1 @@ +nightly-2023-03-13 \ No newline at end of file diff --git a/sgxvm/src/precompiles/blake2f.rs b/crates/static-precompiles/src/blake2f.rs similarity index 88% rename from sgxvm/src/precompiles/blake2f.rs rename to crates/static-precompiles/src/blake2f.rs index 1515eaaa..5ee2409a 100644 --- a/sgxvm/src/precompiles/blake2f.rs +++ b/crates/static-precompiles/src/blake2f.rs @@ -1,11 +1,13 @@ +#[cfg(feature = "std")] use std::vec::Vec; + +#[cfg(not(feature = "std"))] +use sgx_tstd::vec::Vec; + use core::mem::size_of; -use crate::precompiles::{ - ExitSucceed, - ExitError, - LinearCostPrecompile, - PrecompileFailure -}; +use evm::interpreter::error::{ExitException, ExitResult, ExitSucceed}; + +use crate::LinearCostPrecompile; const SIGMA: [[usize; 16]; 10] = [ [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15], @@ -88,13 +90,11 @@ impl LinearCostPrecompile for Blake2F { /// Format of `input`: /// [4 bytes for rounds][64 bytes for h][128 bytes for m][8 bytes for t_0][8 bytes for t_1][1 byte for f] - fn raw_execute(input: &[u8], _: u64) -> Result<(ExitSucceed, Vec), PrecompileFailure> { + fn raw_execute(input: &[u8], _: u64) -> (ExitResult, Vec) { const BLAKE2_F_ARG_LEN: usize = 213; if input.len() != BLAKE2_F_ARG_LEN { - return Err(PrecompileFailure::Error { - exit_status: ExitError::Other("input length for Blake2 F precompile should be exactly 213 bytes".into()) - }); + return (ExitException::Other("input length for Blake2 F precompile should be exactly 213 bytes".into()).into(), Vec::new()); } let mut rounds_buf: [u8; 4] = [0; 4]; @@ -136,9 +136,7 @@ impl LinearCostPrecompile for Blake2F { } else if input[212] == 0 { false } else { - return Err(PrecompileFailure::Error { - exit_status: ExitError::Other("incorrect final block indicator flag".into()) - }); + return (ExitException::Other("incorrect final block indicator flag".into()).into(), Vec::new()); }; compress(&mut h, m, [t_0.into(), t_1.into()], f, rounds as usize); @@ -148,6 +146,6 @@ impl LinearCostPrecompile for Blake2F { output_buf[i * 8..(i + 1) * 8].copy_from_slice(&state_word.to_le_bytes()); } - Ok((ExitSucceed::Returned, output_buf.to_vec())) + (ExitSucceed::Returned.into(), output_buf.to_vec()) } } diff --git a/crates/static-precompiles/src/bn128.rs b/crates/static-precompiles/src/bn128.rs new file mode 100644 index 00000000..9b8da320 --- /dev/null +++ b/crates/static-precompiles/src/bn128.rs @@ -0,0 +1,199 @@ +#[cfg(feature = "std")] +use std::vec::Vec; + +#[cfg(not(feature = "std"))] +use sgx_tstd::vec::Vec; + +use evm::interpreter::error::{ExitException, ExitResult, ExitSucceed}; +use primitive_types::U256; +use substrate_bn as bn; + +use crate::LinearCostPrecompile; + +fn read_fr(input: &[u8], start_inx: usize) -> Result { + bn::Fr::from_slice(&input[start_inx..(start_inx + 32)]).map_err(|_| ExitException::Other("Invalid field element".into())) +} + +fn read_point(input: &[u8], start_inx: usize) -> Result { + use bn::{Fq, AffineG1, G1, Group}; + + let px = Fq::from_slice(&input[start_inx..(start_inx + 32)]).map_err(|_| ExitException::Other("Invalid point x coordinate".into()))?; + let py = Fq::from_slice(&input[(start_inx + 32)..(start_inx + 64)]).map_err(|_| ExitException::Other("Invalid point y coordinate".into()))?; + Ok( + if px == Fq::zero() && py == Fq::zero() { + G1::zero() + } else { + AffineG1::new(px, py).map_err(|_| ExitException::Other("Invalid curve point".into()))?.into() + } + ) +} + +/// The Bn128Add builtin +pub struct Bn128Add; + +impl LinearCostPrecompile for Bn128Add { + const BASE: u64 = 15; + const WORD: u64 = 3; + + fn raw_execute( + input: &[u8], + _: u64, + ) -> (ExitResult, Vec) { + use bn::AffineG1; + + let p1 = match read_point(input, 0) { + Ok(p) => p, + Err(err) => return (err.into(), Vec::new()) + }; + let p2 = match read_point(input, 64) { + Ok(p) => p, + Err(err) => return (err.into(), Vec::new()) + }; + + let mut buf = [0u8; 64]; + if let Some(sum) = AffineG1::from_jacobian(p1 + p2) { + // point not at infinity + match sum.x().to_big_endian(&mut buf[0..32]) { + Ok(_) => {}, + Err(_) => return (ExitException::Other("Cannot fail since 0..32 is 32-byte length".into()).into(), Vec::new()) + } + + match sum.y().to_big_endian(&mut buf[32..64]) { + Ok(_) => {}, + Err(_) => return (ExitException::Other("Cannot fail since 32..64 is 32-byte length".into()).into(), Vec::new()) + } + } + + (ExitSucceed::Returned.into(), buf.to_vec()) + } +} + +/// The Bn128Mul builtin +pub struct Bn128Mul; + +impl LinearCostPrecompile for Bn128Mul { + const BASE: u64 = 15; + const WORD: u64 = 3; + + fn raw_execute( + input: &[u8], + _: u64, + ) -> (ExitResult, Vec) { + use bn::AffineG1; + + let p = match read_point(input, 0) { + Ok(p) => p, + Err(err) => return (err.into(), Vec::new()) + }; + let fr = match read_fr(input, 64) { + Ok(fr) => fr, + Err(err) => return (err.into(), Vec::new()) + }; + + let mut buf = [0u8; 64]; + if let Some(sum) = AffineG1::from_jacobian(p * fr) { + // point not at infinity + match sum.x().to_big_endian(&mut buf[0..32]) { + Ok(_) => {}, + Err(_) => return (ExitException::Other("Cannot fail since 0..32 is 32-byte length".into()).into(), Vec::new()) + } + + match sum.y().to_big_endian(&mut buf[32..64]) { + Ok(_) => {}, + Err(_) => return (ExitException::Other("Cannot fail since 0..32 is 32-byte length".into()).into(), Vec::new()) + } + } + + (ExitSucceed::Returned.into(), buf.to_vec()) + } +} + +/// The Bn128Pairing builtin +pub struct Bn128Pairing; + +impl LinearCostPrecompile for Bn128Pairing { + const BASE: u64 = 15; + const WORD: u64 = 3; + + fn raw_execute( + input: &[u8], + _: u64, + ) -> (ExitResult, Vec) { + use bn::{AffineG1, AffineG2, Fq, Fq2, pairing_batch, G1, G2, Gt, Group}; + + let ret_val = if input.is_empty() { + U256::one() + } else { + // (a, b_a, b_b - each 64-byte affine coordinates) + let elements = input.len() / 192; + let mut vals = Vec::new(); + for idx in 0..elements { + let a_x = match Fq::from_slice(&input[idx*192..idx*192+32]) { + Ok(a) => a, + Err(_) => return (ExitException::Other("Invalid a argument x coordinate".into()).into(), Vec::new()) + }; + + let a_y = match Fq::from_slice(&input[idx*192+32..idx*192+64]) { + Ok(a) => a, + Err(_) => return (ExitException::Other("Invalid a argument y coordinate".into()).into(), Vec::new()) + }; + + let b_a_y = match Fq::from_slice(&input[idx*192+64..idx*192+96]) { + Ok(b) => b, + Err(_) => return (ExitException::Other("Invalid b argument imaginary coeff x coordinate".into()).into(), Vec::new()) + }; + + let b_a_x = match Fq::from_slice(&input[idx*192+96..idx*192+128]) { + Ok(b) => b, + Err(_) => return (ExitException::Other("Invalid b argument imaginary coeff y coordinate".into()).into(), Vec::new()) + }; + + let b_b_y = match Fq::from_slice(&input[idx*192+128..idx*192+160]) { + Ok(b) => b, + Err(_) => return (ExitException::Other("Invalid b argument real coeff x coordinate".into()).into(), Vec::new()) + }; + + let b_b_x = match Fq::from_slice(&input[idx*192+160..idx*192+192]) { + Ok(b) => b, + Err(_) => return (ExitException::Other("Invalid b argument real coeff y coordinate".into()).into(), Vec::new()) + }; + + let b_a = Fq2::new(b_a_x, b_a_y); + let b_b = Fq2::new(b_b_x, b_b_y); + let b = if b_a.is_zero() && b_b.is_zero() { + G2::zero() + } else { + let a_g2 = match AffineG2::new(b_a, b_b) { + Ok(a) => a, + Err(_) => return (ExitException::Other("Invalid b argument - not on curve".into()).into(), Vec::new()) + }; + + G2::from(a_g2) + }; + let a = if a_x.is_zero() && a_y.is_zero() { + G1::zero() + } else { + let a_g1 = match AffineG1::new(a_x, a_y) { + Ok(a) => a, + Err(_) => return (ExitException::Other("Invalid a argumant - not on curve".into()).into(), Vec::new()) + }; + G1::from(a_g1) + }; + vals.push((a, b)); + }; + + let mul = pairing_batch(&vals); + + if mul == Gt::one() { + U256::one() + } else { + U256::zero() + } + }; + + let mut buf = [0u8; 32]; + ret_val.to_big_endian(&mut buf); + + (ExitSucceed::Returned.into(), buf.to_vec()) + } +} diff --git a/sgxvm/src/precompiles/curve25519.rs b/crates/static-precompiles/src/curve25519.rs similarity index 51% rename from sgxvm/src/precompiles/curve25519.rs rename to crates/static-precompiles/src/curve25519.rs index 5b683fb1..43af23af 100644 --- a/sgxvm/src/precompiles/curve25519.rs +++ b/crates/static-precompiles/src/curve25519.rs @@ -1,17 +1,18 @@ +#[cfg(feature = "std")] +use std::vec::Vec; + +#[cfg(not(feature = "std"))] +use sgx_tstd::vec::Vec; + use curve25519_dalek::{ ristretto::{CompressedRistretto, RistrettoPoint}, scalar::Scalar, traits::Identity, }; use ed25519_dalek::{Signature, Verifier, VerifyingKey}; -use std::vec::Vec; +use evm::interpreter::error::{ExitException, ExitResult, ExitSucceed}; -use crate::precompiles::{ - ExitError, - ExitSucceed, - LinearCostPrecompile, - PrecompileFailure, -}; +use crate::LinearCostPrecompile; pub struct Ed25519Verify; @@ -19,11 +20,9 @@ impl LinearCostPrecompile for Ed25519Verify { const BASE: u64 = 15; const WORD: u64 = 3; - fn raw_execute(input: &[u8], _: u64) -> Result<(ExitSucceed, Vec), PrecompileFailure> { + fn raw_execute(input: &[u8], _: u64) -> (ExitResult, Vec) { if input.len() < 128 { - return Err(PrecompileFailure::Error { - exit_status: ExitError::Other("input must contain 128 bytes".into()), - }); + return (ExitException::Other("input must contain 128 bytes".into()).into(), Vec::new()); }; let mut i = [0u8; 128]; @@ -32,12 +31,15 @@ impl LinearCostPrecompile for Ed25519Verify { let mut buf = [0u8; 32]; let msg = &i[0..32]; - let pk = VerifyingKey::try_from(&i[32..64]).map_err(|_| PrecompileFailure::Error { - exit_status: ExitError::Other("Public key recover failed".into()), - })?; - let sig = Signature::try_from(&i[64..128]).map_err(|_| PrecompileFailure::Error { - exit_status: ExitError::Other("Signature recover failed".into()), - })?; + let pk = match VerifyingKey::try_from(&i[32..64]) { + Ok(pk) => pk, + Err(_) => return (ExitException::Other("Public key recover failed".into()).into(), Vec::new()) + }; + + let sig = match Signature::try_from(&i[64..128]) { + Ok(sig) => sig, + Err(_) => return (ExitException::Other("Signature recover failed".into()).into(), Vec::new()) + }; // https://docs.rs/rust-crypto/0.2.36/crypto/ed25519/fn.verify.html if pk.verify(msg, &sig).is_ok() { @@ -46,7 +48,7 @@ impl LinearCostPrecompile for Ed25519Verify { buf[31] = 1u8; }; - Ok((ExitSucceed::Returned, buf.to_vec())) + (ExitSucceed::Returned.into(), buf.to_vec()) } } @@ -57,19 +59,13 @@ impl LinearCostPrecompile for Curve25519Add { const BASE: u64 = 60; const WORD: u64 = 12; - fn raw_execute(input: &[u8], _: u64) -> Result<(ExitSucceed, Vec), PrecompileFailure> { + fn raw_execute(input: &[u8], _: u64) -> (ExitResult, Vec) { if input.len() % 32 != 0 { - return Err(PrecompileFailure::Error { - exit_status: ExitError::Other("input must contain multiple of 32 bytes".into()), - }); + return (ExitException::Other("input must contain multiple of 32 bytes".into()).into(), Vec::new()); }; if input.len() > 320 { - return Err(PrecompileFailure::Error { - exit_status: ExitError::Other( - "input cannot be greater than 320 bytes (10 compressed points)".into(), - ), - }); + return (ExitException::Other("input cannot be greater than 320 bytes (10 compressed points)".into()).into(), Vec::new()); }; let mut points = Vec::new(); @@ -89,7 +85,7 @@ impl LinearCostPrecompile for Curve25519Add { acc + pt }); - Ok((ExitSucceed::Returned, sum.compress().to_bytes().to_vec())) + (ExitSucceed::Returned.into(), sum.compress().to_bytes().to_vec()) } } @@ -100,13 +96,9 @@ impl LinearCostPrecompile for Curve25519ScalarMul { const BASE: u64 = 60; const WORD: u64 = 12; - fn raw_execute(input: &[u8], _: u64) -> Result<(ExitSucceed, Vec), PrecompileFailure> { + fn raw_execute(input: &[u8], _: u64) -> (ExitResult, Vec) { if input.len() != 64 { - return Err(PrecompileFailure::Error { - exit_status: ExitError::Other( - "input must contain 64 bytes (scalar - 32 bytes, point - 32 bytes)".into(), - ), - }); + return (ExitException::Other("input must contain 64 bytes (scalar - 32 bytes, point - 32 bytes)".into()).into(), Vec::new()); }; // first 32 bytes is for the scalar value @@ -122,10 +114,10 @@ impl LinearCostPrecompile for Curve25519ScalarMul { .unwrap_or_else(RistrettoPoint::identity); let scalar_mul = scalar * point; - Ok(( - ExitSucceed::Returned, + ( + ExitSucceed::Returned.into(), scalar_mul.compress().to_bytes().to_vec(), - )) + ) } } @@ -137,28 +129,16 @@ mod tests { use super::*; #[test] - fn test_empty_input() -> Result<(), PrecompileFailure> { + fn test_empty_input() { let input: [u8; 0] = []; let cost: u64 = 1; - match Ed25519Verify::raw_execute(&input, cost) { - Ok((_, _)) => { - panic!("Test not expected to pass"); - } - Err(e) => { - assert_eq!( - e, - PrecompileFailure::Error { - exit_status: ExitError::Other("input must contain 128 bytes".into()) - } - ); - Ok(()) - } - } + let (success, _) = Ed25519Verify::raw_execute(&input, cost); + assert_eq!(success, ExitException::Other("input must contain 128 bytes".into()).into()); } #[test] - fn test_verify() -> Result<(), PrecompileFailure> { + fn test_verify() { #[allow(clippy::zero_prefixed_literal)] let secret_key_bytes: [u8; ed25519_dalek::SECRET_KEY_LENGTH] = [ 157, 097, 177, 157, 239, 253, 090, 096, 186, 132, 074, 244, 146, 236, 044, 196, 068, @@ -184,18 +164,13 @@ mod tests { let cost: u64 = 1; - match Ed25519Verify::raw_execute(&input, cost) { - Ok((_, output)) => { - assert_eq!(output.len(), 32); - assert_eq!(output[0], 0u8); - assert_eq!(output[1], 0u8); - assert_eq!(output[2], 0u8); - assert_eq!(output[31], 0u8); - } - Err(e) => { - return Err(e); - } - }; + let (success, res) = Ed25519Verify::raw_execute(&input, cost); + assert_eq!(res.len(), 32); + assert_eq!(res[0], 0u8); + assert_eq!(res[1], 0u8); + assert_eq!(res[2], 0u8); + assert_eq!(res[31], 0u8); + assert_eq!(success, ExitSucceed::Returned.into()); // try again with a different message let msg: &[u8] = b"BAD_MESSAGE_mnopqrstuvwxyz123456"; @@ -206,24 +181,17 @@ mod tests { input.extend_from_slice(&signature.to_bytes()); assert_eq!(input.len(), 128); - match Ed25519Verify::raw_execute(&input, cost) { - Ok((_, output)) => { - assert_eq!(output.len(), 32); - assert_eq!(output[0], 0u8); - assert_eq!(output[1], 0u8); - assert_eq!(output[2], 0u8); - assert_eq!(output[31], 1u8); // non-zero indicates error (in our case, 1) - } - Err(e) => { - return Err(e); - } - }; - - Ok(()) + let (success, output) = Ed25519Verify::raw_execute(&input, cost); + assert_eq!(success, ExitSucceed::Returned.into()); + assert_eq!(output.len(), 32); + assert_eq!(output[0], 0u8); + assert_eq!(output[1], 0u8); + assert_eq!(output[2], 0u8); + assert_eq!(output[31], 1u8); // non-zero indicates error (in our case, 1) } #[test] - fn test_sum() -> Result<(), PrecompileFailure> { + fn test_sum() { let s1 = Scalar::from(999u64); let p1 = constants::RISTRETTO_BASEPOINT_POINT * s1; @@ -238,37 +206,25 @@ mod tests { let sum: RistrettoPoint = vec.iter().sum(); let cost: u64 = 1; - match Curve25519Add::raw_execute(&input, cost) { - Ok((_, out)) => { - assert_eq!(out, sum.compress().to_bytes()); - Ok(()) - } - Err(e) => { - panic!("Test not expected to fail: {:?}", e); - } - } + let (success, out) = Curve25519Add::raw_execute(&input, cost); + assert_eq!(success, ExitSucceed::Returned.into()); + assert_eq!(out, sum.compress().to_bytes()); } #[test] - fn test_empty() -> Result<(), PrecompileFailure> { + fn test_empty() { // Test that sum works for the empty iterator let input = vec![]; let cost: u64 = 1; - match Curve25519Add::raw_execute(&input, cost) { - Ok((_, out)) => { - assert_eq!(out, RistrettoPoint::identity().compress().to_bytes()); - Ok(()) - } - Err(e) => { - panic!("Test not expected to fail: {:?}", e); - } - } + let (success, res) = Curve25519Add::raw_execute(&input, cost); + assert_eq!(success, ExitSucceed::Returned.into()); + assert_eq!(res, RistrettoPoint::identity().compress().to_bytes()); } #[test] - fn test_scalar_mul() -> Result<(), PrecompileFailure> { + fn test_scalar_mul() { let s1 = Scalar::from(999u64); let s2 = Scalar::from(333u64); let p1 = constants::RISTRETTO_BASEPOINT_POINT * s1; @@ -280,69 +236,34 @@ mod tests { let cost: u64 = 1; - match Curve25519ScalarMul::raw_execute(&input, cost) { - Ok((_, out)) => { - assert_eq!(out, p1.compress().to_bytes()); - assert_ne!(out, p2.compress().to_bytes()); - Ok(()) - } - Err(e) => { - panic!("Test not expected to fail: {:?}", e); - } - } + let (success, out) = Curve25519ScalarMul::raw_execute(&input, cost); + assert_eq!(success, ExitSucceed::Returned.into()); + assert_eq!(out, p1.compress().to_bytes()); + assert_ne!(out, p2.compress().to_bytes()); } #[test] - fn test_scalar_mul_empty_error() -> Result<(), PrecompileFailure> { + fn test_scalar_mul_empty_error() { let input = vec![]; let cost: u64 = 1; - match Curve25519ScalarMul::raw_execute(&input, cost) { - Ok((_, _out)) => { - panic!("Test not expected to work"); - } - Err(e) => { - assert_eq!( - e, - PrecompileFailure::Error { - exit_status: ExitError::Other( - "input must contain 64 bytes (scalar - 32 bytes, point - 32 bytes)" - .into() - ) - } - ); - Ok(()) - } - } + let (success, _) = Curve25519ScalarMul::raw_execute(&input, cost); + assert_eq!(success, ExitException::Other("input must contain 64 bytes (scalar - 32 bytes, point - 32 bytes)".into()).into()); } #[test] - fn test_point_addition_bad_length() -> Result<(), PrecompileFailure> { + fn test_point_addition_bad_length() { let input: Vec = [0u8; 33].to_vec(); let cost: u64 = 1; - match Curve25519Add::raw_execute(&input, cost) { - Ok((_, _out)) => { - panic!("Test not expected to work"); - } - Err(e) => { - assert_eq!( - e, - PrecompileFailure::Error { - exit_status: ExitError::Other( - "input must contain multiple of 32 bytes".into() - ) - } - ); - Ok(()) - } - } + let (success, _) = Curve25519Add::raw_execute(&input, cost); + assert_eq!(success, ExitException::Other("input must contain multiple of 32 bytes".into()).into()); } #[test] - fn test_point_addition_too_many_points() -> Result<(), PrecompileFailure> { + fn test_point_addition_too_many_points() { let mut input = vec![]; input.extend_from_slice(&constants::RISTRETTO_BASEPOINT_POINT.compress().to_bytes()); // 1 input.extend_from_slice(&constants::RISTRETTO_BASEPOINT_POINT.compress().to_bytes()); // 2 @@ -358,21 +279,7 @@ mod tests { let cost: u64 = 1; - match Curve25519Add::raw_execute(&input, cost) { - Ok((_, _out)) => { - panic!("Test not expected to work"); - } - Err(e) => { - assert_eq!( - e, - PrecompileFailure::Error { - exit_status: ExitError::Other( - "input cannot be greater than 320 bytes (10 compressed points)".into() - ) - } - ); - Ok(()) - } - } + let (success, _) = Curve25519Add::raw_execute(&input, cost); + assert_eq!(success, ExitException::Other("input cannot be greater than 320 bytes (10 compressed points)".into()).into()); } } \ No newline at end of file diff --git a/crates/static-precompiles/src/datacopy.rs b/crates/static-precompiles/src/datacopy.rs new file mode 100644 index 00000000..d8b4a871 --- /dev/null +++ b/crates/static-precompiles/src/datacopy.rs @@ -0,0 +1,20 @@ +#[cfg(feature = "std")] +use std::vec::Vec; + +#[cfg(not(feature = "std"))] +use sgx_tstd::vec::Vec; + +use evm::interpreter::error::{ExitResult, ExitSucceed}; +use crate::LinearCostPrecompile; + +/// The DataCopy precompile. +pub struct DataCopy; + +impl LinearCostPrecompile for DataCopy { + const BASE: u64 = 15; + const WORD: u64 = 3; + + fn raw_execute(input: &[u8], _: u64) -> (ExitResult, Vec) { + (ExitSucceed::Returned.into(), input.to_vec()) + } +} \ No newline at end of file diff --git a/sgxvm/src/precompiles/ec_recover.rs b/crates/static-precompiles/src/ec_recover.rs similarity index 76% rename from sgxvm/src/precompiles/ec_recover.rs rename to crates/static-precompiles/src/ec_recover.rs index 4f10758c..720c4f91 100644 --- a/sgxvm/src/precompiles/ec_recover.rs +++ b/crates/static-precompiles/src/ec_recover.rs @@ -1,16 +1,18 @@ +#[cfg(feature = "std")] use std::vec::Vec; + +#[cfg(not(feature = "std"))] +use sgx_tstd::vec::Vec; + use core::cmp::min; +use evm::interpreter::error::{ExitResult, ExitSucceed}; use k256::sha2::Digest; use sha3::Keccak256; use k256::{ ecdsa::recoverable, elliptic_curve::{sec1::ToEncodedPoint, IsHigh}, }; -use crate::precompiles::{ - ExitSucceed, - LinearCostPrecompile, - PrecompileFailure -}; +use crate::LinearCostPrecompile; // The ecrecover precompile. pub struct ECRecover; @@ -19,7 +21,7 @@ impl LinearCostPrecompile for ECRecover { const BASE: u64 = 3000; const WORD: u64 = 0; - fn raw_execute(i: &[u8], _: u64) -> Result<(ExitSucceed, Vec), PrecompileFailure> { + fn raw_execute(i: &[u8], _: u64) -> (ExitResult, Vec) { let mut input = [0u8; 128]; input[..min(i.len(), 128)].copy_from_slice(&i[..min(i.len(), 128)]); @@ -37,18 +39,18 @@ impl LinearCostPrecompile for ECRecover { }; if input[32..63] != [0u8; 31] { - return Ok((ExitSucceed::Returned, [0u8; 0].to_vec())); + return (ExitSucceed::Returned.into(), [0u8; 0].to_vec()); } let signature = match recoverable::Signature::try_from(&sig[..]) { Ok(signature) => signature, Err(_) => { - return Ok((ExitSucceed::Returned, [0u8; 0].to_vec())); + return (ExitSucceed::Returned.into(), [0u8; 0].to_vec()); } }; if signature.s().is_high().into() { - return Ok((ExitSucceed::Returned, [0u8; 0].to_vec())); + return (ExitSucceed::Returned.into(), [0u8; 0].to_vec()); } let result = match signature.recover_verifying_key_from_digest_bytes(&msg.into()) { @@ -64,6 +66,6 @@ impl LinearCostPrecompile for ECRecover { Err(_) => Vec::default(), }; - Ok((ExitSucceed::Returned, result)) + (ExitSucceed::Returned.into(), result) } } \ No newline at end of file diff --git a/sgxvm/src/precompiles/modexp.rs b/crates/static-precompiles/src/modexp.rs similarity index 77% rename from sgxvm/src/precompiles/modexp.rs rename to crates/static-precompiles/src/modexp.rs index 9c7869b2..5a39e699 100644 --- a/sgxvm/src/precompiles/modexp.rs +++ b/crates/static-precompiles/src/modexp.rs @@ -1,15 +1,15 @@ +#[cfg(feature = "std")] use std::vec::Vec; + +#[cfg(not(feature = "std"))] +use sgx_tstd::vec::Vec; + use core::{cmp::max, ops::BitAnd}; +use evm::GasMutState; +use evm::interpreter::error::{ExitException, ExitResult, ExitSucceed}; +use evm::interpreter::runtime::RuntimeState; use num::{BigUint, FromPrimitive, One, ToPrimitive, Zero}; -use crate::precompiles::{ - ExitError, - ExitSucceed, - Precompile, - PrecompileFailure, - PrecompileHandle, - PrecompileOutput, - PrecompileResult -}; +use crate::Precompile; pub struct Modexp; @@ -89,14 +89,10 @@ fn calculate_gas_cost( // // see: https://eips.ethereum.org/EIPS/eip-198 -impl Precompile for Modexp { - fn execute(handle: &mut impl PrecompileHandle) -> PrecompileResult { - let input = handle.input(); - +impl + GasMutState> Precompile for Modexp { + fn execute(input: &[u8], gasometer: &mut G) -> (ExitResult, Vec) { if input.len() < 96 { - return Err(PrecompileFailure::Error { - exit_status: ExitError::Other("input must contain at least 96 bytes".into()), - }); + return (ExitException::Other("input must contain at least 96 bytes".into()).into(), Vec::new()); }; // reasonable assumption: this must fit within the Ethereum EVM's max stack size @@ -106,25 +102,19 @@ impl Precompile for Modexp { buf.copy_from_slice(&input[0..32]); let base_len_big = BigUint::from_bytes_be(&buf); if base_len_big > max_size_big { - return Err(PrecompileFailure::Error { - exit_status: ExitError::Other("unreasonably large base length".into()), - }); + return (ExitException::Other("unreasonably large base length".into()).into(), Vec::new()); } buf.copy_from_slice(&input[32..64]); let exp_len_big = BigUint::from_bytes_be(&buf); if exp_len_big > max_size_big { - return Err(PrecompileFailure::Error { - exit_status: ExitError::Other("unreasonably large exponent length".into()), - }); + return (ExitException::Other("unreasonably large exponent length".into()).into(), Vec::new()); } buf.copy_from_slice(&input[64..96]); let mod_len_big = BigUint::from_bytes_be(&buf); if mod_len_big > max_size_big { - return Err(PrecompileFailure::Error { - exit_status: ExitError::Other("unreasonably large modulus length".into()), - }); + return (ExitException::Other("unreasonably large modulus length".into()).into(), Vec::new()); } // bounds check handled above @@ -135,14 +125,14 @@ impl Precompile for Modexp { // input length should be at least 96 + user-specified length of base + exp + mod let total_len = base_len + exp_len + mod_len + 96; if input.len() < total_len { - return Err(PrecompileFailure::Error { - exit_status: ExitError::Other("insufficient input size".into()), - }); + return (ExitException::Other("insufficient input size".into()).into(), Vec::new()); } // Gas formula allows arbitrary large exp_len when base and modulus are empty, so we need to handle empty base first. let r = if base_len == 0 && mod_len == 0 { - handle.record_cost(MIN_GAS_COST)?; + if let Err(e) = gasometer.record_gas(MIN_GAS_COST.into()) { + return (e.into(), Vec::new()); + } BigUint::zero() } else { // read the numbers themselves. @@ -156,8 +146,9 @@ impl Precompile for Modexp { let gas_cost = calculate_gas_cost(base_len as u64, exp_len as u64, mod_len as u64, &exponent); - handle.record_cost(gas_cost)?; - let input = handle.input(); + if let Err(e) = gasometer.record_gas(gas_cost.into()) { + return (e.into(), Vec::new()); + } let mod_start = exp_start + exp_len; let modulus = BigUint::from_bytes_be(&input[mod_start..mod_start + mod_len]); @@ -175,22 +166,14 @@ impl Precompile for Modexp { // always true except in the case of zero-length modulus, which leads to // output of length and value 1. if bytes.len() == mod_len { - Ok(PrecompileOutput { - exit_status: ExitSucceed::Returned, - output: bytes.to_vec(), - }) + (ExitSucceed::Returned.into(), bytes.to_vec()) } else if bytes.len() < mod_len { let mut ret = Vec::with_capacity(mod_len); ret.extend(core::iter::repeat(0).take(mod_len - bytes.len())); ret.extend_from_slice(&bytes[..]); - Ok(PrecompileOutput { - exit_status: ExitSucceed::Returned, - output: ret.to_vec(), - }) + (ExitSucceed::Returned.into(), ret.to_vec()) } else { - Err(PrecompileFailure::Error { - exit_status: ExitError::Other("failed".into()), - }) + (ExitException::Other("failed".into()).into(), Vec::new()) } } } diff --git a/sgxvm/src/precompiles/ripemd160.rs b/crates/static-precompiles/src/ripemd160.rs similarity index 50% rename from sgxvm/src/precompiles/ripemd160.rs rename to crates/static-precompiles/src/ripemd160.rs index 3467b540..060a7ecf 100644 --- a/sgxvm/src/precompiles/ripemd160.rs +++ b/crates/static-precompiles/src/ripemd160.rs @@ -1,10 +1,12 @@ +#[cfg(feature = "std")] use std::vec::Vec; + +#[cfg(not(feature = "std"))] +use sgx_tstd::vec::Vec; + +use evm::interpreter::error::{ExitResult, ExitSucceed}; use k256::sha2::Digest; -use crate::precompiles::{ - ExitSucceed, - LinearCostPrecompile, - PrecompileFailure -}; +use crate::LinearCostPrecompile; /// The ripemd precompile. pub struct Ripemd160; @@ -13,9 +15,9 @@ impl LinearCostPrecompile for Ripemd160 { const BASE: u64 = 600; const WORD: u64 = 120; - fn raw_execute(input: &[u8], _cost: u64) -> Result<(ExitSucceed, Vec), PrecompileFailure> { + fn raw_execute(input: &[u8], _cost: u64) -> (ExitResult, Vec) { let mut ret = [0u8; 32]; ret[12..32].copy_from_slice(&ripemd::Ripemd160::digest(input)); - Ok((ExitSucceed::Returned, ret.to_vec())) + (ExitSucceed::Returned.into(), ret.to_vec()) } } \ No newline at end of file diff --git a/sgxvm/src/precompiles/secp256r1.rs b/crates/static-precompiles/src/secp256r1.rs similarity index 56% rename from sgxvm/src/precompiles/secp256r1.rs rename to crates/static-precompiles/src/secp256r1.rs index a971d23d..da1430cd 100644 --- a/sgxvm/src/precompiles/secp256r1.rs +++ b/crates/static-precompiles/src/secp256r1.rs @@ -1,15 +1,14 @@ -extern crate sgx_tstd as std; - +#[cfg(feature = "std")] use std::vec::Vec; + +#[cfg(not(feature = "std"))] +use sgx_tstd::vec::Vec; + use core::cmp::min; +use evm::interpreter::error::{ExitException, ExitResult, ExitSucceed}; use p256::ecdsa::{signature::hazmat::PrehashVerifier, Signature, VerifyingKey}; -use crate::precompiles::{ - ExitError, - ExitSucceed, - LinearCostPrecompile, - PrecompileFailure, -}; +use crate::LinearCostPrecompile; pub struct P256Verify; @@ -17,18 +16,14 @@ impl LinearCostPrecompile for P256Verify { const BASE: u64 = 3450; const WORD: u64 = 0; - fn raw_execute(i: &[u8], target_gas: u64) -> Result<(ExitSucceed, Vec), PrecompileFailure> { + fn raw_execute(i: &[u8], target_gas: u64) -> (ExitResult, Vec){ if i.len() < 160 { - return Err(PrecompileFailure::Error { - exit_status: ExitError::Other("input must contain 160 bytes".into()), - }); + return (ExitException::Other("input must contain 160 bytes".into()).into(), Vec::new()); }; const P256VERIFY_BASE: u64 = 3_450; if P256VERIFY_BASE > target_gas { - return Err(PrecompileFailure::Error { - exit_status: ExitError::OutOfGas, - }); + return (ExitException::OutOfGas.into(), Vec::new()); } let mut input = [0u8; 160]; input[..min(i.len(), 160)].copy_from_slice(&i[..min(i.len(), 160)]); @@ -44,13 +39,15 @@ impl LinearCostPrecompile for P256Verify { uncompressed_pk[0] = 0x04; uncompressed_pk[1..].copy_from_slice(&pk); - let public_key = VerifyingKey::from_sec1_bytes(&uncompressed_pk).map_err(|_| PrecompileFailure::Error { - exit_status: ExitError::Other("Public key recover failed".into()), - })?; - let signature = Signature::from_slice(&sig).map_err(|_| PrecompileFailure::Error { - exit_status: ExitError::Other("Signature recover failed".into()), - })?; + let public_key = match VerifyingKey::from_sec1_bytes(&uncompressed_pk) { + Ok(v) => v, + Err(_) => return (ExitException::Other("Public key recover failed".into()).into(), Vec::new()) + }; + let signature = match Signature::from_slice(&sig) { + Ok(sig) => sig, + Err(_) => return (ExitException::Other("Signature recover failed".into()).into(), Vec::new()) + }; let mut buf = [0u8; 32]; @@ -60,40 +57,30 @@ impl LinearCostPrecompile for P256Verify { } else { buf[31] = 0u8; } - Ok((ExitSucceed::Returned, buf.to_vec())) + (ExitSucceed::Returned.into(), buf.to_vec()) } } + #[cfg(test)] mod tests { use super::*; #[test] - fn test_empty_input() -> Result<(), PrecompileFailure> { + fn test_empty_input() { let input: [u8; 0] = []; let cost: u64 = 1; - match P256Verify::raw_execute(&input, cost) { - Ok((_, _)) => { - panic!("Test not expected to pass"); - } - Err(e) => { - assert_eq!( - e, - PrecompileFailure::Error { - exit_status: ExitError::Other("input must contain 160 bytes".into()) - } - ); - Ok(()) - } - } + let (success, _) = P256Verify::raw_execute(&input, cost); + assert_eq!(success, ExitException::Other("input must contain 160 bytes".into()).into()); } + #[test] fn proper_sig_verify() { let input = hex::decode("4cee90eb86eaa050036147a12d49004b6b9c72bd725d39d4785011fe190f0b4da73bd4903f0ce3b639bbbf6e8e80d16931ff4bcf5993d58468e8fb19086e8cac36dbcd03009df8c59286b162af3bd7fcc0450c9aa81be5d10d312af6c66b1d604aebd3099c618202fcfe16ae7770b0c49ab5eadf74b754204a3bb6060e44eff37618b065f9832de4ca6ca971a7a1adc826d0f7c00181a5fb2ddf79ae00b4e10e").unwrap(); let target_gas = 3_500u64; - let (success, res) = P256Verify::raw_execute(&input, target_gas).unwrap(); - assert_eq!(success, ExitSucceed::Returned); + let (success, res) = P256Verify::raw_execute(&input, target_gas); + assert_eq!(success, ExitSucceed::Returned.into()); assert_eq!(res.len(), 32); assert_eq!(res[0], 0u8); assert_eq!(res[1], 0u8); diff --git a/sgxvm/src/precompiles/sha256.rs b/crates/static-precompiles/src/sha256.rs similarity index 52% rename from sgxvm/src/precompiles/sha256.rs rename to crates/static-precompiles/src/sha256.rs index d5ac9c5f..d361b8c3 100644 --- a/sgxvm/src/precompiles/sha256.rs +++ b/crates/static-precompiles/src/sha256.rs @@ -1,13 +1,15 @@ +#[cfg(feature = "std")] use std::vec::Vec; + +#[cfg(not(feature = "std"))] +use sgx_tstd::vec::Vec; + +use evm::interpreter::error::{ExitResult, ExitSucceed}; use k256::sha2::{ Sha256 as kSha256, Digest }; -use crate::precompiles::{ - ExitSucceed, - LinearCostPrecompile, - PrecompileFailure -}; +use crate::LinearCostPrecompile; /// The sha256 precompile. pub struct Sha256; @@ -16,10 +18,10 @@ impl LinearCostPrecompile for Sha256 { const BASE: u64 = 60; const WORD: u64 = 12; - fn raw_execute(input: &[u8], _cost: u64) -> Result<(ExitSucceed, Vec), PrecompileFailure> { + fn raw_execute(input: &[u8], _cost: u64) -> (ExitResult, Vec) { let mut hasher = kSha256::new(); hasher.update(input); let result = hasher.finalize(); - Ok((ExitSucceed::Returned, result.to_vec())) + (ExitSucceed::Returned.into(), result.to_vec()) } } \ No newline at end of file diff --git a/sgxvm/src/precompiles/sha3fips.rs b/crates/static-precompiles/src/sha3fips.rs similarity index 60% rename from sgxvm/src/precompiles/sha3fips.rs rename to crates/static-precompiles/src/sha3fips.rs index a04dbc44..2ed8303b 100644 --- a/sgxvm/src/precompiles/sha3fips.rs +++ b/crates/static-precompiles/src/sha3fips.rs @@ -1,9 +1,11 @@ +#[cfg(feature = "std")] use std::vec::Vec; -use crate::precompiles::{ - ExitSucceed, - LinearCostPrecompile, - PrecompileFailure -}; + +#[cfg(not(feature = "std"))] +use sgx_tstd::vec::Vec; + +use evm::interpreter::error::{ExitResult, ExitSucceed}; +use crate::LinearCostPrecompile; pub struct Sha3FIPS256; @@ -11,13 +13,14 @@ impl LinearCostPrecompile for Sha3FIPS256 { const BASE: u64 = 60; const WORD: u64 = 12; - fn raw_execute(input: &[u8], _: u64) -> Result<(ExitSucceed, Vec), PrecompileFailure> { + fn raw_execute(input: &[u8], _: u64) -> (ExitResult, Vec) { use tiny_keccak::Hasher; let mut output = [0; 32]; let mut sha3 = tiny_keccak::Sha3::v256(); sha3.update(input); sha3.finalize(&mut output); - Ok((ExitSucceed::Returned, output.to_vec())) + + (ExitSucceed::Returned.into(), output.to_vec()) } } @@ -27,13 +30,14 @@ impl LinearCostPrecompile for Sha3FIPS512 { const BASE: u64 = 60; const WORD: u64 = 12; - fn raw_execute(input: &[u8], _: u64) -> Result<(ExitSucceed, Vec), PrecompileFailure> { + fn raw_execute(input: &[u8], _: u64) -> (ExitResult, Vec) { use tiny_keccak::Hasher; let mut output = [0; 64]; let mut sha3 = tiny_keccak::Sha3::v512(); sha3.update(input); sha3.finalize(&mut output); - Ok((ExitSucceed::Returned, output.to_vec())) + + (ExitSucceed::Returned.into(), output.to_vec()) } } @@ -42,7 +46,7 @@ mod tests { use super::*; #[test] - fn test_empty_input() -> Result<(), PrecompileFailure> { + fn test_empty_input() { let input: [u8; 0] = []; let expected = b"\ \xa7\xff\xc6\xf8\xbf\x1e\xd7\x66\x51\xc1\x47\x56\xa0\x61\xd6\x62\ @@ -51,19 +55,13 @@ mod tests { let cost: u64 = 1; - match Sha3FIPS256::raw_execute(&input, cost) { - Ok((_, out)) => { - assert_eq!(out, expected); - Ok(()) - } - Err(e) => { - panic!("Test not expected to fail: {:?}", e); - } - } + let (success, res) = Sha3FIPS256::raw_execute(&input, cost); + assert_eq!(success, ExitSucceed::Returned.into()); + assert_eq!(res, expected); } #[test] - fn hello_sha3_256() -> Result<(), PrecompileFailure> { + fn hello_sha3_256() { let input = b"hello"; let expected = b"\ \x33\x38\xbe\x69\x4f\x50\xc5\xf3\x38\x81\x49\x86\xcd\xf0\x68\x64\ @@ -72,19 +70,13 @@ mod tests { let cost: u64 = 1; - match Sha3FIPS256::raw_execute(input, cost) { - Ok((_, out)) => { - assert_eq!(out, expected); - Ok(()) - } - Err(e) => { - panic!("Test not expected to fail: {:?}", e); - } - } + let (success, res) = Sha3FIPS256::raw_execute(input, cost); + assert_eq!(success, ExitSucceed::Returned.into()); + assert_eq!(res, expected); } #[test] - fn long_string_sha3_256() -> Result<(), PrecompileFailure> { + fn long_string_sha3_256() { let input = b"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; let expected = b"\ \xbd\xe3\xf2\x69\x17\x5e\x1d\xcd\xa1\x38\x48\x27\x8a\xa6\x04\x6b\ @@ -93,19 +85,13 @@ mod tests { let cost: u64 = 1; - match Sha3FIPS256::raw_execute(input, cost) { - Ok((_, out)) => { - assert_eq!(out, expected); - Ok(()) - } - Err(e) => { - panic!("Test not expected to fail: {:?}", e); - } - } + let (success, res) = Sha3FIPS256::raw_execute(input, cost); + assert_eq!(res, expected); + assert_eq!(success, ExitSucceed::Returned.into()); } #[test] - fn long_string_sha3_512() -> Result<(), PrecompileFailure> { + fn long_string_sha3_512() { let input = b"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; let expected = b"\ \xf3\x2a\x94\x23\x55\x13\x51\xdf\x0a\x07\xc0\xb8\xc2\x0e\xb9\x72\ @@ -116,14 +102,8 @@ mod tests { let cost: u64 = 1; - match Sha3FIPS512::raw_execute(input, cost) { - Ok((_, out)) => { - assert_eq!(out, expected); - Ok(()) - } - Err(e) => { - panic!("Test not expected to fail: {:?}", e); - } - } + let (success, res) = Sha3FIPS512::raw_execute(input, cost); + assert_eq!(res, expected); + assert_eq!(success, ExitSucceed::Returned.into()); } } diff --git a/deb/postinst b/deb/postinst index 0737b054..1e0f97b2 100644 --- a/deb/postinst +++ b/deb/postinst @@ -8,7 +8,7 @@ then export SUDO_USER=root fi -cat < /etc/systemd/system/swisstronik-node-v1.0.5.service +cat < /etc/systemd/system/swisstronik-node-v1.0.6.service [Unit] Description=Swisstronik node service After=network.target @@ -16,7 +16,7 @@ After=network.target [Service] Type=simple WorkingDirectory=$(eval echo ~"$SUDO_USER") -ExecStart=/usr/local/bin/swisstronikd_v1.0.5 start --rpc.laddr "tcp://0.0.0.0:26657" --json-rpc.address 0.0.0.0:8545 --json-rpc.ws-address 0.0.0.0:8546 --home /opt/swisstronik/.swisstronik +ExecStart=/usr/local/bin/swisstronikd start --rpc.laddr "tcp://0.0.0.0:26657" --json-rpc.address 0.0.0.0:8545 --json-rpc.ws-address 0.0.0.0:8546 --home /opt/swisstronik/.swisstronik User=$SUDO_USER Restart=on-failure StartLimitInterval=0 diff --git a/deb/postrm b/deb/postrm index ea913f00..2c1acdaa 100644 --- a/deb/postrm +++ b/deb/postrm @@ -3,8 +3,8 @@ set -e -systemctl stop swisstronik-node-v1.0.5 || true -systemctl disable swisstronik-node-v1.0.5 || true -rm -f /etc/systemd/system/swisstronik-node-v1.0.5.service || true +systemctl stop swisstronik-node-v1.0.6 || true +systemctl disable swisstronik-node-v1.0.6 || true +rm -f /etc/systemd/system/swisstronik-node-v1.0.6.service || true rm -r /opt/swisstronik/ || true systemctl daemon-reload || true diff --git a/docker/deb.Dockerfile b/docker/deb.Dockerfile index f1cc3faa..9869e738 100644 --- a/docker/deb.Dockerfile +++ b/docker/deb.Dockerfile @@ -47,7 +47,7 @@ RUN make build ############ Node binary for deb package FROM compile-base as build-deb -ARG BUILD_VERSION="v1.0.5" +ARG BUILD_VERSION="v1.0.6" ENV VERSION=${BUILD_VERSION} ARG DEB_BIN_DIR=/usr/local/bin ENV DEB_BIN_DIR=${DEB_BIN_DIR} @@ -61,7 +61,7 @@ WORKDIR /root # Copy over binaries from the build-env COPY --from=compile-chain /root/chain/build/swisstronikd swisstronikd COPY --from=compile-chain /root/.swisstronik-enclave /usr/lib/.swisstronik-enclave -COPY --from=compile-chain /root/chain/go-sgxvm/internal/api/libsgx_wrapper_v1.0.5.x86_64.so /usr/lib/.swisstronik-enclave/libsgx_wrapper_v1.0.5.x86_64.so +COPY --from=compile-chain /root/chain/go-sgxvm/internal/api/libsgx_wrapper_v1.0.6.x86_64.so /usr/lib/.swisstronik-enclave/libsgx_wrapper_v1.0.5.x86_64.so COPY ./deb ./deb COPY ./scripts/build_deb.sh . diff --git a/docker/node.Dockerfile b/docker/node.Dockerfile index bc4adc3d..0af94793 100644 --- a/docker/node.Dockerfile +++ b/docker/node.Dockerfile @@ -46,7 +46,7 @@ FROM base as hw-node COPY --from=compile-chain /root/chain/build/swisstronikd /usr/local/bin/swisstronikd COPY --from=compile-chain /root/.swisstronik-enclave /root/.swisstronik-enclave -COPY --from=compile-chain /root/chain/go-sgxvm/internal/api/libsgx_wrapper_v1.0.5.x86_64.so /lib/x86_64-linux-gnu/libsgx_wrapper_v1.0.5.x86_64.so +COPY --from=compile-chain /root/chain/go-sgxvm/internal/api/libsgx_wrapper_v1.0.6.x86_64.so /lib/x86_64-linux-gnu/libsgx_wrapper_v1.0.5.x86_64.so COPY --from=compile-chain /opt/intel /opt/intel EXPOSE 26656 26657 1317 9090 8545 8546 8999 @@ -62,7 +62,7 @@ RUN rm -rf /var/lib/apt/lists/* COPY --from=compile-chain /root/chain/build/swisstronikd /usr/bin/swisstronikd COPY --from=compile-chain /root/.swisstronik-enclave /root/.swisstronik-enclave -COPY --from=compile-chain /root/chain/go-sgxvm/internal/api/libsgx_wrapper_v1.0.5/x86_64.so /lib/x86_64-linux-gnu/libsgx_wrapper_v1.0.5.x86_64.so +COPY --from=compile-chain /root/chain/go-sgxvm/internal/api/libsgx_wrapper_v1.0.6/x86_64.so /lib/x86_64-linux-gnu/libsgx_wrapper_v1.0.5.x86_64.so COPY --from=compile-chain /opt/intel/sgxsdk/sdk_libs/* /lib/x86_64-linux-gnu/ COPY --from=compile-chain /root/chain/scripts/local-node.sh /root/local-node.sh diff --git a/go-sgxvm/Makefile b/go-sgxvm/Makefile index b4a3a89a..17cf0221 100644 --- a/go-sgxvm/Makefile +++ b/go-sgxvm/Makefile @@ -9,7 +9,7 @@ SGX_MODE ?= HW ENCLAVE_HOME ?= $(HOME)/.swisstronik-enclave PRODUCTION_MODE ?= false AS_MODE ?= false -VERSION := v1.0.5 +VERSION := v1.0.6 Wrapper_build_feature := "" Wrapper_lib := libsgx_wrapper_$(VERSION).x86_64.so @@ -24,26 +24,31 @@ else Wrapper_build_feature += simulation_mode endif +define proto-gen + @protoc --go_out=types --proto_path=../sgxvm/proto/ ../sgxvm/proto/ffi.proto + @protoc --go_out=types --proto_path=proto/ proto/node.proto + @cp types/github.com/SigmaGmbH/librustgo/types/* types/ && rm -rf types/github.com +endef + build: @ENCLAVE_HOME=$(ENCLAVE_HOME) PRODUCTION_MODE=$(PRODUCTION_MODE) SGX_MODE=$(SGX_MODE) AS_MODE=$(AS_MODE) VERSION=$(VERSION) make build -C ../sgxvm/ @protoc --rust_out src/protobuf_generated/ proto/node.proto @ENCLAVE_HOME=$(ENCLAVE_HOME) cargo build --features "$(Wrapper_build_feature)" --release @cp $(CURDIR)/target/release/libsgxvm_wrapper.so $(CURDIR)/internal/api/$(Wrapper_lib) - @protoc --go_out=types --proto_path=../sgxvm/proto/ ../sgxvm/proto/ffi.proto - @protoc --go_out=types --proto_path=proto/ proto/node.proto - @cp types/github.com/SigmaGmbH/librustgo/types/* types/ && rm -rf types/github.com + $(call proto-gen) build_d: @ENCLAVE_HOME=$(ENCLAVE_HOME) PRODUCTION_MODE=$(PRODUCTION_MODE) SGX_MODE=$(SGX_MODE) AS_MODE=$(AS_MODE) VERSION=$(VERSION) make build_d -C ../sgxvm/ @protoc --rust_out src/protobuf_generated/ proto/node.proto @ENCLAVE_HOME=$(ENCLAVE_HOME) cargo build --features "$(Wrapper_build_feature)" --release @cp $(CURDIR)/target/release/libsgxvm_wrapper.so $(CURDIR)/internal/api/$(Wrapper_lib) - @protoc --go_out=types --proto_path=../sgxvm/proto/ ../sgxvm/proto/ffi.proto - @protoc --go_out=types --proto_path=proto/ proto/node.proto - @cp types/github.com/SigmaGmbH/librustgo/types/* types/ && rm -rf types/github.com + $(call proto-gen) build_AS: build go build -tags osusergo,netgo,attestationServer -o ../build/attestationServer ./cmd/attestation build_AS_d: build_d go build -tags osusergo,netgo,attestationServer -o ../build/attestationServer ./cmd/attestation + +proto-gen: + $(call proto-gen) diff --git a/go-sgxvm/internal/api/lib.go b/go-sgxvm/internal/api/lib.go index 09d9881f..e678cd77 100644 --- a/go-sgxvm/internal/api/lib.go +++ b/go-sgxvm/internal/api/lib.go @@ -265,7 +265,9 @@ func Call( connector Connector, from, to, data, value []byte, accessList ethtypes.AccessList, - gasLimit, nonce uint64, + gasLimit uint64, + gasPrice []byte, + nonce uint64, txContext *types.TransactionContext, commit bool, isUnencrypted bool, @@ -279,6 +281,7 @@ func Call( To: to, Data: data, GasLimit: gasLimit, + GasPrice: gasPrice, Value: value, AccessList: convertAccessList(accessList), Commit: commit, @@ -325,7 +328,9 @@ func Create( connector Connector, from, data, value []byte, accessList ethtypes.AccessList, - gasLimit, nonce uint64, + gasLimit uint64, + gasPrice []byte, + nonce uint64, txContext *types.TransactionContext, commit bool, ) (*types.HandleTransactionResponse, error) { @@ -337,6 +342,7 @@ func Create( From: from, Data: data, GasLimit: gasLimit, + GasPrice: gasPrice, Value: value, AccessList: convertAccessList(accessList), Commit: commit, diff --git a/go-sgxvm/internal/api/link_glibclinux_aarch64.go b/go-sgxvm/internal/api/link_glibclinux_aarch64.go index 5f7dcc27..909f71c0 100644 --- a/go-sgxvm/internal/api/link_glibclinux_aarch64.go +++ b/go-sgxvm/internal/api/link_glibclinux_aarch64.go @@ -2,5 +2,5 @@ package api -// #cgo LDFLAGS: -Wl,-rpath,${SRCDIR} -L${SRCDIR} -lsgx_wrapper_v1.0.5.aarch64 +// #cgo LDFLAGS: -Wl,-rpath,${SRCDIR} -L${SRCDIR} -lsgx_wrapper_v1.0.6.aarch64 import "C" diff --git a/go-sgxvm/internal/api/link_glibclinux_x86_64.attestation.go b/go-sgxvm/internal/api/link_glibclinux_x86_64.attestation.go index 067eb946..71aedb5d 100644 --- a/go-sgxvm/internal/api/link_glibclinux_x86_64.attestation.go +++ b/go-sgxvm/internal/api/link_glibclinux_x86_64.attestation.go @@ -2,5 +2,5 @@ package api -// #cgo LDFLAGS: -Wl,-rpath,${SRCDIR} -L${SRCDIR} -lsgx_attestation_wrapper_v1.0.5.x86_64 +// #cgo LDFLAGS: -Wl,-rpath,${SRCDIR} -L${SRCDIR} -lsgx_attestation_wrapper_v1.0.6.x86_64 import "C" diff --git a/go-sgxvm/internal/api/link_glibclinux_x86_64.go b/go-sgxvm/internal/api/link_glibclinux_x86_64.go index db95872e..9aa0ffa1 100644 --- a/go-sgxvm/internal/api/link_glibclinux_x86_64.go +++ b/go-sgxvm/internal/api/link_glibclinux_x86_64.go @@ -2,5 +2,5 @@ package api -// #cgo LDFLAGS: -Wl,-rpath,${SRCDIR} -L${SRCDIR} -lsgx_wrapper_v1.0.5.x86_64 +// #cgo LDFLAGS: -Wl,-rpath,${SRCDIR} -L${SRCDIR} -lsgx_wrapper_v1.0.6.x86_64 import "C" diff --git a/go-sgxvm/internal/api/link_mac.go b/go-sgxvm/internal/api/link_mac.go index db84a1ed..004eabb3 100644 --- a/go-sgxvm/internal/api/link_mac.go +++ b/go-sgxvm/internal/api/link_mac.go @@ -2,5 +2,5 @@ package api -// #cgo LDFLAGS: -Wl,-rpath,${SRCDIR} -L${SRCDIR} -lsgx_wrapper_v1.0.5 +// #cgo LDFLAGS: -Wl,-rpath,${SRCDIR} -L${SRCDIR} -lsgx_wrapper_v1.0.6 import "C" diff --git a/go-sgxvm/internal/api/link_muslc.go b/go-sgxvm/internal/api/link_muslc.go index 9a0f85a1..83c43510 100644 --- a/go-sgxvm/internal/api/link_muslc.go +++ b/go-sgxvm/internal/api/link_muslc.go @@ -2,5 +2,5 @@ package api -// #cgo LDFLAGS: -Wl,-rpath,${SRCDIR} -L${SRCDIR} -lsgx_wrapper_v1.0.5_muslc +// #cgo LDFLAGS: -Wl,-rpath,${SRCDIR} -L${SRCDIR} -lsgx_wrapper_v1.0.6_muslc import "C" diff --git a/go-sgxvm/internal/api/link_system.go b/go-sgxvm/internal/api/link_system.go index 4dff2c90..7c4bc9d1 100644 --- a/go-sgxvm/internal/api/link_system.go +++ b/go-sgxvm/internal/api/link_system.go @@ -2,5 +2,5 @@ package api -// #cgo LDFLAGS: -lsgx_wrapper_v1.0.5 +// #cgo LDFLAGS: -lsgx_wrapper_v1.0.6 import "C" diff --git a/go-sgxvm/internal/api/link_windows.go b/go-sgxvm/internal/api/link_windows.go index 6898b1ce..d4a64c0b 100644 --- a/go-sgxvm/internal/api/link_windows.go +++ b/go-sgxvm/internal/api/link_windows.go @@ -2,5 +2,5 @@ package api -// #cgo LDFLAGS: -Wl,-rpath,${SRCDIR} -L${SRCDIR} -lsgx_wrapper_v1.0.5 +// #cgo LDFLAGS: -Wl,-rpath,${SRCDIR} -L${SRCDIR} -lsgx_wrapper_v1.0.6 import "C" diff --git a/go-sgxvm/lib.go b/go-sgxvm/lib.go index 69083399..a2ce131a 100644 --- a/go-sgxvm/lib.go +++ b/go-sgxvm/lib.go @@ -21,8 +21,6 @@ type TransactionData = types.TransactionData type QueryGetAccount = types.QueryGetAccount type QueryGetAccountResponse = types.QueryGetAccountResponse type CosmosRequest = types.CosmosRequest -type QueryInsertAccount = types.QueryInsertAccount -type QueryInsertAccountResponse = types.QueryInsertAccountResponse type QueryContainsKey = types.QueryContainsKey type QueryContainsKeyResponse = types.QueryContainsKeyResponse type QueryGetAccountStorageCell = types.QueryGetAccountStorageCell @@ -46,10 +44,17 @@ type QueryHasVerificationResponse = types.QueryHasVerificationResponse type QueryGetVerificationData = types.QueryGetVerificationData type VerificationDetails = types.VerificationDetails type QueryGetVerificationDataResponse = types.QueryGetVerificationDataResponse +type QueryAccountCodeSize = types.QueryGetAccountCodeSize +type QueryAccountCodeSizeResponse = types.QueryGetAccountCodeSizeResponse +type QueryAccountCodeHash = types.QueryGetAccountCodeHash +type QueryAccountCodeHashResponse = types.QueryGetAccountCodeHashResponse +type QueryInsertAccountNonce = types.QueryInsertAccountNonce +type QueryInsertAccountNonceResponse = types.QueryInsertAccountNonceResponse +type QueryInsertAccountBalance = types.QueryInsertAccountBalance +type QueryInsertAccountBalanceResponse = types.QueryInsertAccountBalanceResponse // Storage requests type CosmosRequest_GetAccount = types.CosmosRequest_GetAccount -type CosmosRequest_InsertAccount = types.CosmosRequest_InsertAccount type CosmosRequest_ContainsKey = types.CosmosRequest_ContainsKey type CosmosRequest_AccountCode = types.CosmosRequest_AccountCode type CosmosRequest_StorageCell = types.CosmosRequest_StorageCell @@ -60,6 +65,10 @@ type CosmosRequest_RemoveStorageCell = types.CosmosRequest_RemoveStorageCell type CosmosRequest_AddVerificationDetails = types.CosmosRequest_AddVerificationDetails type CosmosRequest_HasVerification = types.CosmosRequest_HasVerification type CosmosRequest_GetVerificationData = types.CosmosRequest_GetVerificationData +type CosmosRequest_GetAccountCodeSize = types.CosmosRequest_CodeSize +type CosmosRequest_GetAccountCodeHash = types.CosmosRequest_CodeHash +type CosmosRequest_InsertAccountBalance = types.CosmosRequest_InsertAccountBalance +type CosmosRequest_InsertAccountNonce = types.CosmosRequest_InsertAccountNonce // Backend requests type CosmosRequest_BlockHash = types.CosmosRequest_BlockHash @@ -83,12 +92,14 @@ func Call( querier types.Connector, from, to, data, value []byte, accessList ethtypes.AccessList, - gasLimit, nonce uint64, + gasLimit uint64, + gasPrice []byte, + nonce uint64, txContext *TransactionContext, commit bool, isUnencrypted bool, ) (*types.HandleTransactionResponse, error) { - executionResult, err := api.Call(querier, from, to, data, value, accessList, gasLimit, nonce, txContext, commit, isUnencrypted) + executionResult, err := api.Call(querier, from, to, data, value, accessList, gasLimit, gasPrice, nonce, txContext, commit, isUnencrypted) if err != nil { return &types.HandleTransactionResponse{}, err } @@ -101,11 +112,13 @@ func Create( querier types.Connector, from, data, value []byte, accessList ethtypes.AccessList, - gasLimit, nonce uint64, + gasLimit uint64, + gasPrice []byte, + nonce uint64, txContext *TransactionContext, commit bool, ) (*types.HandleTransactionResponse, error) { - executionResult, err := api.Create(querier, from, data, value, accessList, gasLimit, nonce, txContext, commit) + executionResult, err := api.Create(querier, from, data, value, accessList, gasLimit, gasPrice, nonce, txContext, commit) if err != nil { return &types.HandleTransactionResponse{}, err } diff --git a/go-sgxvm/lib_test.go b/go-sgxvm/lib_test.go index 8d3297aa..165e5d21 100644 --- a/go-sgxvm/lib_test.go +++ b/go-sgxvm/lib_test.go @@ -19,6 +19,7 @@ func TestCreate(t *testing.T) { value := common.Hex2Bytes("00") data := common.Hex2Bytes("60806040526000805534801561001457600080fd5b50610394806100246000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80634f2be91f1461004657806361bc221a146100505780636deebae31461006e575b600080fd5b61004e610078565b005b610058610103565b60405161006591906101f1565b60405180910390f35b610076610109565b005b60008081548092919061008a9061023b565b91905055507f64a55044d1f2eddebe1b90e8e2853e8e96931cefadbfa0b2ceb34bee360619416000546040516100c091906101f1565b60405180910390a17f938d2ee5be9cfb0f7270ee2eff90507e94b37625d9d2b3a61c97d30a4560b8296000546040516100f991906101f1565b60405180910390a1565b60005481565b60008054116040518060400160405280600f81526020017f434f554e5445525f544f4f5f4c4f57000000000000000000000000000000000081525090610185576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161017c9190610313565b60405180910390fd5b5060008081548092919061019890610335565b91905055507f938d2ee5be9cfb0f7270ee2eff90507e94b37625d9d2b3a61c97d30a4560b8296000546040516101ce91906101f1565b60405180910390a1565b6000819050919050565b6101eb816101d8565b82525050565b600060208201905061020660008301846101e2565b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b6000610246826101d8565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82036102785761027761020c565b5b600182019050919050565b600081519050919050565b600082825260208201905092915050565b60005b838110156102bd5780820151818401526020810190506102a2565b60008484015250505050565b6000601f19601f8301169050919050565b60006102e582610283565b6102ef818561028e565b93506102ff81856020860161029f565b610308816102c9565b840191505092915050565b6000602082019050818103600083015261032d81846102da565b905092915050565b6000610340826101d8565b9150600082036103535761035261020c565b5b60018203905091905056fea264697066735822122009b7dbde115b8323afdd451cd1b9c02d5e332011af0eb72b9ef71469fe56ab3564736f6c63430008120033") gasLimit := uint64(2000000) + gasPrice := []byte{0,0} txContext := types.GetDefaultTxContext() // Calculate contract address @@ -36,6 +37,7 @@ func TestCreate(t *testing.T) { value, nil, gasLimit, + gasPrice, 0, txContext, true, @@ -80,6 +82,8 @@ func TestCoinTransfer(t *testing.T) { receiverBalanceBefore := types.BytesToBig(toAcct.Balance).Uint64() receiverNonceBefore := toAcct.Nonce + gasPrice := []byte{0,0} + // Send a transaction to transfer 100 wei _, err = api.Call( connector, @@ -89,6 +93,7 @@ func TestCoinTransfer(t *testing.T) { value.Bytes(), nil, gasLimit, + gasPrice, 0, txContext, true, diff --git a/go-sgxvm/rust-toolchain b/go-sgxvm/rust-toolchain index cd5e8eb2..1892e031 100644 --- a/go-sgxvm/rust-toolchain +++ b/go-sgxvm/rust-toolchain @@ -1 +1 @@ -nightly-2022-10-22 +nightly-2023-03-13 \ No newline at end of file diff --git a/go-sgxvm/src/enclave/doorbell.rs b/go-sgxvm/src/enclave/doorbell.rs index 01b2d706..f3f3f55d 100644 --- a/go-sgxvm/src/enclave/doorbell.rs +++ b/go-sgxvm/src/enclave/doorbell.rs @@ -6,10 +6,10 @@ use std::ops::Deref; use std::time::Duration; #[cfg(not(feature = "attestation_server"))] -static ENCLAVE_FILE: &'static str = "v1.0.5_enclave.signed.so"; +static ENCLAVE_FILE: &'static str = "v1.0.6_enclave.signed.so"; #[cfg(feature = "attestation_server")] -static ENCLAVE_FILE: &'static str = "v1.0.5_attestation_enclave.signed.so"; +static ENCLAVE_FILE: &'static str = "v1.0.6_attestation_enclave.signed.so"; #[cfg(feature = "attestation_server")] const ENCLAVE_LOCK_TIMEOUT: u64 = 6 * 50; diff --git a/go-sgxvm/types/ffi.pb.go b/go-sgxvm/types/ffi.pb.go index 3a0347b0..2a0cf63c 100644 --- a/go-sgxvm/types/ffi.pb.go +++ b/go-sgxvm/types/ffi.pb.go @@ -614,19 +614,17 @@ func (x *QueryGetAccountResponse) GetNonce() uint64 { return 0 } -// Request to insert account data such as balance and nonce -type QueryInsertAccount struct { +type QueryInsertAccountBalance struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields Address []byte `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` Balance []byte `protobuf:"bytes,2,opt,name=balance,proto3" json:"balance,omitempty"` - Nonce uint64 `protobuf:"varint,3,opt,name=nonce,proto3" json:"nonce,omitempty"` } -func (x *QueryInsertAccount) Reset() { - *x = QueryInsertAccount{} +func (x *QueryInsertAccountBalance) Reset() { + *x = QueryInsertAccountBalance{} if protoimpl.UnsafeEnabled { mi := &file_ffi_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -634,13 +632,13 @@ func (x *QueryInsertAccount) Reset() { } } -func (x *QueryInsertAccount) String() string { +func (x *QueryInsertAccountBalance) String() string { return protoimpl.X.MessageStringOf(x) } -func (*QueryInsertAccount) ProtoMessage() {} +func (*QueryInsertAccountBalance) ProtoMessage() {} -func (x *QueryInsertAccount) ProtoReflect() protoreflect.Message { +func (x *QueryInsertAccountBalance) ProtoReflect() protoreflect.Message { mi := &file_ffi_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -652,56 +650,141 @@ func (x *QueryInsertAccount) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use QueryInsertAccount.ProtoReflect.Descriptor instead. -func (*QueryInsertAccount) Descriptor() ([]byte, []int) { +// Deprecated: Use QueryInsertAccountBalance.ProtoReflect.Descriptor instead. +func (*QueryInsertAccountBalance) Descriptor() ([]byte, []int) { return file_ffi_proto_rawDescGZIP(), []int{9} } -func (x *QueryInsertAccount) GetAddress() []byte { +func (x *QueryInsertAccountBalance) GetAddress() []byte { if x != nil { return x.Address } return nil } -func (x *QueryInsertAccount) GetBalance() []byte { +func (x *QueryInsertAccountBalance) GetBalance() []byte { if x != nil { return x.Balance } return nil } -func (x *QueryInsertAccount) GetNonce() uint64 { +type QueryInsertAccountBalanceResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *QueryInsertAccountBalanceResponse) Reset() { + *x = QueryInsertAccountBalanceResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_ffi_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *QueryInsertAccountBalanceResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*QueryInsertAccountBalanceResponse) ProtoMessage() {} + +func (x *QueryInsertAccountBalanceResponse) ProtoReflect() protoreflect.Message { + mi := &file_ffi_proto_msgTypes[10] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use QueryInsertAccountBalanceResponse.ProtoReflect.Descriptor instead. +func (*QueryInsertAccountBalanceResponse) Descriptor() ([]byte, []int) { + return file_ffi_proto_rawDescGZIP(), []int{10} +} + +type QueryInsertAccountNonce struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Address []byte `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + Nonce uint64 `protobuf:"varint,2,opt,name=nonce,proto3" json:"nonce,omitempty"` +} + +func (x *QueryInsertAccountNonce) Reset() { + *x = QueryInsertAccountNonce{} + if protoimpl.UnsafeEnabled { + mi := &file_ffi_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *QueryInsertAccountNonce) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*QueryInsertAccountNonce) ProtoMessage() {} + +func (x *QueryInsertAccountNonce) ProtoReflect() protoreflect.Message { + mi := &file_ffi_proto_msgTypes[11] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use QueryInsertAccountNonce.ProtoReflect.Descriptor instead. +func (*QueryInsertAccountNonce) Descriptor() ([]byte, []int) { + return file_ffi_proto_rawDescGZIP(), []int{11} +} + +func (x *QueryInsertAccountNonce) GetAddress() []byte { + if x != nil { + return x.Address + } + return nil +} + +func (x *QueryInsertAccountNonce) GetNonce() uint64 { if x != nil { return x.Nonce } return 0 } -// Response for account insertion -type QueryInsertAccountResponse struct { +type QueryInsertAccountNonceResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields } -func (x *QueryInsertAccountResponse) Reset() { - *x = QueryInsertAccountResponse{} +func (x *QueryInsertAccountNonceResponse) Reset() { + *x = QueryInsertAccountNonceResponse{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[10] + mi := &file_ffi_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } } -func (x *QueryInsertAccountResponse) String() string { +func (x *QueryInsertAccountNonceResponse) String() string { return protoimpl.X.MessageStringOf(x) } -func (*QueryInsertAccountResponse) ProtoMessage() {} +func (*QueryInsertAccountNonceResponse) ProtoMessage() {} -func (x *QueryInsertAccountResponse) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[10] +func (x *QueryInsertAccountNonceResponse) ProtoReflect() protoreflect.Message { + mi := &file_ffi_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -712,9 +795,9 @@ func (x *QueryInsertAccountResponse) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use QueryInsertAccountResponse.ProtoReflect.Descriptor instead. -func (*QueryInsertAccountResponse) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{10} +// Deprecated: Use QueryInsertAccountNonceResponse.ProtoReflect.Descriptor instead. +func (*QueryInsertAccountNonceResponse) Descriptor() ([]byte, []int) { + return file_ffi_proto_rawDescGZIP(), []int{12} } type QueryContainsKey struct { @@ -728,7 +811,7 @@ type QueryContainsKey struct { func (x *QueryContainsKey) Reset() { *x = QueryContainsKey{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[11] + mi := &file_ffi_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -741,7 +824,7 @@ func (x *QueryContainsKey) String() string { func (*QueryContainsKey) ProtoMessage() {} func (x *QueryContainsKey) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[11] + mi := &file_ffi_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -754,7 +837,7 @@ func (x *QueryContainsKey) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryContainsKey.ProtoReflect.Descriptor instead. func (*QueryContainsKey) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{11} + return file_ffi_proto_rawDescGZIP(), []int{13} } func (x *QueryContainsKey) GetKey() []byte { @@ -775,7 +858,7 @@ type QueryContainsKeyResponse struct { func (x *QueryContainsKeyResponse) Reset() { *x = QueryContainsKeyResponse{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[12] + mi := &file_ffi_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -788,7 +871,7 @@ func (x *QueryContainsKeyResponse) String() string { func (*QueryContainsKeyResponse) ProtoMessage() {} func (x *QueryContainsKeyResponse) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[12] + mi := &file_ffi_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -801,7 +884,7 @@ func (x *QueryContainsKeyResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryContainsKeyResponse.ProtoReflect.Descriptor instead. func (*QueryContainsKeyResponse) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{12} + return file_ffi_proto_rawDescGZIP(), []int{14} } func (x *QueryContainsKeyResponse) GetContains() bool { @@ -823,7 +906,7 @@ type QueryGetAccountStorageCell struct { func (x *QueryGetAccountStorageCell) Reset() { *x = QueryGetAccountStorageCell{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[13] + mi := &file_ffi_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -836,7 +919,7 @@ func (x *QueryGetAccountStorageCell) String() string { func (*QueryGetAccountStorageCell) ProtoMessage() {} func (x *QueryGetAccountStorageCell) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[13] + mi := &file_ffi_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -849,7 +932,7 @@ func (x *QueryGetAccountStorageCell) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryGetAccountStorageCell.ProtoReflect.Descriptor instead. func (*QueryGetAccountStorageCell) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{13} + return file_ffi_proto_rawDescGZIP(), []int{15} } func (x *QueryGetAccountStorageCell) GetAddress() []byte { @@ -877,7 +960,7 @@ type QueryGetAccountStorageCellResponse struct { func (x *QueryGetAccountStorageCellResponse) Reset() { *x = QueryGetAccountStorageCellResponse{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[14] + mi := &file_ffi_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -890,7 +973,7 @@ func (x *QueryGetAccountStorageCellResponse) String() string { func (*QueryGetAccountStorageCellResponse) ProtoMessage() {} func (x *QueryGetAccountStorageCellResponse) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[14] + mi := &file_ffi_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -903,7 +986,7 @@ func (x *QueryGetAccountStorageCellResponse) ProtoReflect() protoreflect.Message // Deprecated: Use QueryGetAccountStorageCellResponse.ProtoReflect.Descriptor instead. func (*QueryGetAccountStorageCellResponse) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{14} + return file_ffi_proto_rawDescGZIP(), []int{16} } func (x *QueryGetAccountStorageCellResponse) GetValue() []byte { @@ -924,7 +1007,7 @@ type QueryGetAccountCode struct { func (x *QueryGetAccountCode) Reset() { *x = QueryGetAccountCode{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[15] + mi := &file_ffi_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -937,7 +1020,7 @@ func (x *QueryGetAccountCode) String() string { func (*QueryGetAccountCode) ProtoMessage() {} func (x *QueryGetAccountCode) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[15] + mi := &file_ffi_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -950,7 +1033,7 @@ func (x *QueryGetAccountCode) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryGetAccountCode.ProtoReflect.Descriptor instead. func (*QueryGetAccountCode) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{15} + return file_ffi_proto_rawDescGZIP(), []int{17} } func (x *QueryGetAccountCode) GetAddress() []byte { @@ -971,7 +1054,7 @@ type QueryGetAccountCodeResponse struct { func (x *QueryGetAccountCodeResponse) Reset() { *x = QueryGetAccountCodeResponse{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[16] + mi := &file_ffi_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -984,7 +1067,7 @@ func (x *QueryGetAccountCodeResponse) String() string { func (*QueryGetAccountCodeResponse) ProtoMessage() {} func (x *QueryGetAccountCodeResponse) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[16] + mi := &file_ffi_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -997,7 +1080,7 @@ func (x *QueryGetAccountCodeResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryGetAccountCodeResponse.ProtoReflect.Descriptor instead. func (*QueryGetAccountCodeResponse) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{16} + return file_ffi_proto_rawDescGZIP(), []int{18} } func (x *QueryGetAccountCodeResponse) GetCode() []byte { @@ -1007,6 +1090,194 @@ func (x *QueryGetAccountCodeResponse) GetCode() []byte { return nil } +type QueryGetAccountCodeSize struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Address []byte `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` +} + +func (x *QueryGetAccountCodeSize) Reset() { + *x = QueryGetAccountCodeSize{} + if protoimpl.UnsafeEnabled { + mi := &file_ffi_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *QueryGetAccountCodeSize) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*QueryGetAccountCodeSize) ProtoMessage() {} + +func (x *QueryGetAccountCodeSize) ProtoReflect() protoreflect.Message { + mi := &file_ffi_proto_msgTypes[19] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use QueryGetAccountCodeSize.ProtoReflect.Descriptor instead. +func (*QueryGetAccountCodeSize) Descriptor() ([]byte, []int) { + return file_ffi_proto_rawDescGZIP(), []int{19} +} + +func (x *QueryGetAccountCodeSize) GetAddress() []byte { + if x != nil { + return x.Address + } + return nil +} + +type QueryGetAccountCodeSizeResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Size uint32 `protobuf:"varint,1,opt,name=size,proto3" json:"size,omitempty"` +} + +func (x *QueryGetAccountCodeSizeResponse) Reset() { + *x = QueryGetAccountCodeSizeResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_ffi_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *QueryGetAccountCodeSizeResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*QueryGetAccountCodeSizeResponse) ProtoMessage() {} + +func (x *QueryGetAccountCodeSizeResponse) ProtoReflect() protoreflect.Message { + mi := &file_ffi_proto_msgTypes[20] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use QueryGetAccountCodeSizeResponse.ProtoReflect.Descriptor instead. +func (*QueryGetAccountCodeSizeResponse) Descriptor() ([]byte, []int) { + return file_ffi_proto_rawDescGZIP(), []int{20} +} + +func (x *QueryGetAccountCodeSizeResponse) GetSize() uint32 { + if x != nil { + return x.Size + } + return 0 +} + +type QueryGetAccountCodeHash struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Address []byte `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` +} + +func (x *QueryGetAccountCodeHash) Reset() { + *x = QueryGetAccountCodeHash{} + if protoimpl.UnsafeEnabled { + mi := &file_ffi_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *QueryGetAccountCodeHash) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*QueryGetAccountCodeHash) ProtoMessage() {} + +func (x *QueryGetAccountCodeHash) ProtoReflect() protoreflect.Message { + mi := &file_ffi_proto_msgTypes[21] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use QueryGetAccountCodeHash.ProtoReflect.Descriptor instead. +func (*QueryGetAccountCodeHash) Descriptor() ([]byte, []int) { + return file_ffi_proto_rawDescGZIP(), []int{21} +} + +func (x *QueryGetAccountCodeHash) GetAddress() []byte { + if x != nil { + return x.Address + } + return nil +} + +type QueryGetAccountCodeHashResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Hash []byte `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"` +} + +func (x *QueryGetAccountCodeHashResponse) Reset() { + *x = QueryGetAccountCodeHashResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_ffi_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *QueryGetAccountCodeHashResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*QueryGetAccountCodeHashResponse) ProtoMessage() {} + +func (x *QueryGetAccountCodeHashResponse) ProtoReflect() protoreflect.Message { + mi := &file_ffi_proto_msgTypes[22] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use QueryGetAccountCodeHashResponse.ProtoReflect.Descriptor instead. +func (*QueryGetAccountCodeHashResponse) Descriptor() ([]byte, []int) { + return file_ffi_proto_rawDescGZIP(), []int{22} +} + +func (x *QueryGetAccountCodeHashResponse) GetHash() []byte { + if x != nil { + return x.Hash + } + return nil +} + type QueryInsertAccountCode struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1019,7 +1290,7 @@ type QueryInsertAccountCode struct { func (x *QueryInsertAccountCode) Reset() { *x = QueryInsertAccountCode{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[17] + mi := &file_ffi_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1032,7 +1303,7 @@ func (x *QueryInsertAccountCode) String() string { func (*QueryInsertAccountCode) ProtoMessage() {} func (x *QueryInsertAccountCode) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[17] + mi := &file_ffi_proto_msgTypes[23] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1045,7 +1316,7 @@ func (x *QueryInsertAccountCode) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryInsertAccountCode.ProtoReflect.Descriptor instead. func (*QueryInsertAccountCode) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{17} + return file_ffi_proto_rawDescGZIP(), []int{23} } func (x *QueryInsertAccountCode) GetAddress() []byte { @@ -1071,7 +1342,7 @@ type QueryInsertAccountCodeResponse struct { func (x *QueryInsertAccountCodeResponse) Reset() { *x = QueryInsertAccountCodeResponse{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[18] + mi := &file_ffi_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1084,7 +1355,7 @@ func (x *QueryInsertAccountCodeResponse) String() string { func (*QueryInsertAccountCodeResponse) ProtoMessage() {} func (x *QueryInsertAccountCodeResponse) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[18] + mi := &file_ffi_proto_msgTypes[24] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1097,7 +1368,7 @@ func (x *QueryInsertAccountCodeResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryInsertAccountCodeResponse.ProtoReflect.Descriptor instead. func (*QueryInsertAccountCodeResponse) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{18} + return file_ffi_proto_rawDescGZIP(), []int{24} } type QueryInsertStorageCell struct { @@ -1113,7 +1384,7 @@ type QueryInsertStorageCell struct { func (x *QueryInsertStorageCell) Reset() { *x = QueryInsertStorageCell{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[19] + mi := &file_ffi_proto_msgTypes[25] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1126,7 +1397,7 @@ func (x *QueryInsertStorageCell) String() string { func (*QueryInsertStorageCell) ProtoMessage() {} func (x *QueryInsertStorageCell) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[19] + mi := &file_ffi_proto_msgTypes[25] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1139,7 +1410,7 @@ func (x *QueryInsertStorageCell) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryInsertStorageCell.ProtoReflect.Descriptor instead. func (*QueryInsertStorageCell) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{19} + return file_ffi_proto_rawDescGZIP(), []int{25} } func (x *QueryInsertStorageCell) GetAddress() []byte { @@ -1172,7 +1443,7 @@ type QueryInsertStorageCellResponse struct { func (x *QueryInsertStorageCellResponse) Reset() { *x = QueryInsertStorageCellResponse{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[20] + mi := &file_ffi_proto_msgTypes[26] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1185,7 +1456,7 @@ func (x *QueryInsertStorageCellResponse) String() string { func (*QueryInsertStorageCellResponse) ProtoMessage() {} func (x *QueryInsertStorageCellResponse) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[20] + mi := &file_ffi_proto_msgTypes[26] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1198,7 +1469,7 @@ func (x *QueryInsertStorageCellResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryInsertStorageCellResponse.ProtoReflect.Descriptor instead. func (*QueryInsertStorageCellResponse) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{20} + return file_ffi_proto_rawDescGZIP(), []int{26} } type QueryRemove struct { @@ -1212,7 +1483,7 @@ type QueryRemove struct { func (x *QueryRemove) Reset() { *x = QueryRemove{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[21] + mi := &file_ffi_proto_msgTypes[27] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1225,7 +1496,7 @@ func (x *QueryRemove) String() string { func (*QueryRemove) ProtoMessage() {} func (x *QueryRemove) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[21] + mi := &file_ffi_proto_msgTypes[27] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1238,7 +1509,7 @@ func (x *QueryRemove) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryRemove.ProtoReflect.Descriptor instead. func (*QueryRemove) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{21} + return file_ffi_proto_rawDescGZIP(), []int{27} } func (x *QueryRemove) GetAddress() []byte { @@ -1257,7 +1528,7 @@ type QueryRemoveResponse struct { func (x *QueryRemoveResponse) Reset() { *x = QueryRemoveResponse{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[22] + mi := &file_ffi_proto_msgTypes[28] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1270,7 +1541,7 @@ func (x *QueryRemoveResponse) String() string { func (*QueryRemoveResponse) ProtoMessage() {} func (x *QueryRemoveResponse) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[22] + mi := &file_ffi_proto_msgTypes[28] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1283,7 +1554,7 @@ func (x *QueryRemoveResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryRemoveResponse.ProtoReflect.Descriptor instead. func (*QueryRemoveResponse) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{22} + return file_ffi_proto_rawDescGZIP(), []int{28} } type QueryRemoveStorageCell struct { @@ -1298,7 +1569,7 @@ type QueryRemoveStorageCell struct { func (x *QueryRemoveStorageCell) Reset() { *x = QueryRemoveStorageCell{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[23] + mi := &file_ffi_proto_msgTypes[29] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1311,7 +1582,7 @@ func (x *QueryRemoveStorageCell) String() string { func (*QueryRemoveStorageCell) ProtoMessage() {} func (x *QueryRemoveStorageCell) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[23] + mi := &file_ffi_proto_msgTypes[29] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1324,7 +1595,7 @@ func (x *QueryRemoveStorageCell) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryRemoveStorageCell.ProtoReflect.Descriptor instead. func (*QueryRemoveStorageCell) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{23} + return file_ffi_proto_rawDescGZIP(), []int{29} } func (x *QueryRemoveStorageCell) GetAddress() []byte { @@ -1350,7 +1621,7 @@ type QueryRemoveStorageCellResponse struct { func (x *QueryRemoveStorageCellResponse) Reset() { *x = QueryRemoveStorageCellResponse{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[24] + mi := &file_ffi_proto_msgTypes[30] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1363,7 +1634,7 @@ func (x *QueryRemoveStorageCellResponse) String() string { func (*QueryRemoveStorageCellResponse) ProtoMessage() {} func (x *QueryRemoveStorageCellResponse) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[24] + mi := &file_ffi_proto_msgTypes[30] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1376,7 +1647,7 @@ func (x *QueryRemoveStorageCellResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryRemoveStorageCellResponse.ProtoReflect.Descriptor instead. func (*QueryRemoveStorageCellResponse) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{24} + return file_ffi_proto_rawDescGZIP(), []int{30} } type QueryRemoveStorage struct { @@ -1390,7 +1661,7 @@ type QueryRemoveStorage struct { func (x *QueryRemoveStorage) Reset() { *x = QueryRemoveStorage{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[25] + mi := &file_ffi_proto_msgTypes[31] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1403,7 +1674,7 @@ func (x *QueryRemoveStorage) String() string { func (*QueryRemoveStorage) ProtoMessage() {} func (x *QueryRemoveStorage) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[25] + mi := &file_ffi_proto_msgTypes[31] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1416,7 +1687,7 @@ func (x *QueryRemoveStorage) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryRemoveStorage.ProtoReflect.Descriptor instead. func (*QueryRemoveStorage) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{25} + return file_ffi_proto_rawDescGZIP(), []int{31} } func (x *QueryRemoveStorage) GetAddress() []byte { @@ -1435,7 +1706,7 @@ type QueryRemoveStorageResponse struct { func (x *QueryRemoveStorageResponse) Reset() { *x = QueryRemoveStorageResponse{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[26] + mi := &file_ffi_proto_msgTypes[32] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1448,7 +1719,7 @@ func (x *QueryRemoveStorageResponse) String() string { func (*QueryRemoveStorageResponse) ProtoMessage() {} func (x *QueryRemoveStorageResponse) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[26] + mi := &file_ffi_proto_msgTypes[32] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1461,7 +1732,7 @@ func (x *QueryRemoveStorageResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryRemoveStorageResponse.ProtoReflect.Descriptor instead. func (*QueryRemoveStorageResponse) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{26} + return file_ffi_proto_rawDescGZIP(), []int{32} } type QueryBlockHash struct { @@ -1475,7 +1746,7 @@ type QueryBlockHash struct { func (x *QueryBlockHash) Reset() { *x = QueryBlockHash{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[27] + mi := &file_ffi_proto_msgTypes[33] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1488,7 +1759,7 @@ func (x *QueryBlockHash) String() string { func (*QueryBlockHash) ProtoMessage() {} func (x *QueryBlockHash) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[27] + mi := &file_ffi_proto_msgTypes[33] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1501,7 +1772,7 @@ func (x *QueryBlockHash) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryBlockHash.ProtoReflect.Descriptor instead. func (*QueryBlockHash) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{27} + return file_ffi_proto_rawDescGZIP(), []int{33} } func (x *QueryBlockHash) GetNumber() []byte { @@ -1522,7 +1793,7 @@ type QueryBlockHashResponse struct { func (x *QueryBlockHashResponse) Reset() { *x = QueryBlockHashResponse{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[28] + mi := &file_ffi_proto_msgTypes[34] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1535,7 +1806,7 @@ func (x *QueryBlockHashResponse) String() string { func (*QueryBlockHashResponse) ProtoMessage() {} func (x *QueryBlockHashResponse) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[28] + mi := &file_ffi_proto_msgTypes[34] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1548,7 +1819,7 @@ func (x *QueryBlockHashResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryBlockHashResponse.ProtoReflect.Descriptor instead. func (*QueryBlockHashResponse) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{28} + return file_ffi_proto_rawDescGZIP(), []int{34} } func (x *QueryBlockHashResponse) GetHash() []byte { @@ -1578,7 +1849,7 @@ type QueryAddVerificationDetails struct { func (x *QueryAddVerificationDetails) Reset() { *x = QueryAddVerificationDetails{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[29] + mi := &file_ffi_proto_msgTypes[35] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1591,7 +1862,7 @@ func (x *QueryAddVerificationDetails) String() string { func (*QueryAddVerificationDetails) ProtoMessage() {} func (x *QueryAddVerificationDetails) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[29] + mi := &file_ffi_proto_msgTypes[35] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1604,7 +1875,7 @@ func (x *QueryAddVerificationDetails) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryAddVerificationDetails.ProtoReflect.Descriptor instead. func (*QueryAddVerificationDetails) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{29} + return file_ffi_proto_rawDescGZIP(), []int{35} } func (x *QueryAddVerificationDetails) GetUserAddress() []byte { @@ -1688,7 +1959,7 @@ type QueryAddVerificationDetailsResponse struct { func (x *QueryAddVerificationDetailsResponse) Reset() { *x = QueryAddVerificationDetailsResponse{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[30] + mi := &file_ffi_proto_msgTypes[36] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1701,7 +1972,7 @@ func (x *QueryAddVerificationDetailsResponse) String() string { func (*QueryAddVerificationDetailsResponse) ProtoMessage() {} func (x *QueryAddVerificationDetailsResponse) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[30] + mi := &file_ffi_proto_msgTypes[36] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1714,7 +1985,7 @@ func (x *QueryAddVerificationDetailsResponse) ProtoReflect() protoreflect.Messag // Deprecated: Use QueryAddVerificationDetailsResponse.ProtoReflect.Descriptor instead. func (*QueryAddVerificationDetailsResponse) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{30} + return file_ffi_proto_rawDescGZIP(), []int{36} } func (x *QueryAddVerificationDetailsResponse) GetVerificationId() []byte { @@ -1738,7 +2009,7 @@ type QueryHasVerification struct { func (x *QueryHasVerification) Reset() { *x = QueryHasVerification{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[31] + mi := &file_ffi_proto_msgTypes[37] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1751,7 +2022,7 @@ func (x *QueryHasVerification) String() string { func (*QueryHasVerification) ProtoMessage() {} func (x *QueryHasVerification) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[31] + mi := &file_ffi_proto_msgTypes[37] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1764,7 +2035,7 @@ func (x *QueryHasVerification) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryHasVerification.ProtoReflect.Descriptor instead. func (*QueryHasVerification) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{31} + return file_ffi_proto_rawDescGZIP(), []int{37} } func (x *QueryHasVerification) GetUserAddress() []byte { @@ -1806,7 +2077,7 @@ type QueryHasVerificationResponse struct { func (x *QueryHasVerificationResponse) Reset() { *x = QueryHasVerificationResponse{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[32] + mi := &file_ffi_proto_msgTypes[38] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1819,7 +2090,7 @@ func (x *QueryHasVerificationResponse) String() string { func (*QueryHasVerificationResponse) ProtoMessage() {} func (x *QueryHasVerificationResponse) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[32] + mi := &file_ffi_proto_msgTypes[38] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1832,7 +2103,7 @@ func (x *QueryHasVerificationResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryHasVerificationResponse.ProtoReflect.Descriptor instead. func (*QueryHasVerificationResponse) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{32} + return file_ffi_proto_rawDescGZIP(), []int{38} } func (x *QueryHasVerificationResponse) GetHasVerification() bool { @@ -1854,7 +2125,7 @@ type QueryGetVerificationData struct { func (x *QueryGetVerificationData) Reset() { *x = QueryGetVerificationData{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[33] + mi := &file_ffi_proto_msgTypes[39] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1867,7 +2138,7 @@ func (x *QueryGetVerificationData) String() string { func (*QueryGetVerificationData) ProtoMessage() {} func (x *QueryGetVerificationData) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[33] + mi := &file_ffi_proto_msgTypes[39] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1880,7 +2151,7 @@ func (x *QueryGetVerificationData) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryGetVerificationData.ProtoReflect.Descriptor instead. func (*QueryGetVerificationData) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{33} + return file_ffi_proto_rawDescGZIP(), []int{39} } func (x *QueryGetVerificationData) GetUserAddress() []byte { @@ -1930,7 +2201,7 @@ type VerificationDetails struct { func (x *VerificationDetails) Reset() { *x = VerificationDetails{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[34] + mi := &file_ffi_proto_msgTypes[40] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1943,7 +2214,7 @@ func (x *VerificationDetails) String() string { func (*VerificationDetails) ProtoMessage() {} func (x *VerificationDetails) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[34] + mi := &file_ffi_proto_msgTypes[40] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1956,7 +2227,7 @@ func (x *VerificationDetails) ProtoReflect() protoreflect.Message { // Deprecated: Use VerificationDetails.ProtoReflect.Descriptor instead. func (*VerificationDetails) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{34} + return file_ffi_proto_rawDescGZIP(), []int{40} } func (x *VerificationDetails) GetVerificationType() uint32 { @@ -2040,7 +2311,7 @@ type QueryGetVerificationDataResponse struct { func (x *QueryGetVerificationDataResponse) Reset() { *x = QueryGetVerificationDataResponse{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[35] + mi := &file_ffi_proto_msgTypes[41] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2053,7 +2324,7 @@ func (x *QueryGetVerificationDataResponse) String() string { func (*QueryGetVerificationDataResponse) ProtoMessage() {} func (x *QueryGetVerificationDataResponse) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[35] + mi := &file_ffi_proto_msgTypes[41] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2066,7 +2337,7 @@ func (x *QueryGetVerificationDataResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryGetVerificationDataResponse.ProtoReflect.Descriptor instead. func (*QueryGetVerificationDataResponse) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{35} + return file_ffi_proto_rawDescGZIP(), []int{41} } func (x *QueryGetVerificationDataResponse) GetData() []*VerificationDetails { @@ -2084,9 +2355,10 @@ type CosmosRequest struct { // Types that are assignable to Req: // // *CosmosRequest_GetAccount - // *CosmosRequest_InsertAccount // *CosmosRequest_ContainsKey // *CosmosRequest_AccountCode + // *CosmosRequest_CodeHash + // *CosmosRequest_CodeSize // *CosmosRequest_StorageCell // *CosmosRequest_InsertAccountCode // *CosmosRequest_InsertStorageCell @@ -2097,13 +2369,15 @@ type CosmosRequest struct { // *CosmosRequest_AddVerificationDetails // *CosmosRequest_HasVerification // *CosmosRequest_GetVerificationData + // *CosmosRequest_InsertAccountBalance + // *CosmosRequest_InsertAccountNonce Req isCosmosRequest_Req `protobuf_oneof:"req"` } func (x *CosmosRequest) Reset() { *x = CosmosRequest{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[36] + mi := &file_ffi_proto_msgTypes[42] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2116,7 +2390,7 @@ func (x *CosmosRequest) String() string { func (*CosmosRequest) ProtoMessage() {} func (x *CosmosRequest) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[36] + mi := &file_ffi_proto_msgTypes[42] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2129,7 +2403,7 @@ func (x *CosmosRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use CosmosRequest.ProtoReflect.Descriptor instead. func (*CosmosRequest) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{36} + return file_ffi_proto_rawDescGZIP(), []int{42} } func (m *CosmosRequest) GetReq() isCosmosRequest_Req { @@ -2146,13 +2420,6 @@ func (x *CosmosRequest) GetGetAccount() *QueryGetAccount { return nil } -func (x *CosmosRequest) GetInsertAccount() *QueryInsertAccount { - if x, ok := x.GetReq().(*CosmosRequest_InsertAccount); ok { - return x.InsertAccount - } - return nil -} - func (x *CosmosRequest) GetContainsKey() *QueryContainsKey { if x, ok := x.GetReq().(*CosmosRequest_ContainsKey); ok { return x.ContainsKey @@ -2167,6 +2434,20 @@ func (x *CosmosRequest) GetAccountCode() *QueryGetAccountCode { return nil } +func (x *CosmosRequest) GetCodeHash() *QueryGetAccountCodeHash { + if x, ok := x.GetReq().(*CosmosRequest_CodeHash); ok { + return x.CodeHash + } + return nil +} + +func (x *CosmosRequest) GetCodeSize() *QueryGetAccountCodeSize { + if x, ok := x.GetReq().(*CosmosRequest_CodeSize); ok { + return x.CodeSize + } + return nil +} + func (x *CosmosRequest) GetStorageCell() *QueryGetAccountStorageCell { if x, ok := x.GetReq().(*CosmosRequest_StorageCell); ok { return x.StorageCell @@ -2237,6 +2518,20 @@ func (x *CosmosRequest) GetGetVerificationData() *QueryGetVerificationData { return nil } +func (x *CosmosRequest) GetInsertAccountBalance() *QueryInsertAccountBalance { + if x, ok := x.GetReq().(*CosmosRequest_InsertAccountBalance); ok { + return x.InsertAccountBalance + } + return nil +} + +func (x *CosmosRequest) GetInsertAccountNonce() *QueryInsertAccountNonce { + if x, ok := x.GetReq().(*CosmosRequest_InsertAccountNonce); ok { + return x.InsertAccountNonce + } + return nil +} + type isCosmosRequest_Req interface { isCosmosRequest_Req() } @@ -2245,66 +2540,80 @@ type CosmosRequest_GetAccount struct { GetAccount *QueryGetAccount `protobuf:"bytes,1,opt,name=getAccount,proto3,oneof"` } -type CosmosRequest_InsertAccount struct { - InsertAccount *QueryInsertAccount `protobuf:"bytes,2,opt,name=insertAccount,proto3,oneof"` -} - type CosmosRequest_ContainsKey struct { - ContainsKey *QueryContainsKey `protobuf:"bytes,3,opt,name=containsKey,proto3,oneof"` + ContainsKey *QueryContainsKey `protobuf:"bytes,2,opt,name=containsKey,proto3,oneof"` } type CosmosRequest_AccountCode struct { - AccountCode *QueryGetAccountCode `protobuf:"bytes,4,opt,name=accountCode,proto3,oneof"` + AccountCode *QueryGetAccountCode `protobuf:"bytes,3,opt,name=accountCode,proto3,oneof"` +} + +type CosmosRequest_CodeHash struct { + CodeHash *QueryGetAccountCodeHash `protobuf:"bytes,4,opt,name=codeHash,proto3,oneof"` +} + +type CosmosRequest_CodeSize struct { + CodeSize *QueryGetAccountCodeSize `protobuf:"bytes,5,opt,name=codeSize,proto3,oneof"` } type CosmosRequest_StorageCell struct { - StorageCell *QueryGetAccountStorageCell `protobuf:"bytes,5,opt,name=storageCell,proto3,oneof"` + StorageCell *QueryGetAccountStorageCell `protobuf:"bytes,6,opt,name=storageCell,proto3,oneof"` } type CosmosRequest_InsertAccountCode struct { - InsertAccountCode *QueryInsertAccountCode `protobuf:"bytes,6,opt,name=insertAccountCode,proto3,oneof"` + InsertAccountCode *QueryInsertAccountCode `protobuf:"bytes,7,opt,name=insertAccountCode,proto3,oneof"` } type CosmosRequest_InsertStorageCell struct { - InsertStorageCell *QueryInsertStorageCell `protobuf:"bytes,7,opt,name=insertStorageCell,proto3,oneof"` + InsertStorageCell *QueryInsertStorageCell `protobuf:"bytes,8,opt,name=insertStorageCell,proto3,oneof"` } type CosmosRequest_Remove struct { - Remove *QueryRemove `protobuf:"bytes,8,opt,name=remove,proto3,oneof"` + Remove *QueryRemove `protobuf:"bytes,9,opt,name=remove,proto3,oneof"` } type CosmosRequest_RemoveStorageCell struct { - RemoveStorageCell *QueryRemoveStorageCell `protobuf:"bytes,9,opt,name=removeStorageCell,proto3,oneof"` + RemoveStorageCell *QueryRemoveStorageCell `protobuf:"bytes,10,opt,name=removeStorageCell,proto3,oneof"` } type CosmosRequest_RemoveStorage struct { - RemoveStorage *QueryRemoveStorage `protobuf:"bytes,10,opt,name=removeStorage,proto3,oneof"` + RemoveStorage *QueryRemoveStorage `protobuf:"bytes,11,opt,name=removeStorage,proto3,oneof"` } type CosmosRequest_BlockHash struct { - BlockHash *QueryBlockHash `protobuf:"bytes,11,opt,name=blockHash,proto3,oneof"` + BlockHash *QueryBlockHash `protobuf:"bytes,12,opt,name=blockHash,proto3,oneof"` } type CosmosRequest_AddVerificationDetails struct { - AddVerificationDetails *QueryAddVerificationDetails `protobuf:"bytes,12,opt,name=addVerificationDetails,proto3,oneof"` + AddVerificationDetails *QueryAddVerificationDetails `protobuf:"bytes,13,opt,name=addVerificationDetails,proto3,oneof"` } type CosmosRequest_HasVerification struct { - HasVerification *QueryHasVerification `protobuf:"bytes,13,opt,name=hasVerification,proto3,oneof"` + HasVerification *QueryHasVerification `protobuf:"bytes,14,opt,name=hasVerification,proto3,oneof"` } type CosmosRequest_GetVerificationData struct { - GetVerificationData *QueryGetVerificationData `protobuf:"bytes,14,opt,name=getVerificationData,proto3,oneof"` + GetVerificationData *QueryGetVerificationData `protobuf:"bytes,15,opt,name=getVerificationData,proto3,oneof"` } -func (*CosmosRequest_GetAccount) isCosmosRequest_Req() {} +type CosmosRequest_InsertAccountBalance struct { + InsertAccountBalance *QueryInsertAccountBalance `protobuf:"bytes,16,opt,name=insertAccountBalance,proto3,oneof"` +} + +type CosmosRequest_InsertAccountNonce struct { + InsertAccountNonce *QueryInsertAccountNonce `protobuf:"bytes,17,opt,name=insertAccountNonce,proto3,oneof"` +} -func (*CosmosRequest_InsertAccount) isCosmosRequest_Req() {} +func (*CosmosRequest_GetAccount) isCosmosRequest_Req() {} func (*CosmosRequest_ContainsKey) isCosmosRequest_Req() {} func (*CosmosRequest_AccountCode) isCosmosRequest_Req() {} +func (*CosmosRequest_CodeHash) isCosmosRequest_Req() {} + +func (*CosmosRequest_CodeSize) isCosmosRequest_Req() {} + func (*CosmosRequest_StorageCell) isCosmosRequest_Req() {} func (*CosmosRequest_InsertAccountCode) isCosmosRequest_Req() {} @@ -2325,6 +2634,10 @@ func (*CosmosRequest_HasVerification) isCosmosRequest_Req() {} func (*CosmosRequest_GetVerificationData) isCosmosRequest_Req() {} +func (*CosmosRequest_InsertAccountBalance) isCosmosRequest_Req() {} + +func (*CosmosRequest_InsertAccountNonce) isCosmosRequest_Req() {} + // Message with data required to execute `call` operation type SGXVMCallParams struct { state protoimpl.MessageState @@ -2335,17 +2648,18 @@ type SGXVMCallParams struct { To []byte `protobuf:"bytes,2,opt,name=to,proto3" json:"to,omitempty"` Data []byte `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` GasLimit uint64 `protobuf:"varint,4,opt,name=gasLimit,proto3" json:"gasLimit,omitempty"` - Value []byte `protobuf:"bytes,5,opt,name=value,proto3" json:"value,omitempty"` - AccessList []*AccessListItem `protobuf:"bytes,6,rep,name=accessList,proto3" json:"accessList,omitempty"` - Commit bool `protobuf:"varint,7,opt,name=commit,proto3" json:"commit,omitempty"` - Nonce uint64 `protobuf:"varint,8,opt,name=nonce,proto3" json:"nonce,omitempty"` - Unencrypted bool `protobuf:"varint,9,opt,name=unencrypted,proto3" json:"unencrypted,omitempty"` + GasPrice []byte `protobuf:"bytes,5,opt,name=gasPrice,proto3" json:"gasPrice,omitempty"` + Value []byte `protobuf:"bytes,6,opt,name=value,proto3" json:"value,omitempty"` + AccessList []*AccessListItem `protobuf:"bytes,7,rep,name=accessList,proto3" json:"accessList,omitempty"` + Commit bool `protobuf:"varint,8,opt,name=commit,proto3" json:"commit,omitempty"` + Nonce uint64 `protobuf:"varint,9,opt,name=nonce,proto3" json:"nonce,omitempty"` + Unencrypted bool `protobuf:"varint,10,opt,name=unencrypted,proto3" json:"unencrypted,omitempty"` } func (x *SGXVMCallParams) Reset() { *x = SGXVMCallParams{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[37] + mi := &file_ffi_proto_msgTypes[43] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2358,7 +2672,7 @@ func (x *SGXVMCallParams) String() string { func (*SGXVMCallParams) ProtoMessage() {} func (x *SGXVMCallParams) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[37] + mi := &file_ffi_proto_msgTypes[43] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2371,7 +2685,7 @@ func (x *SGXVMCallParams) ProtoReflect() protoreflect.Message { // Deprecated: Use SGXVMCallParams.ProtoReflect.Descriptor instead. func (*SGXVMCallParams) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{37} + return file_ffi_proto_rawDescGZIP(), []int{43} } func (x *SGXVMCallParams) GetFrom() []byte { @@ -2402,6 +2716,13 @@ func (x *SGXVMCallParams) GetGasLimit() uint64 { return 0 } +func (x *SGXVMCallParams) GetGasPrice() []byte { + if x != nil { + return x.GasPrice + } + return nil +} + func (x *SGXVMCallParams) GetValue() []byte { if x != nil { return x.Value @@ -2446,16 +2767,17 @@ type SGXVMCreateParams struct { From []byte `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"` Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` GasLimit uint64 `protobuf:"varint,3,opt,name=gasLimit,proto3" json:"gasLimit,omitempty"` - Value []byte `protobuf:"bytes,4,opt,name=value,proto3" json:"value,omitempty"` - AccessList []*AccessListItem `protobuf:"bytes,5,rep,name=accessList,proto3" json:"accessList,omitempty"` - Commit bool `protobuf:"varint,6,opt,name=commit,proto3" json:"commit,omitempty"` - Nonce uint64 `protobuf:"varint,7,opt,name=nonce,proto3" json:"nonce,omitempty"` + GasPrice []byte `protobuf:"bytes,4,opt,name=gasPrice,proto3" json:"gasPrice,omitempty"` + Value []byte `protobuf:"bytes,5,opt,name=value,proto3" json:"value,omitempty"` + AccessList []*AccessListItem `protobuf:"bytes,6,rep,name=accessList,proto3" json:"accessList,omitempty"` + Commit bool `protobuf:"varint,7,opt,name=commit,proto3" json:"commit,omitempty"` + Nonce uint64 `protobuf:"varint,8,opt,name=nonce,proto3" json:"nonce,omitempty"` } func (x *SGXVMCreateParams) Reset() { *x = SGXVMCreateParams{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[38] + mi := &file_ffi_proto_msgTypes[44] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2468,7 +2790,7 @@ func (x *SGXVMCreateParams) String() string { func (*SGXVMCreateParams) ProtoMessage() {} func (x *SGXVMCreateParams) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[38] + mi := &file_ffi_proto_msgTypes[44] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2481,7 +2803,7 @@ func (x *SGXVMCreateParams) ProtoReflect() protoreflect.Message { // Deprecated: Use SGXVMCreateParams.ProtoReflect.Descriptor instead. func (*SGXVMCreateParams) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{38} + return file_ffi_proto_rawDescGZIP(), []int{44} } func (x *SGXVMCreateParams) GetFrom() []byte { @@ -2505,6 +2827,13 @@ func (x *SGXVMCreateParams) GetGasLimit() uint64 { return 0 } +func (x *SGXVMCreateParams) GetGasPrice() []byte { + if x != nil { + return x.GasPrice + } + return nil +} + func (x *SGXVMCreateParams) GetValue() []byte { if x != nil { return x.Value @@ -2546,7 +2875,7 @@ type SGXVMCallRequest struct { func (x *SGXVMCallRequest) Reset() { *x = SGXVMCallRequest{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[39] + mi := &file_ffi_proto_msgTypes[45] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2559,7 +2888,7 @@ func (x *SGXVMCallRequest) String() string { func (*SGXVMCallRequest) ProtoMessage() {} func (x *SGXVMCallRequest) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[39] + mi := &file_ffi_proto_msgTypes[45] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2572,7 +2901,7 @@ func (x *SGXVMCallRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use SGXVMCallRequest.ProtoReflect.Descriptor instead. func (*SGXVMCallRequest) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{39} + return file_ffi_proto_rawDescGZIP(), []int{45} } func (x *SGXVMCallRequest) GetParams() *SGXVMCallParams { @@ -2602,7 +2931,7 @@ type SGXVMCreateRequest struct { func (x *SGXVMCreateRequest) Reset() { *x = SGXVMCreateRequest{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[40] + mi := &file_ffi_proto_msgTypes[46] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2615,7 +2944,7 @@ func (x *SGXVMCreateRequest) String() string { func (*SGXVMCreateRequest) ProtoMessage() {} func (x *SGXVMCreateRequest) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[40] + mi := &file_ffi_proto_msgTypes[46] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2628,7 +2957,7 @@ func (x *SGXVMCreateRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use SGXVMCreateRequest.ProtoReflect.Descriptor instead. func (*SGXVMCreateRequest) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{40} + return file_ffi_proto_rawDescGZIP(), []int{46} } func (x *SGXVMCreateRequest) GetParams() *SGXVMCreateParams { @@ -2657,7 +2986,7 @@ type NodePublicKeyRequest struct { func (x *NodePublicKeyRequest) Reset() { *x = NodePublicKeyRequest{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[41] + mi := &file_ffi_proto_msgTypes[47] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2670,7 +2999,7 @@ func (x *NodePublicKeyRequest) String() string { func (*NodePublicKeyRequest) ProtoMessage() {} func (x *NodePublicKeyRequest) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[41] + mi := &file_ffi_proto_msgTypes[47] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2683,7 +3012,7 @@ func (x *NodePublicKeyRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use NodePublicKeyRequest.ProtoReflect.Descriptor instead. func (*NodePublicKeyRequest) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{41} + return file_ffi_proto_rawDescGZIP(), []int{47} } func (x *NodePublicKeyRequest) GetBlockNumber() uint64 { @@ -2705,7 +3034,7 @@ type NodePublicKeyResponse struct { func (x *NodePublicKeyResponse) Reset() { *x = NodePublicKeyResponse{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[42] + mi := &file_ffi_proto_msgTypes[48] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2718,7 +3047,7 @@ func (x *NodePublicKeyResponse) String() string { func (*NodePublicKeyResponse) ProtoMessage() {} func (x *NodePublicKeyResponse) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[42] + mi := &file_ffi_proto_msgTypes[48] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2731,7 +3060,7 @@ func (x *NodePublicKeyResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use NodePublicKeyResponse.ProtoReflect.Descriptor instead. func (*NodePublicKeyResponse) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{42} + return file_ffi_proto_rawDescGZIP(), []int{48} } func (x *NodePublicKeyResponse) GetPublicKey() []byte { @@ -2754,7 +3083,7 @@ type EpochData struct { func (x *EpochData) Reset() { *x = EpochData{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[43] + mi := &file_ffi_proto_msgTypes[49] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2767,7 +3096,7 @@ func (x *EpochData) String() string { func (*EpochData) ProtoMessage() {} func (x *EpochData) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[43] + mi := &file_ffi_proto_msgTypes[49] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2780,7 +3109,7 @@ func (x *EpochData) ProtoReflect() protoreflect.Message { // Deprecated: Use EpochData.ProtoReflect.Descriptor instead. func (*EpochData) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{43} + return file_ffi_proto_rawDescGZIP(), []int{49} } func (x *EpochData) GetEpochNumber() uint32 { @@ -2815,7 +3144,7 @@ type ListEpochsResponse struct { func (x *ListEpochsResponse) Reset() { *x = ListEpochsResponse{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[44] + mi := &file_ffi_proto_msgTypes[50] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2828,7 +3157,7 @@ func (x *ListEpochsResponse) String() string { func (*ListEpochsResponse) ProtoMessage() {} func (x *ListEpochsResponse) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[44] + mi := &file_ffi_proto_msgTypes[50] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2841,7 +3170,7 @@ func (x *ListEpochsResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListEpochsResponse.ProtoReflect.Descriptor instead. func (*ListEpochsResponse) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{44} + return file_ffi_proto_rawDescGZIP(), []int{50} } func (x *ListEpochsResponse) GetEpochs() []*EpochData { @@ -2867,7 +3196,7 @@ type FFIRequest struct { func (x *FFIRequest) Reset() { *x = FFIRequest{} if protoimpl.UnsafeEnabled { - mi := &file_ffi_proto_msgTypes[45] + mi := &file_ffi_proto_msgTypes[51] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2880,7 +3209,7 @@ func (x *FFIRequest) String() string { func (*FFIRequest) ProtoMessage() {} func (x *FFIRequest) ProtoReflect() protoreflect.Message { - mi := &file_ffi_proto_msgTypes[45] + mi := &file_ffi_proto_msgTypes[51] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2893,7 +3222,7 @@ func (x *FFIRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use FFIRequest.ProtoReflect.Descriptor instead. func (*FFIRequest) Descriptor() ([]byte, []int) { - return file_ffi_proto_rawDescGZIP(), []int{45} + return file_ffi_proto_rawDescGZIP(), []int{51} } func (m *FFIRequest) GetReq() isFFIRequest_Req { @@ -3016,302 +3345,340 @@ var file_ffi_proto_rawDesc = []byte{ 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x6f, 0x6e, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x6e, - 0x6f, 0x6e, 0x63, 0x65, 0x22, 0x5e, 0x0a, 0x12, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6e, 0x73, - 0x65, 0x72, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, - 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x61, 0x64, 0x64, - 0x72, 0x65, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x14, - 0x0a, 0x05, 0x6e, 0x6f, 0x6e, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x6e, - 0x6f, 0x6e, 0x63, 0x65, 0x22, 0x1c, 0x0a, 0x1a, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6e, 0x73, - 0x65, 0x72, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x22, 0x24, 0x0a, 0x10, 0x51, 0x75, 0x65, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x74, 0x61, - 0x69, 0x6e, 0x73, 0x4b, 0x65, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0c, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x22, 0x36, 0x0a, 0x18, 0x51, 0x75, 0x65, 0x72, - 0x79, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, - 0x22, 0x4c, 0x0a, 0x1a, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, 0x74, 0x41, 0x63, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x12, 0x18, - 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, - 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, - 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x3a, - 0x0a, 0x22, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x2f, 0x0a, 0x13, 0x51, 0x75, - 0x65, 0x72, 0x79, 0x47, 0x65, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x6f, 0x64, + 0x6f, 0x6e, 0x63, 0x65, 0x22, 0x4f, 0x0a, 0x19, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6e, 0x73, + 0x65, 0x72, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0c, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x31, 0x0a, 0x1b, 0x51, - 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x6f, - 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, - 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x46, - 0x0a, 0x16, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x41, 0x63, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, - 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, - 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, - 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x20, 0x0a, 0x1e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, - 0x6e, 0x73, 0x65, 0x72, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x6f, 0x64, 0x65, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x5e, 0x0a, 0x16, 0x51, 0x75, 0x65, 0x72, - 0x79, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x65, - 0x6c, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0c, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x14, 0x0a, 0x05, - 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x69, 0x6e, 0x64, - 0x65, 0x78, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x20, 0x0a, 0x1e, 0x51, 0x75, 0x65, 0x72, - 0x79, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x65, - 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x27, 0x0a, 0x0b, 0x51, 0x75, - 0x65, 0x72, 0x79, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, - 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, - 0x65, 0x73, 0x73, 0x22, 0x15, 0x0a, 0x13, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x6d, 0x6f, - 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x48, 0x0a, 0x16, 0x51, 0x75, - 0x65, 0x72, 0x79, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, + 0x28, 0x0c, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x62, + 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x62, 0x61, + 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x22, 0x23, 0x0a, 0x21, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6e, + 0x73, 0x65, 0x72, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, + 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x49, 0x0a, 0x17, 0x51, 0x75, + 0x65, 0x72, 0x79, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, + 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, + 0x14, 0x0a, 0x05, 0x6e, 0x6f, 0x6e, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, + 0x6e, 0x6f, 0x6e, 0x63, 0x65, 0x22, 0x21, 0x0a, 0x1f, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6e, + 0x73, 0x65, 0x72, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x4e, 0x6f, 0x6e, 0x63, 0x65, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x24, 0x0a, 0x10, 0x51, 0x75, 0x65, 0x72, + 0x79, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x4b, 0x65, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x22, 0x36, + 0x0a, 0x18, 0x51, 0x75, 0x65, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x4b, + 0x65, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, + 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x63, 0x6f, + 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x22, 0x4c, 0x0a, 0x1a, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, + 0x65, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x69, - 0x6e, 0x64, 0x65, 0x78, 0x22, 0x20, 0x0a, 0x1e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x6d, - 0x6f, 0x76, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2e, 0x0a, 0x12, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, - 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x12, 0x18, 0x0a, 0x07, - 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x61, - 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x1c, 0x0a, 0x1a, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, - 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x28, 0x0a, 0x0e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x42, 0x6c, 0x6f, - 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x2c, - 0x0a, 0x16, 0x51, 0x75, 0x65, 0x72, 0x79, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, + 0x6e, 0x64, 0x65, 0x78, 0x22, 0x3a, 0x0a, 0x22, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, 0x74, + 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x65, + 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x22, 0x2f, 0x0a, 0x13, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, 0x74, 0x41, 0x63, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, + 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, + 0x73, 0x22, 0x31, 0x0a, 0x1b, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, 0x74, 0x41, 0x63, 0x63, + 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, + 0x63, 0x6f, 0x64, 0x65, 0x22, 0x33, 0x0a, 0x17, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, 0x74, + 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, + 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, + 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x35, 0x0a, 0x1f, 0x51, 0x75, 0x65, + 0x72, 0x79, 0x47, 0x65, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x6f, 0x64, 0x65, + 0x53, 0x69, 0x7a, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, + 0x73, 0x69, 0x7a, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, + 0x22, 0x33, 0x0a, 0x17, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, 0x74, 0x41, 0x63, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x48, 0x61, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x61, + 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x61, 0x64, + 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x35, 0x0a, 0x1f, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, + 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x48, 0x61, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x22, 0x97, 0x03, 0x0a, - 0x1b, 0x51, 0x75, 0x65, 0x72, 0x79, 0x41, 0x64, 0x64, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x20, 0x0a, 0x0b, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x22, 0x46, 0x0a, 0x16, + 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, + 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, + 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, + 0x63, 0x6f, 0x64, 0x65, 0x22, 0x20, 0x0a, 0x1e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6e, 0x73, + 0x65, 0x72, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x5e, 0x0a, 0x16, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, + 0x6e, 0x73, 0x65, 0x72, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x65, 0x6c, 0x6c, + 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0c, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, + 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, + 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x20, 0x0a, 0x1e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, + 0x6e, 0x73, 0x65, 0x72, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x65, 0x6c, 0x6c, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x27, 0x0a, 0x0b, 0x51, 0x75, 0x65, 0x72, + 0x79, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, + 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, + 0x73, 0x22, 0x15, 0x0a, 0x13, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x48, 0x0a, 0x16, 0x51, 0x75, 0x65, 0x72, + 0x79, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x65, + 0x6c, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0c, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x14, 0x0a, 0x05, + 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x69, 0x6e, 0x64, + 0x65, 0x78, 0x22, 0x20, 0x0a, 0x1e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x6d, 0x6f, 0x76, + 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2e, 0x0a, 0x12, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x6d, + 0x6f, 0x76, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, + 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x61, 0x64, 0x64, + 0x72, 0x65, 0x73, 0x73, 0x22, 0x1c, 0x0a, 0x1a, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x6d, + 0x6f, 0x76, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x22, 0x28, 0x0a, 0x0e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x42, 0x6c, 0x6f, 0x63, 0x6b, + 0x48, 0x61, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x2c, 0x0a, 0x16, + 0x51, 0x75, 0x65, 0x72, 0x79, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x22, 0x97, 0x03, 0x0a, 0x1b, 0x51, + 0x75, 0x65, 0x72, 0x79, 0x41, 0x64, 0x64, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x75, 0x73, + 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, + 0x0b, 0x75, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x24, 0x0a, 0x0d, + 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, + 0x73, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x43, 0x68, 0x61, 0x69, + 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x43, + 0x68, 0x61, 0x69, 0x6e, 0x12, 0x2a, 0x0a, 0x10, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x10, + 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, + 0x12, 0x2c, 0x0a, 0x11, 0x69, 0x73, 0x73, 0x75, 0x61, 0x6e, 0x63, 0x65, 0x54, 0x69, 0x6d, 0x65, + 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x11, 0x69, 0x73, 0x73, + 0x75, 0x61, 0x6e, 0x63, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x30, + 0x0a, 0x13, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, + 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x13, 0x65, 0x78, 0x70, + 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, + 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x44, 0x61, 0x74, 0x61, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x0c, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, + 0x0a, 0x06, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x32, 0x0a, 0x14, 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, + 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x09, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, + 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x76, 0x65, 0x72, + 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x4d, 0x0a, 0x23, 0x51, 0x75, 0x65, 0x72, 0x79, 0x41, 0x64, 0x64, + 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, + 0x69, 0x6c, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x76, + 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0c, 0x52, 0x0e, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x49, 0x64, 0x22, 0xbe, 0x01, 0x0a, 0x14, 0x51, 0x75, 0x65, 0x72, 0x79, 0x48, 0x61, 0x73, + 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x20, 0x0a, 0x0b, 0x75, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0c, 0x52, 0x0b, 0x75, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x24, + 0x0c, 0x52, 0x0b, 0x75, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x2a, + 0x0a, 0x10, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, + 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x10, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, + 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x30, 0x0a, 0x13, 0x65, 0x78, + 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, + 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x13, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x26, 0x0a, 0x0e, + 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x49, 0x73, 0x73, 0x75, 0x65, 0x72, 0x73, 0x18, 0x04, + 0x20, 0x03, 0x28, 0x0c, 0x52, 0x0e, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x49, 0x73, 0x73, + 0x75, 0x65, 0x72, 0x73, 0x22, 0x48, 0x0a, 0x1c, 0x51, 0x75, 0x65, 0x72, 0x79, 0x48, 0x61, 0x73, + 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x68, 0x61, 0x73, 0x56, 0x65, 0x72, 0x69, 0x66, + 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x68, + 0x61, 0x73, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x62, + 0x0a, 0x18, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, 0x74, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, + 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x12, 0x20, 0x0a, 0x0b, 0x75, 0x73, + 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, + 0x0b, 0x75, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x24, 0x0a, 0x0d, + 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, + 0x73, 0x73, 0x22, 0x9b, 0x03, 0x0a, 0x13, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x2a, 0x0a, 0x10, 0x76, 0x65, + 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0d, 0x52, 0x10, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, + 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0e, + 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x12, 0x24, 0x0a, 0x0d, 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x41, 0x64, 0x64, + 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x43, 0x68, - 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6f, 0x72, 0x69, 0x67, 0x69, - 0x6e, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x12, 0x2a, 0x0a, 0x10, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, - 0x52, 0x10, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, - 0x70, 0x65, 0x12, 0x2c, 0x0a, 0x11, 0x69, 0x73, 0x73, 0x75, 0x61, 0x6e, 0x63, 0x65, 0x54, 0x69, - 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x11, 0x69, - 0x73, 0x73, 0x75, 0x61, 0x6e, 0x63, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, - 0x12, 0x30, 0x0a, 0x13, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, - 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x13, 0x65, - 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, - 0x6d, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x44, 0x61, 0x74, 0x61, 0x18, - 0x07, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x44, 0x61, 0x74, 0x61, - 0x12, 0x16, 0x0a, 0x06, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x06, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x32, 0x0a, 0x14, 0x69, 0x73, 0x73, 0x75, - 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, - 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x56, 0x65, - 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, - 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x76, - 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x4d, 0x0a, 0x23, 0x51, 0x75, 0x65, 0x72, 0x79, 0x41, - 0x64, 0x64, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, - 0x74, 0x61, 0x69, 0x6c, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x26, 0x0a, - 0x0e, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0e, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0xbe, 0x01, 0x0a, 0x14, 0x51, 0x75, 0x65, 0x72, 0x79, 0x48, - 0x61, 0x73, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x20, - 0x0a, 0x0b, 0x75, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0c, 0x52, 0x0b, 0x75, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, - 0x12, 0x2a, 0x0a, 0x10, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x10, 0x76, 0x65, 0x72, 0x69, - 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x30, 0x0a, 0x13, - 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, - 0x61, 0x6d, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x13, 0x65, 0x78, 0x70, 0x69, 0x72, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x26, - 0x0a, 0x0e, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x49, 0x73, 0x73, 0x75, 0x65, 0x72, 0x73, - 0x18, 0x04, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x0e, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x49, - 0x73, 0x73, 0x75, 0x65, 0x72, 0x73, 0x22, 0x48, 0x0a, 0x1c, 0x51, 0x75, 0x65, 0x72, 0x79, 0x48, - 0x61, 0x73, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x68, 0x61, 0x73, 0x56, 0x65, 0x72, - 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x0f, 0x68, 0x61, 0x73, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x62, 0x0a, 0x18, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, 0x74, 0x56, 0x65, 0x72, 0x69, - 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x12, 0x20, 0x0a, 0x0b, - 0x75, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0c, 0x52, 0x0b, 0x75, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x24, - 0x0a, 0x0d, 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x41, 0x64, 0x64, - 0x72, 0x65, 0x73, 0x73, 0x22, 0x9b, 0x03, 0x0a, 0x13, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x2a, 0x0a, 0x10, - 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x10, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x76, 0x65, 0x72, 0x69, - 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, - 0x52, 0x0e, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, - 0x12, 0x24, 0x0a, 0x0d, 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, - 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x41, - 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, - 0x43, 0x68, 0x61, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6f, 0x72, 0x69, - 0x67, 0x69, 0x6e, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x12, 0x2c, 0x0a, 0x11, 0x69, 0x73, 0x73, 0x75, - 0x61, 0x6e, 0x63, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x05, 0x20, - 0x01, 0x28, 0x0d, 0x52, 0x11, 0x69, 0x73, 0x73, 0x75, 0x61, 0x6e, 0x63, 0x65, 0x54, 0x69, 0x6d, - 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x30, 0x0a, 0x13, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x0d, 0x52, 0x13, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, - 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x22, 0x0a, 0x0c, 0x6f, 0x72, 0x69, 0x67, - 0x69, 0x6e, 0x61, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, - 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, - 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x63, - 0x68, 0x65, 0x6d, 0x61, 0x12, 0x32, 0x0a, 0x14, 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x56, 0x65, - 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x14, 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, - 0x69, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, - 0x6f, 0x6e, 0x22, 0x54, 0x0a, 0x20, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, 0x74, 0x56, 0x65, - 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x30, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x56, - 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, 0x69, - 0x6c, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x84, 0x08, 0x0a, 0x0d, 0x43, 0x6f, 0x73, - 0x6d, 0x6f, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3a, 0x0a, 0x0a, 0x67, 0x65, - 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, - 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, - 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x48, 0x00, 0x52, 0x0a, 0x67, 0x65, 0x74, 0x41, - 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x43, 0x0a, 0x0d, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, - 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, - 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6e, 0x73, - 0x65, 0x72, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x48, 0x00, 0x52, 0x0d, 0x69, 0x6e, - 0x73, 0x65, 0x72, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x3d, 0x0a, 0x0b, 0x63, - 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x4b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x19, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, - 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x4b, 0x65, 0x79, 0x48, 0x00, 0x52, 0x0b, 0x63, - 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x4b, 0x65, 0x79, 0x12, 0x40, 0x0a, 0x0b, 0x61, 0x63, - 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1c, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, - 0x65, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x48, 0x00, 0x52, - 0x0b, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x47, 0x0a, 0x0b, - 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x23, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, - 0x79, 0x47, 0x65, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x61, - 0x67, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, - 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x12, 0x4f, 0x0a, 0x11, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x41, - 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x1f, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, - 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x6f, 0x64, - 0x65, 0x48, 0x00, 0x52, 0x11, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x4f, 0x0a, 0x11, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, - 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x1f, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, - 0x79, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x65, - 0x6c, 0x6c, 0x48, 0x00, 0x52, 0x11, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x53, 0x74, 0x6f, 0x72, - 0x61, 0x67, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x12, 0x2e, 0x0a, 0x06, 0x72, 0x65, 0x6d, 0x6f, 0x76, - 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, - 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x48, 0x00, 0x52, - 0x06, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x12, 0x4f, 0x0a, 0x11, 0x72, 0x65, 0x6d, 0x6f, 0x76, - 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x18, 0x09, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, - 0x72, 0x79, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, - 0x65, 0x6c, 0x6c, 0x48, 0x00, 0x52, 0x11, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x6f, - 0x72, 0x61, 0x67, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x12, 0x43, 0x0a, 0x0d, 0x72, 0x65, 0x6d, 0x6f, - 0x76, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1b, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, - 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x48, 0x00, 0x52, 0x0d, - 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x12, 0x37, 0x0a, - 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x17, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, - 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x48, 0x00, 0x52, 0x09, 0x62, 0x6c, 0x6f, - 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x12, 0x5e, 0x0a, 0x16, 0x61, 0x64, 0x64, 0x56, 0x65, 0x72, + 0x61, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6f, 0x72, 0x69, 0x67, 0x69, + 0x6e, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x12, 0x2c, 0x0a, 0x11, 0x69, 0x73, 0x73, 0x75, 0x61, 0x6e, + 0x63, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x0d, 0x52, 0x11, 0x69, 0x73, 0x73, 0x75, 0x61, 0x6e, 0x63, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, + 0x74, 0x61, 0x6d, 0x70, 0x12, 0x30, 0x0a, 0x13, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x0d, 0x52, 0x13, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, + 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x22, 0x0a, 0x0c, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, + 0x61, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x6f, 0x72, + 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x63, + 0x68, 0x65, 0x6d, 0x61, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x63, 0x68, 0x65, + 0x6d, 0x61, 0x12, 0x32, 0x0a, 0x14, 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, + 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x14, 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, + 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, + 0x22, 0x54, 0x0a, 0x20, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, 0x74, 0x56, 0x65, 0x72, 0x69, + 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x30, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, - 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, - 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x41, 0x64, 0x64, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x48, 0x00, 0x52, 0x16, - 0x61, 0x64, 0x64, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, - 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x49, 0x0a, 0x0f, 0x68, 0x61, 0x73, 0x56, 0x65, 0x72, - 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1d, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x48, - 0x61, 0x73, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, - 0x52, 0x0f, 0x68, 0x61, 0x73, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x12, 0x55, 0x0a, 0x13, 0x67, 0x65, 0x74, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, - 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, + 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0xed, 0x09, 0x0a, 0x0d, 0x43, 0x6f, 0x73, 0x6d, 0x6f, + 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3a, 0x0a, 0x0a, 0x67, 0x65, 0x74, 0x41, + 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x66, + 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, 0x74, 0x41, + 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x48, 0x00, 0x52, 0x0a, 0x67, 0x65, 0x74, 0x41, 0x63, 0x63, + 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x3d, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, + 0x4b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x66, 0x66, 0x69, 0x2e, + 0x66, 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, + 0x73, 0x4b, 0x65, 0x79, 0x48, 0x00, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, + 0x4b, 0x65, 0x79, 0x12, 0x40, 0x0a, 0x0b, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x6f, + 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, + 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x48, 0x00, 0x52, 0x0b, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x3e, 0x0a, 0x08, 0x63, 0x6f, 0x64, 0x65, 0x48, 0x61, 0x73, + 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, + 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x43, 0x6f, 0x64, 0x65, 0x48, 0x61, 0x73, 0x68, 0x48, 0x00, 0x52, 0x08, 0x63, 0x6f, 0x64, + 0x65, 0x48, 0x61, 0x73, 0x68, 0x12, 0x3e, 0x0a, 0x08, 0x63, 0x6f, 0x64, 0x65, 0x53, 0x69, 0x7a, + 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, + 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x43, 0x6f, 0x64, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x48, 0x00, 0x52, 0x08, 0x63, 0x6f, 0x64, + 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x47, 0x0a, 0x0b, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, + 0x43, 0x65, 0x6c, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x66, 0x66, 0x69, + 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, 0x74, 0x41, 0x63, 0x63, + 0x6f, 0x75, 0x6e, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x48, + 0x00, 0x52, 0x0b, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x12, 0x4f, + 0x0a, 0x11, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, + 0x6f, 0x64, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x66, 0x66, 0x69, 0x2e, + 0x66, 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x41, + 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x48, 0x00, 0x52, 0x11, 0x69, 0x6e, + 0x73, 0x65, 0x72, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x4f, 0x0a, 0x11, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, + 0x43, 0x65, 0x6c, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x66, 0x66, 0x69, + 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, + 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x48, 0x00, 0x52, 0x11, 0x69, + 0x6e, 0x73, 0x65, 0x72, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x65, 0x6c, 0x6c, + 0x12, 0x2e, 0x0a, 0x06, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x14, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, + 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x48, 0x00, 0x52, 0x06, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, + 0x12, 0x4f, 0x0a, 0x11, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, + 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x66, 0x66, + 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x6d, 0x6f, 0x76, + 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x65, 0x6c, 0x6c, 0x48, 0x00, 0x52, 0x11, + 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x65, 0x6c, + 0x6c, 0x12, 0x43, 0x0a, 0x0d, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, + 0x67, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, + 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x53, 0x74, + 0x6f, 0x72, 0x61, 0x67, 0x65, 0x48, 0x00, 0x52, 0x0d, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x53, + 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x12, 0x37, 0x0a, 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x48, + 0x61, 0x73, 0x68, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x66, 0x66, 0x69, 0x2e, + 0x66, 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, + 0x73, 0x68, 0x48, 0x00, 0x52, 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x12, + 0x5e, 0x0a, 0x16, 0x61, 0x64, 0x64, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x24, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x41, + 0x64, 0x64, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, + 0x74, 0x61, 0x69, 0x6c, 0x73, 0x48, 0x00, 0x52, 0x16, 0x61, 0x64, 0x64, 0x56, 0x65, 0x72, 0x69, + 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, + 0x49, 0x0a, 0x0f, 0x68, 0x61, 0x73, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, + 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x48, 0x61, 0x73, 0x56, 0x65, 0x72, 0x69, 0x66, + 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x0f, 0x68, 0x61, 0x73, 0x56, 0x65, + 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x55, 0x0a, 0x13, 0x67, 0x65, 0x74, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x61, 0x74, - 0x61, 0x48, 0x00, 0x52, 0x13, 0x67, 0x65, 0x74, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x42, 0x05, 0x0a, 0x03, 0x72, 0x65, 0x71, 0x22, - 0x84, 0x02, 0x0a, 0x0f, 0x53, 0x47, 0x58, 0x56, 0x4d, 0x43, 0x61, 0x6c, 0x6c, 0x50, 0x61, 0x72, - 0x61, 0x6d, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0c, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0c, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1a, 0x0a, 0x08, 0x67, - 0x61, 0x73, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x67, - 0x61, 0x73, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x37, 0x0a, - 0x0a, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x17, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x41, 0x63, 0x63, 0x65, - 0x73, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, - 0x73, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x12, 0x14, - 0x0a, 0x05, 0x6e, 0x6f, 0x6e, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x6e, - 0x6f, 0x6e, 0x63, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x75, 0x6e, 0x65, 0x6e, 0x63, 0x72, 0x79, 0x70, - 0x74, 0x65, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x75, 0x6e, 0x65, 0x6e, 0x63, - 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x22, 0xd4, 0x01, 0x0a, 0x11, 0x53, 0x47, 0x58, 0x56, 0x4d, - 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x12, 0x0a, 0x04, - 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, - 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, - 0x64, 0x61, 0x74, 0x61, 0x12, 0x1a, 0x0a, 0x08, 0x67, 0x61, 0x73, 0x4c, 0x69, 0x6d, 0x69, 0x74, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x67, 0x61, 0x73, 0x4c, 0x69, 0x6d, 0x69, 0x74, - 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x37, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, - 0x4c, 0x69, 0x73, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x66, 0x66, 0x69, - 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x49, - 0x74, 0x65, 0x6d, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x12, - 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x6f, 0x6e, 0x63, 0x65, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x6e, 0x6f, 0x6e, 0x63, 0x65, 0x22, 0x7b, 0x0a, - 0x10, 0x53, 0x47, 0x58, 0x56, 0x4d, 0x43, 0x61, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x30, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x18, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x53, 0x47, 0x58, 0x56, - 0x4d, 0x43, 0x61, 0x6c, 0x6c, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x06, 0x70, 0x61, 0x72, + 0x61, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, + 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, 0x74, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, + 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x48, 0x00, 0x52, 0x13, 0x67, 0x65, + 0x74, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x61, 0x74, + 0x61, 0x12, 0x58, 0x0a, 0x14, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x22, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, + 0x6e, 0x73, 0x65, 0x72, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x61, 0x6c, 0x61, + 0x6e, 0x63, 0x65, 0x48, 0x00, 0x52, 0x14, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x41, 0x63, 0x63, + 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x52, 0x0a, 0x12, 0x69, + 0x6e, 0x73, 0x65, 0x72, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x4e, 0x6f, 0x6e, 0x63, + 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, + 0x69, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x41, 0x63, 0x63, + 0x6f, 0x75, 0x6e, 0x74, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x48, 0x00, 0x52, 0x12, 0x69, 0x6e, 0x73, + 0x65, 0x72, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x42, + 0x05, 0x0a, 0x03, 0x72, 0x65, 0x71, 0x22, 0xa0, 0x02, 0x0a, 0x0f, 0x53, 0x47, 0x58, 0x56, 0x4d, + 0x43, 0x61, 0x6c, 0x6c, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, + 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e, + 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x12, + 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x12, 0x1a, 0x0a, 0x08, 0x67, 0x61, 0x73, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x67, 0x61, 0x73, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x1a, + 0x0a, 0x08, 0x67, 0x61, 0x73, 0x50, 0x72, 0x69, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, + 0x52, 0x08, 0x67, 0x61, 0x73, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x12, 0x37, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x07, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x41, + 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x0a, 0x61, + 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6d, + 0x6d, 0x69, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, + 0x74, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x6f, 0x6e, 0x63, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x04, + 0x52, 0x05, 0x6e, 0x6f, 0x6e, 0x63, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x75, 0x6e, 0x65, 0x6e, 0x63, + 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x75, 0x6e, + 0x65, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x22, 0xf0, 0x01, 0x0a, 0x11, 0x53, 0x47, + 0x58, 0x56, 0x4d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, + 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x66, + 0x72, 0x6f, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1a, 0x0a, 0x08, 0x67, 0x61, 0x73, 0x4c, 0x69, + 0x6d, 0x69, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x67, 0x61, 0x73, 0x4c, 0x69, + 0x6d, 0x69, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x67, 0x61, 0x73, 0x50, 0x72, 0x69, 0x63, 0x65, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x08, 0x67, 0x61, 0x73, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, + 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x37, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, + 0x69, 0x73, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x66, 0x66, 0x69, 0x2e, + 0x66, 0x66, 0x69, 0x2e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x74, + 0x65, 0x6d, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x16, + 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, + 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x6f, 0x6e, 0x63, 0x65, 0x18, + 0x08, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x6e, 0x6f, 0x6e, 0x63, 0x65, 0x22, 0x7b, 0x0a, 0x10, + 0x53, 0x47, 0x58, 0x56, 0x4d, 0x43, 0x61, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x12, 0x30, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x18, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x53, 0x47, 0x58, 0x56, 0x4d, + 0x43, 0x61, 0x6c, 0x6c, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x73, 0x12, 0x35, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x54, 0x72, + 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, + 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x22, 0x7f, 0x0a, 0x12, 0x53, 0x47, 0x58, + 0x56, 0x4d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, + 0x32, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x1a, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x53, 0x47, 0x58, 0x56, 0x4d, 0x43, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x35, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, - 0x74, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x22, 0x7f, 0x0a, 0x12, 0x53, 0x47, - 0x58, 0x56, 0x4d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x32, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x1a, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x53, 0x47, 0x58, 0x56, 0x4d, - 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x06, 0x70, 0x61, - 0x72, 0x61, 0x6d, 0x73, 0x12, 0x35, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, - 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, - 0x78, 0x74, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x22, 0x38, 0x0a, 0x14, 0x4e, - 0x6f, 0x64, 0x65, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x62, - 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, - 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x35, 0x0a, 0x15, 0x4e, 0x6f, 0x64, 0x65, 0x50, 0x75, 0x62, - 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, - 0x0a, 0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0c, 0x52, 0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x22, 0x79, 0x0a, 0x09, - 0x45, 0x70, 0x6f, 0x63, 0x68, 0x44, 0x61, 0x74, 0x61, 0x12, 0x20, 0x0a, 0x0b, 0x65, 0x70, 0x6f, - 0x63, 0x68, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0b, - 0x65, 0x70, 0x6f, 0x63, 0x68, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x73, - 0x74, 0x61, 0x72, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x04, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x6c, 0x6f, 0x63, - 0x6b, 0x12, 0x24, 0x0a, 0x0d, 0x6e, 0x6f, 0x64, 0x65, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, - 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x6e, 0x6f, 0x64, 0x65, 0x50, 0x75, - 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x22, 0x40, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x45, - 0x70, 0x6f, 0x63, 0x68, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2a, 0x0a, - 0x06, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, - 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x44, 0x61, 0x74, - 0x61, 0x52, 0x06, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x73, 0x22, 0xe4, 0x01, 0x0a, 0x0a, 0x46, 0x46, - 0x49, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3d, 0x0a, 0x0b, 0x63, 0x61, 0x6c, 0x6c, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, - 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x53, 0x47, 0x58, 0x56, 0x4d, 0x43, 0x61, 0x6c, - 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0b, 0x63, 0x61, 0x6c, 0x6c, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x43, 0x0a, 0x0d, 0x63, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, - 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x53, 0x47, 0x58, 0x56, 0x4d, 0x43, 0x72, - 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0d, 0x63, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4b, 0x0a, 0x10, - 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, - 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x10, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, - 0x65, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x42, 0x05, 0x0a, 0x03, 0x72, 0x65, 0x71, - 0x42, 0x26, 0x5a, 0x24, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x53, - 0x69, 0x67, 0x6d, 0x61, 0x47, 0x6d, 0x62, 0x48, 0x2f, 0x6c, 0x69, 0x62, 0x72, 0x75, 0x73, 0x74, - 0x67, 0x6f, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x22, 0x38, 0x0a, 0x14, 0x4e, 0x6f, + 0x64, 0x65, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, + 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75, + 0x6d, 0x62, 0x65, 0x72, 0x22, 0x35, 0x0a, 0x15, 0x4e, 0x6f, 0x64, 0x65, 0x50, 0x75, 0x62, 0x6c, + 0x69, 0x63, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, 0x0a, + 0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, + 0x52, 0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x22, 0x79, 0x0a, 0x09, 0x45, + 0x70, 0x6f, 0x63, 0x68, 0x44, 0x61, 0x74, 0x61, 0x12, 0x20, 0x0a, 0x0b, 0x65, 0x70, 0x6f, 0x63, + 0x68, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0b, 0x65, + 0x70, 0x6f, 0x63, 0x68, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x04, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x6c, 0x6f, 0x63, 0x6b, + 0x12, 0x24, 0x0a, 0x0d, 0x6e, 0x6f, 0x64, 0x65, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, + 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x6e, 0x6f, 0x64, 0x65, 0x50, 0x75, 0x62, + 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x22, 0x40, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x70, + 0x6f, 0x63, 0x68, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2a, 0x0a, 0x06, + 0x65, 0x70, 0x6f, 0x63, 0x68, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x66, + 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x44, 0x61, 0x74, 0x61, + 0x52, 0x06, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x73, 0x22, 0xe4, 0x01, 0x0a, 0x0a, 0x46, 0x46, 0x49, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3d, 0x0a, 0x0b, 0x63, 0x61, 0x6c, 0x6c, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x66, + 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x53, 0x47, 0x58, 0x56, 0x4d, 0x43, 0x61, 0x6c, 0x6c, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0b, 0x63, 0x61, 0x6c, 0x6c, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x43, 0x0a, 0x0d, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, + 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x53, 0x47, 0x58, 0x56, 0x4d, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0d, 0x63, 0x72, + 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4b, 0x0a, 0x10, 0x70, + 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x66, 0x66, 0x69, 0x2e, 0x66, 0x66, 0x69, 0x2e, + 0x4e, 0x6f, 0x64, 0x65, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x10, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, + 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x42, 0x05, 0x0a, 0x03, 0x72, 0x65, 0x71, 0x42, + 0x26, 0x5a, 0x24, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x53, 0x69, + 0x67, 0x6d, 0x61, 0x47, 0x6d, 0x62, 0x48, 0x2f, 0x6c, 0x69, 0x62, 0x72, 0x75, 0x73, 0x74, 0x67, + 0x6f, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -3326,7 +3693,7 @@ func file_ffi_proto_rawDescGZIP() []byte { return file_ffi_proto_rawDescData } -var file_ffi_proto_msgTypes = make([]protoimpl.MessageInfo, 46) +var file_ffi_proto_msgTypes = make([]protoimpl.MessageInfo, 52) var file_ffi_proto_goTypes = []any{ (*AccessListItem)(nil), // 0: ffi.ffi.AccessListItem (*TransactionData)(nil), // 1: ffi.ffi.TransactionData @@ -3337,43 +3704,49 @@ var file_ffi_proto_goTypes = []any{ (*Log)(nil), // 6: ffi.ffi.Log (*QueryGetAccount)(nil), // 7: ffi.ffi.QueryGetAccount (*QueryGetAccountResponse)(nil), // 8: ffi.ffi.QueryGetAccountResponse - (*QueryInsertAccount)(nil), // 9: ffi.ffi.QueryInsertAccount - (*QueryInsertAccountResponse)(nil), // 10: ffi.ffi.QueryInsertAccountResponse - (*QueryContainsKey)(nil), // 11: ffi.ffi.QueryContainsKey - (*QueryContainsKeyResponse)(nil), // 12: ffi.ffi.QueryContainsKeyResponse - (*QueryGetAccountStorageCell)(nil), // 13: ffi.ffi.QueryGetAccountStorageCell - (*QueryGetAccountStorageCellResponse)(nil), // 14: ffi.ffi.QueryGetAccountStorageCellResponse - (*QueryGetAccountCode)(nil), // 15: ffi.ffi.QueryGetAccountCode - (*QueryGetAccountCodeResponse)(nil), // 16: ffi.ffi.QueryGetAccountCodeResponse - (*QueryInsertAccountCode)(nil), // 17: ffi.ffi.QueryInsertAccountCode - (*QueryInsertAccountCodeResponse)(nil), // 18: ffi.ffi.QueryInsertAccountCodeResponse - (*QueryInsertStorageCell)(nil), // 19: ffi.ffi.QueryInsertStorageCell - (*QueryInsertStorageCellResponse)(nil), // 20: ffi.ffi.QueryInsertStorageCellResponse - (*QueryRemove)(nil), // 21: ffi.ffi.QueryRemove - (*QueryRemoveResponse)(nil), // 22: ffi.ffi.QueryRemoveResponse - (*QueryRemoveStorageCell)(nil), // 23: ffi.ffi.QueryRemoveStorageCell - (*QueryRemoveStorageCellResponse)(nil), // 24: ffi.ffi.QueryRemoveStorageCellResponse - (*QueryRemoveStorage)(nil), // 25: ffi.ffi.QueryRemoveStorage - (*QueryRemoveStorageResponse)(nil), // 26: ffi.ffi.QueryRemoveStorageResponse - (*QueryBlockHash)(nil), // 27: ffi.ffi.QueryBlockHash - (*QueryBlockHashResponse)(nil), // 28: ffi.ffi.QueryBlockHashResponse - (*QueryAddVerificationDetails)(nil), // 29: ffi.ffi.QueryAddVerificationDetails - (*QueryAddVerificationDetailsResponse)(nil), // 30: ffi.ffi.QueryAddVerificationDetailsResponse - (*QueryHasVerification)(nil), // 31: ffi.ffi.QueryHasVerification - (*QueryHasVerificationResponse)(nil), // 32: ffi.ffi.QueryHasVerificationResponse - (*QueryGetVerificationData)(nil), // 33: ffi.ffi.QueryGetVerificationData - (*VerificationDetails)(nil), // 34: ffi.ffi.VerificationDetails - (*QueryGetVerificationDataResponse)(nil), // 35: ffi.ffi.QueryGetVerificationDataResponse - (*CosmosRequest)(nil), // 36: ffi.ffi.CosmosRequest - (*SGXVMCallParams)(nil), // 37: ffi.ffi.SGXVMCallParams - (*SGXVMCreateParams)(nil), // 38: ffi.ffi.SGXVMCreateParams - (*SGXVMCallRequest)(nil), // 39: ffi.ffi.SGXVMCallRequest - (*SGXVMCreateRequest)(nil), // 40: ffi.ffi.SGXVMCreateRequest - (*NodePublicKeyRequest)(nil), // 41: ffi.ffi.NodePublicKeyRequest - (*NodePublicKeyResponse)(nil), // 42: ffi.ffi.NodePublicKeyResponse - (*EpochData)(nil), // 43: ffi.ffi.EpochData - (*ListEpochsResponse)(nil), // 44: ffi.ffi.ListEpochsResponse - (*FFIRequest)(nil), // 45: ffi.ffi.FFIRequest + (*QueryInsertAccountBalance)(nil), // 9: ffi.ffi.QueryInsertAccountBalance + (*QueryInsertAccountBalanceResponse)(nil), // 10: ffi.ffi.QueryInsertAccountBalanceResponse + (*QueryInsertAccountNonce)(nil), // 11: ffi.ffi.QueryInsertAccountNonce + (*QueryInsertAccountNonceResponse)(nil), // 12: ffi.ffi.QueryInsertAccountNonceResponse + (*QueryContainsKey)(nil), // 13: ffi.ffi.QueryContainsKey + (*QueryContainsKeyResponse)(nil), // 14: ffi.ffi.QueryContainsKeyResponse + (*QueryGetAccountStorageCell)(nil), // 15: ffi.ffi.QueryGetAccountStorageCell + (*QueryGetAccountStorageCellResponse)(nil), // 16: ffi.ffi.QueryGetAccountStorageCellResponse + (*QueryGetAccountCode)(nil), // 17: ffi.ffi.QueryGetAccountCode + (*QueryGetAccountCodeResponse)(nil), // 18: ffi.ffi.QueryGetAccountCodeResponse + (*QueryGetAccountCodeSize)(nil), // 19: ffi.ffi.QueryGetAccountCodeSize + (*QueryGetAccountCodeSizeResponse)(nil), // 20: ffi.ffi.QueryGetAccountCodeSizeResponse + (*QueryGetAccountCodeHash)(nil), // 21: ffi.ffi.QueryGetAccountCodeHash + (*QueryGetAccountCodeHashResponse)(nil), // 22: ffi.ffi.QueryGetAccountCodeHashResponse + (*QueryInsertAccountCode)(nil), // 23: ffi.ffi.QueryInsertAccountCode + (*QueryInsertAccountCodeResponse)(nil), // 24: ffi.ffi.QueryInsertAccountCodeResponse + (*QueryInsertStorageCell)(nil), // 25: ffi.ffi.QueryInsertStorageCell + (*QueryInsertStorageCellResponse)(nil), // 26: ffi.ffi.QueryInsertStorageCellResponse + (*QueryRemove)(nil), // 27: ffi.ffi.QueryRemove + (*QueryRemoveResponse)(nil), // 28: ffi.ffi.QueryRemoveResponse + (*QueryRemoveStorageCell)(nil), // 29: ffi.ffi.QueryRemoveStorageCell + (*QueryRemoveStorageCellResponse)(nil), // 30: ffi.ffi.QueryRemoveStorageCellResponse + (*QueryRemoveStorage)(nil), // 31: ffi.ffi.QueryRemoveStorage + (*QueryRemoveStorageResponse)(nil), // 32: ffi.ffi.QueryRemoveStorageResponse + (*QueryBlockHash)(nil), // 33: ffi.ffi.QueryBlockHash + (*QueryBlockHashResponse)(nil), // 34: ffi.ffi.QueryBlockHashResponse + (*QueryAddVerificationDetails)(nil), // 35: ffi.ffi.QueryAddVerificationDetails + (*QueryAddVerificationDetailsResponse)(nil), // 36: ffi.ffi.QueryAddVerificationDetailsResponse + (*QueryHasVerification)(nil), // 37: ffi.ffi.QueryHasVerification + (*QueryHasVerificationResponse)(nil), // 38: ffi.ffi.QueryHasVerificationResponse + (*QueryGetVerificationData)(nil), // 39: ffi.ffi.QueryGetVerificationData + (*VerificationDetails)(nil), // 40: ffi.ffi.VerificationDetails + (*QueryGetVerificationDataResponse)(nil), // 41: ffi.ffi.QueryGetVerificationDataResponse + (*CosmosRequest)(nil), // 42: ffi.ffi.CosmosRequest + (*SGXVMCallParams)(nil), // 43: ffi.ffi.SGXVMCallParams + (*SGXVMCreateParams)(nil), // 44: ffi.ffi.SGXVMCreateParams + (*SGXVMCallRequest)(nil), // 45: ffi.ffi.SGXVMCallRequest + (*SGXVMCreateRequest)(nil), // 46: ffi.ffi.SGXVMCreateRequest + (*NodePublicKeyRequest)(nil), // 47: ffi.ffi.NodePublicKeyRequest + (*NodePublicKeyResponse)(nil), // 48: ffi.ffi.NodePublicKeyResponse + (*EpochData)(nil), // 49: ffi.ffi.EpochData + (*ListEpochsResponse)(nil), // 50: ffi.ffi.ListEpochsResponse + (*FFIRequest)(nil), // 51: ffi.ffi.FFIRequest } var file_ffi_proto_depIdxs = []int32{ 0, // 0: ffi.ffi.TransactionData.accessList:type_name -> ffi.ffi.AccessListItem @@ -3381,36 +3754,39 @@ var file_ffi_proto_depIdxs = []int32{ 2, // 2: ffi.ffi.HandleTransactionRequest.tx_context:type_name -> ffi.ffi.TransactionContext 6, // 3: ffi.ffi.HandleTransactionResponse.logs:type_name -> ffi.ffi.Log 5, // 4: ffi.ffi.Log.topics:type_name -> ffi.ffi.Topic - 34, // 5: ffi.ffi.QueryGetVerificationDataResponse.data:type_name -> ffi.ffi.VerificationDetails + 40, // 5: ffi.ffi.QueryGetVerificationDataResponse.data:type_name -> ffi.ffi.VerificationDetails 7, // 6: ffi.ffi.CosmosRequest.getAccount:type_name -> ffi.ffi.QueryGetAccount - 9, // 7: ffi.ffi.CosmosRequest.insertAccount:type_name -> ffi.ffi.QueryInsertAccount - 11, // 8: ffi.ffi.CosmosRequest.containsKey:type_name -> ffi.ffi.QueryContainsKey - 15, // 9: ffi.ffi.CosmosRequest.accountCode:type_name -> ffi.ffi.QueryGetAccountCode - 13, // 10: ffi.ffi.CosmosRequest.storageCell:type_name -> ffi.ffi.QueryGetAccountStorageCell - 17, // 11: ffi.ffi.CosmosRequest.insertAccountCode:type_name -> ffi.ffi.QueryInsertAccountCode - 19, // 12: ffi.ffi.CosmosRequest.insertStorageCell:type_name -> ffi.ffi.QueryInsertStorageCell - 21, // 13: ffi.ffi.CosmosRequest.remove:type_name -> ffi.ffi.QueryRemove - 23, // 14: ffi.ffi.CosmosRequest.removeStorageCell:type_name -> ffi.ffi.QueryRemoveStorageCell - 25, // 15: ffi.ffi.CosmosRequest.removeStorage:type_name -> ffi.ffi.QueryRemoveStorage - 27, // 16: ffi.ffi.CosmosRequest.blockHash:type_name -> ffi.ffi.QueryBlockHash - 29, // 17: ffi.ffi.CosmosRequest.addVerificationDetails:type_name -> ffi.ffi.QueryAddVerificationDetails - 31, // 18: ffi.ffi.CosmosRequest.hasVerification:type_name -> ffi.ffi.QueryHasVerification - 33, // 19: ffi.ffi.CosmosRequest.getVerificationData:type_name -> ffi.ffi.QueryGetVerificationData - 0, // 20: ffi.ffi.SGXVMCallParams.accessList:type_name -> ffi.ffi.AccessListItem - 0, // 21: ffi.ffi.SGXVMCreateParams.accessList:type_name -> ffi.ffi.AccessListItem - 37, // 22: ffi.ffi.SGXVMCallRequest.params:type_name -> ffi.ffi.SGXVMCallParams - 2, // 23: ffi.ffi.SGXVMCallRequest.context:type_name -> ffi.ffi.TransactionContext - 38, // 24: ffi.ffi.SGXVMCreateRequest.params:type_name -> ffi.ffi.SGXVMCreateParams - 2, // 25: ffi.ffi.SGXVMCreateRequest.context:type_name -> ffi.ffi.TransactionContext - 43, // 26: ffi.ffi.ListEpochsResponse.epochs:type_name -> ffi.ffi.EpochData - 39, // 27: ffi.ffi.FFIRequest.callRequest:type_name -> ffi.ffi.SGXVMCallRequest - 40, // 28: ffi.ffi.FFIRequest.createRequest:type_name -> ffi.ffi.SGXVMCreateRequest - 41, // 29: ffi.ffi.FFIRequest.publicKeyRequest:type_name -> ffi.ffi.NodePublicKeyRequest - 30, // [30:30] is the sub-list for method output_type - 30, // [30:30] is the sub-list for method input_type - 30, // [30:30] is the sub-list for extension type_name - 30, // [30:30] is the sub-list for extension extendee - 0, // [0:30] is the sub-list for field type_name + 13, // 7: ffi.ffi.CosmosRequest.containsKey:type_name -> ffi.ffi.QueryContainsKey + 17, // 8: ffi.ffi.CosmosRequest.accountCode:type_name -> ffi.ffi.QueryGetAccountCode + 21, // 9: ffi.ffi.CosmosRequest.codeHash:type_name -> ffi.ffi.QueryGetAccountCodeHash + 19, // 10: ffi.ffi.CosmosRequest.codeSize:type_name -> ffi.ffi.QueryGetAccountCodeSize + 15, // 11: ffi.ffi.CosmosRequest.storageCell:type_name -> ffi.ffi.QueryGetAccountStorageCell + 23, // 12: ffi.ffi.CosmosRequest.insertAccountCode:type_name -> ffi.ffi.QueryInsertAccountCode + 25, // 13: ffi.ffi.CosmosRequest.insertStorageCell:type_name -> ffi.ffi.QueryInsertStorageCell + 27, // 14: ffi.ffi.CosmosRequest.remove:type_name -> ffi.ffi.QueryRemove + 29, // 15: ffi.ffi.CosmosRequest.removeStorageCell:type_name -> ffi.ffi.QueryRemoveStorageCell + 31, // 16: ffi.ffi.CosmosRequest.removeStorage:type_name -> ffi.ffi.QueryRemoveStorage + 33, // 17: ffi.ffi.CosmosRequest.blockHash:type_name -> ffi.ffi.QueryBlockHash + 35, // 18: ffi.ffi.CosmosRequest.addVerificationDetails:type_name -> ffi.ffi.QueryAddVerificationDetails + 37, // 19: ffi.ffi.CosmosRequest.hasVerification:type_name -> ffi.ffi.QueryHasVerification + 39, // 20: ffi.ffi.CosmosRequest.getVerificationData:type_name -> ffi.ffi.QueryGetVerificationData + 9, // 21: ffi.ffi.CosmosRequest.insertAccountBalance:type_name -> ffi.ffi.QueryInsertAccountBalance + 11, // 22: ffi.ffi.CosmosRequest.insertAccountNonce:type_name -> ffi.ffi.QueryInsertAccountNonce + 0, // 23: ffi.ffi.SGXVMCallParams.accessList:type_name -> ffi.ffi.AccessListItem + 0, // 24: ffi.ffi.SGXVMCreateParams.accessList:type_name -> ffi.ffi.AccessListItem + 43, // 25: ffi.ffi.SGXVMCallRequest.params:type_name -> ffi.ffi.SGXVMCallParams + 2, // 26: ffi.ffi.SGXVMCallRequest.context:type_name -> ffi.ffi.TransactionContext + 44, // 27: ffi.ffi.SGXVMCreateRequest.params:type_name -> ffi.ffi.SGXVMCreateParams + 2, // 28: ffi.ffi.SGXVMCreateRequest.context:type_name -> ffi.ffi.TransactionContext + 49, // 29: ffi.ffi.ListEpochsResponse.epochs:type_name -> ffi.ffi.EpochData + 45, // 30: ffi.ffi.FFIRequest.callRequest:type_name -> ffi.ffi.SGXVMCallRequest + 46, // 31: ffi.ffi.FFIRequest.createRequest:type_name -> ffi.ffi.SGXVMCreateRequest + 47, // 32: ffi.ffi.FFIRequest.publicKeyRequest:type_name -> ffi.ffi.NodePublicKeyRequest + 33, // [33:33] is the sub-list for method output_type + 33, // [33:33] is the sub-list for method input_type + 33, // [33:33] is the sub-list for extension type_name + 33, // [33:33] is the sub-list for extension extendee + 0, // [0:33] is the sub-list for field type_name } func init() { file_ffi_proto_init() } @@ -3528,7 +3904,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[9].Exporter = func(v any, i int) any { - switch v := v.(*QueryInsertAccount); i { + switch v := v.(*QueryInsertAccountBalance); i { case 0: return &v.state case 1: @@ -3540,7 +3916,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[10].Exporter = func(v any, i int) any { - switch v := v.(*QueryInsertAccountResponse); i { + switch v := v.(*QueryInsertAccountBalanceResponse); i { case 0: return &v.state case 1: @@ -3552,7 +3928,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[11].Exporter = func(v any, i int) any { - switch v := v.(*QueryContainsKey); i { + switch v := v.(*QueryInsertAccountNonce); i { case 0: return &v.state case 1: @@ -3564,7 +3940,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[12].Exporter = func(v any, i int) any { - switch v := v.(*QueryContainsKeyResponse); i { + switch v := v.(*QueryInsertAccountNonceResponse); i { case 0: return &v.state case 1: @@ -3576,7 +3952,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[13].Exporter = func(v any, i int) any { - switch v := v.(*QueryGetAccountStorageCell); i { + switch v := v.(*QueryContainsKey); i { case 0: return &v.state case 1: @@ -3588,7 +3964,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[14].Exporter = func(v any, i int) any { - switch v := v.(*QueryGetAccountStorageCellResponse); i { + switch v := v.(*QueryContainsKeyResponse); i { case 0: return &v.state case 1: @@ -3600,7 +3976,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[15].Exporter = func(v any, i int) any { - switch v := v.(*QueryGetAccountCode); i { + switch v := v.(*QueryGetAccountStorageCell); i { case 0: return &v.state case 1: @@ -3612,7 +3988,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[16].Exporter = func(v any, i int) any { - switch v := v.(*QueryGetAccountCodeResponse); i { + switch v := v.(*QueryGetAccountStorageCellResponse); i { case 0: return &v.state case 1: @@ -3624,7 +4000,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[17].Exporter = func(v any, i int) any { - switch v := v.(*QueryInsertAccountCode); i { + switch v := v.(*QueryGetAccountCode); i { case 0: return &v.state case 1: @@ -3636,7 +4012,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[18].Exporter = func(v any, i int) any { - switch v := v.(*QueryInsertAccountCodeResponse); i { + switch v := v.(*QueryGetAccountCodeResponse); i { case 0: return &v.state case 1: @@ -3648,7 +4024,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[19].Exporter = func(v any, i int) any { - switch v := v.(*QueryInsertStorageCell); i { + switch v := v.(*QueryGetAccountCodeSize); i { case 0: return &v.state case 1: @@ -3660,7 +4036,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[20].Exporter = func(v any, i int) any { - switch v := v.(*QueryInsertStorageCellResponse); i { + switch v := v.(*QueryGetAccountCodeSizeResponse); i { case 0: return &v.state case 1: @@ -3672,7 +4048,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[21].Exporter = func(v any, i int) any { - switch v := v.(*QueryRemove); i { + switch v := v.(*QueryGetAccountCodeHash); i { case 0: return &v.state case 1: @@ -3684,7 +4060,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[22].Exporter = func(v any, i int) any { - switch v := v.(*QueryRemoveResponse); i { + switch v := v.(*QueryGetAccountCodeHashResponse); i { case 0: return &v.state case 1: @@ -3696,7 +4072,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[23].Exporter = func(v any, i int) any { - switch v := v.(*QueryRemoveStorageCell); i { + switch v := v.(*QueryInsertAccountCode); i { case 0: return &v.state case 1: @@ -3708,7 +4084,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[24].Exporter = func(v any, i int) any { - switch v := v.(*QueryRemoveStorageCellResponse); i { + switch v := v.(*QueryInsertAccountCodeResponse); i { case 0: return &v.state case 1: @@ -3720,7 +4096,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[25].Exporter = func(v any, i int) any { - switch v := v.(*QueryRemoveStorage); i { + switch v := v.(*QueryInsertStorageCell); i { case 0: return &v.state case 1: @@ -3732,7 +4108,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[26].Exporter = func(v any, i int) any { - switch v := v.(*QueryRemoveStorageResponse); i { + switch v := v.(*QueryInsertStorageCellResponse); i { case 0: return &v.state case 1: @@ -3744,7 +4120,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[27].Exporter = func(v any, i int) any { - switch v := v.(*QueryBlockHash); i { + switch v := v.(*QueryRemove); i { case 0: return &v.state case 1: @@ -3756,7 +4132,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[28].Exporter = func(v any, i int) any { - switch v := v.(*QueryBlockHashResponse); i { + switch v := v.(*QueryRemoveResponse); i { case 0: return &v.state case 1: @@ -3768,7 +4144,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[29].Exporter = func(v any, i int) any { - switch v := v.(*QueryAddVerificationDetails); i { + switch v := v.(*QueryRemoveStorageCell); i { case 0: return &v.state case 1: @@ -3780,7 +4156,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[30].Exporter = func(v any, i int) any { - switch v := v.(*QueryAddVerificationDetailsResponse); i { + switch v := v.(*QueryRemoveStorageCellResponse); i { case 0: return &v.state case 1: @@ -3792,7 +4168,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[31].Exporter = func(v any, i int) any { - switch v := v.(*QueryHasVerification); i { + switch v := v.(*QueryRemoveStorage); i { case 0: return &v.state case 1: @@ -3804,7 +4180,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[32].Exporter = func(v any, i int) any { - switch v := v.(*QueryHasVerificationResponse); i { + switch v := v.(*QueryRemoveStorageResponse); i { case 0: return &v.state case 1: @@ -3816,7 +4192,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[33].Exporter = func(v any, i int) any { - switch v := v.(*QueryGetVerificationData); i { + switch v := v.(*QueryBlockHash); i { case 0: return &v.state case 1: @@ -3828,7 +4204,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[34].Exporter = func(v any, i int) any { - switch v := v.(*VerificationDetails); i { + switch v := v.(*QueryBlockHashResponse); i { case 0: return &v.state case 1: @@ -3840,7 +4216,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[35].Exporter = func(v any, i int) any { - switch v := v.(*QueryGetVerificationDataResponse); i { + switch v := v.(*QueryAddVerificationDetails); i { case 0: return &v.state case 1: @@ -3852,7 +4228,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[36].Exporter = func(v any, i int) any { - switch v := v.(*CosmosRequest); i { + switch v := v.(*QueryAddVerificationDetailsResponse); i { case 0: return &v.state case 1: @@ -3864,7 +4240,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[37].Exporter = func(v any, i int) any { - switch v := v.(*SGXVMCallParams); i { + switch v := v.(*QueryHasVerification); i { case 0: return &v.state case 1: @@ -3876,7 +4252,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[38].Exporter = func(v any, i int) any { - switch v := v.(*SGXVMCreateParams); i { + switch v := v.(*QueryHasVerificationResponse); i { case 0: return &v.state case 1: @@ -3888,7 +4264,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[39].Exporter = func(v any, i int) any { - switch v := v.(*SGXVMCallRequest); i { + switch v := v.(*QueryGetVerificationData); i { case 0: return &v.state case 1: @@ -3900,7 +4276,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[40].Exporter = func(v any, i int) any { - switch v := v.(*SGXVMCreateRequest); i { + switch v := v.(*VerificationDetails); i { case 0: return &v.state case 1: @@ -3912,7 +4288,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[41].Exporter = func(v any, i int) any { - switch v := v.(*NodePublicKeyRequest); i { + switch v := v.(*QueryGetVerificationDataResponse); i { case 0: return &v.state case 1: @@ -3924,7 +4300,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[42].Exporter = func(v any, i int) any { - switch v := v.(*NodePublicKeyResponse); i { + switch v := v.(*CosmosRequest); i { case 0: return &v.state case 1: @@ -3936,7 +4312,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[43].Exporter = func(v any, i int) any { - switch v := v.(*EpochData); i { + switch v := v.(*SGXVMCallParams); i { case 0: return &v.state case 1: @@ -3948,7 +4324,7 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[44].Exporter = func(v any, i int) any { - switch v := v.(*ListEpochsResponse); i { + switch v := v.(*SGXVMCreateParams); i { case 0: return &v.state case 1: @@ -3960,6 +4336,78 @@ func file_ffi_proto_init() { } } file_ffi_proto_msgTypes[45].Exporter = func(v any, i int) any { + switch v := v.(*SGXVMCallRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_ffi_proto_msgTypes[46].Exporter = func(v any, i int) any { + switch v := v.(*SGXVMCreateRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_ffi_proto_msgTypes[47].Exporter = func(v any, i int) any { + switch v := v.(*NodePublicKeyRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_ffi_proto_msgTypes[48].Exporter = func(v any, i int) any { + switch v := v.(*NodePublicKeyResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_ffi_proto_msgTypes[49].Exporter = func(v any, i int) any { + switch v := v.(*EpochData); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_ffi_proto_msgTypes[50].Exporter = func(v any, i int) any { + switch v := v.(*ListEpochsResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_ffi_proto_msgTypes[51].Exporter = func(v any, i int) any { switch v := v.(*FFIRequest); i { case 0: return &v.state @@ -3972,11 +4420,12 @@ func file_ffi_proto_init() { } } } - file_ffi_proto_msgTypes[36].OneofWrappers = []any{ + file_ffi_proto_msgTypes[42].OneofWrappers = []any{ (*CosmosRequest_GetAccount)(nil), - (*CosmosRequest_InsertAccount)(nil), (*CosmosRequest_ContainsKey)(nil), (*CosmosRequest_AccountCode)(nil), + (*CosmosRequest_CodeHash)(nil), + (*CosmosRequest_CodeSize)(nil), (*CosmosRequest_StorageCell)(nil), (*CosmosRequest_InsertAccountCode)(nil), (*CosmosRequest_InsertStorageCell)(nil), @@ -3987,8 +4436,10 @@ func file_ffi_proto_init() { (*CosmosRequest_AddVerificationDetails)(nil), (*CosmosRequest_HasVerification)(nil), (*CosmosRequest_GetVerificationData)(nil), + (*CosmosRequest_InsertAccountBalance)(nil), + (*CosmosRequest_InsertAccountNonce)(nil), } - file_ffi_proto_msgTypes[45].OneofWrappers = []any{ + file_ffi_proto_msgTypes[51].OneofWrappers = []any{ (*FFIRequest_CallRequest)(nil), (*FFIRequest_CreateRequest)(nil), (*FFIRequest_PublicKeyRequest)(nil), @@ -3999,7 +4450,7 @@ func file_ffi_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_ffi_proto_rawDesc, NumEnums: 0, - NumMessages: 46, + NumMessages: 52, NumExtensions: 0, NumServices: 0, }, diff --git a/go-sgxvm/types/mocked_connector.go b/go-sgxvm/types/mocked_connector.go index 59142799..6333a8d7 100644 --- a/go-sgxvm/types/mocked_connector.go +++ b/go-sgxvm/types/mocked_connector.go @@ -36,14 +36,20 @@ func (c MockedConnector) Query(request []byte) ([]byte, error) { Balance: acct.Balance, Nonce: acct.Nonce, }) - case *CosmosRequest_InsertAccount: - data := request.InsertAccount - ethAddress := common.BytesToAddress(request.InsertAccount.Address) - println("[Go:Query] Insert/Update account: ", ethAddress.String()) - if err := c.DB.InsertAccount(ethAddress, data.Balance, data.Nonce); err != nil { + case *CosmosRequest_InsertAccountBalance: + data := request.InsertAccountBalance + ethAddress := common.BytesToAddress(request.InsertAccountBalance.Address) + if err := c.DB.InsertAccountBalance(ethAddress, data.Balance); err != nil { return nil, err } - return proto.Marshal(&QueryInsertAccountResponse{}) + return proto.Marshal(&QueryInsertAccountBalanceResponse{}) + case *CosmosRequest_InsertAccountNonce: + data := request.InsertAccountNonce + ethAddress := common.BytesToAddress(request.InsertAccountNonce.Address) + if err := c.DB.InsertAccountNonce(ethAddress, data.Nonce); err != nil { + return nil, err + } + return proto.Marshal(&QueryInsertAccountNonceResponse{}) case *CosmosRequest_ContainsKey: ethAddress := common.BytesToAddress(request.ContainsKey.Key) println("[Go:Query] Contains key for: ", ethAddress.String()) diff --git a/go-sgxvm/types/mocked_db.go b/go-sgxvm/types/mocked_db.go index 4cc4655a..4bd21bad 100644 --- a/go-sgxvm/types/mocked_db.go +++ b/go-sgxvm/types/mocked_db.go @@ -139,6 +139,48 @@ func (m MockedDB) InsertContractCode(address ethcommon.Address, code []byte) err return nil } +func (m MockedDB) InsertAccountBalance(address ethcommon.Address, balance []byte) error { + acct, err := m.GetAccountOrEmpty(address) + if err != nil { + return err + } + + txn := m.db.Txn(true) + updatedAcct := Account{ + Address: acct.Address, + Balance: balance, + Nonce: acct.Nonce, + Code: acct.Code, + State: acct.State, + } + if err := txn.Insert("account", &updatedAcct); err != nil { + return err + } + txn.Commit() + return nil +} + +func (m MockedDB) InsertAccountNonce(address ethcommon.Address, nonce uint64) error { + acct, err := m.GetAccountOrEmpty(address) + if err != nil { + return err + } + + txn := m.db.Txn(true) + updatedAcct := Account{ + Address: acct.Address, + Balance: acct.Balance, + Nonce: nonce, + Code: acct.Code, + State: acct.State, + } + if err := txn.Insert("account", &updatedAcct); err != nil { + return err + } + txn.Commit() + return nil +} + // InsertStorageCell inserts new storage cell func (m MockedDB) InsertStorageCell(address ethcommon.Address, key []byte, value []byte) error { acct, err := m.GetAccount(address) diff --git a/go.mod b/go.mod index f16e451f..50331d56 100644 --- a/go.mod +++ b/go.mod @@ -2,11 +2,9 @@ module swisstronik go 1.21 -toolchain go1.21.3 - require ( cosmossdk.io/api v0.3.1 - cosmossdk.io/errors v1.0.0 + cosmossdk.io/errors v1.0.1 cosmossdk.io/math v1.1.3-rc.1 cosmossdk.io/simapp v0.0.0-20230608160436-666c345ad23d cosmossdk.io/tools/rosetta v0.2.1 @@ -30,7 +28,7 @@ require ( github.com/go-ozzo/ozzo-validation/v4 v4.3.0 github.com/gogo/protobuf v1.3.2 github.com/golang/protobuf v1.5.3 - github.com/google/uuid v1.3.0 + github.com/google/uuid v1.4.0 github.com/gorilla/mux v1.8.0 github.com/gorilla/websocket v1.5.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 @@ -53,20 +51,20 @@ require ( github.com/status-im/keycard-go v0.2.0 github.com/stretchr/testify v1.8.4 github.com/tyler-smith/go-bip39 v1.1.0 - golang.org/x/crypto v0.13.0 - golang.org/x/net v0.15.0 - golang.org/x/text v0.13.0 - google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb - google.golang.org/grpc v1.58.2 + golang.org/x/crypto v0.16.0 + golang.org/x/net v0.19.0 + golang.org/x/text v0.14.0 + google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f + google.golang.org/grpc v1.60.1 gopkg.in/yaml.v2 v2.4.0 sigs.k8s.io/yaml v1.3.0 ) require ( - cloud.google.com/go v0.110.7 // indirect - cloud.google.com/go/compute v1.23.0 // indirect + cloud.google.com/go v0.110.10 // indirect + cloud.google.com/go/compute v1.23.3 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v1.1.1 // indirect + cloud.google.com/go/iam v1.1.5 // indirect cloud.google.com/go/storage v1.31.0 // indirect cosmossdk.io/core v0.6.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.3 // indirect @@ -120,16 +118,16 @@ require ( github.com/goccy/go-json v0.10.2 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/googleapis v1.4.1 // indirect - github.com/golang/glog v1.1.0 // indirect + github.com/golang/glog v1.1.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.1.2 // indirect - github.com/google/go-cmp v0.5.9 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/google/orderedcode v0.0.1 // indirect github.com/google/pprof v0.0.0-20230228050547-1710fef4ab10 // indirect - github.com/google/s2a-go v0.1.4 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect + github.com/google/s2a-go v0.1.7 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gorilla/handlers v1.5.1 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect @@ -205,17 +203,17 @@ require ( go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect - golang.org/x/oauth2 v0.12.0 // indirect - golang.org/x/sync v0.3.0 // indirect - golang.org/x/sys v0.12.0 // indirect - golang.org/x/term v0.12.0 // indirect + golang.org/x/oauth2 v0.13.0 // indirect + golang.org/x/sync v0.4.0 // indirect + golang.org/x/sys v0.15.0 // indirect + golang.org/x/term v0.15.0 // indirect golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/api v0.134.0 // indirect - google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/api v0.149.0 // indirect + google.golang.org/appengine v1.6.8 // indirect + google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect + google.golang.org/protobuf v1.32.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 5feb4f52..a3cf5f17 100644 --- a/go.sum +++ b/go.sum @@ -36,6 +36,8 @@ cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34h cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= cloud.google.com/go v0.110.7 h1:rJyC7nWRg2jWGZ4wSJ5nY65GTdYJkg0cd/uXb+ACI6o= cloud.google.com/go v0.110.7/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= +cloud.google.com/go v0.110.10 h1:LXy9GEO+timppncPIAZoOj3l58LIU9k+kn48AN7IO3Y= +cloud.google.com/go v0.110.10/go.mod h1:v1OoFqYxiBkUrruItNM3eT4lLByNjxmJSV/xDKJNnic= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= @@ -75,6 +77,8 @@ cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQH cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= +cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= +cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= @@ -116,6 +120,8 @@ cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= cloud.google.com/go/iam v1.1.1 h1:lW7fzj15aVIXYHREOqjRBV9PsH0Z6u8Y46a1YGvQP4Y= cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= +cloud.google.com/go/iam v1.1.5 h1:1jTsCu4bcsNsE4iiqNT5SHwrDRCfRmIaaaVFhRveTJI= +cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= @@ -199,6 +205,8 @@ cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= cosmossdk.io/errors v1.0.0 h1:nxF07lmlBbB8NKQhtJ+sJm6ef5uV1XkvPXG2bUntb04= cosmossdk.io/errors v1.0.0/go.mod h1:+hJZLuhdDE0pYN8HkOrVNwrIOYvUGnn6+4fjnJs/oV0= +cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0= +cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U= cosmossdk.io/log v1.2.0 h1:BbykkDsutXPSy8RojFB3KZEWyvMsToLy0ykb/ZhsLqQ= cosmossdk.io/log v1.2.0/go.mod h1:GNSCc/6+DhFIj1aLn/j7Id7PaO8DzNylUZoOYBL9+I4= cosmossdk.io/math v1.1.3-rc.1 h1:NebCNWDqb1MJRNfvxr4YY7d8FSYgkuB3L75K6xvM+Zo= @@ -215,6 +223,7 @@ git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3/go.mod h1:wMEGFFFN git.sr.ht/~sircmpwn/go-bare v0.0.0-20210406120253-ab86bc2846d9/go.mod h1:BVJwbDfVjCjoFiKrhkei6NdGcZYpkDkdyCdg1ukytRA= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4= +github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM= github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0/go.mod h1:tPaiy8S5bQ+S5sOiDlINkp7+Ef339+Nz5L5XO+cnOHo= @@ -224,14 +233,20 @@ github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= +github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= +github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= +github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= +github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= +github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIOA6tDi6QXUemppXK3P9BI7mr2hd6gx8= @@ -244,6 +259,7 @@ github.com/Zilliqa/gozilliqa-sdk v1.2.1-0.20201201074141-dd0ecada1be6/go.mod h1: github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= +github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/alecthomas/participle/v2 v2.0.0-alpha7 h1:cK4vjj0VSgb3lN1nuKA5F7dw+1s1pWBe5bx7nNCnN+c= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -282,6 +298,7 @@ github.com/aws/aws-sdk-go-v2/service/route53 v1.1.1/go.mod h1:rLiOUrPLW/Er5kRcQ7 github.com/aws/aws-sdk-go-v2/service/sso v1.1.1/go.mod h1:SuZJxklHxLAXgLTc1iFXbEWkXs7QRTQpCLGaKIprQW0= github.com/aws/aws-sdk-go-v2/service/sts v1.1.1/go.mod h1:Wi0EBZwiz/K44YliU0EKxqTCJGUfYTWXrrBwkq736bM= github.com/aws/smithy-go v1.1.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw= +github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= @@ -303,6 +320,7 @@ github.com/btcsuite/btcd v0.23.0/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZg github.com/btcsuite/btcd v0.23.3 h1:4KH/JKy9WiCd+iUS9Mu0Zp7Dnj17TGdKrg9xc/FGj24= github.com/btcsuite/btcd v0.23.3/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY= github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA= +github.com/btcsuite/btcd/btcec/v2 v2.1.2/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= github.com/btcsuite/btcd/btcec/v2 v2.2.0/go.mod h1:U7MHm051Al6XmscBQ0BoNydpOTsFAn707034b5nY8zU= github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= @@ -371,7 +389,18 @@ github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b80 github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw= github.com/cockroachdb/apd/v3 v3.1.0 h1:MK3Ow7LH0W8zkd5GMKA1PvS9qG3bWFI95WaVNfyZJ/w= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= +github.com/cockroachdb/errors v1.9.1 h1:yFVvsI0VxmRShfawbt/laCIDy/mtTqqnvoNgiy5bEV8= +github.com/cockroachdb/errors v1.9.1/go.mod h1:2sxOtL2WIc096WSZqZ5h8fa17rdDq9HZOZLBCor4mBk= +github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= +github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= +github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= +github.com/cockroachdb/pebble v0.0.0-20230226194802-02d779ffbc46 h1:yMaoO76pV9knZ6bzEwzPSHnPSCTnrJohwkIQirmii70= +github.com/cockroachdb/pebble v0.0.0-20230226194802-02d779ffbc46/go.mod h1:9lRMC4XN3/BLPtIp6kAKwIaHu369NOf2rMucPzipz50= +github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ= +github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= +github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= github.com/coinbase/kryptology v1.8.0/go.mod h1:RYXOAPdzOGUe3qlSFkMGn58i3xUA8hmxYHksuq+8ciI= github.com/coinbase/rosetta-sdk-go v0.7.9 h1:lqllBjMnazTjIqYrOGv8h8jxjg9+hJazIGZr9ZvoCcA= github.com/coinbase/rosetta-sdk-go v0.7.9/go.mod h1:0/knutI7XGVqXmmH4OQD8OckFrbQ8yMsUZTG7FXCR2M= @@ -440,6 +469,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4= github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo= +github.com/deckarep/golang-set/v2 v2.1.0 h1:g47V4Or+DUdzbs8FxCCmgb6VYd+ptPAngjM6dtGktsI= +github.com/deckarep/golang-set/v2 v2.1.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= @@ -451,6 +482,7 @@ github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= +github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdwV/GHc4o= github.com/dgraph-io/badger/v2 v2.2007.4/go.mod h1:vSw/ax2qojzbN6eXHIx6KPKtCSHJN/Uz0X0VPruTIhk= github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= @@ -466,9 +498,11 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8 github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= +github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v1.6.2/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/dop251/goja v0.0.0-20211011172007-d99e4b8cbf48/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk= github.com/dop251/goja v0.0.0-20220405120441-9037c2b61cbf/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk= github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= @@ -483,6 +517,7 @@ github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFP github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts= github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= +github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -494,12 +529,18 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.m github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 h1:RWHKLhCrQThMfch+QJ1Z8veEq5ZO3DfIhZ7xgRP9WTc= github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3/go.mod h1:QziizLAiF0KqyLdNJYD7O5cpDlaFMNZzlxYNcWsJUxs= +github.com/ethereum/go-ethereum v1.10.17/go.mod h1:Lt5WzjM07XlXc95YzrhosmR4J9Ahd6X2wyEV2SvGhk0= +github.com/ethereum/go-ethereum v1.11.5 h1:3M1uan+LAUvdn+7wCEFrcMM4LJTeuxDrPTg/f31a5QQ= +github.com/ethereum/go-ethereum v1.11.5/go.mod h1:it7x0DWnTDMfVFdXcU6Ti4KEFQynLHVRarcSlPr0HBo= github.com/evmos/go-ethereum v1.10.26-evmos-rc2 h1:tYghk1ZZ8X4/OQ4YI9hvtm8aSN8OSqO0g9vo/sCMdBo= github.com/evmos/go-ethereum v1.10.26-evmos-rc2/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo= +github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= @@ -518,21 +559,27 @@ github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbS github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= github.com/garslo/gogen v0.0.0-20170306192744-1d203ffc1f61/go.mod h1:Q0X6pkwTILDlzrGEckF6HKjXe48EgsY/l7K7vhY4MW8= +github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= +github.com/getsentry/sentry-go v0.12.0/go.mod h1:NSap0JBYWzHND8oMbyi0+XZhUalc1TBdRL1M71JZW2c= github.com/getsentry/sentry-go v0.23.0 h1:dn+QRCeJv4pPt9OjVXiMcGIBIefaTJPw/h0bZWO05nE= github.com/getsentry/sentry-go v0.23.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= +github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= +github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -552,6 +599,7 @@ github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= @@ -585,8 +633,11 @@ github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MG github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= +github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.3.0+incompatible h1:CaSVZxm5B+7o45rtab4jC2G37WGYX1zQfuU2i6DSvnc= +github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.4.1-0.20201022092350-68b0159b7869/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0= @@ -597,6 +648,8 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM= +github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-jwt/jwt/v4 v4.3.0 h1:kHL1vqdqWNfATmA0FNMdmZNMyZI1U6O31X4rlIPoBog= github.com/golang-jwt/jwt/v4 v4.3.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= @@ -604,6 +657,8 @@ github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgR github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= +github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= +github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -645,6 +700,7 @@ github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y= +github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= @@ -666,6 +722,9 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -698,17 +757,23 @@ github.com/google/pprof v0.0.0-20230228050547-1710fef4ab10/go.mod h1:79YE0hCXdHa github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= +github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= +github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM= github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w= +github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= +github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= @@ -810,11 +875,14 @@ github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0Jr github.com/huandu/skiplist v1.2.0 h1:gox56QD77HzSC0w+Ws3MH3iie755GBJU1OER3h5VsYw= github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXMrPiHF9w= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= +github.com/huin/goupnp v1.0.3-0.20220313090229-ca81a64b4204/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y= github.com/huin/goupnp v1.0.3 h1:N8No57ls+MnjlB+JPiCVSOyy/ot7MJTqlo7rn+NYSqQ= github.com/huin/goupnp v1.0.3/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y= github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= +github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= github.com/improbable-eng/grpc-web v0.15.0 h1:BN+7z6uNXZ1tQGcNAuaU1YjsLTApzkjt2tzCixLaUPQ= github.com/improbable-eng/grpc-web v0.15.0/go.mod h1:1sy9HKV4Jt9aEs9JSnkWlRJPuPtwNr0l57L4f878wP8= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= @@ -832,6 +900,11 @@ github.com/influxdata/promql/v2 v2.12.0/go.mod h1:fxOPu+DY0bqCTCECchSRtWfc+0X19y github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod h1:bSgUQ7q5ZLSO+bKBGqJiCBGAl+9DxyW63zLTujjUlOE= github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0= github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod h1:Wbbw6tYNvwa5dlB6304Sd+82Z3f7PmVZHVKU637d4po= +github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI= +github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0= +github.com/iris-contrib/jade v1.1.3/go.mod h1:H/geBymxJhShH5kecoiOCSssPX7QWYH7UaeZTSWddIk= +github.com/iris-contrib/pongo2 v0.0.1/go.mod h1:Ssh+00+3GAZqSQb30AvBRNxBx7rf0GqwkjqxNd0u65g= +github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw= github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU= @@ -862,13 +935,21 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F6iIOGgxJ5npU/IUOhOhqlVrGjyIZc8/MagT0= +github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/karalabe/usb v0.0.2/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= +github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8= +github.com/kataras/iris/v12 v12.1.8/go.mod h1:LMYy4VlP67TQ3Zgriz8RE2h2kMZV2SgMYbq3UhfoFmE= +github.com/kataras/neffos v0.0.14/go.mod h1:8lqADm8PnbeFfL7CLXh1WHw53dG27MC3pgi2R1rmoTE= +github.com/kataras/pio v0.0.2/go.mod h1:hAoW0t9UmXi4R5Oyq5Z4irTbaTsOemSrDGUtaTl7Dro= +github.com/kataras/sitemap v0.0.5/go.mod h1:KY2eugMKiPwsJgx7+U103YZehfvNGOXURubcGyk0Bz8= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= @@ -876,6 +957,7 @@ github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrD github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= +github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg= github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -884,7 +966,9 @@ github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -892,6 +976,7 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v0.0.0-20170224010052-a616ab194758/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg= +github.com/labstack/echo/v4 v4.5.0/go.mod h1:czIriw4a0C1dFun+ObrXp7ok03xON0N1awStJ6ArI7Y= github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= @@ -933,10 +1018,12 @@ github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= @@ -951,9 +1038,12 @@ github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/Qd github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= +github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8= +github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 h1:QRUSJEgZn2Snx0EmT/QLXibWjSUDjKWvXIT19NBVp94= @@ -984,6 +1074,7 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= +github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= @@ -1067,6 +1158,8 @@ github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= +github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -1127,7 +1220,11 @@ github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRr github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.9.0 h1:l9HGsTsHJcvW14Nk7J9KFz8bzeAWXn3CG6bgt7LsrAE= github.com/rs/cors v1.9.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= @@ -1140,9 +1237,11 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= +github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= @@ -1236,6 +1335,7 @@ github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:s github.com/tyler-smith/go-bip39 v1.0.2/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8= github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= @@ -1250,18 +1350,28 @@ github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtX github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/urfave/cli/v2 v2.10.2 h1:x3p8awjp/2arX+Nl/G2040AZpOCHS/eMJJ1/a+mye4Y= github.com/urfave/cli/v2 v2.10.2/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo= +github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= +github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI= github.com/ybbus/jsonrpc v2.1.2+incompatible/go.mod h1:XJrh1eMSzdIYFbM08flv0wp5G35eRniyeGut1z+LSiE= +github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= +github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= +github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -1314,6 +1424,7 @@ golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190909091759-094676da4a83/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -1329,6 +1440,8 @@ golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= +golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1389,6 +1502,7 @@ golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -1398,6 +1512,7 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -1429,6 +1544,7 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -1447,6 +1563,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1474,6 +1592,8 @@ golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4= golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4= +golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= +golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1491,6 +1611,8 @@ golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= +golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1561,6 +1683,7 @@ golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1572,9 +1695,12 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1604,6 +1730,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -1612,6 +1740,8 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU= golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= +golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1627,6 +1757,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1639,12 +1771,14 @@ golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -1771,6 +1905,8 @@ google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= google.golang.org/api v0.134.0 h1:ktL4Goua+UBgoP1eL1/60LwZJqa1sIzkLmvoR3hR6Gw= google.golang.org/api v0.134.0/go.mod h1:sjRL3UnjTx5UqNQS9EWr9N8p7xbHpy1k0XGRLCf3Spk= +google.golang.org/api v0.149.0 h1:b2CqT6kG+zqJIVKRQ3ELJVLN1PwHZ6DJ3dW8yl82rgY= +google.golang.org/api v0.149.0/go.mod h1:Mwn1B7JTXrzXtnvmzQE2BD6bYZQ8DShKZDZbeN9I7qI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1780,6 +1916,9 @@ google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= +google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= +google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -1892,10 +2031,17 @@ google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb h1:XFBgcDwm7irdHTbz4Zk2h7Mh+eis4nfJEFQFYzJzuIA= google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= +google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 h1:1hfbdAfFbkmpg41000wDVqr7jUpK/Yo+LPnIxxGzmkg= +google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3/go.mod h1:5RBcpGRxr25RbDzY5w+dmaqpSEvl8Gwl1x2CICf60ic= google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb h1:lK0oleSc7IQsUxO3U5TjL9DWlsxpEBemh+zpB7IqhWI= google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= +google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f h1:2yNACc1O40tTnrsbk9Cv6oxiW8pxI/pXj0wRtdlYmgY= +google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f/go.mod h1:Uy9bTZJqmfrw2rIBxgGLnamc78euZULUBrLZ9XTITKI= google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 h1:N3bU/SQDCDyD6R528GJ/PwW9KjYcJA3dgyH+MovAkIM= google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:KSqppvjFjtoCI+KGd4PELB0qLNxdJHRGqRI09mB6pQA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 h1:/jFB8jK5R3Sq3i/lmeZO0cATSzFfZaJq1J2Euan3XKU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0/go.mod h1:FUoWkonphQm3RhTS+kOEhF8h0iDpm4tdXolVCeZ9KKA= +google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -1939,6 +2085,8 @@ google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCD google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I= google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU= +google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -1957,6 +2105,8 @@ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -1969,13 +2119,19 @@ gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qS gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= +gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= +gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= +gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU= gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= +gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -1987,11 +2143,13 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= +gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/proto/ethermint/evm/v1/query.proto b/proto/ethermint/evm/v1/query.proto index 2c79a42e..15ef6517 100644 --- a/proto/ethermint/evm/v1/query.proto +++ b/proto/ethermint/evm/v1/query.proto @@ -243,6 +243,8 @@ message EthCallRequest { message EstimateGasResponse { // gas returns the estimated gas uint64 gas = 1; + bool failed = 2; + bytes return_value = 3; } // QueryTraceTxRequest defines TraceTx request diff --git a/rpc/backend/call_tx.go b/rpc/backend/call_tx.go index 25c17aff..e7d493b4 100644 --- a/rpc/backend/call_tx.go +++ b/rpc/backend/call_tx.go @@ -29,7 +29,6 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" "github.com/pkg/errors" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" @@ -345,6 +344,11 @@ func (b *Backend) EstimateGas(args evmtypes.TransactionArgs, blockNrOptional *rp if err != nil { return 0, err } + + if res.Failed { + err = evmtypes.NewExecErrorWithReason(res.ReturnValue) + return 0, err + } return hexutil.Uint64(res.Gas), nil } @@ -396,7 +400,7 @@ func (b *Backend) DoCall( } if res.Failed() { - if !strings.Contains(res.VmError, vm.ErrExecutionReverted.Error()) { + if !strings.Contains(res.VmError, "reverted") { return nil, status.Error(codes.Internal, res.VmError) } return nil, evmtypes.NewExecErrorWithReason(res.Ret) diff --git a/scripts/debug/debug-precompile.sh b/scripts/debug/debug-precompile.sh index 1d5043d7..2d390f6f 100755 --- a/scripts/debug/debug-precompile.sh +++ b/scripts/debug/debug-precompile.sh @@ -22,7 +22,7 @@ function wait_for_tx () { # Deploy ComplianceProxy contract and get transaction hash echo -e "\nStep 1" echo "Deploying ComplianceProxy contract..." -RAW_BYTES=0x02f9157a82050b018459682f008459684ae683127f3a8080b9151f608060405234801561001057600080fd5b506114ff806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80636be006d41461005c57806395183eb71461008c578063ace417e0146100bc578063d832c2f0146100ec578063d916d4e21461011c575b600080fd5b61007660048036038101906100719190610707565b61013a565b60405161008391906107c4565b60405180910390f35b6100a660048036038101906100a19190610707565b61038c565b6040516100b39190610a6b565b60405180910390f35b6100d660048036038101906100d19190610707565b610484565b6040516100e39190610aa8565b60405180910390f35b61010660048036038101906101019190610c0b565b61058c565b6040516101139190610aa8565b60405180910390f35b610124610690565b6040516101319190610c76565b60405180910390f35b60606000600167ffffffffffffffff81111561015957610158610ac8565b5b6040519080825280601f01601f19166020018201604052801561018b5781602001600182028036833780820191505090505b50905060006040518060400160405280600c81526020017f636861696e5f313239312d310000000000000000000000000000000000000000815250905060006040518060400160405280600681526020017f736368656d610000000000000000000000000000000000000000000000000000815250905060006040518060400160405280601481526020017f697373756572566572696669636174696f6e4964000000000000000000000000815250905060008087856002640100000000426102549190610cca565b60008a89898960405160240161027299989796959493929190610d99565b60405160208183030381529060405263e62364ab60e01b6020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050905060008061040473ffffffffffffffffffffffffffffffffffffffff16836040516102e39190610e7e565b6000604051808303816000865af19150503d8060008114610320576040519150601f19603f3d011682016040523d82523d6000602084013e610325565b606091505b50915091506000818060200190518101906103409190610f3b565b90507f109923c5f814b7944f9591557d6a8d1dde907b5cc4cebccf84d59959347589bc8382604051610373929190610f84565b60405180910390a1809950505050505050505050919050565b6060600082306040516024016103a3929190610fb4565b60405160208183030381529060405263cc8995ec60e01b6020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050905060008061040473ffffffffffffffffffffffffffffffffffffffff16836040516104149190610e7e565b600060405180830381855afa9150503d806000811461044f576040519150601f19603f3d011682016040523d82523d6000602084013e610454565b606091505b5091509150606082156104785781806020019051810190610475919061132c565b90505b80945050505050919050565b6000606060008360026000846040516024016104a39493929190611424565b604051602081830303815290604052634887fcd860e01b6020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050905060008061040473ffffffffffffffffffffffffffffffffffffffff16836040516105149190610e7e565b600060405180830381855afa9150503d806000811461054f576040519150601f19603f3d011682016040523d82523d6000602084013e610554565b606091505b5091509150811561057e5780806020019051810190610573919061149c565b945050505050610587565b60009450505050505b919050565b6000808360026000856040516024016105a89493929190611424565b604051602081830303815290604052634887fcd860e01b6020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050905060008061040473ffffffffffffffffffffffffffffffffffffffff16836040516106199190610e7e565b600060405180830381855afa9150503d8060008114610654576040519150601f19603f3d011682016040523d82523d6000602084013e610659565b606091505b509150915081156106825780806020019051810190610678919061149c565b935050505061068a565b600093505050505b92915050565b600281565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006106d4826106a9565b9050919050565b6106e4816106c9565b81146106ef57600080fd5b50565b600081359050610701816106db565b92915050565b60006020828403121561071d5761071c61069f565b5b600061072b848285016106f2565b91505092915050565b600081519050919050565b600082825260208201905092915050565b60005b8381101561076e578082015181840152602081019050610753565b60008484015250505050565b6000601f19601f8301169050919050565b600061079682610734565b6107a0818561073f565b93506107b0818560208601610750565b6107b98161077a565b840191505092915050565b600060208201905081810360008301526107de818461078b565b905092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b600063ffffffff82169050919050565b61082b81610812565b82525050565b600082825260208201905092915050565b600061084d82610734565b6108578185610831565b9350610867818560208601610750565b6108708161077a565b840191505092915050565b610884816106c9565b82525050565b600081519050919050565b600082825260208201905092915050565b60006108b18261088a565b6108bb8185610895565b93506108cb818560208601610750565b6108d48161077a565b840191505092915050565b6000610140830160008301516108f86000860182610822565b50602083015184820360208601526109108282610842565b9150506040830151610925604086018261087b565b506060830151848203606086015261093d82826108a6565b91505060808301516109526080860182610822565b5060a083015161096560a0860182610822565b5060c083015184820360c086015261097d8282610842565b91505060e083015184820360e086015261099782826108a6565b9150506101008301518482036101008601526109b382826108a6565b9150506101208301516109ca610120860182610822565b508091505092915050565b60006109e183836108df565b905092915050565b6000602082019050919050565b6000610a01826107e6565b610a0b81856107f1565b935083602082028501610a1d85610802565b8060005b85811015610a595784840389528151610a3a85826109d5565b9450610a45836109e9565b925060208a01995050600181019050610a21565b50829750879550505050505092915050565b60006020820190508181036000830152610a8581846109f6565b905092915050565b60008115159050919050565b610aa281610a8d565b82525050565b6000602082019050610abd6000830184610a99565b92915050565b600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b610b008261077a565b810181811067ffffffffffffffff82111715610b1f57610b1e610ac8565b5b80604052505050565b6000610b32610695565b9050610b3e8282610af7565b919050565b600067ffffffffffffffff821115610b5e57610b5d610ac8565b5b602082029050602081019050919050565b600080fd5b6000610b87610b8284610b43565b610b28565b90508083825260208201905060208402830185811115610baa57610ba9610b6f565b5b835b81811015610bd35780610bbf88826106f2565b845260208401935050602081019050610bac565b5050509392505050565b600082601f830112610bf257610bf1610ac3565b5b8135610c02848260208601610b74565b91505092915050565b60008060408385031215610c2257610c2161069f565b5b6000610c30858286016106f2565b925050602083013567ffffffffffffffff811115610c5157610c506106a4565b5b610c5d85828601610bdd565b9150509250929050565b610c7081610812565b82525050565b6000602082019050610c8b6000830184610c67565b92915050565b6000819050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b6000610cd582610c91565b9150610ce083610c91565b925082610cf057610cef610c9b565b5b828206905092915050565b610d04816106c9565b82525050565b600082825260208201905092915050565b6000610d268261088a565b610d308185610d0a565b9350610d40818560208601610750565b610d498161077a565b840191505092915050565b6000819050919050565b6000819050919050565b6000610d83610d7e610d7984610d54565b610d5e565b610812565b9050919050565b610d9381610d68565b82525050565b600061012082019050610daf600083018c610cfb565b8181036020830152610dc1818b610d1b565b9050610dd0604083018a610c67565b610ddd6060830189610c67565b610dea6080830188610d8a565b81810360a0830152610dfc818761078b565b905081810360c0830152610e108186610d1b565b905081810360e0830152610e248185610d1b565b9050610e34610100830184610c67565b9a9950505050505050505050565b600081905092915050565b6000610e5882610734565b610e628185610e42565b9350610e72818560208601610750565b80840191505092915050565b6000610e8a8284610e4d565b915081905092915050565b600080fd5b600067ffffffffffffffff821115610eb557610eb4610ac8565b5b610ebe8261077a565b9050602081019050919050565b6000610ede610ed984610e9a565b610b28565b905082815260208101848484011115610efa57610ef9610e95565b5b610f05848285610750565b509392505050565b600082601f830112610f2257610f21610ac3565b5b8151610f32848260208601610ecb565b91505092915050565b600060208284031215610f5157610f5061069f565b5b600082015167ffffffffffffffff811115610f6f57610f6e6106a4565b5b610f7b84828501610f0d565b91505092915050565b6000604082019050610f996000830185610a99565b8181036020830152610fab818461078b565b90509392505050565b6000604082019050610fc96000830185610cfb565b610fd66020830184610cfb565b9392505050565b600067ffffffffffffffff821115610ff857610ff7610ac8565b5b602082029050602081019050919050565b600080fd5b600080fd5b61101c81610812565b811461102757600080fd5b50565b60008151905061103981611013565b92915050565b60008151905061104e816106db565b92915050565b600067ffffffffffffffff82111561106f5761106e610ac8565b5b6110788261077a565b9050602081019050919050565b600061109861109384611054565b610b28565b9050828152602081018484840111156110b4576110b3610e95565b5b6110bf848285610750565b509392505050565b600082601f8301126110dc576110db610ac3565b5b81516110ec848260208601611085565b91505092915050565b6000610140828403121561110c5761110b611009565b5b611117610140610b28565b905060006111278482850161102a565b600083015250602082015167ffffffffffffffff81111561114b5761114a61100e565b5b61115784828501610f0d565b602083015250604061116b8482850161103f565b604083015250606082015167ffffffffffffffff81111561118f5761118e61100e565b5b61119b848285016110c7565b60608301525060806111af8482850161102a565b60808301525060a06111c38482850161102a565b60a08301525060c082015167ffffffffffffffff8111156111e7576111e661100e565b5b6111f384828501610f0d565b60c08301525060e082015167ffffffffffffffff8111156112175761121661100e565b5b611223848285016110c7565b60e08301525061010082015167ffffffffffffffff8111156112485761124761100e565b5b611254848285016110c7565b6101008301525061012061126a8482850161102a565b6101208301525092915050565b600061128a61128584610fdd565b610b28565b905080838252602082019050602084028301858111156112ad576112ac610b6f565b5b835b818110156112f457805167ffffffffffffffff8111156112d2576112d1610ac3565b5b8086016112df89826110f5565b855260208501945050506020810190506112af565b5050509392505050565b600082601f83011261131357611312610ac3565b5b8151611323848260208601611277565b91505092915050565b6000602082840312156113425761134161069f565b5b600082015167ffffffffffffffff8111156113605761135f6106a4565b5b61136c848285016112fe565b91505092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b60006113ad838361087b565b60208301905092915050565b6000602082019050919050565b60006113d182611375565b6113db8185611380565b93506113e683611391565b8060005b838110156114175781516113fe88826113a1565b9750611409836113b9565b9250506001810190506113ea565b5085935050505092915050565b60006080820190506114396000830187610cfb565b6114466020830186610c67565b6114536040830185610d8a565b818103606083015261146581846113c6565b905095945050505050565b61147981610a8d565b811461148457600080fd5b50565b60008151905061149681611470565b92915050565b6000602082840312156114b2576114b161069f565b5b60006114c084828501611487565b9150509291505056fea26469706673582212208c7fd0ce6ba0690e30f96631c2c085c2b909ace64f9154ffa18b7943df8e856a64736f6c63430008110033c001a07f070587bc30b54a46853ab2725039b8b273176daadff4cea85fc64c8cb73649a02b076e8de4ce5796d2e41196f9221b7cca37eff80739780e461767cf09c8ca3b +RAW_BYTES=0x01f9157182050b8064834c4b408080b9151f608060405234801561001057600080fd5b506114ff806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80636be006d41461005c57806395183eb71461008c578063ace417e0146100bc578063d832c2f0146100ec578063d916d4e21461011c575b600080fd5b61007660048036038101906100719190610707565b61013a565b60405161008391906107c4565b60405180910390f35b6100a660048036038101906100a19190610707565b61038c565b6040516100b39190610a6b565b60405180910390f35b6100d660048036038101906100d19190610707565b610484565b6040516100e39190610aa8565b60405180910390f35b61010660048036038101906101019190610c0b565b61058c565b6040516101139190610aa8565b60405180910390f35b610124610690565b6040516101319190610c76565b60405180910390f35b60606000600167ffffffffffffffff81111561015957610158610ac8565b5b6040519080825280601f01601f19166020018201604052801561018b5781602001600182028036833780820191505090505b50905060006040518060400160405280600c81526020017f636861696e5f313239312d310000000000000000000000000000000000000000815250905060006040518060400160405280600681526020017f736368656d610000000000000000000000000000000000000000000000000000815250905060006040518060400160405280601481526020017f697373756572566572696669636174696f6e4964000000000000000000000000815250905060008087856002640100000000426102549190610cca565b60008a89898960405160240161027299989796959493929190610d99565b60405160208183030381529060405263e62364ab60e01b6020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050905060008061040473ffffffffffffffffffffffffffffffffffffffff16836040516102e39190610e7e565b6000604051808303816000865af19150503d8060008114610320576040519150601f19603f3d011682016040523d82523d6000602084013e610325565b606091505b50915091506000818060200190518101906103409190610f3b565b90507f109923c5f814b7944f9591557d6a8d1dde907b5cc4cebccf84d59959347589bc8382604051610373929190610f84565b60405180910390a1809950505050505050505050919050565b6060600082306040516024016103a3929190610fb4565b60405160208183030381529060405263cc8995ec60e01b6020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050905060008061040473ffffffffffffffffffffffffffffffffffffffff16836040516104149190610e7e565b600060405180830381855afa9150503d806000811461044f576040519150601f19603f3d011682016040523d82523d6000602084013e610454565b606091505b5091509150606082156104785781806020019051810190610475919061132c565b90505b80945050505050919050565b6000606060008360026000846040516024016104a39493929190611424565b604051602081830303815290604052634887fcd860e01b6020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050905060008061040473ffffffffffffffffffffffffffffffffffffffff16836040516105149190610e7e565b600060405180830381855afa9150503d806000811461054f576040519150601f19603f3d011682016040523d82523d6000602084013e610554565b606091505b5091509150811561057e5780806020019051810190610573919061149c565b945050505050610587565b60009450505050505b919050565b6000808360026000856040516024016105a89493929190611424565b604051602081830303815290604052634887fcd860e01b6020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050905060008061040473ffffffffffffffffffffffffffffffffffffffff16836040516106199190610e7e565b600060405180830381855afa9150503d8060008114610654576040519150601f19603f3d011682016040523d82523d6000602084013e610659565b606091505b509150915081156106825780806020019051810190610678919061149c565b935050505061068a565b600093505050505b92915050565b600281565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006106d4826106a9565b9050919050565b6106e4816106c9565b81146106ef57600080fd5b50565b600081359050610701816106db565b92915050565b60006020828403121561071d5761071c61069f565b5b600061072b848285016106f2565b91505092915050565b600081519050919050565b600082825260208201905092915050565b60005b8381101561076e578082015181840152602081019050610753565b60008484015250505050565b6000601f19601f8301169050919050565b600061079682610734565b6107a0818561073f565b93506107b0818560208601610750565b6107b98161077a565b840191505092915050565b600060208201905081810360008301526107de818461078b565b905092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b600063ffffffff82169050919050565b61082b81610812565b82525050565b600082825260208201905092915050565b600061084d82610734565b6108578185610831565b9350610867818560208601610750565b6108708161077a565b840191505092915050565b610884816106c9565b82525050565b600081519050919050565b600082825260208201905092915050565b60006108b18261088a565b6108bb8185610895565b93506108cb818560208601610750565b6108d48161077a565b840191505092915050565b6000610140830160008301516108f86000860182610822565b50602083015184820360208601526109108282610842565b9150506040830151610925604086018261087b565b506060830151848203606086015261093d82826108a6565b91505060808301516109526080860182610822565b5060a083015161096560a0860182610822565b5060c083015184820360c086015261097d8282610842565b91505060e083015184820360e086015261099782826108a6565b9150506101008301518482036101008601526109b382826108a6565b9150506101208301516109ca610120860182610822565b508091505092915050565b60006109e183836108df565b905092915050565b6000602082019050919050565b6000610a01826107e6565b610a0b81856107f1565b935083602082028501610a1d85610802565b8060005b85811015610a595784840389528151610a3a85826109d5565b9450610a45836109e9565b925060208a01995050600181019050610a21565b50829750879550505050505092915050565b60006020820190508181036000830152610a8581846109f6565b905092915050565b60008115159050919050565b610aa281610a8d565b82525050565b6000602082019050610abd6000830184610a99565b92915050565b600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b610b008261077a565b810181811067ffffffffffffffff82111715610b1f57610b1e610ac8565b5b80604052505050565b6000610b32610695565b9050610b3e8282610af7565b919050565b600067ffffffffffffffff821115610b5e57610b5d610ac8565b5b602082029050602081019050919050565b600080fd5b6000610b87610b8284610b43565b610b28565b90508083825260208201905060208402830185811115610baa57610ba9610b6f565b5b835b81811015610bd35780610bbf88826106f2565b845260208401935050602081019050610bac565b5050509392505050565b600082601f830112610bf257610bf1610ac3565b5b8135610c02848260208601610b74565b91505092915050565b60008060408385031215610c2257610c2161069f565b5b6000610c30858286016106f2565b925050602083013567ffffffffffffffff811115610c5157610c506106a4565b5b610c5d85828601610bdd565b9150509250929050565b610c7081610812565b82525050565b6000602082019050610c8b6000830184610c67565b92915050565b6000819050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b6000610cd582610c91565b9150610ce083610c91565b925082610cf057610cef610c9b565b5b828206905092915050565b610d04816106c9565b82525050565b600082825260208201905092915050565b6000610d268261088a565b610d308185610d0a565b9350610d40818560208601610750565b610d498161077a565b840191505092915050565b6000819050919050565b6000819050919050565b6000610d83610d7e610d7984610d54565b610d5e565b610812565b9050919050565b610d9381610d68565b82525050565b600061012082019050610daf600083018c610cfb565b8181036020830152610dc1818b610d1b565b9050610dd0604083018a610c67565b610ddd6060830189610c67565b610dea6080830188610d8a565b81810360a0830152610dfc818761078b565b905081810360c0830152610e108186610d1b565b905081810360e0830152610e248185610d1b565b9050610e34610100830184610c67565b9a9950505050505050505050565b600081905092915050565b6000610e5882610734565b610e628185610e42565b9350610e72818560208601610750565b80840191505092915050565b6000610e8a8284610e4d565b915081905092915050565b600080fd5b600067ffffffffffffffff821115610eb557610eb4610ac8565b5b610ebe8261077a565b9050602081019050919050565b6000610ede610ed984610e9a565b610b28565b905082815260208101848484011115610efa57610ef9610e95565b5b610f05848285610750565b509392505050565b600082601f830112610f2257610f21610ac3565b5b8151610f32848260208601610ecb565b91505092915050565b600060208284031215610f5157610f5061069f565b5b600082015167ffffffffffffffff811115610f6f57610f6e6106a4565b5b610f7b84828501610f0d565b91505092915050565b6000604082019050610f996000830185610a99565b8181036020830152610fab818461078b565b90509392505050565b6000604082019050610fc96000830185610cfb565b610fd66020830184610cfb565b9392505050565b600067ffffffffffffffff821115610ff857610ff7610ac8565b5b602082029050602081019050919050565b600080fd5b600080fd5b61101c81610812565b811461102757600080fd5b50565b60008151905061103981611013565b92915050565b60008151905061104e816106db565b92915050565b600067ffffffffffffffff82111561106f5761106e610ac8565b5b6110788261077a565b9050602081019050919050565b600061109861109384611054565b610b28565b9050828152602081018484840111156110b4576110b3610e95565b5b6110bf848285610750565b509392505050565b600082601f8301126110dc576110db610ac3565b5b81516110ec848260208601611085565b91505092915050565b6000610140828403121561110c5761110b611009565b5b611117610140610b28565b905060006111278482850161102a565b600083015250602082015167ffffffffffffffff81111561114b5761114a61100e565b5b61115784828501610f0d565b602083015250604061116b8482850161103f565b604083015250606082015167ffffffffffffffff81111561118f5761118e61100e565b5b61119b848285016110c7565b60608301525060806111af8482850161102a565b60808301525060a06111c38482850161102a565b60a08301525060c082015167ffffffffffffffff8111156111e7576111e661100e565b5b6111f384828501610f0d565b60c08301525060e082015167ffffffffffffffff8111156112175761121661100e565b5b611223848285016110c7565b60e08301525061010082015167ffffffffffffffff8111156112485761124761100e565b5b611254848285016110c7565b6101008301525061012061126a8482850161102a565b6101208301525092915050565b600061128a61128584610fdd565b610b28565b905080838252602082019050602084028301858111156112ad576112ac610b6f565b5b835b818110156112f457805167ffffffffffffffff8111156112d2576112d1610ac3565b5b8086016112df89826110f5565b855260208501945050506020810190506112af565b5050509392505050565b600082601f83011261131357611312610ac3565b5b8151611323848260208601611277565b91505092915050565b6000602082840312156113425761134161069f565b5b600082015167ffffffffffffffff8111156113605761135f6106a4565b5b61136c848285016112fe565b91505092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b60006113ad838361087b565b60208301905092915050565b6000602082019050919050565b60006113d182611375565b6113db8185611380565b93506113e683611391565b8060005b838110156114175781516113fe88826113a1565b9750611409836113b9565b9250506001810190506113ea565b5085935050505092915050565b60006080820190506114396000830187610cfb565b6114466020830186610c67565b6114536040830185610d8a565b818103606083015261146581846113c6565b905095945050505050565b61147981610a8d565b811461148457600080fd5b50565b60008151905061149681611470565b92915050565b6000602082840312156114b2576114b161069f565b5b60006114c084828501611487565b9150509291505056fea26469706673582212206a37c692c6c96bcec8a41a0716397893adb6165b2c67204d82ea9b15d891a41164736f6c63430008180033c001a0f7d277d587c499a057ec519defb56be9f47ac44b9858a83642f83f9e708df05ca04e5c28c8dac5bfe23c74fb5d49f9a7a5253a9563269f104ae4d44d79e7d93f67 TXHASH=$($BINARY tx evm raw $RAW_BYTES -y --from alice --keyring-backend $KEYRING --home $HOMEDIR --gas-prices 100000000aswtr --output json | jq -r '.txhash') wait_for_tx echo "txHash: $TXHASH" @@ -48,4 +48,4 @@ $BINARY tx compliance set-issuer-status $ISSUER true -y --from operator --keyrin wait_for_tx echo -e "\n\n##########################\n" -echo "Now you are ready to run unit test with the following command: npm run test:tronik" \ No newline at end of file +echo "Now you are ready to run unit test with the following command: npm run test" \ No newline at end of file diff --git a/sgxvm/Cargo.lock b/sgxvm/Cargo.lock index 3f7e4762..b13da1cc 100644 --- a/sgxvm/Cargo.lock +++ b/sgxvm/Cargo.lock @@ -10,14 +10,13 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "auto_impl" -version = "1.0.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a8c1df849285fbacd587de7818cc7d13be6cd2cbcd47a04fb1801b0e2706e33" +checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.50", ] [[package]] @@ -503,50 +502,23 @@ dependencies = [ [[package]] name = "evm" -version = "0.41.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767f43e9630cc36cf8ff2777cbb0121b055f0d1fd6eaaa13b46a1808f0d0e7e9" +version = "1.0.0-dev" +source = "git+https://github.com/SigmaGmbH/evm.git#b76ffcde60078059e99f5f34a32b2b743767619b" dependencies = [ - "auto_impl", - "ethereum", - "evm-core", - "evm-gasometer", - "evm-runtime", - "log 0.4.17", + "evm-interpreter", "primitive-types", - "rlp", "sha3", ] [[package]] -name = "evm-core" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1da6cedc5cedb4208e59467106db0d1f50db01b920920589f8e672c02fdc04f" -dependencies = [ - "primitive-types", -] - -[[package]] -name = "evm-gasometer" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dc0eb591abc5cd7b05bef6a036c2bb6c66ab6c5e0c5ce94bfe377ab670b1fd7" -dependencies = [ - "evm-core", - "evm-runtime", - "primitive-types", -] - -[[package]] -name = "evm-runtime" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84bbe09b64ae13a29514048c1bb6fda6374ac0b4f6a1f15a443348ab88ef42cd" +name = "evm-interpreter" +version = "1.0.0-dev" +source = "git+https://github.com/SigmaGmbH/evm.git#b76ffcde60078059e99f5f34a32b2b743767619b" dependencies = [ "auto_impl", - "evm-core", + "paste", "primitive-types", + "rlp", "sha3", ] @@ -787,15 +759,6 @@ dependencies = [ "sgx_tstd", ] -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - [[package]] name = "memchr" version = "2.6.4" @@ -967,6 +930,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + [[package]] name = "platforms" version = "3.1.2" @@ -1012,30 +981,6 @@ dependencies = [ "toml_edit", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro2" version = "1.0.78" @@ -1177,7 +1122,7 @@ version = "0.19.0" source = "git+https://github.com/mesalock-linux/rustls?branch=mesalock_sgx#95b5e79dc24b02f3ce424437eb9698509d0baf58" dependencies = [ "base64", - "log 0.4.14", + "log", "ring", "sct", "sgx_tstd", @@ -1441,6 +1386,7 @@ dependencies = [ "sgx_types", "sha2 0.9.9", "sha3", + "static-precompiles", "substrate-bn", "thiserror-no-std", "tiny-keccak", @@ -1511,6 +1457,25 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "static-precompiles" +version = "0.1.0" +dependencies = [ + "curve25519-dalek 4.1.1", + "ed25519-dalek", + "evm", + "k256", + "num", + "p256", + "primitive-types", + "ripemd", + "sgx_tstd", + "sha2 0.9.9", + "sha3", + "substrate-bn", + "tiny-keccak", +] + [[package]] name = "static_assertions" version = "1.1.0" diff --git a/sgxvm/Cargo.toml b/sgxvm/Cargo.toml index 94048956..10597883 100644 --- a/sgxvm/Cargo.toml +++ b/sgxvm/Cargo.toml @@ -39,7 +39,7 @@ rustls = { git = "https://github.com/mesalock-linux/rustls", branch = "mesalock_ hmac = { version = "0.11.0", default-features=false } sha2 = { version = "0.9.5", default-features=false } primitive-types = { version = "^0.12", default-features = false, features = ["rlp"] } -evm = { version = "0.41.1", default-features = false } +evm = { git = "https://github.com/SigmaGmbH/evm.git", default-features = false, commit = "b76ffcde60078059e99f5f34a32b2b743767619b"} ethereum = { version = "0.15.0", default-features = false, features = ["with-codec", "with-serde"] } substrate-bn = { version = "0.6.0", default-features = false } tiny-keccak = { version = "2.0.2", features = ["fips202"] } @@ -52,10 +52,11 @@ num = { version = "0.4", default-features = false, features = ["alloc"] } bech32 = { version = "0.9.1", default-features = false } multibase = { version = "0.9.1", default-features=false } ethabi = { version = "18.0.0", default-features=false } +static-precompiles = { path="../crates/static-precompiles", default-features = false, features = ["sgx"] } # Encryption curve25519-dalek = { version = "4.1.1", default-features = false, features = ["alloc"] } -deoxysii = { version = "0.2.4", path="./deoxysii-rust" } +deoxysii = { version = "0.2.4", path="../crates/deoxysii-rust" } x25519-dalek = { version = "2.0.0-pre.1", default-features=false, features=[ "u64_backend" ] } ed25519-dalek = { version = "2.0.0", default-features=false } rand_chacha = { version = "0.3.1", default-features=false } diff --git a/sgxvm/Makefile b/sgxvm/Makefile index d620c9ed..2223b768 100644 --- a/sgxvm/Makefile +++ b/sgxvm/Makefile @@ -17,7 +17,7 @@ Enclave_Security_Link_Flags := -Wl,-z,relro,-z,now,-z,noexecstack Enclave_config_file ?= Enclave.config.development.xml Enclave_signing_key ?= Enclave_dev_private.pem Enclave_signed_file ?= enclave.signed.so -VERSION ?= v1.0.5 +VERSION ?= v1.0.6 # ENCLAVE SETTINGS ifneq ($(SGX_MODE), HW) diff --git a/sgxvm/bindings.h b/sgxvm/bindings.h index 6cdba68e..f874b452 100644 --- a/sgxvm/bindings.h +++ b/sgxvm/bindings.h @@ -216,8 +216,6 @@ extern struct Vec_u8 get_storage_cell(struct Vec_u8 req); extern struct Vec_u8 get_account_code(struct Vec_u8 req); -extern struct Vec_u8 insert_account(struct Vec_u8 req); - extern struct Vec_u8 insert_account_code(struct Vec_u8 req); extern struct Vec_u8 insert_storage_cell(struct Vec_u8 req); diff --git a/sgxvm/proto/ffi.proto b/sgxvm/proto/ffi.proto index 894b414a..00a2f103 100644 --- a/sgxvm/proto/ffi.proto +++ b/sgxvm/proto/ffi.proto @@ -78,15 +78,17 @@ message QueryGetAccountResponse { uint64 nonce = 2; } -// Request to insert account data such as balance and nonce -message QueryInsertAccount { +message QueryInsertAccountBalance { bytes address = 1; bytes balance = 2; - uint64 nonce = 3; } +message QueryInsertAccountBalanceResponse {} -// Response for account insertion -message QueryInsertAccountResponse {} +message QueryInsertAccountNonce { + bytes address = 1; + uint64 nonce = 2; +} +message QueryInsertAccountNonceResponse{} message QueryContainsKey { bytes key = 1; } @@ -103,6 +105,12 @@ message QueryGetAccountCode { bytes address = 1; } message QueryGetAccountCodeResponse { bytes code = 1; } +message QueryGetAccountCodeSize { bytes address = 1; } +message QueryGetAccountCodeSizeResponse { uint32 size = 1; } + +message QueryGetAccountCodeHash { bytes address = 1; } +message QueryGetAccountCodeHashResponse { bytes hash = 1; } + message QueryInsertAccountCode { bytes address = 1; bytes code = 2; @@ -198,19 +206,22 @@ message QueryGetVerificationDataResponse { message CosmosRequest { oneof req { QueryGetAccount getAccount = 1; - QueryInsertAccount insertAccount = 2; - QueryContainsKey containsKey = 3; - QueryGetAccountCode accountCode = 4; - QueryGetAccountStorageCell storageCell = 5; - QueryInsertAccountCode insertAccountCode = 6; - QueryInsertStorageCell insertStorageCell = 7; - QueryRemove remove = 8; - QueryRemoveStorageCell removeStorageCell = 9; - QueryRemoveStorage removeStorage = 10; - QueryBlockHash blockHash = 11; - QueryAddVerificationDetails addVerificationDetails = 12; - QueryHasVerification hasVerification = 13; - QueryGetVerificationData getVerificationData = 14; + QueryContainsKey containsKey = 2; + QueryGetAccountCode accountCode = 3; + QueryGetAccountCodeHash codeHash = 4; + QueryGetAccountCodeSize codeSize = 5; + QueryGetAccountStorageCell storageCell = 6; + QueryInsertAccountCode insertAccountCode = 7; + QueryInsertStorageCell insertStorageCell = 8; + QueryRemove remove = 9; + QueryRemoveStorageCell removeStorageCell = 10; + QueryRemoveStorage removeStorage = 11; + QueryBlockHash blockHash = 12; + QueryAddVerificationDetails addVerificationDetails = 13; + QueryHasVerification hasVerification = 14; + QueryGetVerificationData getVerificationData = 15; + QueryInsertAccountBalance insertAccountBalance = 16; + QueryInsertAccountNonce insertAccountNonce = 17; } } @@ -220,11 +231,12 @@ message SGXVMCallParams { bytes to = 2; bytes data = 3; uint64 gasLimit = 4; - bytes value = 5; - repeated AccessListItem accessList = 6; - bool commit = 7; - uint64 nonce = 8; - bool unencrypted = 9; + bytes gasPrice = 5; + bytes value = 6; + repeated AccessListItem accessList = 7; + bool commit = 8; + uint64 nonce = 9; + bool unencrypted = 10; } // Message with data required to execute `create` operation @@ -232,10 +244,11 @@ message SGXVMCreateParams { bytes from = 1; bytes data = 2; uint64 gasLimit = 3; - bytes value = 4; - repeated AccessListItem accessList = 5; - bool commit = 6; - uint64 nonce = 7; + bytes gasPrice = 4; + bytes value = 5; + repeated AccessListItem accessList = 6; + bool commit = 7; + uint64 nonce = 8; } // Request to execute `call` operation diff --git a/sgxvm/rust-toolchain b/sgxvm/rust-toolchain index 0f99c85c..1892e031 100644 --- a/sgxvm/rust-toolchain +++ b/sgxvm/rust-toolchain @@ -1 +1 @@ -nightly-2022-10-22 \ No newline at end of file +nightly-2023-03-13 \ No newline at end of file diff --git a/sgxvm/sgx-sdk b/sgxvm/sgx-sdk index 3c903bda..c4e93394 160000 --- a/sgxvm/sgx-sdk +++ b/sgxvm/sgx-sdk @@ -1 +1 @@ -Subproject commit 3c903bdac4e503dd27b9b1f761c4abfc55f2464c +Subproject commit c4e9339465e3e425af4c86cf5c4c027ca8a03c31 diff --git a/sgxvm/src/backend.rs b/sgxvm/src/backend.rs index aaf28afb..0802347a 100644 --- a/sgxvm/src/backend.rs +++ b/sgxvm/src/backend.rs @@ -1,19 +1,19 @@ -use ethereum::Log; -use evm::backend::{Apply, Backend as EvmBackend, Basic}; +use alloc::boxed::Box; +use alloc::collections::{BTreeMap, BTreeSet}; +use alloc::string::ToString; +use alloc::vec::Vec; +use core::mem; +use evm::backend::{OverlayedChangeSet, RuntimeBackend, RuntimeBaseBackend, RuntimeEnvironment}; +use evm::interpreter::error::{ExitError, ExitException, ExitResult, ExitSucceed}; +use evm::interpreter::runtime::{Log, SetCodeOrigin}; +use evm::{MergeStrategy, TransactionalBackend}; use primitive_types::{H160, H256, U256}; -use std::vec::Vec; - -use crate::{ - coder, - error::Error, - protobuf_generated::ffi, - querier, - storage::FFIStorage, - types::{ExtendedBackend, Storage, Vicinity}, -}; - -/// Contains context of the transaction such as gas price, block hash, block timestamp, etc. -pub struct TxContext { +use crate::{coder, querier}; +use crate::protobuf_generated::ffi; +use crate::storage::FFIStorage; +use crate::types::{Storage}; + +pub struct TxEnvironment { pub chain_id: U256, pub gas_price: U256, pub block_number: U256, @@ -23,7 +23,7 @@ pub struct TxContext { pub block_coinbase: H160, } -impl From for TxContext { +impl From for TxEnvironment { fn from(context: ffi::TransactionContext) -> Self { Self { chain_id: U256::from(context.chain_id), @@ -37,103 +37,70 @@ impl From for TxContext { } } -pub struct FFIBackend<'state> { - // We keep GoQuerier to make it accessible for `OCALL` handlers - pub querier: *mut querier::GoQuerier, - // Contains gas price and original sender - pub vicinity: Vicinity, - // Accounts state - pub state: &'state mut FFIStorage, - // Emitted events - pub logs: Vec, - // Transaction context - pub tx_context: TxContext, +pub struct Backend<'state> { + querier: *mut querier::GoQuerier, + storage: &'state FFIStorage, + environment: TxEnvironment, + substate: Box, + accessed: BTreeSet<(H160, Option)>, } -impl<'state> ExtendedBackend for FFIBackend<'state> { - fn get_logs(&self) -> Vec { - self.logs.clone() - } - - fn apply(&mut self, values: A, logs: L, _delete_empty: bool) -> Result<(), Error> - where - A: IntoIterator>, - I: IntoIterator, - L: IntoIterator, - { - let mut total_supply_add = U256::zero(); - let mut total_supply_sub = U256::zero(); - - for apply in values { - match apply { - Apply::Modify { - address, - basic, - code, - storage, - .. - } => { - // Update account balance and nonce - let previous_account_data = self.state.get_account(&address); - - if basic.balance > previous_account_data.balance { - total_supply_add = total_supply_add - .checked_add(basic.balance - previous_account_data.balance) - .unwrap(); - } else { - total_supply_sub = total_supply_sub - .checked_add(previous_account_data.balance - basic.balance) - .unwrap(); - } - self.state.insert_account(address, basic)?; +impl<'state> Backend<'state> { + pub fn new( + querier: *mut querier::GoQuerier, + storage: &'state FFIStorage, + environment: TxEnvironment, + ) -> Self { + Self { + querier, + storage, + substate: Box::new(Substate::new()), + environment, + accessed: BTreeSet::new(), + } + } - // Handle contract updates - if let Some(code) = code { - self.state.insert_account_code(address, code)?; - } + pub fn apply_changeset(storage: &'state FFIStorage, changeset: &OverlayedChangeSet) -> ExitResult { + for (address, balance) in changeset.balances.clone() { + storage.insert_account_balance(&address, &balance).map_err(|err| ExitException::Other(err.to_string().into()))? + } - // Handle storage updates - for (index, value) in storage { - if value == H256::default() { - self.state.remove_storage_cell(&address, &index)?; - } else { - self.state.insert_storage_cell(address, index, value)?; - } - } - } - // Used by `SELFDESTRUCT` opcode - Apply::Delete { address } => { - self.state.remove(&address)?; - } - } + for (address, nonce) in changeset.nonces.clone() { + storage.insert_account_nonce(&address, &nonce).map_err(|err| ExitException::Other(err.to_string().into()))? } - // Used to avoid corrupting state via invariant violation - assert_eq!( - total_supply_add, total_supply_sub, - "evm execution would lead to invariant violation ({} != {})", - total_supply_add, total_supply_sub - ); + for (address, code) in changeset.codes.clone() { + storage.insert_account_code(address, code).map_err(|err| ExitException::Other(err.to_string().into()))? + } - for log in logs { - self.logs.push(log); + for ((address, key), value) in changeset.storages.clone() { + storage.insert_storage_cell(address, key, value).map_err(|err| ExitException::Other(err.to_string().into()))?; } - Ok(()) - } -} + for address in changeset.deletes.clone() { + storage.remove(&address).map_err(|err| ExitException::Other(err.to_string().into()))?; + } -impl<'state> EvmBackend for FFIBackend<'state> { - fn gas_price(&self) -> U256 { - self.tx_context.gas_price + Ok(ExitSucceed::Returned) } - fn origin(&self) -> H160 { - self.vicinity.origin + pub fn deconstruct(self) -> OverlayedChangeSet { + OverlayedChangeSet { + logs: self.substate.logs, + balances: self.substate.balances, + codes: self.substate.codes, + nonces: self.substate.nonces, + storage_resets: self.substate.storage_resets, + storages: self.substate.storages, + transient_storage: self.substate.transient_storage, + deletes: self.substate.deletes, + } } +} +impl<'state> RuntimeEnvironment for Backend<'state> { fn block_hash(&self, number: U256) -> H256 { - let encoded_request = coder::encode_query_block_hash(number); + let encoded_request = coder::encode_query_block_hash(&number); match querier::make_request(self.querier, encoded_request) { Some(result) => { // Decode protobuf @@ -156,19 +123,19 @@ impl<'state> EvmBackend for FFIBackend<'state> { } fn block_number(&self) -> U256 { - self.tx_context.block_number + self.environment.block_number } fn block_coinbase(&self) -> H160 { - self.tx_context.block_coinbase + self.environment.block_coinbase } fn block_timestamp(&self) -> U256 { - self.tx_context.timestamp + self.environment.timestamp } fn block_difficulty(&self) -> U256 { - U256::zero() // Only applicable for PoW + U256::zero() } fn block_randomness(&self) -> Option { @@ -176,68 +143,310 @@ impl<'state> EvmBackend for FFIBackend<'state> { } fn block_gas_limit(&self) -> U256 { - self.tx_context.block_gas_limit + self.environment.block_gas_limit } fn block_base_fee_per_gas(&self) -> U256 { - self.tx_context.block_base_fee_per_gas + self.environment.block_base_fee_per_gas } fn chain_id(&self) -> U256 { - self.tx_context.chain_id + self.environment.chain_id } +} - fn exists(&self, address: H160) -> bool { - self.state.contains_key(&address) - } - - fn basic(&self, address: H160) -> Basic { - if address == self.vicinity.origin { - let mut account_data = self.state.get_account(&address); - let updated_nonce = account_data - .nonce - .checked_sub(U256::from(1u8)) - .unwrap_or(U256::zero()); - if updated_nonce > self.vicinity.nonce { - account_data.nonce = updated_nonce; - } else { - account_data.nonce = self.vicinity.nonce; - } - - account_data +impl<'state> RuntimeBaseBackend for Backend<'state> { + fn balance(&self, address: H160) -> U256 { + if let Some(balance) = self.substate.known_balance(address) { + balance } else { - self.state.get_account(&address) + self.storage.get_account(&address).0 } } + fn code_size(&self, address: H160) -> U256 { + self.storage.get_account_code_size(&address).unwrap_or(U256::zero()) + } + + fn code_hash(&self, address: H160) -> H256 { + self.storage.get_account_code_hash(&address).unwrap_or(H256::default()) + } + fn code(&self, address: H160) -> Vec { - self.state.get_account_code(&address).unwrap_or_default() + if let Some(code) = self.substate.known_code(address) { + code + } else { + self.storage.get_account_code(&address).unwrap_or(Vec::new()) + } } fn storage(&self, address: H160, index: H256) -> H256 { - self.state - .get_account_storage_cell(&address, &index) - .unwrap_or_default() + if let Some(value) = self.substate.known_storage(address, index) { + value + } else { + self.storage.get_account_storage_cell(&address, &index).unwrap_or(H256::default()) + } } - fn original_storage(&self, _address: H160, _index: H256) -> Option { - None + fn transient_storage(&self, address: H160, index: H256) -> H256 { + if let Some(value) = self.substate.known_transient_storage(address, index) { + value + } else { + H256::default() + } + } + + fn exists(&self, address: H160) -> bool { + if let Some(exists) = self.substate.known_exists(address) { + exists + } else { + self.storage.contains_key(&address) + } + } + + fn nonce(&self, address: H160) -> U256 { + self.storage.get_account(&address).1 } } -impl<'state> FFIBackend<'state> { - pub fn new( - querier: *mut querier::GoQuerier, - storage: &'state mut FFIStorage, - vicinity: Vicinity, - tx_context: TxContext, - ) -> Self { - Self { - querier, - vicinity, - state: storage, - logs: vec![], - tx_context, +impl<'state> RuntimeBackend for Backend<'state> { + fn original_storage(&self, address: H160, index: H256) -> H256 { + self.storage(address, index) + } + + fn deleted(&self, address: H160) -> bool { + self.substate.deleted(address) + } + + fn is_cold(&self, address: H160, index: Option) -> bool { + !self.accessed.contains(&(address, index)) + } + + fn mark_hot(&mut self, address: H160, index: Option) { + self.accessed.insert((address, index)); + } + + fn set_storage(&mut self, address: H160, index: H256, value: H256) -> Result<(), ExitError> { + self.substate.storages.insert((address, index), value); + Ok(()) + } + + fn set_transient_storage( + &mut self, + address: H160, + index: H256, + value: H256, + ) -> Result<(), ExitError> { + self.substate + .transient_storage + .insert((address, index), value); + Ok(()) + } + + fn log(&mut self, log: Log) -> Result<(), ExitError> { + self.substate.logs.push(log); + Ok(()) + } + + fn mark_delete(&mut self, address: H160) { + self.substate.deletes.insert(address); + } + + fn reset_storage(&mut self, address: H160) { + self.substate.storage_resets.insert(address); + } + + fn set_code( + &mut self, + address: H160, + code: Vec, + _origin: SetCodeOrigin, + ) -> Result<(), ExitError> { + self.substate.codes.insert(address, code); + Ok(()) + } + + fn reset_balance(&mut self, address: H160) { + self.substate.balances.insert(address, U256::zero()); + } + + fn deposit(&mut self, target: H160, value: U256) { + if value == U256::zero() { + return; + } + + let current_balance = self.balance(target); + self.substate + .balances + .insert(target, current_balance.saturating_add(value)); + } + + fn withdrawal(&mut self, source: H160, value: U256) -> Result<(), ExitError> { + if value == U256::zero() { + return Ok(()); + } + + let current_balance = self.balance(source); + if current_balance < value { + return Err(ExitException::OutOfFund.into()); + } + let new_balance = current_balance - value; + self.substate.balances.insert(source, new_balance); + Ok(()) + } + + fn inc_nonce(&mut self, address: H160) -> Result<(), ExitError> { + let new_nonce = self.nonce(address).saturating_add(U256::from(1)); + self.substate.nonces.insert(address, new_nonce); + Ok(()) + } +} + +impl<'state> TransactionalBackend for Backend<'state> { + fn push_substate(&mut self) { + let mut parent = Box::new(Substate::new()); + mem::swap(&mut parent, &mut self.substate); + self.substate.parent = Some(parent); + } + + fn pop_substate(&mut self, strategy: MergeStrategy) { + let mut child = self.substate.parent.take().expect("uneven substate pop"); + mem::swap(&mut child, &mut self.substate); + let child = child; + + match strategy { + MergeStrategy::Commit => { + for log in child.logs { + self.substate.logs.push(log); + } + for (address, balance) in child.balances { + self.substate.balances.insert(address, balance); + } + for (address, code) in child.codes { + self.substate.codes.insert(address, code); + } + for (address, nonce) in child.nonces { + self.substate.nonces.insert(address, nonce); + } + for address in child.storage_resets { + self.substate.storage_resets.insert(address); + } + for ((address, key), value) in child.storages { + self.substate.storages.insert((address, key), value); + } + for ((address, key), value) in child.transient_storage { + self.substate + .transient_storage + .insert((address, key), value); + } + for address in child.deletes { + self.substate.deletes.insert(address); + } + } + MergeStrategy::Revert | MergeStrategy::Discard => {} } } } + +struct Substate { + parent: Option>, + logs: Vec, + balances: BTreeMap, + codes: BTreeMap>, + nonces: BTreeMap, + storage_resets: BTreeSet, + storages: BTreeMap<(H160, H256), H256>, + transient_storage: BTreeMap<(H160, H256), H256>, + deletes: BTreeSet, +} + +impl Substate { + pub fn new() -> Self { + Self { + parent: None, + logs: Vec::new(), + balances: Default::default(), + codes: Default::default(), + nonces: Default::default(), + storage_resets: Default::default(), + storages: Default::default(), + transient_storage: Default::default(), + deletes: Default::default(), + } + } + + pub fn known_balance(&self, address: H160) -> Option { + if let Some(balance) = self.balances.get(&address) { + Some(*balance) + } else if let Some(parent) = self.parent.as_ref() { + parent.known_balance(address) + } else { + None + } + } + + pub fn known_code(&self, address: H160) -> Option> { + if let Some(code) = self.codes.get(&address) { + Some(code.clone()) + } else if let Some(parent) = self.parent.as_ref() { + parent.known_code(address) + } else { + None + } + } + + pub fn known_nonce(&self, address: H160) -> Option { + if let Some(nonce) = self.nonces.get(&address) { + Some(*nonce) + } else if let Some(parent) = self.parent.as_ref() { + parent.known_nonce(address) + } else { + None + } + } + + pub fn known_storage(&self, address: H160, key: H256) -> Option { + if let Some(value) = self.storages.get(&(address, key)) { + Some(*value) + } else if self.storage_resets.contains(&address) { + Some(H256::default()) + } else if let Some(parent) = self.parent.as_ref() { + parent.known_storage(address, key) + } else { + None + } + } + + pub fn known_transient_storage(&self, address: H160, key: H256) -> Option { + if let Some(value) = self.transient_storage.get(&(address, key)) { + Some(*value) + } else if let Some(parent) = self.parent.as_ref() { + parent.known_transient_storage(address, key) + } else { + None + } + } + + pub fn known_exists(&self, address: H160) -> Option { + if self.balances.contains_key(&address) + || self.nonces.contains_key(&address) + || self.codes.contains_key(&address) + { + Some(true) + } else if let Some(parent) = self.parent.as_ref() { + parent.known_exists(address) + } else { + None + } + } + + pub fn deleted(&self, address: H160) -> bool { + if self.deletes.contains(&address) { + true + } else if let Some(parent) = self.parent.as_ref() { + parent.deleted(address) + } else { + false + } + } +} \ No newline at end of file diff --git a/sgxvm/src/coder.rs b/sgxvm/src/coder.rs index a58e57b6..0390ac38 100644 --- a/sgxvm/src/coder.rs +++ b/sgxvm/src/coder.rs @@ -1,5 +1,4 @@ use ethabi::Address; -use evm::backend::Basic; use primitive_types::{H160, U256, H256}; use protobuf::Message; use crate::protobuf_generated::ffi; @@ -8,13 +7,13 @@ use std::{ string::String }; -fn u256_to_vec(value: U256) -> Vec { +fn u256_to_vec(value: &U256) -> Vec { let mut buffer = [0u8; 32]; value.to_big_endian(&mut buffer); buffer.to_vec() } -pub fn encode_query_block_hash(number: U256) -> Vec { +pub fn encode_query_block_hash(number: &U256) -> Vec { let mut cosmos_request = ffi::CosmosRequest::new(); let mut request = ffi::QueryBlockHash::new(); request.set_number(u256_to_vec(number)); @@ -55,16 +54,6 @@ pub fn encode_get_account_code(account_address: &H160) -> Vec { cosmos_request.write_to_bytes().unwrap() } -pub fn encode_insert_account(account_address: H160, data: Basic) -> Vec { - let mut cosmos_request = ffi::CosmosRequest::new(); - let mut request = ffi::QueryInsertAccount::new(); - request.set_address(account_address.as_bytes().to_vec()); - request.set_balance(u256_to_vec(data.balance)); - request.set_nonce(data.nonce.as_u64()); - cosmos_request.set_insertAccount(request); - cosmos_request.write_to_bytes().unwrap() -} - pub fn encode_insert_account_code(account_address: H160, code: Vec) -> Vec { let mut cosmos_request = ffi::CosmosRequest::new(); let mut request = ffi::QueryInsertAccountCode::new(); @@ -162,3 +151,45 @@ pub fn encode_get_verification_data(user_address: Address, issuer_address: H160) cosmos_request.set_getVerificationData(request); cosmos_request.write_to_bytes().unwrap() } + +pub fn encode_insert_account_balance(address: &H160, balance: &U256) -> Vec { + let mut cosmos_request = ffi::CosmosRequest::new(); + let mut request = ffi::QueryInsertAccountBalance::new(); + + request.set_address(address.as_bytes().to_vec()); + request.set_balance(u256_to_vec(&balance)); + + cosmos_request.set_insertAccountBalance(request); + cosmos_request.write_to_bytes().unwrap() +} + +pub fn encode_insert_account_nonce(address: &H160, nonce: &U256) -> Vec { + let mut cosmos_request = ffi::CosmosRequest::new(); + let mut request = ffi::QueryInsertAccountNonce::new(); + + request.set_address(address.as_bytes().to_vec()); + request.set_nonce(nonce.as_u64()); + + cosmos_request.set_insertAccountNonce(request); + cosmos_request.write_to_bytes().unwrap() +} + +pub fn encode_get_account_code_hash(address: &H160) -> Vec { + let mut cosmos_request = ffi::CosmosRequest::new(); + let mut request = ffi::QueryGetAccountCodeHash::new(); + + request.set_address(address.as_bytes().to_vec()); + + cosmos_request.set_codeHash(request); + cosmos_request.write_to_bytes().unwrap() +} + +pub fn encode_get_account_code_size(address: &H160) -> Vec { + let mut cosmos_request = ffi::CosmosRequest::new(); + let mut request = ffi::QueryGetAccountCodeSize::new(); + + request.set_address(address.as_bytes().to_vec()); + + cosmos_request.set_codeSize(request); + cosmos_request.write_to_bytes().unwrap() +} diff --git a/sgxvm/src/handlers/mod.rs b/sgxvm/src/handlers/mod.rs index b62ad992..ab6a9e7d 100644 --- a/sgxvm/src/handlers/mod.rs +++ b/sgxvm/src/handlers/mod.rs @@ -15,6 +15,7 @@ use crate::protobuf_generated::ffi::{ use crate::GoQuerier; pub mod tx; +mod utils; /// Handles incoming protobuf-encoded request pub fn handle_protobuf_request_inner( diff --git a/sgxvm/src/handlers/tx.rs b/sgxvm/src/handlers/tx.rs index dca02217..eea6f0c0 100644 --- a/sgxvm/src/handlers/tx.rs +++ b/sgxvm/src/handlers/tx.rs @@ -1,23 +1,21 @@ -use evm::executor::stack::{MemoryStackState, StackExecutor, StackSubstateMetadata}; -use evm::ExitReason; +use evm::standard::{Etable, EtableResolver, TransactArgs, TransactValue}; use primitive_types::{H160, H256, U256}; use protobuf::Message; -use protobuf::RepeatedField; -use std::{string::String, vec::Vec}; +use std::vec::Vec; -use crate::backend::{FFIBackend, TxContext}; use crate::encryption::{ decrypt_transaction_data, encrypt_transaction_data, extract_public_key_and_data, }; use crate::key_manager::utils::random_nonce; use crate::precompiles::EVMPrecompiles; -use crate::protobuf_generated::ffi::{ - AccessListItem, HandleTransactionResponse, Log, SGXVMCallRequest, SGXVMCreateRequest, Topic, -}; +use crate::protobuf_generated::ffi::{HandleTransactionResponse, Log, SGXVMCallRequest, SGXVMCreateRequest, Topic, TransactionContext}; use crate::std::string::ToString; -use crate::types::{ExecutionResult, ExtendedBackend, Vicinity, GASOMETER_CONFIG}; +use crate::types::{ExecutionResult, GASOMETER_CONFIG}; use crate::AllocationWithResult; use crate::GoQuerier; +use crate::handlers::utils::{convert_logs, parse_access_list}; +use crate::backend::{TxEnvironment, Backend}; +use crate::invoker::OverlayedInvoker; /// Converts raw execution result into protobuf and returns it outside of enclave pub fn convert_and_allocate_transaction_result( @@ -65,104 +63,61 @@ pub fn handle_call_request_inner( ) -> ExecutionResult { let params = data.params.unwrap(); let context = data.context.unwrap(); - let block_number = context.block_number; - let vicinity = Vicinity { - origin: H160::from_slice(¶ms.from), - nonce: U256::from(params.nonce), - }; - let mut storage = crate::storage::FFIStorage::new(querier, context.timestamp, block_number); - let mut backend = FFIBackend::new(querier, &mut storage, vicinity, TxContext::from(context)); + let should_commit = params.commit; + let block_number = context.block_number; - // We do not decrypt transaction if no tx.data provided, or provided explicit flag, that transaction is unencrypted - let is_encrypted = params.data.len() != 0 && !params.unencrypted; - match is_encrypted { - false => execute_call( - querier, - &mut backend, - params.gasLimit, - H160::from_slice(¶ms.from), - H160::from_slice(¶ms.to), - U256::from_big_endian(¶ms.value), - params.data, - parse_access_list(params.accessList), - params.commit, - ), - true => { - // Extract user public key and nonce from transaction data - let (user_public_key, data, nonce) = match extract_public_key_and_data(params.data) { - Ok((user_public_key, data, nonce)) => (user_public_key, data, nonce), - Err(err) => { - return ExecutionResult::from_error(format!("{:?}", err), Vec::default(), None); - } - }; + // Check if transaction is unencrypted, handle it as regular EVM transaction + let is_unencrypted = params.data.is_empty() || params.unencrypted; + if is_unencrypted { + return run_tx(querier, context, params.into(), should_commit) + } - // If encrypted data presents, decrypt it - let decrypted_data = if !data.is_empty() { - match decrypt_transaction_data(data, user_public_key.clone(), block_number) { - Ok(decrypted_data) => decrypted_data, - Err(err) => { - return ExecutionResult::from_error( - format!("{:?}", err), - Vec::default(), - None, - ); - } - } - } else { - Vec::default() - }; + // Otherwise, we should decrypt input, execute tx and encrypt output + let (user_public_key, data, nonce) = match extract_public_key_and_data(params.data) { + Ok(res) => res, + Err(err) => return ExecutionResult::from_error(err.to_string(), Vec::new(), None) + }; - let mut exec_result = execute_call( - querier, - &mut backend, - params.gasLimit, - H160::from_slice(¶ms.from), - H160::from_slice(¶ms.to), - U256::from_big_endian(¶ms.value), - decrypted_data, - parse_access_list(params.accessList), - params.commit, - ); + let decrypted_data = match !data.is_empty() { + true => match decrypt_transaction_data(data, user_public_key.clone(), block_number) { + Ok(data) => data, + Err(err) => return ExecutionResult::from_error(err.to_string(), Vec::new(), None) + }, + false => Vec::new() + }; - // If there is transaction with no incoming transaction data, use random nonce to encrypt output - let nonce = if nonce.is_empty() { - match random_nonce() { - Ok(nonce) => nonce.to_vec(), - Err(err) => { - return ExecutionResult::from_error( - format!("{:?}", err), - Vec::default(), - None, - ); - } - } - } else { - nonce - }; + let transact_args = TransactArgs::Call { + caller: H160::from_slice(¶ms.from), + address: H160::from_slice(¶ms.to), + value: U256::from_big_endian(¶ms.value), + data: decrypted_data, + gas_limit: U256::from(params.gasLimit), + gas_price: U256::from_big_endian(¶ms.gasPrice), + access_list: parse_access_list(params.accessList), + }; + let mut execution_result = run_tx(querier, context, transact_args, should_commit); - // Return unencrypted transaction response in case of revert - if !exec_result.vm_error.is_empty() { - return exec_result; + let nonce = match nonce.is_empty() { + true => { + match random_nonce() { + Ok(nonce) => nonce.to_vec(), + Err(err) => return ExecutionResult::from_error(err.to_string(), Vec::new(), None) } + }, + false => nonce, + }; - // Encrypt transaction data output - let encrypted_data = - match encrypt_transaction_data(exec_result.data, user_public_key, nonce, block_number) { - Ok(data) => data, - Err(err) => { - return ExecutionResult::from_error( - format!("{:?}", err), - Vec::default(), - None, - ); - } - }; + if execution_result.vm_error.is_empty() { + let encrypted_response = match encrypt_transaction_data(execution_result.data, user_public_key, nonce, block_number) { + Ok(data) => data, + Err(err) => return ExecutionResult::from_error(err.to_string(), Vec::new(), None) + }; - exec_result.data = encrypted_data; - exec_result - } + execution_result.data = encrypted_response; } + + execution_result } /// Inner handler for EVM create request @@ -172,42 +127,9 @@ pub fn handle_create_request_inner( ) -> ExecutionResult { let params = data.params.unwrap(); let context = data.context.unwrap(); + let should_commit = params.commit; - let vicinity = Vicinity { - origin: H160::from_slice(¶ms.from), - nonce: U256::from(params.nonce), - }; - let mut storage = crate::storage::FFIStorage::new(querier, context.timestamp, context.block_number); - let mut backend = FFIBackend::new(querier, &mut storage, vicinity, TxContext::from(context)); - - execute_create( - querier, - &mut backend, - params.gasLimit, - H160::from_slice(¶ms.from), - U256::from_big_endian(¶ms.value), - params.data, - parse_access_list(params.accessList), - params.commit, - ) -} - -/// Converts access list from RepeatedField to Vec -fn parse_access_list(data: RepeatedField) -> Vec<(H160, Vec)> { - let mut access_list = Vec::default(); - for access_list_item in data.to_vec() { - let address = H160::from_slice(&access_list_item.address); - let slots = access_list_item - .storageSlot - .to_vec() - .into_iter() - .map(|item| H256::from_slice(&item)) - .collect(); - - access_list.push((address, slots)); - } - - access_list + run_tx(querier, context, params.into(), should_commit) } /// Converts EVM topic into protobuf-generated `Topic @@ -218,112 +140,74 @@ fn convert_topic_to_proto(topic: H256) -> Topic { protobuf_topic } -/// Executes call to smart contract or transferring value -/// * querier - GoQuerier which is used to interact with Go (Cosmos) from SGX Enclave -/// * backend - EVM backend for reading and writting state -/// * gas_limit - gas limit for transaction -/// * from - transaction origin address -/// * to - destination address -/// * data - encoded params for smart contract call or arbitrary data -/// * access_list - EIP-2930 access list -/// * commit - should apply changes. Provide `false` if you want to simulate transaction, without state changes -/// -/// Returns EVM execution result -fn execute_call( +fn run_tx( querier: *mut GoQuerier, - backend: &mut impl ExtendedBackend, - gas_limit: u64, - from: H160, - to: H160, - value: U256, - data: Vec, - access_list: Vec<(H160, Vec)>, - commit: bool, + context: TransactionContext, + args: TransactArgs, + should_commit: bool, ) -> ExecutionResult { - let metadata = StackSubstateMetadata::new(gas_limit, &GASOMETER_CONFIG); - let state = MemoryStackState::new(metadata, backend); + let gas_etable = Etable::single(evm::standard::eval_gasometer); + let exec_etable = Etable::runtime(); + let etable = (gas_etable, exec_etable); let precompiles = EVMPrecompiles::new(querier); + let resolver = EtableResolver::new(&GASOMETER_CONFIG, &precompiles, &etable); + let invoker = OverlayedInvoker::new(&GASOMETER_CONFIG, &resolver); - let mut executor = StackExecutor::new_with_precompiles(state, &GASOMETER_CONFIG, &precompiles); - let (exit_reason, ret) = executor.transact_call(from, to, value, data, gas_limit, access_list); - - let gas_used = executor.used_gas(); - let exit_value = match handle_evm_result(exit_reason, ret) { - Ok(data) => data, - Err((err, data)) => { - return ExecutionResult::from_error(err, data, Some(gas_used)); - } - }; - - if commit { - let (vals, logs) = executor.into_state().deconstruct(); - if let Err(err) = backend.apply(vals, logs, false) { - return ExecutionResult::from_error(err.to_string(), Vec::default(), None) - } - } + let storage = crate::storage::FFIStorage::new(querier, context.timestamp, context.block_number); + let tx_environment = TxEnvironment::from(context); + let mut backend = Backend::new(querier, &storage, tx_environment); - ExecutionResult { - logs: backend.get_logs(), - data: exit_value, - gas_used, - vm_error: "".to_string(), - } -} - -/// Creates new smart contract -/// * querier - GoQuerier which is used to interact with Go (Cosmos) from SGX Enclave -/// * backend - EVM backend for reading and writting state -/// * gas_limit - gas limit for contract creation -/// * from - creator address of smart contract -/// * data - encoded bytecode and creation params -/// * access_list - EIP-2930 access list -/// * commit - should apply changes. Provide `false` if you want to simulate contract creation, without state changes -/// -/// Returns EVM execution result -fn execute_create( - querier: *mut GoQuerier, - backend: &mut impl ExtendedBackend, - gas_limit: u64, - from: H160, - value: U256, - data: Vec, - access_list: Vec<(H160, Vec)>, - commit: bool, -) -> ExecutionResult { - let metadata = StackSubstateMetadata::new(gas_limit, &GASOMETER_CONFIG); - let state = MemoryStackState::new(metadata, backend); - let precompiles = EVMPrecompiles::new(querier); + let res = evm::transact(args, None, &mut backend, &invoker); + let changeset = backend.deconstruct(); - let mut executor = StackExecutor::new_with_precompiles(state, &GASOMETER_CONFIG, &precompiles); - let (exit_reason, ret) = executor.transact_create(from, value, data, gas_limit, access_list); + let used_gas = invoker.get_gas_used().map(|used_gas| used_gas.as_u64()).unwrap_or(21000); - let gas_used = executor.used_gas(); - let exit_value = match handle_evm_result(exit_reason, ret) { - Ok(data) => data, - Err((err, data)) => return ExecutionResult::from_error(err, data, Some(gas_used)), - }; - - if commit { - let (vals, logs) = executor.into_state().deconstruct(); - if let Err(err) = backend.apply(vals, logs, false) { - return ExecutionResult::from_error(err.to_string(), Vec::default(), None) + if should_commit { + if let Err(err) = Backend::apply_changeset(&storage, &changeset) { + return ExecutionResult::from_exit_error( + err, + invoker.get_return_value().unwrap_or_default(), + used_gas, + ); } } - ExecutionResult { - logs: backend.get_logs(), - data: exit_value, - gas_used, - vm_error: "".to_string(), - } -} + match res { + Ok(res) => { + match res { + TransactValue::Call {succeed, retval} => { + ExecutionResult { + logs: convert_logs(changeset.logs), + data: retval, + gas_used: used_gas, + vm_error: "".to_string() + } + } + TransactValue::Create {succeed, address} => { + // Check if run_tx was called in context of transaction or in context of eth_call or eth_estimateGas. + // We commit changes only in case of transaction context. + if should_commit { + ExecutionResult { + logs: convert_logs(changeset.logs), + data: address.to_fixed_bytes().to_vec(), + gas_used: used_gas, + vm_error: "".to_string() + } + } else { + ExecutionResult { + logs: convert_logs(changeset.logs), + data: invoker.get_return_value().unwrap_or_default(), + gas_used: used_gas, + vm_error: "".to_string() + } + } -/// Handles an EVM result to return either a successful result or a (readable) error reason. -fn handle_evm_result(exit_reason: ExitReason, data: Vec) -> Result, (String, Vec)> { - match exit_reason { - ExitReason::Succeed(_) => Ok(data), - ExitReason::Revert(err) => Err((format!("execution reverted: {:?}", err), data)), - ExitReason::Error(err) => Err((format!("evm error: {:?}", err), data)), - ExitReason::Fatal(err) => Err((format!("fatal evm error: {:?}", err), data)), + } + } + }, + Err(err) => { + let error_data = invoker.get_return_value().unwrap_or_default(); + ExecutionResult::from_exit_error(err, error_data, used_gas) + } } -} +} \ No newline at end of file diff --git a/sgxvm/src/handlers/utils.rs b/sgxvm/src/handlers/utils.rs new file mode 100644 index 00000000..d217cd7b --- /dev/null +++ b/sgxvm/src/handlers/utils.rs @@ -0,0 +1,75 @@ +use ethereum::Log; +use evm::interpreter::runtime::Log as RuntimeLog; +use evm::standard::TransactArgs; +use primitive_types::{H160, H256, U256}; +use protobuf::RepeatedField; +use std::vec::Vec; +use crate::protobuf_generated::ffi::{AccessListItem, SGXVMCallParams, SGXVMCreateParams}; + +impl Into for SGXVMCallParams { + fn into(self) -> TransactArgs { + TransactArgs::Call { + caller: H160::from_slice(&self.from), + address: H160::from_slice(&self.to), + value: U256::from_big_endian(&self.value), + data: self.data, + gas_limit: U256::from(self.gasLimit), + gas_price: U256::from_big_endian(&self.gasPrice), + access_list: parse_access_list(self.accessList), + } + } +} + +impl Into for SGXVMCreateParams { + fn into(self) -> TransactArgs { + TransactArgs::Create { + caller: H160::from_slice(&self.from), + value: U256::from_big_endian(&self.value), + init_code: self.data, + salt: None, + gas_limit: U256::from(self.gasLimit), + gas_price: U256::from_big_endian(&self.gasPrice), + access_list: parse_access_list(self.accessList), + } + } +} + +pub fn construct_call_args(params: SGXVMCallParams, data: Vec) -> TransactArgs { + TransactArgs::Call { + caller: H160::from_slice(¶ms.from), + address: H160::from_slice(¶ms.to), + value: U256::from_big_endian(¶ms.value), + data, + gas_limit: U256::from(params.gasLimit), + gas_price: U256::from_big_endian(¶ms.gasPrice), + access_list: parse_access_list(params.accessList), + } +} + +pub fn parse_access_list(data: RepeatedField) -> Vec<(H160, Vec)> { + let mut access_list = Vec::default(); + for access_list_item in data.to_vec() { + let address = H160::from_slice(&access_list_item.address); + let slots = access_list_item + .storageSlot + .to_vec() + .into_iter() + .map(|item| H256::from_slice(&item)) + .collect(); + + access_list.push((address, slots)); + } + + access_list +} + +pub fn convert_logs(input: Vec) -> Vec { + input + .into_iter() + .map(|rl| Log { + address: rl.address, + topics: rl.topics, + data: rl.data, + }) + .collect() +} \ No newline at end of file diff --git a/sgxvm/src/invoker.rs b/sgxvm/src/invoker.rs new file mode 100644 index 00000000..a8ad25fe --- /dev/null +++ b/sgxvm/src/invoker.rs @@ -0,0 +1,490 @@ +use alloc::{rc::Rc, vec::Vec}; +use core::{cmp::min, convert::Infallible}; +use core::cell::RefCell; +use evm::interpreter::error::{ExitError, ExitResult, ExitException}; +use evm::{MergeStrategy, TransactionalBackend}; +use evm::standard::{routines, Config, Resolver, TransactArgs, TransactValue, InvokerState, SubstackInvoke}; +use evm::{Invoker, InvokerControl}; +use evm::interpreter::{ + error::{ + CallCreateTrap, CallCreateTrapData, CallTrapData, + Capture, CreateScheme, TrapConsume, + }, + opcode::Opcode, + runtime::{ + Context, GasState, RuntimeBackend, RuntimeEnvironment, RuntimeState, SetCodeOrigin, + TransactionContext, Transfer, + }, + Interpreter, +}; +use primitive_types::{H160, H256, U256}; +use sha3::{Digest, Keccak256}; + +/// A trap that can be turned into either a call/create trap (where we push new +/// call stack), or an interrupt (an external signal). +pub trait IntoCallCreateTrap { + /// An external signal. + type Interrupt; + + /// Turn the current trap into either a call/create trap or an interrupt. + fn into_call_create_trap(self) -> Result; +} + +impl IntoCallCreateTrap for Opcode { + type Interrupt = Infallible; + + fn into_call_create_trap(self) -> Result { + Ok(self) + } +} + +/// The invoke used in a top-layer transaction stack. +pub struct TransactInvoke { + pub create_address: Option, + pub gas_limit: U256, + pub gas_price: U256, + pub caller: H160, +} + +pub struct DataContainer { + pub gas_used: U256, + pub return_value: Vec, +} + +impl Default for DataContainer { + fn default() -> Self { + Self { + gas_used: U256::from(21000), + return_value: vec![], + } + } +} + +/// Overlayed Invoker. +/// +/// The generic parameters are as follows: +/// * `S`: The runtime state, usually [RuntimeState] but can be customized. +/// * `H`: Backend type. +/// * `R`: Code resolver type, also handle precompiles. Usually +/// [EtableResolver] but can be customized. +/// * `Tr`: Trap type, usually [crate::Opcode] but can be customized. +pub struct OverlayedInvoker<'config, 'resolver, R> { + container: RefCell>, + config: &'config Config, + resolver: &'resolver R, +} + +impl<'config, 'resolver, R> OverlayedInvoker<'config, 'resolver, R> { + /// Create a new standard invoker with the given config and resolver. + pub fn new(config: &'config Config, resolver: &'resolver R) -> Self { + Self { config, resolver, container: RefCell::new(None) } + } + + pub fn get_gas_used(&self) -> Option { + self.container.borrow().as_ref().map(|data| data.gas_used) + } + + pub fn get_return_value(&self) -> Option> { + self.container.borrow().as_ref().map(|data| data.return_value.clone()) + } +} + +impl<'config, 'resolver, H, R, Tr> Invoker for OverlayedInvoker<'config, 'resolver, R> +where + R::State: InvokerState<'config> + AsRef + AsMut, + H: RuntimeEnvironment + RuntimeBackend + TransactionalBackend, + R: Resolver, + Tr: TrapConsume, +{ + type State = R::State; + type Interpreter = R::Interpreter; + type Interrupt = Tr::Rest; + type TransactArgs = TransactArgs; + type TransactInvoke = TransactInvoke; + type TransactValue = TransactValue; + type SubstackInvoke = SubstackInvoke; + + fn new_transact( + &self, + args: TransactArgs, + handler: &mut H, + ) -> Result< + ( + TransactInvoke, + InvokerControl))>, + ), + ExitError, + > { + let caller = args.caller(); + let gas_price = args.gas_price(); + + handler.inc_nonce(caller)?; + + let address = match &args { + TransactArgs::Call { address, .. } => *address, + TransactArgs::Create { + caller, + salt, + init_code, + .. + } => match salt { + Some(salt) => { + let scheme = CreateScheme::Create2 { + caller: *caller, + code_hash: H256::from_slice(Keccak256::digest(init_code).as_slice()), + salt: *salt, + }; + scheme.address(handler) + } + None => { + let scheme = CreateScheme::Legacy { caller: *caller }; + scheme.address(handler) + } + }, + }; + let value = args.value(); + + let invoke = TransactInvoke { + gas_limit: args.gas_limit(), + gas_price: args.gas_price(), + caller: args.caller(), + create_address: match &args { + TransactArgs::Call { .. } => None, + TransactArgs::Create { .. } => Some(address), + }, + }; + + handler.push_substate(); + + let context = Context { + caller, + address, + apparent_value: value, + }; + let transaction_context = TransactionContext { + origin: caller, + gas_price, + }; + let transfer = Transfer { + source: caller, + target: address, + value, + }; + let runtime_state = RuntimeState { + context, + transaction_context: Rc::new(transaction_context), + retbuf: Vec::new(), + }; + + let work = || -> Result<(TransactInvoke, _), ExitError> { + match args { + TransactArgs::Call { + caller, + address, + data, + gas_limit, + access_list, + .. + } => { + for (address, keys) in &access_list { + handler.mark_hot(*address, None); + for key in keys { + handler.mark_hot(*address, Some(*key)); + } + } + + let state = ::new_transact_call( + runtime_state, + gas_limit, + &data, + &access_list, + self.config, + )?; + + let machine = routines::make_enter_call_machine( + self.config, + self.resolver, + address, + data, + Some(transfer), + state, + handler, + )?; + + if self.config.increase_state_access_gas { + if self.config.warm_coinbase_address { + let coinbase = handler.block_coinbase(); + handler.mark_hot(coinbase, None); + } + handler.mark_hot(caller, None); + handler.mark_hot(address, None); + } + + Ok((invoke, machine)) + } + TransactArgs::Create { + caller, + init_code, + gas_limit, + access_list, + .. + } => { + let state = ::new_transact_create( + runtime_state, + gas_limit, + &init_code, + &access_list, + self.config, + )?; + + let machine = routines::make_enter_create_machine( + self.config, + self.resolver, + caller, + init_code, + transfer, + state, + handler, + )?; + + Ok((invoke, machine)) + } + } + }; + + work().map_err(|err| { + handler.pop_substate(MergeStrategy::Discard); + err + }) + } + + fn finalize_transact( + &self, + invoke: &TransactInvoke, + result: ExitResult, + (mut substate, retval): (R::State, Vec), + handler: &mut H, + ) -> Result { + // Since retval is moved into closure, we clone it here + let retval_copy = retval.clone(); + + let work = || -> Result { + match result { + Ok(result) => { + if let Some(address) = invoke.create_address { + let retbuf = retval; + + routines::deploy_create_code( + self.config, + address, + retbuf, + &mut substate, + handler, + SetCodeOrigin::Transaction, + )?; + + Ok(TransactValue::Create { + succeed: result, + address, + }) + } else { + Ok(TransactValue::Call { + succeed: result, + retval, + }) + } + } + Err(result) => Err(result), + } + }; + + let result = work(); + + match &result { + Ok(_) => { + handler.pop_substate(MergeStrategy::Commit); + } + Err(_) => { + handler.pop_substate(MergeStrategy::Discard); + } + } + + let used_gas = invoke.gas_limit.saturating_sub(substate.effective_gas()); + *self.container.borrow_mut() = Some(DataContainer{ + gas_used: used_gas, + return_value: retval_copy, + }); + + result + } + + fn enter_substack( + &self, + trap: Tr, + machine: &mut Self::Interpreter, + handler: &mut H, + depth: usize, + ) -> Capture< + Result< + ( + SubstackInvoke, + InvokerControl))>, + ), + ExitError, + >, + Self::Interrupt, + > { + fn l64(gas: U256) -> U256 { + gas - gas / U256::from(64) + } + + let opcode = match trap.consume() { + Ok(opcode) => opcode, + Err(interrupt) => return Capture::Trap(interrupt), + }; + + if depth >= self.config.call_stack_limit { + return Capture::Exit(Err(ExitException::CallTooDeep.into())); + } + + let trap_data = match CallCreateTrapData::new_from(opcode, machine.machine_mut()) { + Ok(trap_data) => trap_data, + Err(err) => return Capture::Exit(Err(err)), + }; + + let after_gas = if self.config.call_l64_after_gas { + l64(machine.machine().state.gas()) + } else { + machine.machine().state.gas() + }; + let target_gas = trap_data.target_gas().unwrap_or(after_gas); + let gas_limit = min(after_gas, target_gas); + + let call_has_value = + matches!(&trap_data, CallCreateTrapData::Call(call) if call.has_value()); + + let is_static = if machine.machine().state.is_static() { + true + } else { + match &trap_data { + CallCreateTrapData::Call(CallTrapData { is_static, .. }) => *is_static, + _ => false, + } + }; + + let transaction_context = machine.machine().state.as_ref().transaction_context.clone(); + + match trap_data { + CallCreateTrapData::Call(call_trap_data) => { + let substate = match machine.machine_mut().state.substate( + RuntimeState { + context: call_trap_data.context.clone(), + transaction_context, + retbuf: Vec::new(), + }, + gas_limit, + is_static, + call_has_value, + ) { + Ok(submeter) => submeter, + Err(err) => return Capture::Exit(Err(err)), + }; + + let target = call_trap_data.target; + + Capture::Exit(routines::enter_call_substack( + self.config, + self.resolver, + call_trap_data, + target, + substate, + handler, + )) + } + CallCreateTrapData::Create(create_trap_data) => { + let caller = create_trap_data.scheme.caller(); + let address = create_trap_data.scheme.address(handler); + let code = create_trap_data.code.clone(); + + let substate = match machine.machine_mut().state.substate( + RuntimeState { + context: Context { + address, + caller, + apparent_value: create_trap_data.value, + }, + transaction_context, + retbuf: Vec::new(), + }, + gas_limit, + is_static, + call_has_value, + ) { + Ok(submeter) => submeter, + Err(err) => return Capture::Exit(Err(err)), + }; + + Capture::Exit(routines::enter_create_substack( + self.config, + self.resolver, + code, + create_trap_data, + substate, + handler, + )) + } + } + } + + fn exit_substack( + &self, + result: ExitResult, + (mut substate, retval): (R::State, Vec), + trap_data: Self::SubstackInvoke, + parent: &mut Self::Interpreter, + handler: &mut H, + ) -> Result<(), ExitError> { + let strategy = match &result { + Ok(_) => MergeStrategy::Commit, + Err(ExitError::Reverted) => MergeStrategy::Revert, + Err(_) => MergeStrategy::Discard, + }; + + match trap_data { + SubstackInvoke::Create { address, trap } => { + let retbuf = retval; + let caller = trap.scheme.caller(); + + let result = result.and_then(|_| { + routines::deploy_create_code( + self.config, + address, + retbuf.clone(), + &mut substate, + handler, + SetCodeOrigin::Subcall(caller), + )?; + + Ok(address) + }); + + parent.machine_mut().state.merge(substate, strategy); + handler.pop_substate(strategy); + + trap.feedback(result, retbuf, parent)?; + + Ok(()) + } + SubstackInvoke::Call { trap } => { + let retbuf = retval; + + parent.machine_mut().state.merge(substate, strategy); + handler.pop_substate(strategy); + + trap.feedback(result, retbuf, parent)?; + + Ok(()) + } + } + } +} diff --git a/sgxvm/src/lib.rs b/sgxvm/src/lib.rs index 511eb297..82d4eb0a 100644 --- a/sgxvm/src/lib.rs +++ b/sgxvm/src/lib.rs @@ -41,6 +41,7 @@ mod protobuf_generated; mod querier; mod storage; mod types; +mod invoker; #[no_mangle] /// Checks if there is already sealed master key diff --git a/sgxvm/src/precompiles/bn128.rs b/sgxvm/src/precompiles/bn128.rs deleted file mode 100644 index 7279a68b..00000000 --- a/sgxvm/src/precompiles/bn128.rs +++ /dev/null @@ -1,150 +0,0 @@ -use std::vec::Vec; -use primitive_types::U256; -use substrate_bn as bn; -use crate::precompiles::{ - ExitSucceed, - ExitError, - LinearCostPrecompile, - PrecompileFailure -}; - -fn read_fr(input: &[u8], start_inx: usize) -> Result { - bn::Fr::from_slice(&input[start_inx..(start_inx + 32)]).map_err(|_| ExitError::Other("Invalid field element".into())) -} - -fn read_point(input: &[u8], start_inx: usize) -> Result { - use bn::{Fq, AffineG1, G1, Group}; - - let px = Fq::from_slice(&input[start_inx..(start_inx + 32)]).map_err(|_| ExitError::Other("Invalid point x coordinate".into()))?; - let py = Fq::from_slice(&input[(start_inx + 32)..(start_inx + 64)]).map_err(|_| ExitError::Other("Invalid point y coordinate".into()))?; - Ok( - if px == Fq::zero() && py == Fq::zero() { - G1::zero() - } else { - AffineG1::new(px, py).map_err(|_| ExitError::Other("Invalid curve point".into()))?.into() - } - ) -} - -/// The Bn128Add builtin -pub struct Bn128Add; - -impl LinearCostPrecompile for Bn128Add { - const BASE: u64 = 15; - const WORD: u64 = 3; - - fn raw_execute( - input: &[u8], - _: u64, - ) -> Result<(ExitSucceed, Vec), PrecompileFailure> { - use bn::AffineG1; - - let p1 = read_point(input, 0)?; - let p2 = read_point(input, 64)?; - - let mut buf = [0u8; 64]; - if let Some(sum) = AffineG1::from_jacobian(p1 + p2) { - // point not at infinity - sum.x().to_big_endian(&mut buf[0..32]).map_err(|_| ExitError::Other("Cannot fail since 0..32 is 32-byte length".into()))?; - sum.y().to_big_endian(&mut buf[32..64]).map_err(|_| ExitError::Other("Cannot fail since 32..64 is 32-byte length".into()))?; - } - - Ok((ExitSucceed::Returned, buf.to_vec())) - } -} - -/// The Bn128Mul builtin -pub struct Bn128Mul; - -impl LinearCostPrecompile for Bn128Mul { - const BASE: u64 = 15; - const WORD: u64 = 3; - - fn raw_execute( - input: &[u8], - _: u64, - ) -> Result<(ExitSucceed, Vec), PrecompileFailure> { - use bn::AffineG1; - - let p = read_point(input, 0)?; - let fr = read_fr(input, 64)?; - - let mut buf = [0u8; 64]; - if let Some(sum) = AffineG1::from_jacobian(p * fr) { - // point not at infinity - sum.x().to_big_endian(&mut buf[0..32]).map_err(|_| ExitError::Other("Cannot fail since 0..32 is 32-byte length".into()))?; - sum.y().to_big_endian(&mut buf[32..64]).map_err(|_| ExitError::Other("Cannot fail since 32..64 is 32-byte length".into()))?; - } - - Ok((ExitSucceed::Returned, buf.to_vec())) - } -} - -/// The Bn128Pairing builtin -pub struct Bn128Pairing; - -impl LinearCostPrecompile for Bn128Pairing { - const BASE: u64 = 15; - const WORD: u64 = 3; - - fn raw_execute( - input: &[u8], - _: u64, - ) -> Result<(ExitSucceed, Vec), PrecompileFailure> { - use bn::{AffineG1, AffineG2, Fq, Fq2, pairing_batch, G1, G2, Gt, Group}; - - let ret_val = if input.is_empty() { - U256::one() - } else { - // (a, b_a, b_b - each 64-byte affine coordinates) - let elements = input.len() / 192; - let mut vals = Vec::new(); - for idx in 0..elements { - let a_x = Fq::from_slice(&input[idx*192..idx*192+32]) - .map_err(|_| ExitError::Other("Invalid a argument x coordinate".into()))?; - - let a_y = Fq::from_slice(&input[idx*192+32..idx*192+64]) - .map_err(|_| ExitError::Other("Invalid a argument y coordinate".into()))?; - - let b_a_y = Fq::from_slice(&input[idx*192+64..idx*192+96]) - .map_err(|_| ExitError::Other("Invalid b argument imaginary coeff x coordinate".into()))?; - - let b_a_x = Fq::from_slice(&input[idx*192+96..idx*192+128]) - .map_err(|_| ExitError::Other("Invalid b argument imaginary coeff y coordinate".into()))?; - - let b_b_y = Fq::from_slice(&input[idx*192+128..idx*192+160]) - .map_err(|_| ExitError::Other("Invalid b argument real coeff x coordinate".into()))?; - - let b_b_x = Fq::from_slice(&input[idx*192+160..idx*192+192]) - .map_err(|_| ExitError::Other("Invalid b argument real coeff y coordinate".into()))?; - - let b_a = Fq2::new(b_a_x, b_a_y); - let b_b = Fq2::new(b_b_x, b_b_y); - let b = if b_a.is_zero() && b_b.is_zero() { - G2::zero() - } else { - G2::from(AffineG2::new(b_a, b_b).map_err(|_| ExitError::Other("Invalid b argument - not on curve".into()))?) - }; - let a = if a_x.is_zero() && a_y.is_zero() { - G1::zero() - } else { - G1::from(AffineG1::new(a_x, a_y).map_err(|_| ExitError::Other("Invalid a argument - not on curve".into()))?) - }; - vals.push((a, b)); - }; - - let mul = pairing_batch(&vals); - - if mul == Gt::one() { - U256::one() - } else { - U256::zero() - } - }; - - let mut buf = [0u8; 32]; - ret_val.to_big_endian(&mut buf); - - Ok((ExitSucceed::Returned, buf.to_vec())) - } -} diff --git a/sgxvm/src/precompiles/compliance_bridge.rs b/sgxvm/src/precompiles/compliance_bridge.rs index c42ea00a..25de0fa4 100644 --- a/sgxvm/src/precompiles/compliance_bridge.rs +++ b/sgxvm/src/precompiles/compliance_bridge.rs @@ -1,17 +1,16 @@ extern crate sgx_tstd as std; use ethabi::{encode, Address, ParamType, Token as AbiToken, Token}; -use evm::executor::stack::{PrecompileHandle, PrecompileOutput}; -use evm::{ExitError, ExitRevert}; +use evm::GasMutState; +use evm::interpreter::error::{ExitError, ExitResult, ExitSucceed}; +use evm::interpreter::runtime::RuntimeState; use primitive_types::H160; use std::prelude::v1::*; use std::vec::Vec; -use crate::precompiles::{ - ExitSucceed, LinearCostPrecompileWithQuerier, PrecompileFailure, PrecompileResult, -}; -use crate::protobuf_generated::ffi; +use crate::precompiles::LinearCostPrecompileWithQuerier; use crate::{coder, querier, GoQuerier}; +use crate::protobuf_generated::ffi::{QueryAddVerificationDetailsResponse, QueryGetVerificationDataResponse, QueryHasVerificationResponse}; // Selector of addVerificationDetails function const ADD_VERIFICATION_FN_SELECTOR: &str = "e62364ab"; @@ -23,27 +22,25 @@ const GET_VERIFICATION_DATA_FN_SELECTOR: &str = "cc8995ec"; /// Precompile for interactions with x/compliance module. pub struct ComplianceBridge; -impl LinearCostPrecompileWithQuerier for ComplianceBridge { +impl + GasMutState> LinearCostPrecompileWithQuerier for ComplianceBridge { const BASE: u64 = 60; const WORD: u64 = 150; - fn execute(querier: *mut GoQuerier, handle: &mut impl PrecompileHandle) -> PrecompileResult { - let target_gas = handle.gas_limit(); - let cost = crate::precompiles::ensure_linear_cost( - target_gas, - handle.input().len() as u64, - Self::BASE, - Self::WORD, - )?; - - handle.record_cost(cost)?; - - let context = handle.context(); - let (exit_status, output) = route(querier, context.caller, handle.input())?; - Ok(PrecompileOutput { - exit_status, - output, - }) + fn execute(querier: *mut GoQuerier, input: &[u8], gasometer: &mut G) -> (ExitResult, Vec) { + // For some reason, rust compiler cannot infer type for BASE and WORD consts, + // therefore their values provided directly + let cost = match static_precompiles::linear_cost(input.len() as u64, 60, 150) { + Ok(cost) => cost, + Err(e) => return (e.into(), Vec::new()), + }; + + if let Err(e) = gasometer.record_gas(cost.into()) { + return (e.into(), Vec::new()); + } + + // TODO: Check how to provide caller + let d = gasometer.as_ref(); + route(querier, d.context.caller, input) } } @@ -51,12 +48,9 @@ fn route( querier: *mut GoQuerier, caller: H160, data: &[u8], -) -> Result<(ExitSucceed, Vec), PrecompileFailure> { +) -> (ExitResult, Vec) { if data.len() <= 4 { - return Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String("cannot decode input".into())]), - }); + return (ExitError::Reverted.into(), encode(&[AbiToken::String("cannot decode input".into())])); } let input_signature = hex::encode(data[..4].to_vec()); @@ -71,62 +65,27 @@ fn route( let decoded_params = match decode_input(has_verification_params, &data[4..]) { Ok(params) => params, - Err(_) => { - return Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&vec![AbiToken::String( - "failed to decode input parameters".into(), - )]), - }); - } + Err(_) => return (ExitError::Reverted.into(), encode(&vec![AbiToken::String("failed to decode input parameters".into())])) }; let user_address = match decoded_params[0].clone().into_address() { Some(addr) => addr, - None => { - return Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "invalid user address".into(), - )]), - }); - } + None => return (ExitError::Reverted.into(), encode(&vec![AbiToken::String("invalid user address".into())])) }; let verification_type = match decoded_params[1].clone().into_uint() { Some(vtype) => vtype.as_u32(), - None => { - return Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "invalid verification type".into(), - )]), - }); - } + None => return (ExitError::Reverted.into(), encode(&[AbiToken::String("invalid verification type".into())])) }; let expiration_timestamp = match decoded_params[2].clone().into_uint() { Some(timestamp) => timestamp.as_u32(), - None => { - return Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "invalid expiration timestamp".into(), - )]), - }); - } + None => return (ExitError::Reverted.into(), encode(&[AbiToken::String("invalid expiration timestamp".into())])) }; let allowed_issuers = match decoded_params[3].clone().into_array() { Some(array) => array, - None => { - return Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "invalid allowed issuers array".into(), - )]), - }); - } + None => return (ExitError::Reverted.into(), encode(&[AbiToken::String("invalid allowed issuers array".into())])) }; // Decode allowed issuers @@ -141,12 +100,7 @@ fn route( let allowed_issuers = match allowed_issuers { Ok(issuers) => issuers, Err(_) => { - return Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "one or more invalid issuer addresses".into(), - )]), - }); + return (ExitError::Reverted.into(), encode(&[AbiToken::String("one or more invalid issuer addresses".into())])) } }; @@ -159,29 +113,17 @@ fn route( match querier::make_request(querier, encoded_request) { Some(result) => { - let has_verification = protobuf::parse_from_bytes::< - ffi::QueryHasVerificationResponse, - >(result.as_slice()) - .map_err(|_| PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "cannot decode protobuf response".into(), - )]), - })?; + let has_verification: QueryHasVerificationResponse = match protobuf::parse_from_bytes(&result) { + Ok(response) => response, + Err(_) => return (ExitError::Reverted.into(), encode(&[AbiToken::String("cannot decode protobuf response".into())])) + }; let tokens = vec![AbiToken::Bool(has_verification.hasVerification)]; let encoded_response = encode(&tokens); - Ok((ExitSucceed::Returned, encoded_response.to_vec())) - } - None => { - Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "call to hasVerification function to x/compliance failed".into(), - )]), - }) + (ExitSucceed::Returned.into(), encoded_response.to_vec()) } + None => (ExitError::Reverted.into(), encode(&[AbiToken::String("call to hasVerification function to x/compliance failed".into())])) } } ADD_VERIFICATION_FN_SELECTOR => { @@ -199,122 +141,60 @@ fn route( let decoded_params = match decode_input(verification_params, &data[4..]) { Ok(params) => params, - Err(_) => { - return Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "failed to decode input parameters".into(), - )]), - }); - } + Err(_) => return (ExitError::Reverted.into(), encode(&[AbiToken::String("failed to decode input parameters".into())])) }; let user_address = match decoded_params[0].clone().into_address() { Some(addr) => addr, - None => { - return Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "invalid user address".into(), - )]), - }); - } + None => return (ExitError::Reverted.into(), encode(&[AbiToken::String("invalid user address".into())])) }; let origin_chain = match decoded_params[1].clone().into_string() { Some(chain) => chain, - None => { - return Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "invalid origin chain".into(), - )]), - }); - } + None => return (ExitError::Reverted.into(), encode(&[AbiToken::String("invalid origin chain".into())])) }; let verification_type = match decoded_params[2].clone().into_uint() { Some(vtype) => vtype.as_u32(), - None => { - return Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "invalid verification type".into(), - )]), - }); - } + None => return (ExitError::Reverted.into(), encode(&[AbiToken::String("invalid verification type".into())])) }; let issuance_timestamp = match decoded_params[3].clone().into_uint() { Some(timestamp) => timestamp.as_u32(), - None => { - return Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "invalid issuance timestamp".into(), - )]), - }); - } + None => return (ExitError::Reverted.into(), encode(&[AbiToken::String("invalid issuance timestamp".into())])) }; let expiration_timestamp = match decoded_params[4].clone().into_uint() { Some(timestamp) => timestamp.as_u32(), - None => { - return Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "invalid expiration timestamp".into(), - )]), - }); - } + None => return (ExitError::Reverted.into(), encode(&[AbiToken::String("invalid expiration timestamp".into())])) }; let proof_data = match decoded_params[5].clone().into_bytes() { Some(data) => data, - None => { - return Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "invalid proof data".into(), - )]), - }); - } + None => return (ExitError::Reverted.into(), encode(&[AbiToken::String("invalid proof data".into())])) }; let schema = match decoded_params[6].clone().into_string() { Some(schema) => schema, None => { - return Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "invalid schema".into(), - )]), - }); + return ( + ExitError::Reverted.into(), encode(&[AbiToken::String("invalid schema".into())]), + ); } }; let issuer_verification_id = match decoded_params[7].clone().into_string() { Some(id) => id, - None => { - return Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "invalid issuer verification ID".into(), - )]), - }); - } + None => return (ExitError::Reverted.into(), encode(&[AbiToken::String("invalid issuer verification ID".into())])) }; let version = match decoded_params[8].clone().into_uint() { Some(ver) => ver.as_u32(), - None => { - return Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "invalid version".into(), - )]), - }); - } + None => return ( + ExitError::Reverted.into(), encode(&[AbiToken::String( + "invalid version".into(), + )]) + ) }; let encoded_request = coder::encode_add_verification_details_request( @@ -332,31 +212,19 @@ fn route( match querier::make_request(querier, encoded_request) { Some(result) => { - let added_verification = protobuf::parse_from_bytes::< - ffi::QueryAddVerificationDetailsResponse, - >(result.as_slice()) - .map_err(|_| PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "cannot parse protobuf response".into(), - )]), - })?; + let added_verification: QueryAddVerificationDetailsResponse = match protobuf::parse_from_bytes(result.as_slice()) { + Ok(response) => response, + Err(_) => return (ExitError::Reverted.into(), encode(&[AbiToken::String("cannot parse protobuf response".into())])) + }; let token = vec![AbiToken::Bytes( added_verification.verificationId.into(), )]; let encoded_response = encode(&token); - Ok((ExitSucceed::Returned, encoded_response.to_vec())) - } - None => { - return Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "call to addVerificationDetails to x/compliance failed".into(), - )]), - }); - } + (ExitSucceed::Returned.into(), encoded_response.to_vec()) + }, + None => (ExitError::Reverted.into(), encode(&[AbiToken::String("call to addVerificationDetails to x/compliance failed".into())])) } } GET_VERIFICATION_DATA_FN_SELECTOR => { @@ -364,50 +232,38 @@ fn route( let decoded_params = match decode_input(get_verification_data_params, &data[4..]) { Ok(params) => params, Err(_) => { - return Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( + return ( + ExitError::Reverted.into(), + encode(&[AbiToken::String( "failed to decode input parameters".into(), )]), - }); + ); } }; let user_address = match decoded_params[0].clone().into_address() { Some(addr) => addr, None => { - return Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "invalid user address".into(), - )]), - }); + return ( + ExitError::Reverted.into(), + encode(&[AbiToken::String("invalid user address".into())]), + ); } }; let issuer_address = match decoded_params[1].clone().into_address() { Some(addr) => addr, - None => { - return Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "invalid issuer address".into(), - )]), - }); - } + None => return (ExitError::Reverted.into(), encode(&[AbiToken::String("invalid issuer address".into())])) }; let encoded_request = coder::encode_get_verification_data(user_address, issuer_address); match querier::make_request(querier, encoded_request) { Some(result) => { - let get_verification_data = protobuf::parse_from_bytes::(result.as_slice()) - .map_err(|_| PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "cannot decode protobuf response".into(), - )]), - })?; + let get_verification_data: QueryGetVerificationDataResponse = match protobuf::parse_from_bytes(result.as_slice()) { + Ok(response) => response, + Err(_) => return (ExitError::Reverted.into(), encode(&[AbiToken::String("cannot decode protobuf response".into())])) + }; let data = get_verification_data .data @@ -432,44 +288,27 @@ fn route( .collect::>(); let encoded_response = encode(&[AbiToken::Array(data)]); - Ok((ExitSucceed::Returned, encoded_response.to_vec())) - } - None => { - Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "call to getVerificationData to x/compliance failed".into(), - )]), - }) - } + (ExitSucceed::Returned.into(), encoded_response.to_vec()) + }, + None => (ExitError::Reverted.into(), encode(&[AbiToken::String("call to getVerificationData failed to x/compliance failed".into())])) } - } - _ => Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&vec![AbiToken::String("incorrect request".into())]), - }), + }, + _ => (ExitError::Reverted.into(), encode(&vec![AbiToken::String("incorrect request".into())])) } } fn decode_input( param_types: Vec, input: &[u8], -) -> Result, PrecompileFailure> { +) -> Result, (ExitError, Vec)> { let decoded_params = - ethabi::decode(¶m_types, input).map_err(|err| PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - format!("cannot decode params: {:?}", err).into(), - )]), - })?; + ethabi::decode(¶m_types, input).map_err(|err| ( + ExitError::Reverted.into(), + encode(&[AbiToken::String(format!("cannot decode params: {:?}", err).into())]) + ))?; if decoded_params.len() != param_types.len() { - return Err(PrecompileFailure::Revert { - exit_status: ExitRevert::Reverted, - output: encode(&[AbiToken::String( - "incorrect decoded params len".into(), - )]), - }); + return Err((ExitError::Reverted.into(), encode(&[AbiToken::String("incorrect decoded params len".into())]))); } Ok(decoded_params) diff --git a/sgxvm/src/precompiles/datacopy.rs b/sgxvm/src/precompiles/datacopy.rs deleted file mode 100644 index 5ef179f5..00000000 --- a/sgxvm/src/precompiles/datacopy.rs +++ /dev/null @@ -1,18 +0,0 @@ -use std::vec::Vec; -use crate::precompiles::{ - ExitSucceed, - LinearCostPrecompile, - PrecompileFailure -}; - -/// The DataCopy precompile. -pub struct DataCopy; - -impl LinearCostPrecompile for DataCopy { - const BASE: u64 = 15; - const WORD: u64 = 3; - - fn raw_execute(input: &[u8], _: u64) -> Result<(ExitSucceed, Vec), PrecompileFailure> { - Ok((ExitSucceed::Returned, input.to_vec())) - } -} \ No newline at end of file diff --git a/sgxvm/src/precompiles/mod.rs b/sgxvm/src/precompiles/mod.rs index 683a71be..12f21279 100644 --- a/sgxvm/src/precompiles/mod.rs +++ b/sgxvm/src/precompiles/mod.rs @@ -1,93 +1,25 @@ extern crate sgx_tstd as std; -use evm::{ - executor::stack::{PrecompileFailure, PrecompileHandle, PrecompileOutput, PrecompileSet, IsPrecompileResult}, - ExitError, - ExitSucceed, -}; +use evm::GasMutState; +use evm::interpreter::error::{ExitError, ExitException, ExitResult}; +use evm::interpreter::runtime::RuntimeState; +use evm::standard::PrecompileSet; use std::vec::Vec; -use primitive_types::H160 ; -use crate::GoQuerier; - -mod blake2f; -mod bn128; -mod curve25519; -mod modexp; -mod sha3fips; -mod ec_recover; -mod sha256; -mod ripemd160; -mod datacopy; -mod compliance_bridge; -mod secp256r1; +use primitive_types::H160; -pub type PrecompileResult = Result; +use static_precompiles::{secp256r1, modexp, ripemd160, ec_recover, sha3fips, sha256, datacopy, bn128, blake2f, curve25519}; +use static_precompiles::Precompile; -/// One single precompile used by EVM engine. -pub trait Precompile { - /// Try to execute the precompile with given `handle` which provides all call data - /// and allow to register costs and logs. - fn execute(handle: &mut impl PrecompileHandle) -> PrecompileResult; -} - -pub trait LinearCostPrecompile { - const BASE: u64; - const WORD: u64; +use crate::GoQuerier; - fn raw_execute( - input: &[u8], - cost: u64, - ) -> Result<(ExitSucceed, Vec), PrecompileFailure>; -} +mod compliance_bridge; /// Precompile with possibility to interact with Cosmos side using GoQuerier -pub trait LinearCostPrecompileWithQuerier { +pub trait LinearCostPrecompileWithQuerier { const BASE: u64; const WORD: u64; - fn execute(querier: *mut GoQuerier, handle: &mut impl PrecompileHandle) -> PrecompileResult; -} - -impl Precompile for T { - fn execute(handle: &mut impl PrecompileHandle) -> PrecompileResult { - let target_gas = handle.gas_limit(); - let cost = ensure_linear_cost(target_gas, handle.input().len() as u64, T::BASE, T::WORD)?; - - handle.record_cost(cost)?; - let (exit_status, output) = T::raw_execute(handle.input(), cost)?; - Ok(PrecompileOutput { - exit_status, - output, - }) - } -} - -/// Linear gas cost -pub fn ensure_linear_cost( - target_gas: Option, - len: u64, - base: u64, - word: u64, -) -> Result { - let cost = base - .checked_add(word.checked_mul(len.saturating_add(31) / 32).ok_or( - PrecompileFailure::Error { - exit_status: ExitError::OutOfGas, - }, - )?) - .ok_or(PrecompileFailure::Error { - exit_status: ExitError::OutOfGas, - })?; - - if let Some(target_gas) = target_gas { - if cost > target_gas { - return Err(PrecompileFailure::Error { - exit_status: ExitError::OutOfGas, - }); - } - } - - Ok(cost) + fn execute(querier: *mut GoQuerier, input: &[u8], gasometer: &mut G) -> (ExitResult, Vec); } pub struct EVMPrecompiles { @@ -98,61 +30,33 @@ impl EVMPrecompiles { pub fn new(querier: *mut GoQuerier) -> Self { Self{ querier } } - pub fn used_addresses() -> [H160; 17] { - [ - hash(1), - hash(2), - hash(3), - hash(4), - hash(5), - hash(6), - hash(7), - hash(8), - hash(9), - hash(0x100), - hash(1024), - hash(1025), - hash(1027), - hash(1028), - hash(1029), - hash(1030), - hash(1031), - ] - } } -impl PrecompileSet for EVMPrecompiles { - fn execute(&self, handle: &mut impl PrecompileHandle) -> Option { - match handle.code_address() { +impl + GasMutState, H> PrecompileSet for EVMPrecompiles { + fn execute(&self, code_address: H160, input: &[u8], gasometer: &mut G, _handler: &mut H) -> Option<(ExitResult, Vec)> { + match code_address { // Ethereum precompiles: - a if a == hash(1) => Some(ec_recover::ECRecover::execute(handle)), - a if a == hash(2) => Some(sha256::Sha256::execute(handle)), - a if a == hash(3) => Some(ripemd160::Ripemd160::execute(handle)), - a if a == hash(4) => Some(datacopy::DataCopy::execute(handle)), - a if a == hash(5) => Some(modexp::Modexp::execute(handle)), - a if a == hash(6) => Some(bn128::Bn128Add::execute(handle)), - a if a == hash(7) => Some(bn128::Bn128Mul::execute(handle)), - a if a == hash(8) => Some(bn128::Bn128Pairing::execute(handle)), - a if a == hash(9) => Some(blake2f::Blake2F::execute(handle)), + a if a == hash(1) => Some(ec_recover::ECRecover::execute(input, gasometer)), + a if a == hash(2) => Some(sha256::Sha256::execute(input, gasometer)), + a if a == hash(3) => Some(ripemd160::Ripemd160::execute(input, gasometer)), + a if a == hash(4) => Some(datacopy::DataCopy::execute(input, gasometer)), + a if a == hash(5) => Some(modexp::Modexp::execute(input, gasometer)), + a if a == hash(6) => Some(bn128::Bn128Add::execute(input, gasometer)), + a if a == hash(7) => Some(bn128::Bn128Mul::execute(input, gasometer)), + a if a == hash(8) => Some(bn128::Bn128Pairing::execute(input, gasometer)), + a if a == hash(9) => Some(blake2f::Blake2F::execute(input, gasometer)), // RIP-7212 - a if a == hash(0x100) => Some(secp256r1::P256Verify::execute(handle)), + a if a == hash(0x100) => Some(secp256r1::P256Verify::execute(input, gasometer)), // Non-Frontier specific nor Ethereum precompiles : - a if a == hash(1024) => Some(sha3fips::Sha3FIPS256::execute(handle)), - a if a == hash(1025) => Some(sha3fips::Sha3FIPS512::execute(handle)), - a if a == hash(1028) => Some(compliance_bridge::ComplianceBridge::execute(self.querier, handle)), - a if a == hash(1029) => Some(curve25519::Curve25519Add::execute(handle)), - a if a == hash(1030) => Some(curve25519::Curve25519ScalarMul::execute(handle)), - a if a == hash(1031) => Some(curve25519::Ed25519Verify::execute(handle)), + a if a == hash(1024) => Some(sha3fips::Sha3FIPS256::execute(input, gasometer)), + a if a == hash(1025) => Some(sha3fips::Sha3FIPS512::execute(input, gasometer)), + a if a == hash(1028) => Some(compliance_bridge::ComplianceBridge::execute(self.querier, input, gasometer)), + a if a == hash(1029) => Some(curve25519::Curve25519Add::execute(input, gasometer)), + a if a == hash(1030) => Some(curve25519::Curve25519ScalarMul::execute(input, gasometer)), + a if a == hash(1031) => Some(curve25519::Ed25519Verify::execute(input, gasometer)), _ => None, } } - - fn is_precompile(&self, address: H160, _gas: u64) -> IsPrecompileResult { - IsPrecompileResult::Answer { - is_precompile: Self::used_addresses().contains(&address), - extra_cost: 0, - } - } } #[inline] diff --git a/sgxvm/src/protobuf_generated/ffi.rs b/sgxvm/src/protobuf_generated/ffi.rs index 5900f16b..93348a1a 100644 --- a/sgxvm/src/protobuf_generated/ffi.rs +++ b/sgxvm/src/protobuf_generated/ffi.rs @@ -2350,24 +2350,23 @@ impl ::protobuf::reflect::ProtobufValue for QueryGetAccountResponse { } #[derive(PartialEq,Clone,Default)] -pub struct QueryInsertAccount { +pub struct QueryInsertAccountBalance { // message fields pub address: ::std::vec::Vec, pub balance: ::std::vec::Vec, - pub nonce: u64, // special fields pub unknown_fields: ::protobuf::UnknownFields, pub cached_size: ::protobuf::CachedSize, } -impl<'a> ::std::default::Default for &'a QueryInsertAccount { - fn default() -> &'a QueryInsertAccount { - ::default_instance() +impl<'a> ::std::default::Default for &'a QueryInsertAccountBalance { + fn default() -> &'a QueryInsertAccountBalance { + ::default_instance() } } -impl QueryInsertAccount { - pub fn new() -> QueryInsertAccount { +impl QueryInsertAccountBalance { + pub fn new() -> QueryInsertAccountBalance { ::std::default::Default::default() } @@ -2422,24 +2421,9 @@ impl QueryInsertAccount { pub fn take_balance(&mut self) -> ::std::vec::Vec { ::std::mem::replace(&mut self.balance, ::std::vec::Vec::new()) } - - // uint64 nonce = 3; - - - pub fn get_nonce(&self) -> u64 { - self.nonce - } - pub fn clear_nonce(&mut self) { - self.nonce = 0; - } - - // Param is passed by value, moved - pub fn set_nonce(&mut self, v: u64) { - self.nonce = v; - } } -impl ::protobuf::Message for QueryInsertAccount { +impl ::protobuf::Message for QueryInsertAccountBalance { fn is_initialized(&self) -> bool { true } @@ -2454,13 +2438,6 @@ impl ::protobuf::Message for QueryInsertAccount { 2 => { ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.balance)?; }, - 3 => { - if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); - } - let tmp = is.read_uint64()?; - self.nonce = tmp; - }, _ => { ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; }, @@ -2479,9 +2456,6 @@ impl ::protobuf::Message for QueryInsertAccount { if !self.balance.is_empty() { my_size += ::protobuf::rt::bytes_size(2, &self.balance); } - if self.nonce != 0 { - my_size += ::protobuf::rt::value_size(3, self.nonce, ::protobuf::wire_format::WireTypeVarint); - } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size @@ -2494,9 +2468,6 @@ impl ::protobuf::Message for QueryInsertAccount { if !self.balance.is_empty() { os.write_bytes(2, &self.balance)?; } - if self.nonce != 0 { - os.write_uint64(3, self.nonce)?; - } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -2527,8 +2498,8 @@ impl ::protobuf::Message for QueryInsertAccount { Self::descriptor_static() } - fn new() -> QueryInsertAccount { - QueryInsertAccount::new() + fn new() -> QueryInsertAccountBalance { + QueryInsertAccountBalance::new() } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { @@ -2541,21 +2512,16 @@ impl ::protobuf::Message for QueryInsertAccount { let mut fields = ::std::vec::Vec::new(); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( "address", - |m: &QueryInsertAccount| { &m.address }, - |m: &mut QueryInsertAccount| { &mut m.address }, + |m: &QueryInsertAccountBalance| { &m.address }, + |m: &mut QueryInsertAccountBalance| { &mut m.address }, )); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( "balance", - |m: &QueryInsertAccount| { &m.balance }, - |m: &mut QueryInsertAccount| { &mut m.balance }, - )); - fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeUint64>( - "nonce", - |m: &QueryInsertAccount| { &m.nonce }, - |m: &mut QueryInsertAccount| { &mut m.nonce }, + |m: &QueryInsertAccountBalance| { &m.balance }, + |m: &mut QueryInsertAccountBalance| { &mut m.balance }, )); - ::protobuf::reflect::MessageDescriptor::new::( - "QueryInsertAccount", + ::protobuf::reflect::MessageDescriptor::new::( + "QueryInsertAccountBalance", fields, file_descriptor_proto() ) @@ -2563,58 +2529,57 @@ impl ::protobuf::Message for QueryInsertAccount { } } - fn default_instance() -> &'static QueryInsertAccount { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { + fn default_instance() -> &'static QueryInsertAccountBalance { + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const QueryInsertAccount, + ptr: 0 as *const QueryInsertAccountBalance, }; unsafe { - instance.get(QueryInsertAccount::new) + instance.get(QueryInsertAccountBalance::new) } } } -impl ::protobuf::Clear for QueryInsertAccount { +impl ::protobuf::Clear for QueryInsertAccountBalance { fn clear(&mut self) { self.address.clear(); self.balance.clear(); - self.nonce = 0; self.unknown_fields.clear(); } } -impl ::std::fmt::Debug for QueryInsertAccount { +impl ::std::fmt::Debug for QueryInsertAccountBalance { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for QueryInsertAccount { +impl ::protobuf::reflect::ProtobufValue for QueryInsertAccountBalance { fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { ::protobuf::reflect::ProtobufValueRef::Message(self) } } #[derive(PartialEq,Clone,Default)] -pub struct QueryInsertAccountResponse { +pub struct QueryInsertAccountBalanceResponse { // special fields pub unknown_fields: ::protobuf::UnknownFields, pub cached_size: ::protobuf::CachedSize, } -impl<'a> ::std::default::Default for &'a QueryInsertAccountResponse { - fn default() -> &'a QueryInsertAccountResponse { - ::default_instance() +impl<'a> ::std::default::Default for &'a QueryInsertAccountBalanceResponse { + fn default() -> &'a QueryInsertAccountBalanceResponse { + ::default_instance() } } -impl QueryInsertAccountResponse { - pub fn new() -> QueryInsertAccountResponse { +impl QueryInsertAccountBalanceResponse { + pub fn new() -> QueryInsertAccountBalanceResponse { ::std::default::Default::default() } } -impl ::protobuf::Message for QueryInsertAccountResponse { +impl ::protobuf::Message for QueryInsertAccountBalanceResponse { fn is_initialized(&self) -> bool { true } @@ -2671,8 +2636,8 @@ impl ::protobuf::Message for QueryInsertAccountResponse { Self::descriptor_static() } - fn new() -> QueryInsertAccountResponse { - QueryInsertAccountResponse::new() + fn new() -> QueryInsertAccountBalanceResponse { + QueryInsertAccountBalanceResponse::new() } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { @@ -2683,8 +2648,8 @@ impl ::protobuf::Message for QueryInsertAccountResponse { unsafe { descriptor.get(|| { let fields = ::std::vec::Vec::new(); - ::protobuf::reflect::MessageDescriptor::new::( - "QueryInsertAccountResponse", + ::protobuf::reflect::MessageDescriptor::new::( + "QueryInsertAccountBalanceResponse", fields, file_descriptor_proto() ) @@ -2692,83 +2657,99 @@ impl ::protobuf::Message for QueryInsertAccountResponse { } } - fn default_instance() -> &'static QueryInsertAccountResponse { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { + fn default_instance() -> &'static QueryInsertAccountBalanceResponse { + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const QueryInsertAccountResponse, + ptr: 0 as *const QueryInsertAccountBalanceResponse, }; unsafe { - instance.get(QueryInsertAccountResponse::new) + instance.get(QueryInsertAccountBalanceResponse::new) } } } -impl ::protobuf::Clear for QueryInsertAccountResponse { +impl ::protobuf::Clear for QueryInsertAccountBalanceResponse { fn clear(&mut self) { self.unknown_fields.clear(); } } -impl ::std::fmt::Debug for QueryInsertAccountResponse { +impl ::std::fmt::Debug for QueryInsertAccountBalanceResponse { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for QueryInsertAccountResponse { +impl ::protobuf::reflect::ProtobufValue for QueryInsertAccountBalanceResponse { fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { ::protobuf::reflect::ProtobufValueRef::Message(self) } } #[derive(PartialEq,Clone,Default)] -pub struct QueryContainsKey { +pub struct QueryInsertAccountNonce { // message fields - pub key: ::std::vec::Vec, + pub address: ::std::vec::Vec, + pub nonce: u64, // special fields pub unknown_fields: ::protobuf::UnknownFields, pub cached_size: ::protobuf::CachedSize, } -impl<'a> ::std::default::Default for &'a QueryContainsKey { - fn default() -> &'a QueryContainsKey { - ::default_instance() +impl<'a> ::std::default::Default for &'a QueryInsertAccountNonce { + fn default() -> &'a QueryInsertAccountNonce { + ::default_instance() } } -impl QueryContainsKey { - pub fn new() -> QueryContainsKey { +impl QueryInsertAccountNonce { + pub fn new() -> QueryInsertAccountNonce { ::std::default::Default::default() } - // bytes key = 1; + // bytes address = 1; - pub fn get_key(&self) -> &[u8] { - &self.key + pub fn get_address(&self) -> &[u8] { + &self.address } - pub fn clear_key(&mut self) { - self.key.clear(); + pub fn clear_address(&mut self) { + self.address.clear(); } // Param is passed by value, moved - pub fn set_key(&mut self, v: ::std::vec::Vec) { - self.key = v; + pub fn set_address(&mut self, v: ::std::vec::Vec) { + self.address = v; } // Mutable pointer to the field. // If field is not initialized, it is initialized with default value first. - pub fn mut_key(&mut self) -> &mut ::std::vec::Vec { - &mut self.key + pub fn mut_address(&mut self) -> &mut ::std::vec::Vec { + &mut self.address } // Take field - pub fn take_key(&mut self) -> ::std::vec::Vec { - ::std::mem::replace(&mut self.key, ::std::vec::Vec::new()) + pub fn take_address(&mut self) -> ::std::vec::Vec { + ::std::mem::replace(&mut self.address, ::std::vec::Vec::new()) + } + + // uint64 nonce = 2; + + + pub fn get_nonce(&self) -> u64 { + self.nonce + } + pub fn clear_nonce(&mut self) { + self.nonce = 0; + } + + // Param is passed by value, moved + pub fn set_nonce(&mut self, v: u64) { + self.nonce = v; } } -impl ::protobuf::Message for QueryContainsKey { +impl ::protobuf::Message for QueryInsertAccountNonce { fn is_initialized(&self) -> bool { true } @@ -2778,7 +2759,14 @@ impl ::protobuf::Message for QueryContainsKey { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { - ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.key)?; + ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.address)?; + }, + 2 => { + if wire_type != ::protobuf::wire_format::WireTypeVarint { + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + } + let tmp = is.read_uint64()?; + self.nonce = tmp; }, _ => { ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; @@ -2792,8 +2780,11 @@ impl ::protobuf::Message for QueryContainsKey { #[allow(unused_variables)] fn compute_size(&self) -> u32 { let mut my_size = 0; - if !self.key.is_empty() { - my_size += ::protobuf::rt::bytes_size(1, &self.key); + if !self.address.is_empty() { + my_size += ::protobuf::rt::bytes_size(1, &self.address); + } + if self.nonce != 0 { + my_size += ::protobuf::rt::value_size(2, self.nonce, ::protobuf::wire_format::WireTypeVarint); } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); @@ -2801,8 +2792,11 @@ impl ::protobuf::Message for QueryContainsKey { } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { - if !self.key.is_empty() { - os.write_bytes(1, &self.key)?; + if !self.address.is_empty() { + os.write_bytes(1, &self.address)?; + } + if self.nonce != 0 { + os.write_uint64(2, self.nonce)?; } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) @@ -2834,8 +2828,8 @@ impl ::protobuf::Message for QueryContainsKey { Self::descriptor_static() } - fn new() -> QueryContainsKey { - QueryContainsKey::new() + fn new() -> QueryInsertAccountNonce { + QueryInsertAccountNonce::new() } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { @@ -2847,12 +2841,17 @@ impl ::protobuf::Message for QueryContainsKey { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "key", - |m: &QueryContainsKey| { &m.key }, - |m: &mut QueryContainsKey| { &mut m.key }, + "address", + |m: &QueryInsertAccountNonce| { &m.address }, + |m: &mut QueryInsertAccountNonce| { &mut m.address }, )); - ::protobuf::reflect::MessageDescriptor::new::( - "QueryContainsKey", + fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeUint64>( + "nonce", + |m: &QueryInsertAccountNonce| { &m.nonce }, + |m: &mut QueryInsertAccountNonce| { &mut m.nonce }, + )); + ::protobuf::reflect::MessageDescriptor::new::( + "QueryInsertAccountNonce", fields, file_descriptor_proto() ) @@ -2860,73 +2859,57 @@ impl ::protobuf::Message for QueryContainsKey { } } - fn default_instance() -> &'static QueryContainsKey { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { + fn default_instance() -> &'static QueryInsertAccountNonce { + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const QueryContainsKey, + ptr: 0 as *const QueryInsertAccountNonce, }; unsafe { - instance.get(QueryContainsKey::new) + instance.get(QueryInsertAccountNonce::new) } } } -impl ::protobuf::Clear for QueryContainsKey { +impl ::protobuf::Clear for QueryInsertAccountNonce { fn clear(&mut self) { - self.key.clear(); + self.address.clear(); + self.nonce = 0; self.unknown_fields.clear(); } } -impl ::std::fmt::Debug for QueryContainsKey { +impl ::std::fmt::Debug for QueryInsertAccountNonce { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for QueryContainsKey { +impl ::protobuf::reflect::ProtobufValue for QueryInsertAccountNonce { fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { ::protobuf::reflect::ProtobufValueRef::Message(self) } } #[derive(PartialEq,Clone,Default)] -pub struct QueryContainsKeyResponse { - // message fields - pub contains: bool, +pub struct QueryInsertAccountNonceResponse { // special fields pub unknown_fields: ::protobuf::UnknownFields, pub cached_size: ::protobuf::CachedSize, } -impl<'a> ::std::default::Default for &'a QueryContainsKeyResponse { - fn default() -> &'a QueryContainsKeyResponse { - ::default_instance() +impl<'a> ::std::default::Default for &'a QueryInsertAccountNonceResponse { + fn default() -> &'a QueryInsertAccountNonceResponse { + ::default_instance() } } -impl QueryContainsKeyResponse { - pub fn new() -> QueryContainsKeyResponse { +impl QueryInsertAccountNonceResponse { + pub fn new() -> QueryInsertAccountNonceResponse { ::std::default::Default::default() } - - // bool contains = 1; - - - pub fn get_contains(&self) -> bool { - self.contains - } - pub fn clear_contains(&mut self) { - self.contains = false; - } - - // Param is passed by value, moved - pub fn set_contains(&mut self, v: bool) { - self.contains = v; - } } -impl ::protobuf::Message for QueryContainsKeyResponse { +impl ::protobuf::Message for QueryInsertAccountNonceResponse { fn is_initialized(&self) -> bool { true } @@ -2935,13 +2918,6 @@ impl ::protobuf::Message for QueryContainsKeyResponse { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { - 1 => { - if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); - } - let tmp = is.read_bool()?; - self.contains = tmp; - }, _ => { ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; }, @@ -2954,18 +2930,12 @@ impl ::protobuf::Message for QueryContainsKeyResponse { #[allow(unused_variables)] fn compute_size(&self) -> u32 { let mut my_size = 0; - if self.contains != false { - my_size += 2; - } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { - if self.contains != false { - os.write_bool(1, self.contains)?; - } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -2996,8 +2966,8 @@ impl ::protobuf::Message for QueryContainsKeyResponse { Self::descriptor_static() } - fn new() -> QueryContainsKeyResponse { - QueryContainsKeyResponse::new() + fn new() -> QueryInsertAccountNonceResponse { + QueryInsertAccountNonceResponse::new() } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { @@ -3007,14 +2977,9 @@ impl ::protobuf::Message for QueryContainsKeyResponse { }; unsafe { descriptor.get(|| { - let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBool>( - "contains", - |m: &QueryContainsKeyResponse| { &m.contains }, - |m: &mut QueryContainsKeyResponse| { &mut m.contains }, - )); - ::protobuf::reflect::MessageDescriptor::new::( - "QueryContainsKeyResponse", + let fields = ::std::vec::Vec::new(); + ::protobuf::reflect::MessageDescriptor::new::( + "QueryInsertAccountNonceResponse", fields, file_descriptor_proto() ) @@ -3022,111 +2987,1132 @@ impl ::protobuf::Message for QueryContainsKeyResponse { } } - fn default_instance() -> &'static QueryContainsKeyResponse { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { + fn default_instance() -> &'static QueryInsertAccountNonceResponse { + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const QueryContainsKeyResponse, + ptr: 0 as *const QueryInsertAccountNonceResponse, }; unsafe { - instance.get(QueryContainsKeyResponse::new) + instance.get(QueryInsertAccountNonceResponse::new) } } } -impl ::protobuf::Clear for QueryContainsKeyResponse { +impl ::protobuf::Clear for QueryInsertAccountNonceResponse { fn clear(&mut self) { - self.contains = false; self.unknown_fields.clear(); } } -impl ::std::fmt::Debug for QueryContainsKeyResponse { +impl ::std::fmt::Debug for QueryInsertAccountNonceResponse { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for QueryContainsKeyResponse { +impl ::protobuf::reflect::ProtobufValue for QueryInsertAccountNonceResponse { fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { ::protobuf::reflect::ProtobufValueRef::Message(self) } } #[derive(PartialEq,Clone,Default)] -pub struct QueryGetAccountStorageCell { +pub struct QueryContainsKey { // message fields - pub address: ::std::vec::Vec, - pub index: ::std::vec::Vec, + pub key: ::std::vec::Vec, // special fields pub unknown_fields: ::protobuf::UnknownFields, pub cached_size: ::protobuf::CachedSize, } -impl<'a> ::std::default::Default for &'a QueryGetAccountStorageCell { - fn default() -> &'a QueryGetAccountStorageCell { - ::default_instance() +impl<'a> ::std::default::Default for &'a QueryContainsKey { + fn default() -> &'a QueryContainsKey { + ::default_instance() } } -impl QueryGetAccountStorageCell { - pub fn new() -> QueryGetAccountStorageCell { +impl QueryContainsKey { + pub fn new() -> QueryContainsKey { ::std::default::Default::default() } - // bytes address = 1; + // bytes key = 1; - pub fn get_address(&self) -> &[u8] { - &self.address + pub fn get_key(&self) -> &[u8] { + &self.key } - pub fn clear_address(&mut self) { - self.address.clear(); + pub fn clear_key(&mut self) { + self.key.clear(); } // Param is passed by value, moved - pub fn set_address(&mut self, v: ::std::vec::Vec) { - self.address = v; + pub fn set_key(&mut self, v: ::std::vec::Vec) { + self.key = v; } // Mutable pointer to the field. // If field is not initialized, it is initialized with default value first. - pub fn mut_address(&mut self) -> &mut ::std::vec::Vec { - &mut self.address + pub fn mut_key(&mut self) -> &mut ::std::vec::Vec { + &mut self.key } // Take field - pub fn take_address(&mut self) -> ::std::vec::Vec { - ::std::mem::replace(&mut self.address, ::std::vec::Vec::new()) + pub fn take_key(&mut self) -> ::std::vec::Vec { + ::std::mem::replace(&mut self.key, ::std::vec::Vec::new()) } +} - // bytes index = 2; +impl ::protobuf::Message for QueryContainsKey { + fn is_initialized(&self) -> bool { + true + } + + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + while !is.eof()? { + let (field_number, wire_type) = is.read_tag_unpack()?; + match field_number { + 1 => { + ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.key)?; + }, + _ => { + ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; + }, + }; + } + ::std::result::Result::Ok(()) + } + // Compute sizes of nested messages + #[allow(unused_variables)] + fn compute_size(&self) -> u32 { + let mut my_size = 0; + if !self.key.is_empty() { + my_size += ::protobuf::rt::bytes_size(1, &self.key); + } + my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); + self.cached_size.set(my_size); + my_size + } - pub fn get_index(&self) -> &[u8] { - &self.index + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + if !self.key.is_empty() { + os.write_bytes(1, &self.key)?; + } + os.write_unknown_fields(self.get_unknown_fields())?; + ::std::result::Result::Ok(()) } - pub fn clear_index(&mut self) { - self.index.clear(); + + fn get_cached_size(&self) -> u32 { + self.cached_size.get() + } + + fn get_unknown_fields(&self) -> &::protobuf::UnknownFields { + &self.unknown_fields + } + + fn mut_unknown_fields(&mut self) -> &mut ::protobuf::UnknownFields { + &mut self.unknown_fields + } + + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) + } + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) + } + fn into_any(self: Box) -> ::std::boxed::Box { + self + } + + fn descriptor(&self) -> &'static ::protobuf::reflect::MessageDescriptor { + Self::descriptor_static() + } + + fn new() -> QueryContainsKey { + QueryContainsKey::new() + } + + fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { + lock: ::protobuf::lazy::ONCE_INIT, + ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, + }; + unsafe { + descriptor.get(|| { + let mut fields = ::std::vec::Vec::new(); + fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( + "key", + |m: &QueryContainsKey| { &m.key }, + |m: &mut QueryContainsKey| { &mut m.key }, + )); + ::protobuf::reflect::MessageDescriptor::new::( + "QueryContainsKey", + fields, + file_descriptor_proto() + ) + }) + } + } + + fn default_instance() -> &'static QueryContainsKey { + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { + lock: ::protobuf::lazy::ONCE_INIT, + ptr: 0 as *const QueryContainsKey, + }; + unsafe { + instance.get(QueryContainsKey::new) + } + } +} + +impl ::protobuf::Clear for QueryContainsKey { + fn clear(&mut self) { + self.key.clear(); + self.unknown_fields.clear(); + } +} + +impl ::std::fmt::Debug for QueryContainsKey { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { + ::protobuf::text_format::fmt(self, f) + } +} + +impl ::protobuf::reflect::ProtobufValue for QueryContainsKey { + fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { + ::protobuf::reflect::ProtobufValueRef::Message(self) + } +} + +#[derive(PartialEq,Clone,Default)] +pub struct QueryContainsKeyResponse { + // message fields + pub contains: bool, + // special fields + pub unknown_fields: ::protobuf::UnknownFields, + pub cached_size: ::protobuf::CachedSize, +} + +impl<'a> ::std::default::Default for &'a QueryContainsKeyResponse { + fn default() -> &'a QueryContainsKeyResponse { + ::default_instance() + } +} + +impl QueryContainsKeyResponse { + pub fn new() -> QueryContainsKeyResponse { + ::std::default::Default::default() + } + + // bool contains = 1; + + + pub fn get_contains(&self) -> bool { + self.contains + } + pub fn clear_contains(&mut self) { + self.contains = false; + } + + // Param is passed by value, moved + pub fn set_contains(&mut self, v: bool) { + self.contains = v; + } +} + +impl ::protobuf::Message for QueryContainsKeyResponse { + fn is_initialized(&self) -> bool { + true + } + + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + while !is.eof()? { + let (field_number, wire_type) = is.read_tag_unpack()?; + match field_number { + 1 => { + if wire_type != ::protobuf::wire_format::WireTypeVarint { + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + } + let tmp = is.read_bool()?; + self.contains = tmp; + }, + _ => { + ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; + }, + }; + } + ::std::result::Result::Ok(()) + } + + // Compute sizes of nested messages + #[allow(unused_variables)] + fn compute_size(&self) -> u32 { + let mut my_size = 0; + if self.contains != false { + my_size += 2; + } + my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); + self.cached_size.set(my_size); + my_size + } + + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + if self.contains != false { + os.write_bool(1, self.contains)?; + } + os.write_unknown_fields(self.get_unknown_fields())?; + ::std::result::Result::Ok(()) + } + + fn get_cached_size(&self) -> u32 { + self.cached_size.get() + } + + fn get_unknown_fields(&self) -> &::protobuf::UnknownFields { + &self.unknown_fields + } + + fn mut_unknown_fields(&mut self) -> &mut ::protobuf::UnknownFields { + &mut self.unknown_fields + } + + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) + } + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) + } + fn into_any(self: Box) -> ::std::boxed::Box { + self + } + + fn descriptor(&self) -> &'static ::protobuf::reflect::MessageDescriptor { + Self::descriptor_static() + } + + fn new() -> QueryContainsKeyResponse { + QueryContainsKeyResponse::new() + } + + fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { + lock: ::protobuf::lazy::ONCE_INIT, + ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, + }; + unsafe { + descriptor.get(|| { + let mut fields = ::std::vec::Vec::new(); + fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + "contains", + |m: &QueryContainsKeyResponse| { &m.contains }, + |m: &mut QueryContainsKeyResponse| { &mut m.contains }, + )); + ::protobuf::reflect::MessageDescriptor::new::( + "QueryContainsKeyResponse", + fields, + file_descriptor_proto() + ) + }) + } + } + + fn default_instance() -> &'static QueryContainsKeyResponse { + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { + lock: ::protobuf::lazy::ONCE_INIT, + ptr: 0 as *const QueryContainsKeyResponse, + }; + unsafe { + instance.get(QueryContainsKeyResponse::new) + } + } +} + +impl ::protobuf::Clear for QueryContainsKeyResponse { + fn clear(&mut self) { + self.contains = false; + self.unknown_fields.clear(); + } +} + +impl ::std::fmt::Debug for QueryContainsKeyResponse { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { + ::protobuf::text_format::fmt(self, f) + } +} + +impl ::protobuf::reflect::ProtobufValue for QueryContainsKeyResponse { + fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { + ::protobuf::reflect::ProtobufValueRef::Message(self) + } +} + +#[derive(PartialEq,Clone,Default)] +pub struct QueryGetAccountStorageCell { + // message fields + pub address: ::std::vec::Vec, + pub index: ::std::vec::Vec, + // special fields + pub unknown_fields: ::protobuf::UnknownFields, + pub cached_size: ::protobuf::CachedSize, +} + +impl<'a> ::std::default::Default for &'a QueryGetAccountStorageCell { + fn default() -> &'a QueryGetAccountStorageCell { + ::default_instance() + } +} + +impl QueryGetAccountStorageCell { + pub fn new() -> QueryGetAccountStorageCell { + ::std::default::Default::default() + } + + // bytes address = 1; + + + pub fn get_address(&self) -> &[u8] { + &self.address + } + pub fn clear_address(&mut self) { + self.address.clear(); + } + + // Param is passed by value, moved + pub fn set_address(&mut self, v: ::std::vec::Vec) { + self.address = v; + } + + // Mutable pointer to the field. + // If field is not initialized, it is initialized with default value first. + pub fn mut_address(&mut self) -> &mut ::std::vec::Vec { + &mut self.address + } + + // Take field + pub fn take_address(&mut self) -> ::std::vec::Vec { + ::std::mem::replace(&mut self.address, ::std::vec::Vec::new()) + } + + // bytes index = 2; + + + pub fn get_index(&self) -> &[u8] { + &self.index + } + pub fn clear_index(&mut self) { + self.index.clear(); + } + + // Param is passed by value, moved + pub fn set_index(&mut self, v: ::std::vec::Vec) { + self.index = v; + } + + // Mutable pointer to the field. + // If field is not initialized, it is initialized with default value first. + pub fn mut_index(&mut self) -> &mut ::std::vec::Vec { + &mut self.index + } + + // Take field + pub fn take_index(&mut self) -> ::std::vec::Vec { + ::std::mem::replace(&mut self.index, ::std::vec::Vec::new()) + } +} + +impl ::protobuf::Message for QueryGetAccountStorageCell { + fn is_initialized(&self) -> bool { + true + } + + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + while !is.eof()? { + let (field_number, wire_type) = is.read_tag_unpack()?; + match field_number { + 1 => { + ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.address)?; + }, + 2 => { + ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.index)?; + }, + _ => { + ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; + }, + }; + } + ::std::result::Result::Ok(()) + } + + // Compute sizes of nested messages + #[allow(unused_variables)] + fn compute_size(&self) -> u32 { + let mut my_size = 0; + if !self.address.is_empty() { + my_size += ::protobuf::rt::bytes_size(1, &self.address); + } + if !self.index.is_empty() { + my_size += ::protobuf::rt::bytes_size(2, &self.index); + } + my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); + self.cached_size.set(my_size); + my_size + } + + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + if !self.address.is_empty() { + os.write_bytes(1, &self.address)?; + } + if !self.index.is_empty() { + os.write_bytes(2, &self.index)?; + } + os.write_unknown_fields(self.get_unknown_fields())?; + ::std::result::Result::Ok(()) + } + + fn get_cached_size(&self) -> u32 { + self.cached_size.get() + } + + fn get_unknown_fields(&self) -> &::protobuf::UnknownFields { + &self.unknown_fields + } + + fn mut_unknown_fields(&mut self) -> &mut ::protobuf::UnknownFields { + &mut self.unknown_fields + } + + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) + } + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) + } + fn into_any(self: Box) -> ::std::boxed::Box { + self + } + + fn descriptor(&self) -> &'static ::protobuf::reflect::MessageDescriptor { + Self::descriptor_static() + } + + fn new() -> QueryGetAccountStorageCell { + QueryGetAccountStorageCell::new() + } + + fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { + lock: ::protobuf::lazy::ONCE_INIT, + ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, + }; + unsafe { + descriptor.get(|| { + let mut fields = ::std::vec::Vec::new(); + fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( + "address", + |m: &QueryGetAccountStorageCell| { &m.address }, + |m: &mut QueryGetAccountStorageCell| { &mut m.address }, + )); + fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( + "index", + |m: &QueryGetAccountStorageCell| { &m.index }, + |m: &mut QueryGetAccountStorageCell| { &mut m.index }, + )); + ::protobuf::reflect::MessageDescriptor::new::( + "QueryGetAccountStorageCell", + fields, + file_descriptor_proto() + ) + }) + } + } + + fn default_instance() -> &'static QueryGetAccountStorageCell { + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { + lock: ::protobuf::lazy::ONCE_INIT, + ptr: 0 as *const QueryGetAccountStorageCell, + }; + unsafe { + instance.get(QueryGetAccountStorageCell::new) + } + } +} + +impl ::protobuf::Clear for QueryGetAccountStorageCell { + fn clear(&mut self) { + self.address.clear(); + self.index.clear(); + self.unknown_fields.clear(); + } +} + +impl ::std::fmt::Debug for QueryGetAccountStorageCell { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { + ::protobuf::text_format::fmt(self, f) + } +} + +impl ::protobuf::reflect::ProtobufValue for QueryGetAccountStorageCell { + fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { + ::protobuf::reflect::ProtobufValueRef::Message(self) + } +} + +#[derive(PartialEq,Clone,Default)] +pub struct QueryGetAccountStorageCellResponse { + // message fields + pub value: ::std::vec::Vec, + // special fields + pub unknown_fields: ::protobuf::UnknownFields, + pub cached_size: ::protobuf::CachedSize, +} + +impl<'a> ::std::default::Default for &'a QueryGetAccountStorageCellResponse { + fn default() -> &'a QueryGetAccountStorageCellResponse { + ::default_instance() + } +} + +impl QueryGetAccountStorageCellResponse { + pub fn new() -> QueryGetAccountStorageCellResponse { + ::std::default::Default::default() + } + + // bytes value = 1; + + + pub fn get_value(&self) -> &[u8] { + &self.value + } + pub fn clear_value(&mut self) { + self.value.clear(); + } + + // Param is passed by value, moved + pub fn set_value(&mut self, v: ::std::vec::Vec) { + self.value = v; + } + + // Mutable pointer to the field. + // If field is not initialized, it is initialized with default value first. + pub fn mut_value(&mut self) -> &mut ::std::vec::Vec { + &mut self.value + } + + // Take field + pub fn take_value(&mut self) -> ::std::vec::Vec { + ::std::mem::replace(&mut self.value, ::std::vec::Vec::new()) + } +} + +impl ::protobuf::Message for QueryGetAccountStorageCellResponse { + fn is_initialized(&self) -> bool { + true + } + + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + while !is.eof()? { + let (field_number, wire_type) = is.read_tag_unpack()?; + match field_number { + 1 => { + ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.value)?; + }, + _ => { + ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; + }, + }; + } + ::std::result::Result::Ok(()) + } + + // Compute sizes of nested messages + #[allow(unused_variables)] + fn compute_size(&self) -> u32 { + let mut my_size = 0; + if !self.value.is_empty() { + my_size += ::protobuf::rt::bytes_size(1, &self.value); + } + my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); + self.cached_size.set(my_size); + my_size + } + + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + if !self.value.is_empty() { + os.write_bytes(1, &self.value)?; + } + os.write_unknown_fields(self.get_unknown_fields())?; + ::std::result::Result::Ok(()) + } + + fn get_cached_size(&self) -> u32 { + self.cached_size.get() + } + + fn get_unknown_fields(&self) -> &::protobuf::UnknownFields { + &self.unknown_fields + } + + fn mut_unknown_fields(&mut self) -> &mut ::protobuf::UnknownFields { + &mut self.unknown_fields + } + + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) + } + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) + } + fn into_any(self: Box) -> ::std::boxed::Box { + self + } + + fn descriptor(&self) -> &'static ::protobuf::reflect::MessageDescriptor { + Self::descriptor_static() + } + + fn new() -> QueryGetAccountStorageCellResponse { + QueryGetAccountStorageCellResponse::new() + } + + fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { + lock: ::protobuf::lazy::ONCE_INIT, + ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, + }; + unsafe { + descriptor.get(|| { + let mut fields = ::std::vec::Vec::new(); + fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( + "value", + |m: &QueryGetAccountStorageCellResponse| { &m.value }, + |m: &mut QueryGetAccountStorageCellResponse| { &mut m.value }, + )); + ::protobuf::reflect::MessageDescriptor::new::( + "QueryGetAccountStorageCellResponse", + fields, + file_descriptor_proto() + ) + }) + } + } + + fn default_instance() -> &'static QueryGetAccountStorageCellResponse { + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { + lock: ::protobuf::lazy::ONCE_INIT, + ptr: 0 as *const QueryGetAccountStorageCellResponse, + }; + unsafe { + instance.get(QueryGetAccountStorageCellResponse::new) + } + } +} + +impl ::protobuf::Clear for QueryGetAccountStorageCellResponse { + fn clear(&mut self) { + self.value.clear(); + self.unknown_fields.clear(); + } +} + +impl ::std::fmt::Debug for QueryGetAccountStorageCellResponse { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { + ::protobuf::text_format::fmt(self, f) + } +} + +impl ::protobuf::reflect::ProtobufValue for QueryGetAccountStorageCellResponse { + fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { + ::protobuf::reflect::ProtobufValueRef::Message(self) + } +} + +#[derive(PartialEq,Clone,Default)] +pub struct QueryGetAccountCode { + // message fields + pub address: ::std::vec::Vec, + // special fields + pub unknown_fields: ::protobuf::UnknownFields, + pub cached_size: ::protobuf::CachedSize, +} + +impl<'a> ::std::default::Default for &'a QueryGetAccountCode { + fn default() -> &'a QueryGetAccountCode { + ::default_instance() + } +} + +impl QueryGetAccountCode { + pub fn new() -> QueryGetAccountCode { + ::std::default::Default::default() + } + + // bytes address = 1; + + + pub fn get_address(&self) -> &[u8] { + &self.address + } + pub fn clear_address(&mut self) { + self.address.clear(); + } + + // Param is passed by value, moved + pub fn set_address(&mut self, v: ::std::vec::Vec) { + self.address = v; + } + + // Mutable pointer to the field. + // If field is not initialized, it is initialized with default value first. + pub fn mut_address(&mut self) -> &mut ::std::vec::Vec { + &mut self.address + } + + // Take field + pub fn take_address(&mut self) -> ::std::vec::Vec { + ::std::mem::replace(&mut self.address, ::std::vec::Vec::new()) + } +} + +impl ::protobuf::Message for QueryGetAccountCode { + fn is_initialized(&self) -> bool { + true + } + + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + while !is.eof()? { + let (field_number, wire_type) = is.read_tag_unpack()?; + match field_number { + 1 => { + ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.address)?; + }, + _ => { + ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; + }, + }; + } + ::std::result::Result::Ok(()) + } + + // Compute sizes of nested messages + #[allow(unused_variables)] + fn compute_size(&self) -> u32 { + let mut my_size = 0; + if !self.address.is_empty() { + my_size += ::protobuf::rt::bytes_size(1, &self.address); + } + my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); + self.cached_size.set(my_size); + my_size + } + + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + if !self.address.is_empty() { + os.write_bytes(1, &self.address)?; + } + os.write_unknown_fields(self.get_unknown_fields())?; + ::std::result::Result::Ok(()) + } + + fn get_cached_size(&self) -> u32 { + self.cached_size.get() + } + + fn get_unknown_fields(&self) -> &::protobuf::UnknownFields { + &self.unknown_fields + } + + fn mut_unknown_fields(&mut self) -> &mut ::protobuf::UnknownFields { + &mut self.unknown_fields + } + + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) + } + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) + } + fn into_any(self: Box) -> ::std::boxed::Box { + self + } + + fn descriptor(&self) -> &'static ::protobuf::reflect::MessageDescriptor { + Self::descriptor_static() + } + + fn new() -> QueryGetAccountCode { + QueryGetAccountCode::new() + } + + fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { + lock: ::protobuf::lazy::ONCE_INIT, + ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, + }; + unsafe { + descriptor.get(|| { + let mut fields = ::std::vec::Vec::new(); + fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( + "address", + |m: &QueryGetAccountCode| { &m.address }, + |m: &mut QueryGetAccountCode| { &mut m.address }, + )); + ::protobuf::reflect::MessageDescriptor::new::( + "QueryGetAccountCode", + fields, + file_descriptor_proto() + ) + }) + } + } + + fn default_instance() -> &'static QueryGetAccountCode { + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { + lock: ::protobuf::lazy::ONCE_INIT, + ptr: 0 as *const QueryGetAccountCode, + }; + unsafe { + instance.get(QueryGetAccountCode::new) + } + } +} + +impl ::protobuf::Clear for QueryGetAccountCode { + fn clear(&mut self) { + self.address.clear(); + self.unknown_fields.clear(); + } +} + +impl ::std::fmt::Debug for QueryGetAccountCode { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { + ::protobuf::text_format::fmt(self, f) + } +} + +impl ::protobuf::reflect::ProtobufValue for QueryGetAccountCode { + fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { + ::protobuf::reflect::ProtobufValueRef::Message(self) + } +} + +#[derive(PartialEq,Clone,Default)] +pub struct QueryGetAccountCodeResponse { + // message fields + pub code: ::std::vec::Vec, + // special fields + pub unknown_fields: ::protobuf::UnknownFields, + pub cached_size: ::protobuf::CachedSize, +} + +impl<'a> ::std::default::Default for &'a QueryGetAccountCodeResponse { + fn default() -> &'a QueryGetAccountCodeResponse { + ::default_instance() + } +} + +impl QueryGetAccountCodeResponse { + pub fn new() -> QueryGetAccountCodeResponse { + ::std::default::Default::default() + } + + // bytes code = 1; + + + pub fn get_code(&self) -> &[u8] { + &self.code + } + pub fn clear_code(&mut self) { + self.code.clear(); + } + + // Param is passed by value, moved + pub fn set_code(&mut self, v: ::std::vec::Vec) { + self.code = v; + } + + // Mutable pointer to the field. + // If field is not initialized, it is initialized with default value first. + pub fn mut_code(&mut self) -> &mut ::std::vec::Vec { + &mut self.code + } + + // Take field + pub fn take_code(&mut self) -> ::std::vec::Vec { + ::std::mem::replace(&mut self.code, ::std::vec::Vec::new()) + } +} + +impl ::protobuf::Message for QueryGetAccountCodeResponse { + fn is_initialized(&self) -> bool { + true + } + + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + while !is.eof()? { + let (field_number, wire_type) = is.read_tag_unpack()?; + match field_number { + 1 => { + ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.code)?; + }, + _ => { + ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; + }, + }; + } + ::std::result::Result::Ok(()) + } + + // Compute sizes of nested messages + #[allow(unused_variables)] + fn compute_size(&self) -> u32 { + let mut my_size = 0; + if !self.code.is_empty() { + my_size += ::protobuf::rt::bytes_size(1, &self.code); + } + my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); + self.cached_size.set(my_size); + my_size + } + + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + if !self.code.is_empty() { + os.write_bytes(1, &self.code)?; + } + os.write_unknown_fields(self.get_unknown_fields())?; + ::std::result::Result::Ok(()) + } + + fn get_cached_size(&self) -> u32 { + self.cached_size.get() + } + + fn get_unknown_fields(&self) -> &::protobuf::UnknownFields { + &self.unknown_fields + } + + fn mut_unknown_fields(&mut self) -> &mut ::protobuf::UnknownFields { + &mut self.unknown_fields + } + + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) + } + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) + } + fn into_any(self: Box) -> ::std::boxed::Box { + self + } + + fn descriptor(&self) -> &'static ::protobuf::reflect::MessageDescriptor { + Self::descriptor_static() + } + + fn new() -> QueryGetAccountCodeResponse { + QueryGetAccountCodeResponse::new() + } + + fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { + lock: ::protobuf::lazy::ONCE_INIT, + ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, + }; + unsafe { + descriptor.get(|| { + let mut fields = ::std::vec::Vec::new(); + fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( + "code", + |m: &QueryGetAccountCodeResponse| { &m.code }, + |m: &mut QueryGetAccountCodeResponse| { &mut m.code }, + )); + ::protobuf::reflect::MessageDescriptor::new::( + "QueryGetAccountCodeResponse", + fields, + file_descriptor_proto() + ) + }) + } + } + + fn default_instance() -> &'static QueryGetAccountCodeResponse { + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { + lock: ::protobuf::lazy::ONCE_INIT, + ptr: 0 as *const QueryGetAccountCodeResponse, + }; + unsafe { + instance.get(QueryGetAccountCodeResponse::new) + } + } +} + +impl ::protobuf::Clear for QueryGetAccountCodeResponse { + fn clear(&mut self) { + self.code.clear(); + self.unknown_fields.clear(); + } +} + +impl ::std::fmt::Debug for QueryGetAccountCodeResponse { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { + ::protobuf::text_format::fmt(self, f) + } +} + +impl ::protobuf::reflect::ProtobufValue for QueryGetAccountCodeResponse { + fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { + ::protobuf::reflect::ProtobufValueRef::Message(self) + } +} + +#[derive(PartialEq,Clone,Default)] +pub struct QueryGetAccountCodeSize { + // message fields + pub address: ::std::vec::Vec, + // special fields + pub unknown_fields: ::protobuf::UnknownFields, + pub cached_size: ::protobuf::CachedSize, +} + +impl<'a> ::std::default::Default for &'a QueryGetAccountCodeSize { + fn default() -> &'a QueryGetAccountCodeSize { + ::default_instance() + } +} + +impl QueryGetAccountCodeSize { + pub fn new() -> QueryGetAccountCodeSize { + ::std::default::Default::default() + } + + // bytes address = 1; + + + pub fn get_address(&self) -> &[u8] { + &self.address + } + pub fn clear_address(&mut self) { + self.address.clear(); } // Param is passed by value, moved - pub fn set_index(&mut self, v: ::std::vec::Vec) { - self.index = v; + pub fn set_address(&mut self, v: ::std::vec::Vec) { + self.address = v; } // Mutable pointer to the field. // If field is not initialized, it is initialized with default value first. - pub fn mut_index(&mut self) -> &mut ::std::vec::Vec { - &mut self.index + pub fn mut_address(&mut self) -> &mut ::std::vec::Vec { + &mut self.address } // Take field - pub fn take_index(&mut self) -> ::std::vec::Vec { - ::std::mem::replace(&mut self.index, ::std::vec::Vec::new()) + pub fn take_address(&mut self) -> ::std::vec::Vec { + ::std::mem::replace(&mut self.address, ::std::vec::Vec::new()) } } -impl ::protobuf::Message for QueryGetAccountStorageCell { +impl ::protobuf::Message for QueryGetAccountCodeSize { fn is_initialized(&self) -> bool { true } @@ -3138,9 +4124,6 @@ impl ::protobuf::Message for QueryGetAccountStorageCell { 1 => { ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.address)?; }, - 2 => { - ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.index)?; - }, _ => { ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; }, @@ -3156,9 +4139,6 @@ impl ::protobuf::Message for QueryGetAccountStorageCell { if !self.address.is_empty() { my_size += ::protobuf::rt::bytes_size(1, &self.address); } - if !self.index.is_empty() { - my_size += ::protobuf::rt::bytes_size(2, &self.index); - } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size @@ -3168,9 +4148,6 @@ impl ::protobuf::Message for QueryGetAccountStorageCell { if !self.address.is_empty() { os.write_bytes(1, &self.address)?; } - if !self.index.is_empty() { - os.write_bytes(2, &self.index)?; - } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -3201,8 +4178,8 @@ impl ::protobuf::Message for QueryGetAccountStorageCell { Self::descriptor_static() } - fn new() -> QueryGetAccountStorageCell { - QueryGetAccountStorageCell::new() + fn new() -> QueryGetAccountCodeSize { + QueryGetAccountCodeSize::new() } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { @@ -3215,16 +4192,11 @@ impl ::protobuf::Message for QueryGetAccountStorageCell { let mut fields = ::std::vec::Vec::new(); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( "address", - |m: &QueryGetAccountStorageCell| { &m.address }, - |m: &mut QueryGetAccountStorageCell| { &mut m.address }, - )); - fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "index", - |m: &QueryGetAccountStorageCell| { &m.index }, - |m: &mut QueryGetAccountStorageCell| { &mut m.index }, + |m: &QueryGetAccountCodeSize| { &m.address }, + |m: &mut QueryGetAccountCodeSize| { &mut m.address }, )); - ::protobuf::reflect::MessageDescriptor::new::( - "QueryGetAccountStorageCell", + ::protobuf::reflect::MessageDescriptor::new::( + "QueryGetAccountCodeSize", fields, file_descriptor_proto() ) @@ -3232,85 +4204,73 @@ impl ::protobuf::Message for QueryGetAccountStorageCell { } } - fn default_instance() -> &'static QueryGetAccountStorageCell { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { + fn default_instance() -> &'static QueryGetAccountCodeSize { + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const QueryGetAccountStorageCell, + ptr: 0 as *const QueryGetAccountCodeSize, }; unsafe { - instance.get(QueryGetAccountStorageCell::new) + instance.get(QueryGetAccountCodeSize::new) } } } -impl ::protobuf::Clear for QueryGetAccountStorageCell { +impl ::protobuf::Clear for QueryGetAccountCodeSize { fn clear(&mut self) { self.address.clear(); - self.index.clear(); self.unknown_fields.clear(); } } -impl ::std::fmt::Debug for QueryGetAccountStorageCell { +impl ::std::fmt::Debug for QueryGetAccountCodeSize { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for QueryGetAccountStorageCell { +impl ::protobuf::reflect::ProtobufValue for QueryGetAccountCodeSize { fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { ::protobuf::reflect::ProtobufValueRef::Message(self) } } #[derive(PartialEq,Clone,Default)] -pub struct QueryGetAccountStorageCellResponse { +pub struct QueryGetAccountCodeSizeResponse { // message fields - pub value: ::std::vec::Vec, + pub size: u32, // special fields pub unknown_fields: ::protobuf::UnknownFields, pub cached_size: ::protobuf::CachedSize, } -impl<'a> ::std::default::Default for &'a QueryGetAccountStorageCellResponse { - fn default() -> &'a QueryGetAccountStorageCellResponse { - ::default_instance() +impl<'a> ::std::default::Default for &'a QueryGetAccountCodeSizeResponse { + fn default() -> &'a QueryGetAccountCodeSizeResponse { + ::default_instance() } } -impl QueryGetAccountStorageCellResponse { - pub fn new() -> QueryGetAccountStorageCellResponse { +impl QueryGetAccountCodeSizeResponse { + pub fn new() -> QueryGetAccountCodeSizeResponse { ::std::default::Default::default() } - // bytes value = 1; + // uint32 size = 1; - pub fn get_value(&self) -> &[u8] { - &self.value + pub fn get_size(&self) -> u32 { + self.size } - pub fn clear_value(&mut self) { - self.value.clear(); + pub fn clear_size(&mut self) { + self.size = 0; } // Param is passed by value, moved - pub fn set_value(&mut self, v: ::std::vec::Vec) { - self.value = v; - } - - // Mutable pointer to the field. - // If field is not initialized, it is initialized with default value first. - pub fn mut_value(&mut self) -> &mut ::std::vec::Vec { - &mut self.value - } - - // Take field - pub fn take_value(&mut self) -> ::std::vec::Vec { - ::std::mem::replace(&mut self.value, ::std::vec::Vec::new()) + pub fn set_size(&mut self, v: u32) { + self.size = v; } } -impl ::protobuf::Message for QueryGetAccountStorageCellResponse { +impl ::protobuf::Message for QueryGetAccountCodeSizeResponse { fn is_initialized(&self) -> bool { true } @@ -3320,7 +4280,11 @@ impl ::protobuf::Message for QueryGetAccountStorageCellResponse { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { - ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.value)?; + if wire_type != ::protobuf::wire_format::WireTypeVarint { + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + } + let tmp = is.read_uint32()?; + self.size = tmp; }, _ => { ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; @@ -3334,8 +4298,8 @@ impl ::protobuf::Message for QueryGetAccountStorageCellResponse { #[allow(unused_variables)] fn compute_size(&self) -> u32 { let mut my_size = 0; - if !self.value.is_empty() { - my_size += ::protobuf::rt::bytes_size(1, &self.value); + if self.size != 0 { + my_size += ::protobuf::rt::value_size(1, self.size, ::protobuf::wire_format::WireTypeVarint); } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); @@ -3343,8 +4307,8 @@ impl ::protobuf::Message for QueryGetAccountStorageCellResponse { } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { - if !self.value.is_empty() { - os.write_bytes(1, &self.value)?; + if self.size != 0 { + os.write_uint32(1, self.size)?; } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) @@ -3376,8 +4340,8 @@ impl ::protobuf::Message for QueryGetAccountStorageCellResponse { Self::descriptor_static() } - fn new() -> QueryGetAccountStorageCellResponse { - QueryGetAccountStorageCellResponse::new() + fn new() -> QueryGetAccountCodeSizeResponse { + QueryGetAccountCodeSizeResponse::new() } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { @@ -3388,13 +4352,13 @@ impl ::protobuf::Message for QueryGetAccountStorageCellResponse { unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "value", - |m: &QueryGetAccountStorageCellResponse| { &m.value }, - |m: &mut QueryGetAccountStorageCellResponse| { &mut m.value }, + fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeUint32>( + "size", + |m: &QueryGetAccountCodeSizeResponse| { &m.size }, + |m: &mut QueryGetAccountCodeSizeResponse| { &mut m.size }, )); - ::protobuf::reflect::MessageDescriptor::new::( - "QueryGetAccountStorageCellResponse", + ::protobuf::reflect::MessageDescriptor::new::( + "QueryGetAccountCodeSizeResponse", fields, file_descriptor_proto() ) @@ -3402,38 +4366,38 @@ impl ::protobuf::Message for QueryGetAccountStorageCellResponse { } } - fn default_instance() -> &'static QueryGetAccountStorageCellResponse { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { + fn default_instance() -> &'static QueryGetAccountCodeSizeResponse { + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const QueryGetAccountStorageCellResponse, + ptr: 0 as *const QueryGetAccountCodeSizeResponse, }; unsafe { - instance.get(QueryGetAccountStorageCellResponse::new) + instance.get(QueryGetAccountCodeSizeResponse::new) } } } -impl ::protobuf::Clear for QueryGetAccountStorageCellResponse { +impl ::protobuf::Clear for QueryGetAccountCodeSizeResponse { fn clear(&mut self) { - self.value.clear(); + self.size = 0; self.unknown_fields.clear(); } } -impl ::std::fmt::Debug for QueryGetAccountStorageCellResponse { +impl ::std::fmt::Debug for QueryGetAccountCodeSizeResponse { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for QueryGetAccountStorageCellResponse { +impl ::protobuf::reflect::ProtobufValue for QueryGetAccountCodeSizeResponse { fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { ::protobuf::reflect::ProtobufValueRef::Message(self) } } #[derive(PartialEq,Clone,Default)] -pub struct QueryGetAccountCode { +pub struct QueryGetAccountCodeHash { // message fields pub address: ::std::vec::Vec, // special fields @@ -3441,14 +4405,14 @@ pub struct QueryGetAccountCode { pub cached_size: ::protobuf::CachedSize, } -impl<'a> ::std::default::Default for &'a QueryGetAccountCode { - fn default() -> &'a QueryGetAccountCode { - ::default_instance() +impl<'a> ::std::default::Default for &'a QueryGetAccountCodeHash { + fn default() -> &'a QueryGetAccountCodeHash { + ::default_instance() } } -impl QueryGetAccountCode { - pub fn new() -> QueryGetAccountCode { +impl QueryGetAccountCodeHash { + pub fn new() -> QueryGetAccountCodeHash { ::std::default::Default::default() } @@ -3479,7 +4443,7 @@ impl QueryGetAccountCode { } } -impl ::protobuf::Message for QueryGetAccountCode { +impl ::protobuf::Message for QueryGetAccountCodeHash { fn is_initialized(&self) -> bool { true } @@ -3545,8 +4509,8 @@ impl ::protobuf::Message for QueryGetAccountCode { Self::descriptor_static() } - fn new() -> QueryGetAccountCode { - QueryGetAccountCode::new() + fn new() -> QueryGetAccountCodeHash { + QueryGetAccountCodeHash::new() } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { @@ -3559,11 +4523,11 @@ impl ::protobuf::Message for QueryGetAccountCode { let mut fields = ::std::vec::Vec::new(); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( "address", - |m: &QueryGetAccountCode| { &m.address }, - |m: &mut QueryGetAccountCode| { &mut m.address }, + |m: &QueryGetAccountCodeHash| { &m.address }, + |m: &mut QueryGetAccountCodeHash| { &mut m.address }, )); - ::protobuf::reflect::MessageDescriptor::new::( - "QueryGetAccountCode", + ::protobuf::reflect::MessageDescriptor::new::( + "QueryGetAccountCodeHash", fields, file_descriptor_proto() ) @@ -3571,84 +4535,84 @@ impl ::protobuf::Message for QueryGetAccountCode { } } - fn default_instance() -> &'static QueryGetAccountCode { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { + fn default_instance() -> &'static QueryGetAccountCodeHash { + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const QueryGetAccountCode, + ptr: 0 as *const QueryGetAccountCodeHash, }; unsafe { - instance.get(QueryGetAccountCode::new) + instance.get(QueryGetAccountCodeHash::new) } } } -impl ::protobuf::Clear for QueryGetAccountCode { +impl ::protobuf::Clear for QueryGetAccountCodeHash { fn clear(&mut self) { self.address.clear(); self.unknown_fields.clear(); } } -impl ::std::fmt::Debug for QueryGetAccountCode { +impl ::std::fmt::Debug for QueryGetAccountCodeHash { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for QueryGetAccountCode { +impl ::protobuf::reflect::ProtobufValue for QueryGetAccountCodeHash { fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { ::protobuf::reflect::ProtobufValueRef::Message(self) } } #[derive(PartialEq,Clone,Default)] -pub struct QueryGetAccountCodeResponse { +pub struct QueryGetAccountCodeHashResponse { // message fields - pub code: ::std::vec::Vec, + pub hash: ::std::vec::Vec, // special fields pub unknown_fields: ::protobuf::UnknownFields, pub cached_size: ::protobuf::CachedSize, } -impl<'a> ::std::default::Default for &'a QueryGetAccountCodeResponse { - fn default() -> &'a QueryGetAccountCodeResponse { - ::default_instance() +impl<'a> ::std::default::Default for &'a QueryGetAccountCodeHashResponse { + fn default() -> &'a QueryGetAccountCodeHashResponse { + ::default_instance() } } -impl QueryGetAccountCodeResponse { - pub fn new() -> QueryGetAccountCodeResponse { +impl QueryGetAccountCodeHashResponse { + pub fn new() -> QueryGetAccountCodeHashResponse { ::std::default::Default::default() } - // bytes code = 1; + // bytes hash = 1; - pub fn get_code(&self) -> &[u8] { - &self.code + pub fn get_hash(&self) -> &[u8] { + &self.hash } - pub fn clear_code(&mut self) { - self.code.clear(); + pub fn clear_hash(&mut self) { + self.hash.clear(); } // Param is passed by value, moved - pub fn set_code(&mut self, v: ::std::vec::Vec) { - self.code = v; + pub fn set_hash(&mut self, v: ::std::vec::Vec) { + self.hash = v; } // Mutable pointer to the field. // If field is not initialized, it is initialized with default value first. - pub fn mut_code(&mut self) -> &mut ::std::vec::Vec { - &mut self.code + pub fn mut_hash(&mut self) -> &mut ::std::vec::Vec { + &mut self.hash } // Take field - pub fn take_code(&mut self) -> ::std::vec::Vec { - ::std::mem::replace(&mut self.code, ::std::vec::Vec::new()) + pub fn take_hash(&mut self) -> ::std::vec::Vec { + ::std::mem::replace(&mut self.hash, ::std::vec::Vec::new()) } } -impl ::protobuf::Message for QueryGetAccountCodeResponse { +impl ::protobuf::Message for QueryGetAccountCodeHashResponse { fn is_initialized(&self) -> bool { true } @@ -3658,7 +4622,7 @@ impl ::protobuf::Message for QueryGetAccountCodeResponse { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { - ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.code)?; + ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.hash)?; }, _ => { ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; @@ -3672,8 +4636,8 @@ impl ::protobuf::Message for QueryGetAccountCodeResponse { #[allow(unused_variables)] fn compute_size(&self) -> u32 { let mut my_size = 0; - if !self.code.is_empty() { - my_size += ::protobuf::rt::bytes_size(1, &self.code); + if !self.hash.is_empty() { + my_size += ::protobuf::rt::bytes_size(1, &self.hash); } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); @@ -3681,8 +4645,8 @@ impl ::protobuf::Message for QueryGetAccountCodeResponse { } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { - if !self.code.is_empty() { - os.write_bytes(1, &self.code)?; + if !self.hash.is_empty() { + os.write_bytes(1, &self.hash)?; } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) @@ -3714,8 +4678,8 @@ impl ::protobuf::Message for QueryGetAccountCodeResponse { Self::descriptor_static() } - fn new() -> QueryGetAccountCodeResponse { - QueryGetAccountCodeResponse::new() + fn new() -> QueryGetAccountCodeHashResponse { + QueryGetAccountCodeHashResponse::new() } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { @@ -3727,12 +4691,12 @@ impl ::protobuf::Message for QueryGetAccountCodeResponse { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "code", - |m: &QueryGetAccountCodeResponse| { &m.code }, - |m: &mut QueryGetAccountCodeResponse| { &mut m.code }, + "hash", + |m: &QueryGetAccountCodeHashResponse| { &m.hash }, + |m: &mut QueryGetAccountCodeHashResponse| { &mut m.hash }, )); - ::protobuf::reflect::MessageDescriptor::new::( - "QueryGetAccountCodeResponse", + ::protobuf::reflect::MessageDescriptor::new::( + "QueryGetAccountCodeHashResponse", fields, file_descriptor_proto() ) @@ -3740,31 +4704,31 @@ impl ::protobuf::Message for QueryGetAccountCodeResponse { } } - fn default_instance() -> &'static QueryGetAccountCodeResponse { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { + fn default_instance() -> &'static QueryGetAccountCodeHashResponse { + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const QueryGetAccountCodeResponse, + ptr: 0 as *const QueryGetAccountCodeHashResponse, }; unsafe { - instance.get(QueryGetAccountCodeResponse::new) + instance.get(QueryGetAccountCodeHashResponse::new) } } } -impl ::protobuf::Clear for QueryGetAccountCodeResponse { +impl ::protobuf::Clear for QueryGetAccountCodeHashResponse { fn clear(&mut self) { - self.code.clear(); + self.hash.clear(); self.unknown_fields.clear(); } } -impl ::std::fmt::Debug for QueryGetAccountCodeResponse { +impl ::std::fmt::Debug for QueryGetAccountCodeHashResponse { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for QueryGetAccountCodeResponse { +impl ::protobuf::reflect::ProtobufValue for QueryGetAccountCodeHashResponse { fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { ::protobuf::reflect::ProtobufValueRef::Message(self) } @@ -7805,9 +8769,10 @@ impl<'a> ::std::default::Default for &'a CosmosRequest { #[derive(Clone,PartialEq,Debug)] pub enum CosmosRequest_oneof_req { getAccount(QueryGetAccount), - insertAccount(QueryInsertAccount), containsKey(QueryContainsKey), accountCode(QueryGetAccountCode), + codeHash(QueryGetAccountCodeHash), + codeSize(QueryGetAccountCodeSize), storageCell(QueryGetAccountStorageCell), insertAccountCode(QueryInsertAccountCode), insertStorageCell(QueryInsertStorageCell), @@ -7818,6 +8783,8 @@ pub enum CosmosRequest_oneof_req { addVerificationDetails(QueryAddVerificationDetails), hasVerification(QueryHasVerification), getVerificationData(QueryGetVerificationData), + insertAccountBalance(QueryInsertAccountBalance), + insertAccountNonce(QueryInsertAccountNonce), } impl CosmosRequest { @@ -7874,154 +8841,203 @@ impl CosmosRequest { } } - // .ffi.ffi.QueryInsertAccount insertAccount = 2; + // .ffi.ffi.QueryContainsKey containsKey = 2; - pub fn get_insertAccount(&self) -> &QueryInsertAccount { + pub fn get_containsKey(&self) -> &QueryContainsKey { match self.req { - ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccount(ref v)) => v, - _ => QueryInsertAccount::default_instance(), + ::std::option::Option::Some(CosmosRequest_oneof_req::containsKey(ref v)) => v, + _ => QueryContainsKey::default_instance(), } } - pub fn clear_insertAccount(&mut self) { + pub fn clear_containsKey(&mut self) { self.req = ::std::option::Option::None; } - pub fn has_insertAccount(&self) -> bool { + pub fn has_containsKey(&self) -> bool { match self.req { - ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccount(..)) => true, + ::std::option::Option::Some(CosmosRequest_oneof_req::containsKey(..)) => true, _ => false, } } // Param is passed by value, moved - pub fn set_insertAccount(&mut self, v: QueryInsertAccount) { - self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccount(v)) + pub fn set_containsKey(&mut self, v: QueryContainsKey) { + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::containsKey(v)) } // Mutable pointer to the field. - pub fn mut_insertAccount(&mut self) -> &mut QueryInsertAccount { - if let ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccount(_)) = self.req { + pub fn mut_containsKey(&mut self) -> &mut QueryContainsKey { + if let ::std::option::Option::Some(CosmosRequest_oneof_req::containsKey(_)) = self.req { } else { - self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccount(QueryInsertAccount::new())); + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::containsKey(QueryContainsKey::new())); } match self.req { - ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccount(ref mut v)) => v, + ::std::option::Option::Some(CosmosRequest_oneof_req::containsKey(ref mut v)) => v, _ => panic!(), } } // Take field - pub fn take_insertAccount(&mut self) -> QueryInsertAccount { - if self.has_insertAccount() { + pub fn take_containsKey(&mut self) -> QueryContainsKey { + if self.has_containsKey() { match self.req.take() { - ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccount(v)) => v, + ::std::option::Option::Some(CosmosRequest_oneof_req::containsKey(v)) => v, _ => panic!(), } } else { - QueryInsertAccount::new() + QueryContainsKey::new() } } - // .ffi.ffi.QueryContainsKey containsKey = 3; + // .ffi.ffi.QueryGetAccountCode accountCode = 3; - pub fn get_containsKey(&self) -> &QueryContainsKey { + pub fn get_accountCode(&self) -> &QueryGetAccountCode { match self.req { - ::std::option::Option::Some(CosmosRequest_oneof_req::containsKey(ref v)) => v, - _ => QueryContainsKey::default_instance(), + ::std::option::Option::Some(CosmosRequest_oneof_req::accountCode(ref v)) => v, + _ => QueryGetAccountCode::default_instance(), } } - pub fn clear_containsKey(&mut self) { + pub fn clear_accountCode(&mut self) { self.req = ::std::option::Option::None; } - pub fn has_containsKey(&self) -> bool { + pub fn has_accountCode(&self) -> bool { match self.req { - ::std::option::Option::Some(CosmosRequest_oneof_req::containsKey(..)) => true, + ::std::option::Option::Some(CosmosRequest_oneof_req::accountCode(..)) => true, _ => false, } } // Param is passed by value, moved - pub fn set_containsKey(&mut self, v: QueryContainsKey) { - self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::containsKey(v)) + pub fn set_accountCode(&mut self, v: QueryGetAccountCode) { + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::accountCode(v)) } // Mutable pointer to the field. - pub fn mut_containsKey(&mut self) -> &mut QueryContainsKey { - if let ::std::option::Option::Some(CosmosRequest_oneof_req::containsKey(_)) = self.req { + pub fn mut_accountCode(&mut self) -> &mut QueryGetAccountCode { + if let ::std::option::Option::Some(CosmosRequest_oneof_req::accountCode(_)) = self.req { } else { - self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::containsKey(QueryContainsKey::new())); + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::accountCode(QueryGetAccountCode::new())); } match self.req { - ::std::option::Option::Some(CosmosRequest_oneof_req::containsKey(ref mut v)) => v, + ::std::option::Option::Some(CosmosRequest_oneof_req::accountCode(ref mut v)) => v, _ => panic!(), } } // Take field - pub fn take_containsKey(&mut self) -> QueryContainsKey { - if self.has_containsKey() { + pub fn take_accountCode(&mut self) -> QueryGetAccountCode { + if self.has_accountCode() { match self.req.take() { - ::std::option::Option::Some(CosmosRequest_oneof_req::containsKey(v)) => v, + ::std::option::Option::Some(CosmosRequest_oneof_req::accountCode(v)) => v, _ => panic!(), } } else { - QueryContainsKey::new() + QueryGetAccountCode::new() } } - // .ffi.ffi.QueryGetAccountCode accountCode = 4; + // .ffi.ffi.QueryGetAccountCodeHash codeHash = 4; - pub fn get_accountCode(&self) -> &QueryGetAccountCode { + pub fn get_codeHash(&self) -> &QueryGetAccountCodeHash { match self.req { - ::std::option::Option::Some(CosmosRequest_oneof_req::accountCode(ref v)) => v, - _ => QueryGetAccountCode::default_instance(), + ::std::option::Option::Some(CosmosRequest_oneof_req::codeHash(ref v)) => v, + _ => QueryGetAccountCodeHash::default_instance(), + } + } + pub fn clear_codeHash(&mut self) { + self.req = ::std::option::Option::None; + } + + pub fn has_codeHash(&self) -> bool { + match self.req { + ::std::option::Option::Some(CosmosRequest_oneof_req::codeHash(..)) => true, + _ => false, + } + } + + // Param is passed by value, moved + pub fn set_codeHash(&mut self, v: QueryGetAccountCodeHash) { + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::codeHash(v)) + } + + // Mutable pointer to the field. + pub fn mut_codeHash(&mut self) -> &mut QueryGetAccountCodeHash { + if let ::std::option::Option::Some(CosmosRequest_oneof_req::codeHash(_)) = self.req { + } else { + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::codeHash(QueryGetAccountCodeHash::new())); + } + match self.req { + ::std::option::Option::Some(CosmosRequest_oneof_req::codeHash(ref mut v)) => v, + _ => panic!(), + } + } + + // Take field + pub fn take_codeHash(&mut self) -> QueryGetAccountCodeHash { + if self.has_codeHash() { + match self.req.take() { + ::std::option::Option::Some(CosmosRequest_oneof_req::codeHash(v)) => v, + _ => panic!(), + } + } else { + QueryGetAccountCodeHash::new() + } + } + + // .ffi.ffi.QueryGetAccountCodeSize codeSize = 5; + + + pub fn get_codeSize(&self) -> &QueryGetAccountCodeSize { + match self.req { + ::std::option::Option::Some(CosmosRequest_oneof_req::codeSize(ref v)) => v, + _ => QueryGetAccountCodeSize::default_instance(), } } - pub fn clear_accountCode(&mut self) { + pub fn clear_codeSize(&mut self) { self.req = ::std::option::Option::None; } - pub fn has_accountCode(&self) -> bool { + pub fn has_codeSize(&self) -> bool { match self.req { - ::std::option::Option::Some(CosmosRequest_oneof_req::accountCode(..)) => true, + ::std::option::Option::Some(CosmosRequest_oneof_req::codeSize(..)) => true, _ => false, } } // Param is passed by value, moved - pub fn set_accountCode(&mut self, v: QueryGetAccountCode) { - self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::accountCode(v)) + pub fn set_codeSize(&mut self, v: QueryGetAccountCodeSize) { + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::codeSize(v)) } // Mutable pointer to the field. - pub fn mut_accountCode(&mut self) -> &mut QueryGetAccountCode { - if let ::std::option::Option::Some(CosmosRequest_oneof_req::accountCode(_)) = self.req { + pub fn mut_codeSize(&mut self) -> &mut QueryGetAccountCodeSize { + if let ::std::option::Option::Some(CosmosRequest_oneof_req::codeSize(_)) = self.req { } else { - self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::accountCode(QueryGetAccountCode::new())); + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::codeSize(QueryGetAccountCodeSize::new())); } match self.req { - ::std::option::Option::Some(CosmosRequest_oneof_req::accountCode(ref mut v)) => v, + ::std::option::Option::Some(CosmosRequest_oneof_req::codeSize(ref mut v)) => v, _ => panic!(), } } // Take field - pub fn take_accountCode(&mut self) -> QueryGetAccountCode { - if self.has_accountCode() { + pub fn take_codeSize(&mut self) -> QueryGetAccountCodeSize { + if self.has_codeSize() { match self.req.take() { - ::std::option::Option::Some(CosmosRequest_oneof_req::accountCode(v)) => v, + ::std::option::Option::Some(CosmosRequest_oneof_req::codeSize(v)) => v, _ => panic!(), } } else { - QueryGetAccountCode::new() + QueryGetAccountCodeSize::new() } } - // .ffi.ffi.QueryGetAccountStorageCell storageCell = 5; + // .ffi.ffi.QueryGetAccountStorageCell storageCell = 6; pub fn get_storageCell(&self) -> &QueryGetAccountStorageCell { @@ -8070,7 +9086,7 @@ impl CosmosRequest { } } - // .ffi.ffi.QueryInsertAccountCode insertAccountCode = 6; + // .ffi.ffi.QueryInsertAccountCode insertAccountCode = 7; pub fn get_insertAccountCode(&self) -> &QueryInsertAccountCode { @@ -8119,7 +9135,7 @@ impl CosmosRequest { } } - // .ffi.ffi.QueryInsertStorageCell insertStorageCell = 7; + // .ffi.ffi.QueryInsertStorageCell insertStorageCell = 8; pub fn get_insertStorageCell(&self) -> &QueryInsertStorageCell { @@ -8168,7 +9184,7 @@ impl CosmosRequest { } } - // .ffi.ffi.QueryRemove remove = 8; + // .ffi.ffi.QueryRemove remove = 9; pub fn get_remove(&self) -> &QueryRemove { @@ -8217,7 +9233,7 @@ impl CosmosRequest { } } - // .ffi.ffi.QueryRemoveStorageCell removeStorageCell = 9; + // .ffi.ffi.QueryRemoveStorageCell removeStorageCell = 10; pub fn get_removeStorageCell(&self) -> &QueryRemoveStorageCell { @@ -8266,7 +9282,7 @@ impl CosmosRequest { } } - // .ffi.ffi.QueryRemoveStorage removeStorage = 10; + // .ffi.ffi.QueryRemoveStorage removeStorage = 11; pub fn get_removeStorage(&self) -> &QueryRemoveStorage { @@ -8315,7 +9331,7 @@ impl CosmosRequest { } } - // .ffi.ffi.QueryBlockHash blockHash = 11; + // .ffi.ffi.QueryBlockHash blockHash = 12; pub fn get_blockHash(&self) -> &QueryBlockHash { @@ -8364,7 +9380,7 @@ impl CosmosRequest { } } - // .ffi.ffi.QueryAddVerificationDetails addVerificationDetails = 12; + // .ffi.ffi.QueryAddVerificationDetails addVerificationDetails = 13; pub fn get_addVerificationDetails(&self) -> &QueryAddVerificationDetails { @@ -8413,7 +9429,7 @@ impl CosmosRequest { } } - // .ffi.ffi.QueryHasVerification hasVerification = 13; + // .ffi.ffi.QueryHasVerification hasVerification = 14; pub fn get_hasVerification(&self) -> &QueryHasVerification { @@ -8462,7 +9478,7 @@ impl CosmosRequest { } } - // .ffi.ffi.QueryGetVerificationData getVerificationData = 14; + // .ffi.ffi.QueryGetVerificationData getVerificationData = 15; pub fn get_getVerificationData(&self) -> &QueryGetVerificationData { @@ -8510,6 +9526,104 @@ impl CosmosRequest { QueryGetVerificationData::new() } } + + // .ffi.ffi.QueryInsertAccountBalance insertAccountBalance = 16; + + + pub fn get_insertAccountBalance(&self) -> &QueryInsertAccountBalance { + match self.req { + ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccountBalance(ref v)) => v, + _ => QueryInsertAccountBalance::default_instance(), + } + } + pub fn clear_insertAccountBalance(&mut self) { + self.req = ::std::option::Option::None; + } + + pub fn has_insertAccountBalance(&self) -> bool { + match self.req { + ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccountBalance(..)) => true, + _ => false, + } + } + + // Param is passed by value, moved + pub fn set_insertAccountBalance(&mut self, v: QueryInsertAccountBalance) { + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccountBalance(v)) + } + + // Mutable pointer to the field. + pub fn mut_insertAccountBalance(&mut self) -> &mut QueryInsertAccountBalance { + if let ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccountBalance(_)) = self.req { + } else { + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccountBalance(QueryInsertAccountBalance::new())); + } + match self.req { + ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccountBalance(ref mut v)) => v, + _ => panic!(), + } + } + + // Take field + pub fn take_insertAccountBalance(&mut self) -> QueryInsertAccountBalance { + if self.has_insertAccountBalance() { + match self.req.take() { + ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccountBalance(v)) => v, + _ => panic!(), + } + } else { + QueryInsertAccountBalance::new() + } + } + + // .ffi.ffi.QueryInsertAccountNonce insertAccountNonce = 17; + + + pub fn get_insertAccountNonce(&self) -> &QueryInsertAccountNonce { + match self.req { + ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccountNonce(ref v)) => v, + _ => QueryInsertAccountNonce::default_instance(), + } + } + pub fn clear_insertAccountNonce(&mut self) { + self.req = ::std::option::Option::None; + } + + pub fn has_insertAccountNonce(&self) -> bool { + match self.req { + ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccountNonce(..)) => true, + _ => false, + } + } + + // Param is passed by value, moved + pub fn set_insertAccountNonce(&mut self, v: QueryInsertAccountNonce) { + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccountNonce(v)) + } + + // Mutable pointer to the field. + pub fn mut_insertAccountNonce(&mut self) -> &mut QueryInsertAccountNonce { + if let ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccountNonce(_)) = self.req { + } else { + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccountNonce(QueryInsertAccountNonce::new())); + } + match self.req { + ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccountNonce(ref mut v)) => v, + _ => panic!(), + } + } + + // Take field + pub fn take_insertAccountNonce(&mut self) -> QueryInsertAccountNonce { + if self.has_insertAccountNonce() { + match self.req.take() { + ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccountNonce(v)) => v, + _ => panic!(), + } + } else { + QueryInsertAccountNonce::new() + } + } } impl ::protobuf::Message for CosmosRequest { @@ -8519,17 +9633,22 @@ impl ::protobuf::Message for CosmosRequest { return false; } } - if let Some(CosmosRequest_oneof_req::insertAccount(ref v)) = self.req { + if let Some(CosmosRequest_oneof_req::containsKey(ref v)) = self.req { if !v.is_initialized() { return false; } } - if let Some(CosmosRequest_oneof_req::containsKey(ref v)) = self.req { + if let Some(CosmosRequest_oneof_req::accountCode(ref v)) = self.req { if !v.is_initialized() { return false; } } - if let Some(CosmosRequest_oneof_req::accountCode(ref v)) = self.req { + if let Some(CosmosRequest_oneof_req::codeHash(ref v)) = self.req { + if !v.is_initialized() { + return false; + } + } + if let Some(CosmosRequest_oneof_req::codeSize(ref v)) = self.req { if !v.is_initialized() { return false; } @@ -8584,6 +9703,16 @@ impl ::protobuf::Message for CosmosRequest { return false; } } + if let Some(CosmosRequest_oneof_req::insertAccountBalance(ref v)) = self.req { + if !v.is_initialized() { + return false; + } + } + if let Some(CosmosRequest_oneof_req::insertAccountNonce(ref v)) = self.req { + if !v.is_initialized() { + return false; + } + } true } @@ -8601,80 +9730,98 @@ impl ::protobuf::Message for CosmosRequest { if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } - self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccount(is.read_message()?)); + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::containsKey(is.read_message()?)); }, 3 => { if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } - self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::containsKey(is.read_message()?)); + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::accountCode(is.read_message()?)); }, 4 => { if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } - self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::accountCode(is.read_message()?)); + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::codeHash(is.read_message()?)); }, 5 => { if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } - self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::storageCell(is.read_message()?)); + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::codeSize(is.read_message()?)); }, 6 => { if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } - self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccountCode(is.read_message()?)); + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::storageCell(is.read_message()?)); }, 7 => { if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } - self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::insertStorageCell(is.read_message()?)); + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccountCode(is.read_message()?)); }, 8 => { if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } - self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::remove(is.read_message()?)); + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::insertStorageCell(is.read_message()?)); }, 9 => { if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } - self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::removeStorageCell(is.read_message()?)); + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::remove(is.read_message()?)); }, 10 => { if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } - self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::removeStorage(is.read_message()?)); + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::removeStorageCell(is.read_message()?)); }, 11 => { if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } - self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::blockHash(is.read_message()?)); + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::removeStorage(is.read_message()?)); }, 12 => { if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } - self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::addVerificationDetails(is.read_message()?)); + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::blockHash(is.read_message()?)); }, 13 => { if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } - self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::hasVerification(is.read_message()?)); + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::addVerificationDetails(is.read_message()?)); }, 14 => { + if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited { + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + } + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::hasVerification(is.read_message()?)); + }, + 15 => { if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::getVerificationData(is.read_message()?)); }, + 16 => { + if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited { + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + } + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccountBalance(is.read_message()?)); + }, + 17 => { + if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited { + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + } + self.req = ::std::option::Option::Some(CosmosRequest_oneof_req::insertAccountNonce(is.read_message()?)); + }, _ => { ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; }, @@ -8693,15 +9840,19 @@ impl ::protobuf::Message for CosmosRequest { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; }, - &CosmosRequest_oneof_req::insertAccount(ref v) => { + &CosmosRequest_oneof_req::containsKey(ref v) => { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; }, - &CosmosRequest_oneof_req::containsKey(ref v) => { + &CosmosRequest_oneof_req::accountCode(ref v) => { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; }, - &CosmosRequest_oneof_req::accountCode(ref v) => { + &CosmosRequest_oneof_req::codeHash(ref v) => { + let len = v.compute_size(); + my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; + }, + &CosmosRequest_oneof_req::codeSize(ref v) => { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; }, @@ -8745,6 +9896,14 @@ impl ::protobuf::Message for CosmosRequest { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; }, + &CosmosRequest_oneof_req::insertAccountBalance(ref v) => { + let len = v.compute_size(); + my_size += 2 + ::protobuf::rt::compute_raw_varint32_size(len) + len; + }, + &CosmosRequest_oneof_req::insertAccountNonce(ref v) => { + let len = v.compute_size(); + my_size += 2 + ::protobuf::rt::compute_raw_varint32_size(len) + len; + }, }; } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); @@ -8760,71 +9919,86 @@ impl ::protobuf::Message for CosmosRequest { os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; }, - &CosmosRequest_oneof_req::insertAccount(ref v) => { + &CosmosRequest_oneof_req::containsKey(ref v) => { os.write_tag(2, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; }, - &CosmosRequest_oneof_req::containsKey(ref v) => { + &CosmosRequest_oneof_req::accountCode(ref v) => { os.write_tag(3, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; }, - &CosmosRequest_oneof_req::accountCode(ref v) => { + &CosmosRequest_oneof_req::codeHash(ref v) => { os.write_tag(4, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; }, - &CosmosRequest_oneof_req::storageCell(ref v) => { + &CosmosRequest_oneof_req::codeSize(ref v) => { os.write_tag(5, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; }, - &CosmosRequest_oneof_req::insertAccountCode(ref v) => { + &CosmosRequest_oneof_req::storageCell(ref v) => { os.write_tag(6, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; }, - &CosmosRequest_oneof_req::insertStorageCell(ref v) => { + &CosmosRequest_oneof_req::insertAccountCode(ref v) => { os.write_tag(7, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; }, - &CosmosRequest_oneof_req::remove(ref v) => { + &CosmosRequest_oneof_req::insertStorageCell(ref v) => { os.write_tag(8, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; }, - &CosmosRequest_oneof_req::removeStorageCell(ref v) => { + &CosmosRequest_oneof_req::remove(ref v) => { os.write_tag(9, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; }, - &CosmosRequest_oneof_req::removeStorage(ref v) => { + &CosmosRequest_oneof_req::removeStorageCell(ref v) => { os.write_tag(10, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; }, - &CosmosRequest_oneof_req::blockHash(ref v) => { + &CosmosRequest_oneof_req::removeStorage(ref v) => { os.write_tag(11, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; }, - &CosmosRequest_oneof_req::addVerificationDetails(ref v) => { + &CosmosRequest_oneof_req::blockHash(ref v) => { os.write_tag(12, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; }, - &CosmosRequest_oneof_req::hasVerification(ref v) => { + &CosmosRequest_oneof_req::addVerificationDetails(ref v) => { os.write_tag(13, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; }, - &CosmosRequest_oneof_req::getVerificationData(ref v) => { + &CosmosRequest_oneof_req::hasVerification(ref v) => { os.write_tag(14, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; }, + &CosmosRequest_oneof_req::getVerificationData(ref v) => { + os.write_tag(15, ::protobuf::wire_format::WireTypeLengthDelimited)?; + os.write_raw_varint32(v.get_cached_size())?; + v.write_to_with_cached_sizes(os)?; + }, + &CosmosRequest_oneof_req::insertAccountBalance(ref v) => { + os.write_tag(16, ::protobuf::wire_format::WireTypeLengthDelimited)?; + os.write_raw_varint32(v.get_cached_size())?; + v.write_to_with_cached_sizes(os)?; + }, + &CosmosRequest_oneof_req::insertAccountNonce(ref v) => { + os.write_tag(17, ::protobuf::wire_format::WireTypeLengthDelimited)?; + os.write_raw_varint32(v.get_cached_size())?; + v.write_to_with_cached_sizes(os)?; + }, }; } os.write_unknown_fields(self.get_unknown_fields())?; @@ -8874,11 +10048,6 @@ impl ::protobuf::Message for CosmosRequest { CosmosRequest::has_getAccount, CosmosRequest::get_getAccount, )); - fields.push(::protobuf::reflect::accessor::make_singular_message_accessor::<_, QueryInsertAccount>( - "insertAccount", - CosmosRequest::has_insertAccount, - CosmosRequest::get_insertAccount, - )); fields.push(::protobuf::reflect::accessor::make_singular_message_accessor::<_, QueryContainsKey>( "containsKey", CosmosRequest::has_containsKey, @@ -8889,6 +10058,16 @@ impl ::protobuf::Message for CosmosRequest { CosmosRequest::has_accountCode, CosmosRequest::get_accountCode, )); + fields.push(::protobuf::reflect::accessor::make_singular_message_accessor::<_, QueryGetAccountCodeHash>( + "codeHash", + CosmosRequest::has_codeHash, + CosmosRequest::get_codeHash, + )); + fields.push(::protobuf::reflect::accessor::make_singular_message_accessor::<_, QueryGetAccountCodeSize>( + "codeSize", + CosmosRequest::has_codeSize, + CosmosRequest::get_codeSize, + )); fields.push(::protobuf::reflect::accessor::make_singular_message_accessor::<_, QueryGetAccountStorageCell>( "storageCell", CosmosRequest::has_storageCell, @@ -8939,6 +10118,16 @@ impl ::protobuf::Message for CosmosRequest { CosmosRequest::has_getVerificationData, CosmosRequest::get_getVerificationData, )); + fields.push(::protobuf::reflect::accessor::make_singular_message_accessor::<_, QueryInsertAccountBalance>( + "insertAccountBalance", + CosmosRequest::has_insertAccountBalance, + CosmosRequest::get_insertAccountBalance, + )); + fields.push(::protobuf::reflect::accessor::make_singular_message_accessor::<_, QueryInsertAccountNonce>( + "insertAccountNonce", + CosmosRequest::has_insertAccountNonce, + CosmosRequest::get_insertAccountNonce, + )); ::protobuf::reflect::MessageDescriptor::new::( "CosmosRequest", fields, @@ -8975,6 +10164,9 @@ impl ::protobuf::Clear for CosmosRequest { self.req = ::std::option::Option::None; self.req = ::std::option::Option::None; self.req = ::std::option::Option::None; + self.req = ::std::option::Option::None; + self.req = ::std::option::Option::None; + self.req = ::std::option::Option::None; self.unknown_fields.clear(); } } @@ -8998,6 +10190,7 @@ pub struct SGXVMCallParams { pub to: ::std::vec::Vec, pub data: ::std::vec::Vec, pub gasLimit: u64, + pub gasPrice: ::std::vec::Vec, pub value: ::std::vec::Vec, pub accessList: ::protobuf::RepeatedField, pub commit: bool, @@ -9112,7 +10305,33 @@ impl SGXVMCallParams { self.gasLimit = v; } - // bytes value = 5; + // bytes gasPrice = 5; + + + pub fn get_gasPrice(&self) -> &[u8] { + &self.gasPrice + } + pub fn clear_gasPrice(&mut self) { + self.gasPrice.clear(); + } + + // Param is passed by value, moved + pub fn set_gasPrice(&mut self, v: ::std::vec::Vec) { + self.gasPrice = v; + } + + // Mutable pointer to the field. + // If field is not initialized, it is initialized with default value first. + pub fn mut_gasPrice(&mut self) -> &mut ::std::vec::Vec { + &mut self.gasPrice + } + + // Take field + pub fn take_gasPrice(&mut self) -> ::std::vec::Vec { + ::std::mem::replace(&mut self.gasPrice, ::std::vec::Vec::new()) + } + + // bytes value = 6; pub fn get_value(&self) -> &[u8] { @@ -9138,7 +10357,7 @@ impl SGXVMCallParams { ::std::mem::replace(&mut self.value, ::std::vec::Vec::new()) } - // repeated .ffi.ffi.AccessListItem accessList = 6; + // repeated .ffi.ffi.AccessListItem accessList = 7; pub fn get_accessList(&self) -> &[AccessListItem] { @@ -9163,7 +10382,7 @@ impl SGXVMCallParams { ::std::mem::replace(&mut self.accessList, ::protobuf::RepeatedField::new()) } - // bool commit = 7; + // bool commit = 8; pub fn get_commit(&self) -> bool { @@ -9178,7 +10397,7 @@ impl SGXVMCallParams { self.commit = v; } - // uint64 nonce = 8; + // uint64 nonce = 9; pub fn get_nonce(&self) -> u64 { @@ -9193,7 +10412,7 @@ impl SGXVMCallParams { self.nonce = v; } - // bool unencrypted = 9; + // bool unencrypted = 10; pub fn get_unencrypted(&self) -> bool { @@ -9240,26 +10459,29 @@ impl ::protobuf::Message for SGXVMCallParams { self.gasLimit = tmp; }, 5 => { - ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.value)?; + ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.gasPrice)?; }, 6 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.accessList)?; + ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.value)?; }, 7 => { + ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.accessList)?; + }, + 8 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } let tmp = is.read_bool()?; self.commit = tmp; }, - 8 => { + 9 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } let tmp = is.read_uint64()?; self.nonce = tmp; }, - 9 => { + 10 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } @@ -9290,8 +10512,11 @@ impl ::protobuf::Message for SGXVMCallParams { if self.gasLimit != 0 { my_size += ::protobuf::rt::value_size(4, self.gasLimit, ::protobuf::wire_format::WireTypeVarint); } + if !self.gasPrice.is_empty() { + my_size += ::protobuf::rt::bytes_size(5, &self.gasPrice); + } if !self.value.is_empty() { - my_size += ::protobuf::rt::bytes_size(5, &self.value); + my_size += ::protobuf::rt::bytes_size(6, &self.value); } for value in &self.accessList { let len = value.compute_size(); @@ -9301,7 +10526,7 @@ impl ::protobuf::Message for SGXVMCallParams { my_size += 2; } if self.nonce != 0 { - my_size += ::protobuf::rt::value_size(8, self.nonce, ::protobuf::wire_format::WireTypeVarint); + my_size += ::protobuf::rt::value_size(9, self.nonce, ::protobuf::wire_format::WireTypeVarint); } if self.unencrypted != false { my_size += 2; @@ -9324,22 +10549,25 @@ impl ::protobuf::Message for SGXVMCallParams { if self.gasLimit != 0 { os.write_uint64(4, self.gasLimit)?; } + if !self.gasPrice.is_empty() { + os.write_bytes(5, &self.gasPrice)?; + } if !self.value.is_empty() { - os.write_bytes(5, &self.value)?; + os.write_bytes(6, &self.value)?; } for v in &self.accessList { - os.write_tag(6, ::protobuf::wire_format::WireTypeLengthDelimited)?; + os.write_tag(7, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; }; if self.commit != false { - os.write_bool(7, self.commit)?; + os.write_bool(8, self.commit)?; } if self.nonce != 0 { - os.write_uint64(8, self.nonce)?; + os.write_uint64(9, self.nonce)?; } if self.unencrypted != false { - os.write_bool(9, self.unencrypted)?; + os.write_bool(10, self.unencrypted)?; } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) @@ -9403,6 +10631,11 @@ impl ::protobuf::Message for SGXVMCallParams { |m: &SGXVMCallParams| { &m.gasLimit }, |m: &mut SGXVMCallParams| { &mut m.gasLimit }, )); + fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( + "gasPrice", + |m: &SGXVMCallParams| { &m.gasPrice }, + |m: &mut SGXVMCallParams| { &mut m.gasPrice }, + )); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( "value", |m: &SGXVMCallParams| { &m.value }, @@ -9454,6 +10687,7 @@ impl ::protobuf::Clear for SGXVMCallParams { self.to.clear(); self.data.clear(); self.gasLimit = 0; + self.gasPrice.clear(); self.value.clear(); self.accessList.clear(); self.commit = false; @@ -9481,6 +10715,7 @@ pub struct SGXVMCreateParams { pub from: ::std::vec::Vec, pub data: ::std::vec::Vec, pub gasLimit: u64, + pub gasPrice: ::std::vec::Vec, pub value: ::std::vec::Vec, pub accessList: ::protobuf::RepeatedField, pub commit: bool, @@ -9568,7 +10803,33 @@ impl SGXVMCreateParams { self.gasLimit = v; } - // bytes value = 4; + // bytes gasPrice = 4; + + + pub fn get_gasPrice(&self) -> &[u8] { + &self.gasPrice + } + pub fn clear_gasPrice(&mut self) { + self.gasPrice.clear(); + } + + // Param is passed by value, moved + pub fn set_gasPrice(&mut self, v: ::std::vec::Vec) { + self.gasPrice = v; + } + + // Mutable pointer to the field. + // If field is not initialized, it is initialized with default value first. + pub fn mut_gasPrice(&mut self) -> &mut ::std::vec::Vec { + &mut self.gasPrice + } + + // Take field + pub fn take_gasPrice(&mut self) -> ::std::vec::Vec { + ::std::mem::replace(&mut self.gasPrice, ::std::vec::Vec::new()) + } + + // bytes value = 5; pub fn get_value(&self) -> &[u8] { @@ -9594,7 +10855,7 @@ impl SGXVMCreateParams { ::std::mem::replace(&mut self.value, ::std::vec::Vec::new()) } - // repeated .ffi.ffi.AccessListItem accessList = 5; + // repeated .ffi.ffi.AccessListItem accessList = 6; pub fn get_accessList(&self) -> &[AccessListItem] { @@ -9619,7 +10880,7 @@ impl SGXVMCreateParams { ::std::mem::replace(&mut self.accessList, ::protobuf::RepeatedField::new()) } - // bool commit = 6; + // bool commit = 7; pub fn get_commit(&self) -> bool { @@ -9634,7 +10895,7 @@ impl SGXVMCreateParams { self.commit = v; } - // uint64 nonce = 7; + // uint64 nonce = 8; pub fn get_nonce(&self) -> u64 { @@ -9678,19 +10939,22 @@ impl ::protobuf::Message for SGXVMCreateParams { self.gasLimit = tmp; }, 4 => { - ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.value)?; + ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.gasPrice)?; }, 5 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.accessList)?; + ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.value)?; }, 6 => { + ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.accessList)?; + }, + 7 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } let tmp = is.read_bool()?; self.commit = tmp; }, - 7 => { + 8 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } @@ -9718,8 +10982,11 @@ impl ::protobuf::Message for SGXVMCreateParams { if self.gasLimit != 0 { my_size += ::protobuf::rt::value_size(3, self.gasLimit, ::protobuf::wire_format::WireTypeVarint); } + if !self.gasPrice.is_empty() { + my_size += ::protobuf::rt::bytes_size(4, &self.gasPrice); + } if !self.value.is_empty() { - my_size += ::protobuf::rt::bytes_size(4, &self.value); + my_size += ::protobuf::rt::bytes_size(5, &self.value); } for value in &self.accessList { let len = value.compute_size(); @@ -9729,7 +10996,7 @@ impl ::protobuf::Message for SGXVMCreateParams { my_size += 2; } if self.nonce != 0 { - my_size += ::protobuf::rt::value_size(7, self.nonce, ::protobuf::wire_format::WireTypeVarint); + my_size += ::protobuf::rt::value_size(8, self.nonce, ::protobuf::wire_format::WireTypeVarint); } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); @@ -9746,19 +11013,22 @@ impl ::protobuf::Message for SGXVMCreateParams { if self.gasLimit != 0 { os.write_uint64(3, self.gasLimit)?; } + if !self.gasPrice.is_empty() { + os.write_bytes(4, &self.gasPrice)?; + } if !self.value.is_empty() { - os.write_bytes(4, &self.value)?; + os.write_bytes(5, &self.value)?; } for v in &self.accessList { - os.write_tag(5, ::protobuf::wire_format::WireTypeLengthDelimited)?; + os.write_tag(6, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; }; if self.commit != false { - os.write_bool(6, self.commit)?; + os.write_bool(7, self.commit)?; } if self.nonce != 0 { - os.write_uint64(7, self.nonce)?; + os.write_uint64(8, self.nonce)?; } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) @@ -9817,6 +11087,11 @@ impl ::protobuf::Message for SGXVMCreateParams { |m: &SGXVMCreateParams| { &m.gasLimit }, |m: &mut SGXVMCreateParams| { &mut m.gasLimit }, )); + fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( + "gasPrice", + |m: &SGXVMCreateParams| { &m.gasPrice }, + |m: &mut SGXVMCreateParams| { &mut m.gasPrice }, + )); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( "value", |m: &SGXVMCreateParams| { &m.value }, @@ -9862,6 +11137,7 @@ impl ::protobuf::Clear for SGXVMCreateParams { self.from.clear(); self.data.clear(); self.gasLimit = 0; + self.gasPrice.clear(); self.value.clear(); self.accessList.clear(); self.commit = false; @@ -11505,543 +12781,582 @@ static file_descriptor_proto_data: &'static [u8] = b"\ .ffi.TopicR\x06topics\x12\x12\n\x04data\x18\x03\x20\x01(\x0cR\x04data\"+\ \n\x0fQueryGetAccount\x12\x18\n\x07address\x18\x01\x20\x01(\x0cR\x07addr\ ess\"I\n\x17QueryGetAccountResponse\x12\x18\n\x07balance\x18\x01\x20\x01\ - (\x0cR\x07balance\x12\x14\n\x05nonce\x18\x02\x20\x01(\x04R\x05nonce\"^\n\ - \x12QueryInsertAccount\x12\x18\n\x07address\x18\x01\x20\x01(\x0cR\x07add\ - ress\x12\x18\n\x07balance\x18\x02\x20\x01(\x0cR\x07balance\x12\x14\n\x05\ - nonce\x18\x03\x20\x01(\x04R\x05nonce\"\x1c\n\x1aQueryInsertAccountRespon\ - se\"$\n\x10QueryContainsKey\x12\x10\n\x03key\x18\x01\x20\x01(\x0cR\x03ke\ - y\"6\n\x18QueryContainsKeyResponse\x12\x1a\n\x08contains\x18\x01\x20\x01\ - (\x08R\x08contains\"L\n\x1aQueryGetAccountStorageCell\x12\x18\n\x07addre\ - ss\x18\x01\x20\x01(\x0cR\x07address\x12\x14\n\x05index\x18\x02\x20\x01(\ - \x0cR\x05index\":\n\"QueryGetAccountStorageCellResponse\x12\x14\n\x05val\ - ue\x18\x01\x20\x01(\x0cR\x05value\"/\n\x13QueryGetAccountCode\x12\x18\n\ + (\x0cR\x07balance\x12\x14\n\x05nonce\x18\x02\x20\x01(\x04R\x05nonce\"O\n\ + \x19QueryInsertAccountBalance\x12\x18\n\x07address\x18\x01\x20\x01(\x0cR\ + \x07address\x12\x18\n\x07balance\x18\x02\x20\x01(\x0cR\x07balance\"#\n!Q\ + ueryInsertAccountBalanceResponse\"I\n\x17QueryInsertAccountNonce\x12\x18\ + \n\x07address\x18\x01\x20\x01(\x0cR\x07address\x12\x14\n\x05nonce\x18\ + \x02\x20\x01(\x04R\x05nonce\"!\n\x1fQueryInsertAccountNonceResponse\"$\n\ + \x10QueryContainsKey\x12\x10\n\x03key\x18\x01\x20\x01(\x0cR\x03key\"6\n\ + \x18QueryContainsKeyResponse\x12\x1a\n\x08contains\x18\x01\x20\x01(\x08R\ + \x08contains\"L\n\x1aQueryGetAccountStorageCell\x12\x18\n\x07address\x18\ + \x01\x20\x01(\x0cR\x07address\x12\x14\n\x05index\x18\x02\x20\x01(\x0cR\ + \x05index\":\n\"QueryGetAccountStorageCellResponse\x12\x14\n\x05value\ + \x18\x01\x20\x01(\x0cR\x05value\"/\n\x13QueryGetAccountCode\x12\x18\n\ \x07address\x18\x01\x20\x01(\x0cR\x07address\"1\n\x1bQueryGetAccountCode\ - Response\x12\x12\n\x04code\x18\x01\x20\x01(\x0cR\x04code\"F\n\x16QueryIn\ - sertAccountCode\x12\x18\n\x07address\x18\x01\x20\x01(\x0cR\x07address\ - \x12\x12\n\x04code\x18\x02\x20\x01(\x0cR\x04code\"\x20\n\x1eQueryInsertA\ - ccountCodeResponse\"^\n\x16QueryInsertStorageCell\x12\x18\n\x07address\ - \x18\x01\x20\x01(\x0cR\x07address\x12\x14\n\x05index\x18\x02\x20\x01(\ - \x0cR\x05index\x12\x14\n\x05value\x18\x03\x20\x01(\x0cR\x05value\"\x20\n\ - \x1eQueryInsertStorageCellResponse\"'\n\x0bQueryRemove\x12\x18\n\x07addr\ - ess\x18\x01\x20\x01(\x0cR\x07address\"\x15\n\x13QueryRemoveResponse\"H\n\ - \x16QueryRemoveStorageCell\x12\x18\n\x07address\x18\x01\x20\x01(\x0cR\ - \x07address\x12\x14\n\x05index\x18\x02\x20\x01(\x0cR\x05index\"\x20\n\ - \x1eQueryRemoveStorageCellResponse\".\n\x12QueryRemoveStorage\x12\x18\n\ - \x07address\x18\x01\x20\x01(\x0cR\x07address\"\x1c\n\x1aQueryRemoveStora\ - geResponse\"(\n\x0eQueryBlockHash\x12\x16\n\x06number\x18\x01\x20\x01(\ - \x0cR\x06number\",\n\x16QueryBlockHashResponse\x12\x12\n\x04hash\x18\x01\ - \x20\x01(\x0cR\x04hash\"\x97\x03\n\x1bQueryAddVerificationDetails\x12\ - \x20\n\x0buserAddress\x18\x01\x20\x01(\x0cR\x0buserAddress\x12$\n\rissue\ - rAddress\x18\x02\x20\x01(\x0cR\rissuerAddress\x12\x20\n\x0boriginChain\ - \x18\x03\x20\x01(\tR\x0boriginChain\x12*\n\x10verificationType\x18\x04\ - \x20\x01(\rR\x10verificationType\x12,\n\x11issuanceTimestamp\x18\x05\x20\ - \x01(\rR\x11issuanceTimestamp\x120\n\x13expirationTimestamp\x18\x06\x20\ - \x01(\rR\x13expirationTimestamp\x12\x1c\n\tproofData\x18\x07\x20\x01(\ - \x0cR\tproofData\x12\x16\n\x06schema\x18\x08\x20\x01(\tR\x06schema\x122\ - \n\x14issuerVerificationId\x18\t\x20\x01(\tR\x14issuerVerificationId\x12\ - \x18\n\x07version\x18\n\x20\x01(\rR\x07version\"M\n#QueryAddVerification\ - DetailsResponse\x12&\n\x0everificationId\x18\x01\x20\x01(\x0cR\x0everifi\ - cationId\"\xbe\x01\n\x14QueryHasVerification\x12\x20\n\x0buserAddress\ - \x18\x01\x20\x01(\x0cR\x0buserAddress\x12*\n\x10verificationType\x18\x02\ - \x20\x01(\rR\x10verificationType\x120\n\x13expirationTimestamp\x18\x03\ - \x20\x01(\rR\x13expirationTimestamp\x12&\n\x0eallowedIssuers\x18\x04\x20\ - \x03(\x0cR\x0eallowedIssuers\"H\n\x1cQueryHasVerificationResponse\x12(\n\ - \x0fhasVerification\x18\x01\x20\x01(\x08R\x0fhasVerification\"b\n\x18Que\ - ryGetVerificationData\x12\x20\n\x0buserAddress\x18\x01\x20\x01(\x0cR\x0b\ - userAddress\x12$\n\rissuerAddress\x18\x02\x20\x01(\x0cR\rissuerAddress\"\ - \x9b\x03\n\x13VerificationDetails\x12*\n\x10verificationType\x18\x01\x20\ - \x01(\rR\x10verificationType\x12&\n\x0everificationID\x18\x02\x20\x01(\ - \x0cR\x0everificationID\x12$\n\rissuerAddress\x18\x03\x20\x01(\x0cR\riss\ - uerAddress\x12\x20\n\x0boriginChain\x18\x04\x20\x01(\tR\x0boriginChain\ - \x12,\n\x11issuanceTimestamp\x18\x05\x20\x01(\rR\x11issuanceTimestamp\ - \x120\n\x13expirationTimestamp\x18\x06\x20\x01(\rR\x13expirationTimestam\ - p\x12\"\n\x0coriginalData\x18\x07\x20\x01(\x0cR\x0coriginalData\x12\x16\ - \n\x06schema\x18\x08\x20\x01(\tR\x06schema\x122\n\x14issuerVerificationI\ - d\x18\t\x20\x01(\tR\x14issuerVerificationId\x12\x18\n\x07version\x18\n\ - \x20\x01(\rR\x07version\"T\n\x20QueryGetVerificationDataResponse\x120\n\ - \x04data\x18\x01\x20\x03(\x0b2\x1c.ffi.ffi.VerificationDetailsR\x04data\ - \"\x84\x08\n\rCosmosRequest\x12:\n\ngetAccount\x18\x01\x20\x01(\x0b2\x18\ - .ffi.ffi.QueryGetAccountH\0R\ngetAccount\x12C\n\rinsertAccount\x18\x02\ - \x20\x01(\x0b2\x1b.ffi.ffi.QueryInsertAccountH\0R\rinsertAccount\x12=\n\ - \x0bcontainsKey\x18\x03\x20\x01(\x0b2\x19.ffi.ffi.QueryContainsKeyH\0R\ - \x0bcontainsKey\x12@\n\x0baccountCode\x18\x04\x20\x01(\x0b2\x1c.ffi.ffi.\ - QueryGetAccountCodeH\0R\x0baccountCode\x12G\n\x0bstorageCell\x18\x05\x20\ - \x01(\x0b2#.ffi.ffi.QueryGetAccountStorageCellH\0R\x0bstorageCell\x12O\n\ - \x11insertAccountCode\x18\x06\x20\x01(\x0b2\x1f.ffi.ffi.QueryInsertAccou\ - ntCodeH\0R\x11insertAccountCode\x12O\n\x11insertStorageCell\x18\x07\x20\ - \x01(\x0b2\x1f.ffi.ffi.QueryInsertStorageCellH\0R\x11insertStorageCell\ - \x12.\n\x06remove\x18\x08\x20\x01(\x0b2\x14.ffi.ffi.QueryRemoveH\0R\x06r\ - emove\x12O\n\x11removeStorageCell\x18\t\x20\x01(\x0b2\x1f.ffi.ffi.QueryR\ - emoveStorageCellH\0R\x11removeStorageCell\x12C\n\rremoveStorage\x18\n\ - \x20\x01(\x0b2\x1b.ffi.ffi.QueryRemoveStorageH\0R\rremoveStorage\x127\n\ - \tblockHash\x18\x0b\x20\x01(\x0b2\x17.ffi.ffi.QueryBlockHashH\0R\tblockH\ - ash\x12^\n\x16addVerificationDetails\x18\x0c\x20\x01(\x0b2$.ffi.ffi.Quer\ - yAddVerificationDetailsH\0R\x16addVerificationDetails\x12I\n\x0fhasVerif\ - ication\x18\r\x20\x01(\x0b2\x1d.ffi.ffi.QueryHasVerificationH\0R\x0fhasV\ - erification\x12U\n\x13getVerificationData\x18\x0e\x20\x01(\x0b2!.ffi.ffi\ - .QueryGetVerificationDataH\0R\x13getVerificationDataB\x05\n\x03req\"\x84\ - \x02\n\x0fSGXVMCallParams\x12\x12\n\x04from\x18\x01\x20\x01(\x0cR\x04fro\ - m\x12\x0e\n\x02to\x18\x02\x20\x01(\x0cR\x02to\x12\x12\n\x04data\x18\x03\ - \x20\x01(\x0cR\x04data\x12\x1a\n\x08gasLimit\x18\x04\x20\x01(\x04R\x08ga\ - sLimit\x12\x14\n\x05value\x18\x05\x20\x01(\x0cR\x05value\x127\n\naccessL\ - ist\x18\x06\x20\x03(\x0b2\x17.ffi.ffi.AccessListItemR\naccessList\x12\ - \x16\n\x06commit\x18\x07\x20\x01(\x08R\x06commit\x12\x14\n\x05nonce\x18\ - \x08\x20\x01(\x04R\x05nonce\x12\x20\n\x0bunencrypted\x18\t\x20\x01(\x08R\ - \x0bunencrypted\"\xd4\x01\n\x11SGXVMCreateParams\x12\x12\n\x04from\x18\ - \x01\x20\x01(\x0cR\x04from\x12\x12\n\x04data\x18\x02\x20\x01(\x0cR\x04da\ - ta\x12\x1a\n\x08gasLimit\x18\x03\x20\x01(\x04R\x08gasLimit\x12\x14\n\x05\ - value\x18\x04\x20\x01(\x0cR\x05value\x127\n\naccessList\x18\x05\x20\x03(\ - \x0b2\x17.ffi.ffi.AccessListItemR\naccessList\x12\x16\n\x06commit\x18\ - \x06\x20\x01(\x08R\x06commit\x12\x14\n\x05nonce\x18\x07\x20\x01(\x04R\ - \x05nonce\"{\n\x10SGXVMCallRequest\x120\n\x06params\x18\x01\x20\x01(\x0b\ - 2\x18.ffi.ffi.SGXVMCallParamsR\x06params\x125\n\x07context\x18\x02\x20\ - \x01(\x0b2\x1b.ffi.ffi.TransactionContextR\x07context\"\x7f\n\x12SGXVMCr\ - eateRequest\x122\n\x06params\x18\x01\x20\x01(\x0b2\x1a.ffi.ffi.SGXVMCrea\ - teParamsR\x06params\x125\n\x07context\x18\x02\x20\x01(\x0b2\x1b.ffi.ffi.\ - TransactionContextR\x07context\"8\n\x14NodePublicKeyRequest\x12\x20\n\ - \x0bblockNumber\x18\x01\x20\x01(\x04R\x0bblockNumber\"5\n\x15NodePublicK\ - eyResponse\x12\x1c\n\tpublicKey\x18\x01\x20\x01(\x0cR\tpublicKey\"y\n\tE\ - pochData\x12\x20\n\x0bepochNumber\x18\x01\x20\x01(\rR\x0bepochNumber\x12\ - $\n\rstartingBlock\x18\x02\x20\x01(\x04R\rstartingBlock\x12$\n\rnodePubl\ - icKey\x18\x03\x20\x01(\x0cR\rnodePublicKey\"@\n\x12ListEpochsResponse\ - \x12*\n\x06epochs\x18\x01\x20\x03(\x0b2\x12.ffi.ffi.EpochDataR\x06epochs\ - \"\xe4\x01\n\nFFIRequest\x12=\n\x0bcallRequest\x18\x01\x20\x01(\x0b2\x19\ - .ffi.ffi.SGXVMCallRequestH\0R\x0bcallRequest\x12C\n\rcreateRequest\x18\ - \x02\x20\x01(\x0b2\x1b.ffi.ffi.SGXVMCreateRequestH\0R\rcreateRequest\x12\ - K\n\x10publicKeyRequest\x18\x03\x20\x01(\x0b2\x1d.ffi.ffi.NodePublicKeyR\ - equestH\0R\x10publicKeyRequestB\x05\n\x03reqB&Z$github.com/SigmaGmbH/lib\ - rustgo/typesJ\xf1N\n\x07\x12\x05\0\0\x93\x02\x01\n\x08\n\x01\x0c\x12\x03\ - \0\0\x12\n\x08\n\x01\x02\x12\x03\x02\0\x10\n\x08\n\x01\x08\x12\x03\x04\0\ - ;\n\t\n\x02\x08\x0b\x12\x03\x04\0;\n\x1d\n\x02\x04\0\x12\x04\x08\0\x0b\ - \x012\x11\x20General\x20request\n\n\n\n\x03\x04\0\x01\x12\x03\x08\x08\ - \x16\n\x0b\n\x04\x04\0\x02\0\x12\x03\t\x02!\n\x0c\n\x05\x04\0\x02\0\x04\ - \x12\x03\t\x02\n\n\x0c\n\x05\x04\0\x02\0\x05\x12\x03\t\x0b\x10\n\x0c\n\ - \x05\x04\0\x02\0\x01\x12\x03\t\x11\x1c\n\x0c\n\x05\x04\0\x02\0\x03\x12\ - \x03\t\x1f\x20\n\x0b\n\x04\x04\0\x02\x01\x12\x03\n\x02\x14\n\x0c\n\x05\ - \x04\0\x02\x01\x05\x12\x03\n\x02\x07\n\x0c\n\x05\x04\0\x02\x01\x01\x12\ - \x03\n\x08\x0f\n\x0c\n\x05\x04\0\x02\x01\x03\x12\x03\n\x12\x13\n\n\n\x02\ - \x04\x01\x12\x04\r\0\x14\x01\n\n\n\x03\x04\x01\x01\x12\x03\r\x08\x17\n\ - \x0b\n\x04\x04\x01\x02\0\x12\x03\x0e\x02\x11\n\x0c\n\x05\x04\x01\x02\0\ - \x05\x12\x03\x0e\x02\x07\n\x0c\n\x05\x04\x01\x02\0\x01\x12\x03\x0e\x08\ - \x0c\n\x0c\n\x05\x04\x01\x02\0\x03\x12\x03\x0e\x0f\x10\n\x0b\n\x04\x04\ - \x01\x02\x01\x12\x03\x0f\x02\x0f\n\x0c\n\x05\x04\x01\x02\x01\x05\x12\x03\ - \x0f\x02\x07\n\x0c\n\x05\x04\x01\x02\x01\x01\x12\x03\x0f\x08\n\n\x0c\n\ - \x05\x04\x01\x02\x01\x03\x12\x03\x0f\r\x0e\n\x0b\n\x04\x04\x01\x02\x02\ - \x12\x03\x10\x02\x11\n\x0c\n\x05\x04\x01\x02\x02\x05\x12\x03\x10\x02\x07\ - \n\x0c\n\x05\x04\x01\x02\x02\x01\x12\x03\x10\x08\x0c\n\x0c\n\x05\x04\x01\ - \x02\x02\x03\x12\x03\x10\x0f\x10\n\x0b\n\x04\x04\x01\x02\x03\x12\x03\x11\ - \x02\x16\n\x0c\n\x05\x04\x01\x02\x03\x05\x12\x03\x11\x02\x08\n\x0c\n\x05\ - \x04\x01\x02\x03\x01\x12\x03\x11\t\x11\n\x0c\n\x05\x04\x01\x02\x03\x03\ - \x12\x03\x11\x14\x15\n\x0b\n\x04\x04\x01\x02\x04\x12\x03\x12\x02\x12\n\ - \x0c\n\x05\x04\x01\x02\x04\x05\x12\x03\x12\x02\x07\n\x0c\n\x05\x04\x01\ - \x02\x04\x01\x12\x03\x12\x08\r\n\x0c\n\x05\x04\x01\x02\x04\x03\x12\x03\ - \x12\x10\x11\n\x0b\n\x04\x04\x01\x02\x05\x12\x03\x13\x02)\n\x0c\n\x05\ - \x04\x01\x02\x05\x04\x12\x03\x13\x02\n\n\x0c\n\x05\x04\x01\x02\x05\x06\ - \x12\x03\x13\x0b\x19\n\x0c\n\x05\x04\x01\x02\x05\x01\x12\x03\x13\x1a$\n\ - \x0c\n\x05\x04\x01\x02\x05\x03\x12\x03\x13'(\n\n\n\x02\x04\x02\x12\x04\ - \x16\0\x1e\x01\n\n\n\x03\x04\x02\x01\x12\x03\x16\x08\x1a\n\x0b\n\x04\x04\ - \x02\x02\0\x12\x03\x17\x02\x16\n\x0c\n\x05\x04\x02\x02\0\x05\x12\x03\x17\ - \x02\x08\n\x0c\n\x05\x04\x02\x02\0\x01\x12\x03\x17\t\x11\n\x0c\n\x05\x04\ - \x02\x02\0\x03\x12\x03\x17\x14\x15\n\x0b\n\x04\x04\x02\x02\x01\x12\x03\ - \x18\x02\x16\n\x0c\n\x05\x04\x02\x02\x01\x05\x12\x03\x18\x02\x07\n\x0c\n\ - \x05\x04\x02\x02\x01\x01\x12\x03\x18\x08\x11\n\x0c\n\x05\x04\x02\x02\x01\ - \x03\x12\x03\x18\x14\x15\n\x0b\n\x04\x04\x02\x02\x02\x12\x03\x19\x02\x17\ - \n\x0c\n\x05\x04\x02\x02\x02\x05\x12\x03\x19\x02\x08\n\x0c\n\x05\x04\x02\ - \x02\x02\x01\x12\x03\x19\t\x12\n\x0c\n\x05\x04\x02\x02\x02\x03\x12\x03\ - \x19\x15\x16\n\x0b\n\x04\x04\x02\x02\x03\x12\x03\x1a\x02\x1d\n\x0c\n\x05\ - \x04\x02\x02\x03\x05\x12\x03\x1a\x02\x08\n\x0c\n\x05\x04\x02\x02\x03\x01\ - \x12\x03\x1a\t\x18\n\x0c\n\x05\x04\x02\x02\x03\x03\x12\x03\x1a\x1b\x1c\n\ - \x0b\n\x04\x04\x02\x02\x04\x12\x03\x1b\x02#\n\x0c\n\x05\x04\x02\x02\x04\ - \x05\x12\x03\x1b\x02\x07\n\x0c\n\x05\x04\x02\x02\x04\x01\x12\x03\x1b\x08\ - \x1e\n\x0c\n\x05\x04\x02\x02\x04\x03\x12\x03\x1b!\"\n\x0b\n\x04\x04\x02\ - \x02\x05\x12\x03\x1c\x02\x1b\n\x0c\n\x05\x04\x02\x02\x05\x05\x12\x03\x1c\ - \x02\x07\n\x0c\n\x05\x04\x02\x02\x05\x01\x12\x03\x1c\x08\x16\n\x0c\n\x05\ - \x04\x02\x02\x05\x03\x12\x03\x1c\x19\x1a\n\x0b\n\x04\x04\x02\x02\x06\x12\ - \x03\x1d\x02\x1a\n\x0c\n\x05\x04\x02\x02\x06\x05\x12\x03\x1d\x02\x08\n\ - \x0c\n\x05\x04\x02\x02\x06\x01\x12\x03\x1d\t\x15\n\x0c\n\x05\x04\x02\x02\ - \x06\x03\x12\x03\x1d\x18\x19\n\n\n\x02\x04\x03\x12\x04\x20\0#\x01\n\n\n\ - \x03\x04\x03\x01\x12\x03\x20\x08\x20\n\x0b\n\x04\x04\x03\x02\0\x12\x03!\ - \x02\x1e\n\x0c\n\x05\x04\x03\x02\0\x06\x12\x03!\x02\x11\n\x0c\n\x05\x04\ - \x03\x02\0\x01\x12\x03!\x12\x19\n\x0c\n\x05\x04\x03\x02\0\x03\x12\x03!\ - \x1c\x1d\n\x0b\n\x04\x04\x03\x02\x01\x12\x03\"\x02$\n\x0c\n\x05\x04\x03\ - \x02\x01\x06\x12\x03\"\x02\x14\n\x0c\n\x05\x04\x03\x02\x01\x01\x12\x03\"\ - \x15\x1f\n\x0c\n\x05\x04\x03\x02\x01\x03\x12\x03\"\"#\n\n\n\x02\x04\x04\ - \x12\x04%\00\x01\n\n\n\x03\x04\x04\x01\x12\x03%\x08!\nZ\n\x04\x04\x04\ - \x02\0\x12\x03(\x02\x18\x1aM\x20logs\x20contains\x20the\x20transaction\ - \x20hash\x20and\x20the\x20proto-compatible\x20ethereum\n\x20logs.\n\n\ - \x0c\n\x05\x04\x04\x02\0\x04\x12\x03(\x02\n\n\x0c\n\x05\x04\x04\x02\0\ - \x06\x12\x03(\x0b\x0e\n\x0c\n\x05\x04\x04\x02\0\x01\x12\x03(\x0f\x13\n\ - \x0c\n\x05\x04\x04\x02\0\x03\x12\x03(\x16\x17\n\\\n\x04\x04\x04\x02\x01\ - \x12\x03+\x02\x10\x1aO\x20returned\x20data\x20from\x20evm\x20function\ - \x20(result\x20or\x20data\x20supplied\x20with\x20revert\n\x20opcode)\n\n\ - \x0c\n\x05\x04\x04\x02\x01\x05\x12\x03+\x02\x07\n\x0c\n\x05\x04\x04\x02\ - \x01\x01\x12\x03+\x08\x0b\n\x0c\n\x05\x04\x04\x02\x01\x03\x12\x03+\x0e\ - \x0f\n=\n\x04\x04\x04\x02\x02\x12\x03-\x02\x16\x1a0\x20vm\x20error\x20is\ - \x20the\x20error\x20returned\x20by\x20vm\x20execution\n\n\x0c\n\x05\x04\ - \x04\x02\x02\x05\x12\x03-\x02\x08\n\x0c\n\x05\x04\x04\x02\x02\x01\x12\ - \x03-\t\x11\n\x0c\n\x05\x04\x04\x02\x02\x03\x12\x03-\x14\x15\n.\n\x04\ - \x04\x04\x02\x03\x12\x03/\x02\x16\x1a!\x20gas\x20consumed\x20by\x20the\ - \x20transaction\n\n\x0c\n\x05\x04\x04\x02\x03\x05\x12\x03/\x02\x08\n\x0c\ - \n\x05\x04\x04\x02\x03\x01\x12\x03/\t\x11\n\x0c\n\x05\x04\x04\x02\x03\ - \x03\x12\x03/\x14\x15\nc\n\x02\x04\x05\x12\x034\0\"\x1aX\x20Topic\x20rep\ - resents\x2032-byte\x20words\x20that\x20is\x20used\x20to\x20describe\x20w\ - hat\xe2\x80\x99s\x20going\x20on\x20in\x20an\n\x20event\n\n\n\n\x03\x04\ - \x05\x01\x12\x034\x08\r\n\x0b\n\x04\x04\x05\x02\0\x12\x034\x10\x20\n\x0c\ - \n\x05\x04\x05\x02\0\x05\x12\x034\x10\x15\n\x0c\n\x05\x04\x05\x02\0\x01\ - \x12\x034\x16\x1b\n\x0c\n\x05\x04\x05\x02\0\x03\x12\x034\x1e\x1f\n\x81\ - \x01\n\x02\x04\x06\x12\x049\0@\x01\x1au\x20Log\x20represents\x20an\x20pr\ - otobuf\x20compatible\x20Ethereum\x20Log\x20that\x20defines\x20a\x20contr\ - act\n\x20log\x20event.\n\x20Copied\x20from\x20`devnet/proto``\n\n\n\n\ - \x03\x04\x06\x01\x12\x039\x08\x0b\n?\n\x04\x04\x06\x02\0\x12\x03;\x02\ - \x14\x1a2\x20address\x20of\x20the\x20contract\x20that\x20generated\x20th\ - e\x20event\n\n\x0c\n\x05\x04\x06\x02\0\x05\x12\x03;\x02\x07\n\x0c\n\x05\ - \x04\x06\x02\0\x01\x12\x03;\x08\x0f\n\x0c\n\x05\x04\x06\x02\0\x03\x12\ - \x03;\x12\x13\n7\n\x04\x04\x06\x02\x01\x12\x03=\x02\x1c\x1a*\x20list\x20\ - of\x20topics\x20provided\x20by\x20the\x20contract.\n\n\x0c\n\x05\x04\x06\ - \x02\x01\x04\x12\x03=\x02\n\n\x0c\n\x05\x04\x06\x02\x01\x06\x12\x03=\x0b\ - \x10\n\x0c\n\x05\x04\x06\x02\x01\x01\x12\x03=\x11\x17\n\x0c\n\x05\x04\ - \x06\x02\x01\x03\x12\x03=\x1a\x1b\n<\n\x04\x04\x06\x02\x02\x12\x03?\x02\ - \x11\x1a/\x20supplied\x20by\x20the\x20contract,\x20usually\x20ABI-encode\ - d\n\n\x0c\n\x05\x04\x06\x02\x02\x05\x12\x03?\x02\x07\n\x0c\n\x05\x04\x06\ - \x02\x02\x01\x12\x03?\x08\x0c\n\x0c\n\x05\x04\x06\x02\x02\x03\x12\x03?\ - \x0f\x10\nX\n\x02\x04\x07\x12\x04C\0F\x01\x1aL\x20Request\x20for\x20acco\ - unt\x20code\x20(smart\x20contract\x20deployed\x20behind\x20provided\x20a\ - ddress)\n\n\n\n\x03\x04\x07\x01\x12\x03C\x08\x17\n*\n\x04\x04\x07\x02\0\ - \x12\x03E\x02\x14\x1a\x1d\x2020\x20bytes\x20of\x20account\x20address\n\n\ - \x0c\n\x05\x04\x07\x02\0\x05\x12\x03E\x02\x07\n\x0c\n\x05\x04\x07\x02\0\ - \x01\x12\x03E\x08\x0f\n\x0c\n\x05\x04\x07\x02\0\x03\x12\x03E\x12\x13\n'\ - \n\x02\x04\x08\x12\x04I\0N\x01\x1a\x1b\x20Response\x20for\x20account\x20\ - code\n\n\n\n\x03\x04\x08\x01\x12\x03I\x08\x1f\nb\n\x04\x04\x08\x02\0\x12\ - \x03L\x02\x14\x1aU\x20Since\x20both\x20fields\x20are\x20256-bit\x20unsig\ - ned\x20integer,\x20we\x20encode\x20them\x20as\n\x20big-endian\x20bytes\n\ - \n\x0c\n\x05\x04\x08\x02\0\x05\x12\x03L\x02\x07\n\x0c\n\x05\x04\x08\x02\ - \0\x01\x12\x03L\x08\x0f\n\x0c\n\x05\x04\x08\x02\0\x03\x12\x03L\x12\x13\n\ - \x0b\n\x04\x04\x08\x02\x01\x12\x03M\x02\x13\n\x0c\n\x05\x04\x08\x02\x01\ - \x05\x12\x03M\x02\x08\n\x0c\n\x05\x04\x08\x02\x01\x01\x12\x03M\t\x0e\n\ - \x0c\n\x05\x04\x08\x02\x01\x03\x12\x03M\x11\x12\nF\n\x02\x04\t\x12\x04Q\ - \0U\x01\x1a:\x20Request\x20to\x20insert\x20account\x20data\x20such\x20as\ - \x20balance\x20and\x20nonce\n\n\n\n\x03\x04\t\x01\x12\x03Q\x08\x1a\n\x0b\ - \n\x04\x04\t\x02\0\x12\x03R\x02\x14\n\x0c\n\x05\x04\t\x02\0\x05\x12\x03R\ - \x02\x07\n\x0c\n\x05\x04\t\x02\0\x01\x12\x03R\x08\x0f\n\x0c\n\x05\x04\t\ - \x02\0\x03\x12\x03R\x12\x13\n\x0b\n\x04\x04\t\x02\x01\x12\x03S\x02\x14\n\ - \x0c\n\x05\x04\t\x02\x01\x05\x12\x03S\x02\x07\n\x0c\n\x05\x04\t\x02\x01\ - \x01\x12\x03S\x08\x0f\n\x0c\n\x05\x04\t\x02\x01\x03\x12\x03S\x12\x13\n\ - \x0b\n\x04\x04\t\x02\x02\x12\x03T\x02\x13\n\x0c\n\x05\x04\t\x02\x02\x05\ - \x12\x03T\x02\x08\n\x0c\n\x05\x04\t\x02\x02\x01\x12\x03T\t\x0e\n\x0c\n\ - \x05\x04\t\x02\x02\x03\x12\x03T\x11\x12\n+\n\x02\x04\n\x12\x03X\0%\x1a\ - \x20\x20Response\x20for\x20account\x20insertion\n\n\n\n\x03\x04\n\x01\ - \x12\x03X\x08\"\n\t\n\x02\x04\x0b\x12\x03Z\0+\n\n\n\x03\x04\x0b\x01\x12\ - \x03Z\x08\x18\n\x0b\n\x04\x04\x0b\x02\0\x12\x03Z\x1b)\n\x0c\n\x05\x04\ - \x0b\x02\0\x05\x12\x03Z\x1b\x20\n\x0c\n\x05\x04\x0b\x02\0\x01\x12\x03Z!$\ - \n\x0c\n\x05\x04\x0b\x02\0\x03\x12\x03Z'(\n\t\n\x02\x04\x0c\x12\x03\\\07\ - \n\n\n\x03\x04\x0c\x01\x12\x03\\\x08\x20\n\x0b\n\x04\x04\x0c\x02\0\x12\ - \x03\\#5\n\x0c\n\x05\x04\x0c\x02\0\x05\x12\x03\\#'\n\x0c\n\x05\x04\x0c\ - \x02\0\x01\x12\x03\\(0\n\x0c\n\x05\x04\x0c\x02\0\x03\x12\x03\\34\n\n\n\ - \x02\x04\r\x12\x04^\0a\x01\n\n\n\x03\x04\r\x01\x12\x03^\x08\"\n\x0b\n\ - \x04\x04\r\x02\0\x12\x03_\x02\x14\n\x0c\n\x05\x04\r\x02\0\x05\x12\x03_\ - \x02\x07\n\x0c\n\x05\x04\r\x02\0\x01\x12\x03_\x08\x0f\n\x0c\n\x05\x04\r\ - \x02\0\x03\x12\x03_\x12\x13\n\x0b\n\x04\x04\r\x02\x01\x12\x03`\x02\x12\n\ - \x0c\n\x05\x04\r\x02\x01\x05\x12\x03`\x02\x07\n\x0c\n\x05\x04\r\x02\x01\ - \x01\x12\x03`\x08\r\n\x0c\n\x05\x04\r\x02\x01\x03\x12\x03`\x10\x11\n\t\n\ - \x02\x04\x0e\x12\x03c\0?\n\n\n\x03\x04\x0e\x01\x12\x03c\x08*\n\x0b\n\x04\ - \x04\x0e\x02\0\x12\x03c-=\n\x0c\n\x05\x04\x0e\x02\0\x05\x12\x03c-2\n\x0c\ - \n\x05\x04\x0e\x02\0\x01\x12\x03c38\n\x0c\n\x05\x04\x0e\x02\0\x03\x12\ - \x03c;<\n\t\n\x02\x04\x0f\x12\x03e\02\n\n\n\x03\x04\x0f\x01\x12\x03e\x08\ - \x1b\n\x0b\n\x04\x04\x0f\x02\0\x12\x03e\x1e0\n\x0c\n\x05\x04\x0f\x02\0\ - \x05\x12\x03e\x1e#\n\x0c\n\x05\x04\x0f\x02\0\x01\x12\x03e$+\n\x0c\n\x05\ - \x04\x0f\x02\0\x03\x12\x03e./\n\t\n\x02\x04\x10\x12\x03g\07\n\n\n\x03\ - \x04\x10\x01\x12\x03g\x08#\n\x0b\n\x04\x04\x10\x02\0\x12\x03g&5\n\x0c\n\ - \x05\x04\x10\x02\0\x05\x12\x03g&+\n\x0c\n\x05\x04\x10\x02\0\x01\x12\x03g\ - ,0\n\x0c\n\x05\x04\x10\x02\0\x03\x12\x03g34\n\n\n\x02\x04\x11\x12\x04i\0\ - l\x01\n\n\n\x03\x04\x11\x01\x12\x03i\x08\x1e\n\x0b\n\x04\x04\x11\x02\0\ - \x12\x03j\x02\x14\n\x0c\n\x05\x04\x11\x02\0\x05\x12\x03j\x02\x07\n\x0c\n\ - \x05\x04\x11\x02\0\x01\x12\x03j\x08\x0f\n\x0c\n\x05\x04\x11\x02\0\x03\ - \x12\x03j\x12\x13\n\x0b\n\x04\x04\x11\x02\x01\x12\x03k\x02\x11\n\x0c\n\ - \x05\x04\x11\x02\x01\x05\x12\x03k\x02\x07\n\x0c\n\x05\x04\x11\x02\x01\ - \x01\x12\x03k\x08\x0c\n\x0c\n\x05\x04\x11\x02\x01\x03\x12\x03k\x0f\x10\n\ - \t\n\x02\x04\x12\x12\x03n\0)\n\n\n\x03\x04\x12\x01\x12\x03n\x08&\n\n\n\ - \x02\x04\x13\x12\x04p\0t\x01\n\n\n\x03\x04\x13\x01\x12\x03p\x08\x1e\n\ - \x0b\n\x04\x04\x13\x02\0\x12\x03q\x02\x14\n\x0c\n\x05\x04\x13\x02\0\x05\ - \x12\x03q\x02\x07\n\x0c\n\x05\x04\x13\x02\0\x01\x12\x03q\x08\x0f\n\x0c\n\ - \x05\x04\x13\x02\0\x03\x12\x03q\x12\x13\n\x0b\n\x04\x04\x13\x02\x01\x12\ - \x03r\x02\x12\n\x0c\n\x05\x04\x13\x02\x01\x05\x12\x03r\x02\x07\n\x0c\n\ - \x05\x04\x13\x02\x01\x01\x12\x03r\x08\r\n\x0c\n\x05\x04\x13\x02\x01\x03\ - \x12\x03r\x10\x11\n\x0b\n\x04\x04\x13\x02\x02\x12\x03s\x02\x12\n\x0c\n\ - \x05\x04\x13\x02\x02\x05\x12\x03s\x02\x07\n\x0c\n\x05\x04\x13\x02\x02\ - \x01\x12\x03s\x08\r\n\x0c\n\x05\x04\x13\x02\x02\x03\x12\x03s\x10\x11\n\t\ - \n\x02\x04\x14\x12\x03v\0)\n\n\n\x03\x04\x14\x01\x12\x03v\x08&\n\t\n\x02\ - \x04\x15\x12\x03x\0*\n\n\n\x03\x04\x15\x01\x12\x03x\x08\x13\n\x0b\n\x04\ - \x04\x15\x02\0\x12\x03x\x16(\n\x0c\n\x05\x04\x15\x02\0\x05\x12\x03x\x16\ - \x1b\n\x0c\n\x05\x04\x15\x02\0\x01\x12\x03x\x1c#\n\x0c\n\x05\x04\x15\x02\ - \0\x03\x12\x03x&'\n\t\n\x02\x04\x16\x12\x03z\0\x1e\n\n\n\x03\x04\x16\x01\ - \x12\x03z\x08\x1b\n\n\n\x02\x04\x17\x12\x04|\0\x7f\x01\n\n\n\x03\x04\x17\ - \x01\x12\x03|\x08\x1e\n\x0b\n\x04\x04\x17\x02\0\x12\x03}\x02\x14\n\x0c\n\ - \x05\x04\x17\x02\0\x05\x12\x03}\x02\x07\n\x0c\n\x05\x04\x17\x02\0\x01\ - \x12\x03}\x08\x0f\n\x0c\n\x05\x04\x17\x02\0\x03\x12\x03}\x12\x13\n\x0b\n\ - \x04\x04\x17\x02\x01\x12\x03~\x02\x12\n\x0c\n\x05\x04\x17\x02\x01\x05\ - \x12\x03~\x02\x07\n\x0c\n\x05\x04\x17\x02\x01\x01\x12\x03~\x08\r\n\x0c\n\ - \x05\x04\x17\x02\x01\x03\x12\x03~\x10\x11\n\n\n\x02\x04\x18\x12\x04\x81\ - \x01\0)\n\x0b\n\x03\x04\x18\x01\x12\x04\x81\x01\x08&\n\n\n\x02\x04\x19\ - \x12\x04\x83\x01\01\n\x0b\n\x03\x04\x19\x01\x12\x04\x83\x01\x08\x1a\n\ - \x0c\n\x04\x04\x19\x02\0\x12\x04\x83\x01\x1d/\n\r\n\x05\x04\x19\x02\0\ - \x05\x12\x04\x83\x01\x1d\"\n\r\n\x05\x04\x19\x02\0\x01\x12\x04\x83\x01#*\ - \n\r\n\x05\x04\x19\x02\0\x03\x12\x04\x83\x01-.\n\n\n\x02\x04\x1a\x12\x04\ - \x85\x01\0%\n\x0b\n\x03\x04\x1a\x01\x12\x04\x85\x01\x08\"\n\n\n\x02\x04\ - \x1b\x12\x04\x87\x01\0,\n\x0b\n\x03\x04\x1b\x01\x12\x04\x87\x01\x08\x16\ - \n\x0c\n\x04\x04\x1b\x02\0\x12\x04\x87\x01\x19*\n\r\n\x05\x04\x1b\x02\0\ - \x05\x12\x04\x87\x01\x19\x1e\n\r\n\x05\x04\x1b\x02\0\x01\x12\x04\x87\x01\ - \x1f%\n\r\n\x05\x04\x1b\x02\0\x03\x12\x04\x87\x01()\n\n\n\x02\x04\x1c\ - \x12\x04\x88\x01\02\n\x0b\n\x03\x04\x1c\x01\x12\x04\x88\x01\x08\x1e\n\ - \x0c\n\x04\x04\x1c\x02\0\x12\x04\x88\x01!0\n\r\n\x05\x04\x1c\x02\0\x05\ - \x12\x04\x88\x01!&\n\r\n\x05\x04\x1c\x02\0\x01\x12\x04\x88\x01'+\n\r\n\ - \x05\x04\x1c\x02\0\x03\x12\x04\x88\x01./\n\x0c\n\x02\x04\x1d\x12\x06\x8a\ - \x01\0\x95\x01\x01\n\x0b\n\x03\x04\x1d\x01\x12\x04\x8a\x01\x08#\n\x0c\n\ - \x04\x04\x1d\x02\0\x12\x04\x8b\x01\x02\x18\n\r\n\x05\x04\x1d\x02\0\x05\ - \x12\x04\x8b\x01\x02\x07\n\r\n\x05\x04\x1d\x02\0\x01\x12\x04\x8b\x01\x08\ - \x13\n\r\n\x05\x04\x1d\x02\0\x03\x12\x04\x8b\x01\x16\x17\n\x0c\n\x04\x04\ - \x1d\x02\x01\x12\x04\x8c\x01\x02\x1a\n\r\n\x05\x04\x1d\x02\x01\x05\x12\ - \x04\x8c\x01\x02\x07\n\r\n\x05\x04\x1d\x02\x01\x01\x12\x04\x8c\x01\x08\ - \x15\n\r\n\x05\x04\x1d\x02\x01\x03\x12\x04\x8c\x01\x18\x19\n\x0c\n\x04\ - \x04\x1d\x02\x02\x12\x04\x8d\x01\x02\x19\n\r\n\x05\x04\x1d\x02\x02\x05\ - \x12\x04\x8d\x01\x02\x08\n\r\n\x05\x04\x1d\x02\x02\x01\x12\x04\x8d\x01\t\ - \x14\n\r\n\x05\x04\x1d\x02\x02\x03\x12\x04\x8d\x01\x17\x18\n\x0c\n\x04\ - \x04\x1d\x02\x03\x12\x04\x8e\x01\x02\x1e\n\r\n\x05\x04\x1d\x02\x03\x05\ - \x12\x04\x8e\x01\x02\x08\n\r\n\x05\x04\x1d\x02\x03\x01\x12\x04\x8e\x01\t\ - \x19\n\r\n\x05\x04\x1d\x02\x03\x03\x12\x04\x8e\x01\x1c\x1d\n\x0c\n\x04\ - \x04\x1d\x02\x04\x12\x04\x8f\x01\x02\x1f\n\r\n\x05\x04\x1d\x02\x04\x05\ - \x12\x04\x8f\x01\x02\x08\n\r\n\x05\x04\x1d\x02\x04\x01\x12\x04\x8f\x01\t\ - \x1a\n\r\n\x05\x04\x1d\x02\x04\x03\x12\x04\x8f\x01\x1d\x1e\n\x0c\n\x04\ - \x04\x1d\x02\x05\x12\x04\x90\x01\x02!\n\r\n\x05\x04\x1d\x02\x05\x05\x12\ - \x04\x90\x01\x02\x08\n\r\n\x05\x04\x1d\x02\x05\x01\x12\x04\x90\x01\t\x1c\ - \n\r\n\x05\x04\x1d\x02\x05\x03\x12\x04\x90\x01\x1f\x20\n\x0c\n\x04\x04\ - \x1d\x02\x06\x12\x04\x91\x01\x02\x16\n\r\n\x05\x04\x1d\x02\x06\x05\x12\ - \x04\x91\x01\x02\x07\n\r\n\x05\x04\x1d\x02\x06\x01\x12\x04\x91\x01\x08\ - \x11\n\r\n\x05\x04\x1d\x02\x06\x03\x12\x04\x91\x01\x14\x15\n\x0c\n\x04\ - \x04\x1d\x02\x07\x12\x04\x92\x01\x02\x14\n\r\n\x05\x04\x1d\x02\x07\x05\ - \x12\x04\x92\x01\x02\x08\n\r\n\x05\x04\x1d\x02\x07\x01\x12\x04\x92\x01\t\ - \x0f\n\r\n\x05\x04\x1d\x02\x07\x03\x12\x04\x92\x01\x12\x13\n\x0c\n\x04\ - \x04\x1d\x02\x08\x12\x04\x93\x01\x02\"\n\r\n\x05\x04\x1d\x02\x08\x05\x12\ - \x04\x93\x01\x02\x08\n\r\n\x05\x04\x1d\x02\x08\x01\x12\x04\x93\x01\t\x1d\ - \n\r\n\x05\x04\x1d\x02\x08\x03\x12\x04\x93\x01\x20!\n\x0c\n\x04\x04\x1d\ - \x02\t\x12\x04\x94\x01\x02\x16\n\r\n\x05\x04\x1d\x02\t\x05\x12\x04\x94\ - \x01\x02\x08\n\r\n\x05\x04\x1d\x02\t\x01\x12\x04\x94\x01\t\x10\n\r\n\x05\ - \x04\x1d\x02\t\x03\x12\x04\x94\x01\x13\x15\n\x0c\n\x02\x04\x1e\x12\x06\ - \x96\x01\0\x98\x01\x01\n\x0b\n\x03\x04\x1e\x01\x12\x04\x96\x01\x08+\n\ - \x0c\n\x04\x04\x1e\x02\0\x12\x04\x97\x01\x02\x1b\n\r\n\x05\x04\x1e\x02\0\ - \x05\x12\x04\x97\x01\x02\x07\n\r\n\x05\x04\x1e\x02\0\x01\x12\x04\x97\x01\ - \x08\x16\n\r\n\x05\x04\x1e\x02\0\x03\x12\x04\x97\x01\x19\x1a\n\x0c\n\x02\ - \x04\x1f\x12\x06\x9a\x01\0\x9f\x01\x01\n\x0b\n\x03\x04\x1f\x01\x12\x04\ - \x9a\x01\x08\x1c\n\x0c\n\x04\x04\x1f\x02\0\x12\x04\x9b\x01\x02\x18\n\r\n\ - \x05\x04\x1f\x02\0\x05\x12\x04\x9b\x01\x02\x07\n\r\n\x05\x04\x1f\x02\0\ - \x01\x12\x04\x9b\x01\x08\x13\n\r\n\x05\x04\x1f\x02\0\x03\x12\x04\x9b\x01\ - \x16\x17\n\x0c\n\x04\x04\x1f\x02\x01\x12\x04\x9c\x01\x02\x1e\n\r\n\x05\ - \x04\x1f\x02\x01\x05\x12\x04\x9c\x01\x02\x08\n\r\n\x05\x04\x1f\x02\x01\ - \x01\x12\x04\x9c\x01\t\x19\n\r\n\x05\x04\x1f\x02\x01\x03\x12\x04\x9c\x01\ - \x1c\x1d\n\x0c\n\x04\x04\x1f\x02\x02\x12\x04\x9d\x01\x02!\n\r\n\x05\x04\ - \x1f\x02\x02\x05\x12\x04\x9d\x01\x02\x08\n\r\n\x05\x04\x1f\x02\x02\x01\ - \x12\x04\x9d\x01\t\x1c\n\r\n\x05\x04\x1f\x02\x02\x03\x12\x04\x9d\x01\x1f\ - \x20\n\x0c\n\x04\x04\x1f\x02\x03\x12\x04\x9e\x01\x02$\n\r\n\x05\x04\x1f\ - \x02\x03\x04\x12\x04\x9e\x01\x02\n\n\r\n\x05\x04\x1f\x02\x03\x05\x12\x04\ - \x9e\x01\x0b\x10\n\r\n\x05\x04\x1f\x02\x03\x01\x12\x04\x9e\x01\x11\x1f\n\ - \r\n\x05\x04\x1f\x02\x03\x03\x12\x04\x9e\x01\"#\n\x0c\n\x02\x04\x20\x12\ - \x06\xa0\x01\0\xa2\x01\x01\n\x0b\n\x03\x04\x20\x01\x12\x04\xa0\x01\x08$\ - \n\x0c\n\x04\x04\x20\x02\0\x12\x04\xa1\x01\x02\x1b\n\r\n\x05\x04\x20\x02\ - \0\x05\x12\x04\xa1\x01\x02\x06\n\r\n\x05\x04\x20\x02\0\x01\x12\x04\xa1\ - \x01\x07\x16\n\r\n\x05\x04\x20\x02\0\x03\x12\x04\xa1\x01\x19\x1a\n\x0c\n\ - \x02\x04!\x12\x06\xa4\x01\0\xa7\x01\x01\n\x0b\n\x03\x04!\x01\x12\x04\xa4\ - \x01\x08\x20\n\x0c\n\x04\x04!\x02\0\x12\x04\xa5\x01\x02\x18\n\r\n\x05\ - \x04!\x02\0\x05\x12\x04\xa5\x01\x02\x07\n\r\n\x05\x04!\x02\0\x01\x12\x04\ - \xa5\x01\x08\x13\n\r\n\x05\x04!\x02\0\x03\x12\x04\xa5\x01\x16\x17\n\x0c\ - \n\x04\x04!\x02\x01\x12\x04\xa6\x01\x02\x1a\n\r\n\x05\x04!\x02\x01\x05\ - \x12\x04\xa6\x01\x02\x07\n\r\n\x05\x04!\x02\x01\x01\x12\x04\xa6\x01\x08\ - \x15\n\r\n\x05\x04!\x02\x01\x03\x12\x04\xa6\x01\x18\x19\n\xf1\x01\n\x02\ - \x04\"\x12\x06\xab\x01\0\xc0\x01\x01\x1a\xe2\x01\x20VerificationDetails\ - \x20must\x20have\x20same\x20members\x20with\x20VerificationDetails\x20in\ - \x20\"sgxvm/proto/ffi.proto\"\n\x20including\x20verification\x20type\x20\ - and\x20verification\x20id\x20as\x20key.\n\x20But\x20the\x20member\x20typ\ - es\x20can\x20be\x20different,\x20such\x20as\x20string(address)\x20to\x20\ - bytes\n\n\x0b\n\x03\x04\"\x01\x12\x04\xab\x01\x08\x1b\n!\n\x04\x04\"\x02\ - \0\x12\x04\xad\x01\x02\x1e\x1a\x13\x20Verification\x20type\n\n\r\n\x05\ - \x04\"\x02\0\x05\x12\x04\xad\x01\x02\x08\n\r\n\x05\x04\"\x02\0\x01\x12\ - \x04\xad\x01\t\x19\n\r\n\x05\x04\"\x02\0\x03\x12\x04\xad\x01\x1c\x1d\n\ - \x1f\n\x04\x04\"\x02\x01\x12\x04\xaf\x01\x02\x1b\x1a\x11\x20Verification\ - \x20Id\n\n\r\n\x05\x04\"\x02\x01\x05\x12\x04\xaf\x01\x02\x07\n\r\n\x05\ - \x04\"\x02\x01\x01\x12\x04\xaf\x01\x08\x16\n\r\n\x05\x04\"\x02\x01\x03\ - \x12\x04\xaf\x01\x19\x1a\n+\n\x04\x04\"\x02\x02\x12\x04\xb1\x01\x02\x1a\ - \x1a\x1d\x20Verification\x20issuer\x20address\n\n\r\n\x05\x04\"\x02\x02\ - \x05\x12\x04\xb1\x01\x02\x07\n\r\n\x05\x04\"\x02\x02\x01\x12\x04\xb1\x01\ - \x08\x15\n\r\n\x05\x04\"\x02\x02\x03\x12\x04\xb1\x01\x18\x19\n6\n\x04\ - \x04\"\x02\x03\x12\x04\xb3\x01\x02\x19\x1a(\x20From\x20which\x20chain\ - \x20proof\x20was\x20transferred\n\n\r\n\x05\x04\"\x02\x03\x05\x12\x04\ - \xb3\x01\x02\x08\n\r\n\x05\x04\"\x02\x03\x01\x12\x04\xb3\x01\t\x14\n\r\n\ - \x05\x04\"\x02\x03\x03\x12\x04\xb3\x01\x17\x18\n+\n\x04\x04\"\x02\x04\ - \x12\x04\xb5\x01\x02\x1f\x1a\x1d\x20Original\x20issuance\x20timestamp\n\ - \n\r\n\x05\x04\"\x02\x04\x05\x12\x04\xb5\x01\x02\x08\n\r\n\x05\x04\"\x02\ - \x04\x01\x12\x04\xb5\x01\t\x1a\n\r\n\x05\x04\"\x02\x04\x03\x12\x04\xb5\ - \x01\x1d\x1e\n-\n\x04\x04\"\x02\x05\x12\x04\xb7\x01\x02!\x1a\x1f\x20Orig\ - inal\x20expiration\x20timestamp\n\n\r\n\x05\x04\"\x02\x05\x05\x12\x04\ - \xb7\x01\x02\x08\n\r\n\x05\x04\"\x02\x05\x01\x12\x04\xb7\x01\t\x1c\n\r\n\ - \x05\x04\"\x02\x05\x03\x12\x04\xb7\x01\x1f\x20\n.\n\x04\x04\"\x02\x06\ - \x12\x04\xb9\x01\x02\x19\x1a\x20\x20Original\x20proof\x20data\x20(ZK-pro\ - of)\n\n\r\n\x05\x04\"\x02\x06\x05\x12\x04\xb9\x01\x02\x07\n\r\n\x05\x04\ - \"\x02\x06\x01\x12\x04\xb9\x01\x08\x14\n\r\n\x05\x04\"\x02\x06\x03\x12\ - \x04\xb9\x01\x17\x18\n(\n\x04\x04\"\x02\x07\x12\x04\xbb\x01\x02\x14\x1a\ - \x1a\x20ZK-proof\x20original\x20schema\n\n\r\n\x05\x04\"\x02\x07\x05\x12\ - \x04\xbb\x01\x02\x08\n\r\n\x05\x04\"\x02\x07\x01\x12\x04\xbb\x01\t\x0f\n\ - \r\n\x05\x04\"\x02\x07\x03\x12\x04\xbb\x01\x12\x13\nN\n\x04\x04\"\x02\ - \x08\x12\x04\xbd\x01\x02\"\x1a@\x20Verification\x20id\x20for\x20checking\ - (KYC/KYB/AML\x20etc)\x20from\x20issuer\x20side\n\n\r\n\x05\x04\"\x02\x08\ - \x05\x12\x04\xbd\x01\x02\x08\n\r\n\x05\x04\"\x02\x08\x01\x12\x04\xbd\x01\ - \t\x1d\n\r\n\x05\x04\"\x02\x08\x03\x12\x04\xbd\x01\x20!\n\x17\n\x04\x04\ - \"\x02\t\x12\x04\xbf\x01\x02\x16\x1a\t\x20Version\n\n\r\n\x05\x04\"\x02\ - \t\x05\x12\x04\xbf\x01\x02\x08\n\r\n\x05\x04\"\x02\t\x01\x12\x04\xbf\x01\ - \t\x10\n\r\n\x05\x04\"\x02\t\x03\x12\x04\xbf\x01\x13\x15\n\x0c\n\x02\x04\ - #\x12\x06\xc1\x01\0\xc3\x01\x01\n\x0b\n\x03\x04#\x01\x12\x04\xc1\x01\x08\ - (\n\x0c\n\x04\x04#\x02\0\x12\x04\xc2\x01\x02(\n\r\n\x05\x04#\x02\0\x04\ - \x12\x04\xc2\x01\x02\n\n\r\n\x05\x04#\x02\0\x06\x12\x04\xc2\x01\x0b\x1e\ - \n\r\n\x05\x04#\x02\0\x01\x12\x04\xc2\x01\x1f#\n\r\n\x05\x04#\x02\0\x03\ - \x12\x04\xc2\x01&'\n\x0c\n\x02\x04$\x12\x06\xc5\x01\0\xd6\x01\x01\n\x0b\ - \n\x03\x04$\x01\x12\x04\xc5\x01\x08\x15\n\x0e\n\x04\x04$\x08\0\x12\x06\ - \xc6\x01\x02\xd5\x01\x03\n\r\n\x05\x04$\x08\0\x01\x12\x04\xc6\x01\x08\ - \x0b\n\x0c\n\x04\x04$\x02\0\x12\x04\xc7\x01\x04#\n\r\n\x05\x04$\x02\0\ - \x06\x12\x04\xc7\x01\x04\x13\n\r\n\x05\x04$\x02\0\x01\x12\x04\xc7\x01\ - \x14\x1e\n\r\n\x05\x04$\x02\0\x03\x12\x04\xc7\x01!\"\n\x0c\n\x04\x04$\ - \x02\x01\x12\x04\xc8\x01\x04)\n\r\n\x05\x04$\x02\x01\x06\x12\x04\xc8\x01\ - \x04\x16\n\r\n\x05\x04$\x02\x01\x01\x12\x04\xc8\x01\x17$\n\r\n\x05\x04$\ - \x02\x01\x03\x12\x04\xc8\x01'(\n\x0c\n\x04\x04$\x02\x02\x12\x04\xc9\x01\ - \x04%\n\r\n\x05\x04$\x02\x02\x06\x12\x04\xc9\x01\x04\x14\n\r\n\x05\x04$\ - \x02\x02\x01\x12\x04\xc9\x01\x15\x20\n\r\n\x05\x04$\x02\x02\x03\x12\x04\ - \xc9\x01#$\n\x0c\n\x04\x04$\x02\x03\x12\x04\xca\x01\x04(\n\r\n\x05\x04$\ - \x02\x03\x06\x12\x04\xca\x01\x04\x17\n\r\n\x05\x04$\x02\x03\x01\x12\x04\ - \xca\x01\x18#\n\r\n\x05\x04$\x02\x03\x03\x12\x04\xca\x01&'\n\x0c\n\x04\ - \x04$\x02\x04\x12\x04\xcb\x01\x04/\n\r\n\x05\x04$\x02\x04\x06\x12\x04\ - \xcb\x01\x04\x1e\n\r\n\x05\x04$\x02\x04\x01\x12\x04\xcb\x01\x1f*\n\r\n\ - \x05\x04$\x02\x04\x03\x12\x04\xcb\x01-.\n\x0c\n\x04\x04$\x02\x05\x12\x04\ - \xcc\x01\x041\n\r\n\x05\x04$\x02\x05\x06\x12\x04\xcc\x01\x04\x1a\n\r\n\ - \x05\x04$\x02\x05\x01\x12\x04\xcc\x01\x1b,\n\r\n\x05\x04$\x02\x05\x03\ - \x12\x04\xcc\x01/0\n\x0c\n\x04\x04$\x02\x06\x12\x04\xcd\x01\x041\n\r\n\ - \x05\x04$\x02\x06\x06\x12\x04\xcd\x01\x04\x1a\n\r\n\x05\x04$\x02\x06\x01\ - \x12\x04\xcd\x01\x1b,\n\r\n\x05\x04$\x02\x06\x03\x12\x04\xcd\x01/0\n\x0c\ - \n\x04\x04$\x02\x07\x12\x04\xce\x01\x04\x1b\n\r\n\x05\x04$\x02\x07\x06\ - \x12\x04\xce\x01\x04\x0f\n\r\n\x05\x04$\x02\x07\x01\x12\x04\xce\x01\x10\ - \x16\n\r\n\x05\x04$\x02\x07\x03\x12\x04\xce\x01\x19\x1a\n\x0c\n\x04\x04$\ - \x02\x08\x12\x04\xcf\x01\x041\n\r\n\x05\x04$\x02\x08\x06\x12\x04\xcf\x01\ - \x04\x1a\n\r\n\x05\x04$\x02\x08\x01\x12\x04\xcf\x01\x1b,\n\r\n\x05\x04$\ - \x02\x08\x03\x12\x04\xcf\x01/0\n\x0c\n\x04\x04$\x02\t\x12\x04\xd0\x01\ - \x04*\n\r\n\x05\x04$\x02\t\x06\x12\x04\xd0\x01\x04\x16\n\r\n\x05\x04$\ - \x02\t\x01\x12\x04\xd0\x01\x17$\n\r\n\x05\x04$\x02\t\x03\x12\x04\xd0\x01\ - ')\n\x0c\n\x04\x04$\x02\n\x12\x04\xd1\x01\x04\"\n\r\n\x05\x04$\x02\n\x06\ - \x12\x04\xd1\x01\x04\x12\n\r\n\x05\x04$\x02\n\x01\x12\x04\xd1\x01\x13\ - \x1c\n\r\n\x05\x04$\x02\n\x03\x12\x04\xd1\x01\x1f!\n\x0c\n\x04\x04$\x02\ - \x0b\x12\x04\xd2\x01\x04<\n\r\n\x05\x04$\x02\x0b\x06\x12\x04\xd2\x01\x04\ - \x1f\n\r\n\x05\x04$\x02\x0b\x01\x12\x04\xd2\x01\x206\n\r\n\x05\x04$\x02\ - \x0b\x03\x12\x04\xd2\x019;\n\x0c\n\x04\x04$\x02\x0c\x12\x04\xd3\x01\x04.\ - \n\r\n\x05\x04$\x02\x0c\x06\x12\x04\xd3\x01\x04\x18\n\r\n\x05\x04$\x02\ - \x0c\x01\x12\x04\xd3\x01\x19(\n\r\n\x05\x04$\x02\x0c\x03\x12\x04\xd3\x01\ - +-\n\x0c\n\x04\x04$\x02\r\x12\x04\xd4\x01\x046\n\r\n\x05\x04$\x02\r\x06\ - \x12\x04\xd4\x01\x04\x1c\n\r\n\x05\x04$\x02\r\x01\x12\x04\xd4\x01\x1d0\n\ - \r\n\x05\x04$\x02\r\x03\x12\x04\xd4\x0135\nF\n\x02\x04%\x12\x06\xd9\x01\ - \0\xe3\x01\x01\x1a8\x20Message\x20with\x20data\x20required\x20to\x20exec\ - ute\x20`call`\x20operation\n\n\x0b\n\x03\x04%\x01\x12\x04\xd9\x01\x08\ - \x17\n\x0c\n\x04\x04%\x02\0\x12\x04\xda\x01\x02\x11\n\r\n\x05\x04%\x02\0\ - \x05\x12\x04\xda\x01\x02\x07\n\r\n\x05\x04%\x02\0\x01\x12\x04\xda\x01\ - \x08\x0c\n\r\n\x05\x04%\x02\0\x03\x12\x04\xda\x01\x0f\x10\n\x0c\n\x04\ - \x04%\x02\x01\x12\x04\xdb\x01\x02\x0f\n\r\n\x05\x04%\x02\x01\x05\x12\x04\ - \xdb\x01\x02\x07\n\r\n\x05\x04%\x02\x01\x01\x12\x04\xdb\x01\x08\n\n\r\n\ - \x05\x04%\x02\x01\x03\x12\x04\xdb\x01\r\x0e\n\x0c\n\x04\x04%\x02\x02\x12\ - \x04\xdc\x01\x02\x11\n\r\n\x05\x04%\x02\x02\x05\x12\x04\xdc\x01\x02\x07\ - \n\r\n\x05\x04%\x02\x02\x01\x12\x04\xdc\x01\x08\x0c\n\r\n\x05\x04%\x02\ - \x02\x03\x12\x04\xdc\x01\x0f\x10\n\x0c\n\x04\x04%\x02\x03\x12\x04\xdd\ - \x01\x02\x16\n\r\n\x05\x04%\x02\x03\x05\x12\x04\xdd\x01\x02\x08\n\r\n\ - \x05\x04%\x02\x03\x01\x12\x04\xdd\x01\t\x11\n\r\n\x05\x04%\x02\x03\x03\ - \x12\x04\xdd\x01\x14\x15\n\x0c\n\x04\x04%\x02\x04\x12\x04\xde\x01\x02\ - \x12\n\r\n\x05\x04%\x02\x04\x05\x12\x04\xde\x01\x02\x07\n\r\n\x05\x04%\ - \x02\x04\x01\x12\x04\xde\x01\x08\r\n\r\n\x05\x04%\x02\x04\x03\x12\x04\ - \xde\x01\x10\x11\n\x0c\n\x04\x04%\x02\x05\x12\x04\xdf\x01\x02)\n\r\n\x05\ - \x04%\x02\x05\x04\x12\x04\xdf\x01\x02\n\n\r\n\x05\x04%\x02\x05\x06\x12\ - \x04\xdf\x01\x0b\x19\n\r\n\x05\x04%\x02\x05\x01\x12\x04\xdf\x01\x1a$\n\r\ - \n\x05\x04%\x02\x05\x03\x12\x04\xdf\x01'(\n\x0c\n\x04\x04%\x02\x06\x12\ - \x04\xe0\x01\x02\x12\n\r\n\x05\x04%\x02\x06\x05\x12\x04\xe0\x01\x02\x06\ - \n\r\n\x05\x04%\x02\x06\x01\x12\x04\xe0\x01\x07\r\n\r\n\x05\x04%\x02\x06\ - \x03\x12\x04\xe0\x01\x10\x11\n\x0c\n\x04\x04%\x02\x07\x12\x04\xe1\x01\ - \x02\x13\n\r\n\x05\x04%\x02\x07\x05\x12\x04\xe1\x01\x02\x08\n\r\n\x05\ - \x04%\x02\x07\x01\x12\x04\xe1\x01\t\x0e\n\r\n\x05\x04%\x02\x07\x03\x12\ - \x04\xe1\x01\x11\x12\n\x0c\n\x04\x04%\x02\x08\x12\x04\xe2\x01\x02\x17\n\ - \r\n\x05\x04%\x02\x08\x05\x12\x04\xe2\x01\x02\x06\n\r\n\x05\x04%\x02\x08\ - \x01\x12\x04\xe2\x01\x07\x12\n\r\n\x05\x04%\x02\x08\x03\x12\x04\xe2\x01\ - \x15\x16\nH\n\x02\x04&\x12\x06\xe6\x01\0\xee\x01\x01\x1a:\x20Message\x20\ + Response\x12\x12\n\x04code\x18\x01\x20\x01(\x0cR\x04code\"3\n\x17QueryGe\ + tAccountCodeSize\x12\x18\n\x07address\x18\x01\x20\x01(\x0cR\x07address\"\ + 5\n\x1fQueryGetAccountCodeSizeResponse\x12\x12\n\x04size\x18\x01\x20\x01\ + (\rR\x04size\"3\n\x17QueryGetAccountCodeHash\x12\x18\n\x07address\x18\ + \x01\x20\x01(\x0cR\x07address\"5\n\x1fQueryGetAccountCodeHashResponse\ + \x12\x12\n\x04hash\x18\x01\x20\x01(\x0cR\x04hash\"F\n\x16QueryInsertAcco\ + untCode\x12\x18\n\x07address\x18\x01\x20\x01(\x0cR\x07address\x12\x12\n\ + \x04code\x18\x02\x20\x01(\x0cR\x04code\"\x20\n\x1eQueryInsertAccountCode\ + Response\"^\n\x16QueryInsertStorageCell\x12\x18\n\x07address\x18\x01\x20\ + \x01(\x0cR\x07address\x12\x14\n\x05index\x18\x02\x20\x01(\x0cR\x05index\ + \x12\x14\n\x05value\x18\x03\x20\x01(\x0cR\x05value\"\x20\n\x1eQueryInser\ + tStorageCellResponse\"'\n\x0bQueryRemove\x12\x18\n\x07address\x18\x01\ + \x20\x01(\x0cR\x07address\"\x15\n\x13QueryRemoveResponse\"H\n\x16QueryRe\ + moveStorageCell\x12\x18\n\x07address\x18\x01\x20\x01(\x0cR\x07address\ + \x12\x14\n\x05index\x18\x02\x20\x01(\x0cR\x05index\"\x20\n\x1eQueryRemov\ + eStorageCellResponse\".\n\x12QueryRemoveStorage\x12\x18\n\x07address\x18\ + \x01\x20\x01(\x0cR\x07address\"\x1c\n\x1aQueryRemoveStorageResponse\"(\n\ + \x0eQueryBlockHash\x12\x16\n\x06number\x18\x01\x20\x01(\x0cR\x06number\"\ + ,\n\x16QueryBlockHashResponse\x12\x12\n\x04hash\x18\x01\x20\x01(\x0cR\ + \x04hash\"\x97\x03\n\x1bQueryAddVerificationDetails\x12\x20\n\x0buserAdd\ + ress\x18\x01\x20\x01(\x0cR\x0buserAddress\x12$\n\rissuerAddress\x18\x02\ + \x20\x01(\x0cR\rissuerAddress\x12\x20\n\x0boriginChain\x18\x03\x20\x01(\ + \tR\x0boriginChain\x12*\n\x10verificationType\x18\x04\x20\x01(\rR\x10ver\ + ificationType\x12,\n\x11issuanceTimestamp\x18\x05\x20\x01(\rR\x11issuanc\ + eTimestamp\x120\n\x13expirationTimestamp\x18\x06\x20\x01(\rR\x13expirati\ + onTimestamp\x12\x1c\n\tproofData\x18\x07\x20\x01(\x0cR\tproofData\x12\ + \x16\n\x06schema\x18\x08\x20\x01(\tR\x06schema\x122\n\x14issuerVerificat\ + ionId\x18\t\x20\x01(\tR\x14issuerVerificationId\x12\x18\n\x07version\x18\ + \n\x20\x01(\rR\x07version\"M\n#QueryAddVerificationDetailsResponse\x12&\ + \n\x0everificationId\x18\x01\x20\x01(\x0cR\x0everificationId\"\xbe\x01\n\ + \x14QueryHasVerification\x12\x20\n\x0buserAddress\x18\x01\x20\x01(\x0cR\ + \x0buserAddress\x12*\n\x10verificationType\x18\x02\x20\x01(\rR\x10verifi\ + cationType\x120\n\x13expirationTimestamp\x18\x03\x20\x01(\rR\x13expirati\ + onTimestamp\x12&\n\x0eallowedIssuers\x18\x04\x20\x03(\x0cR\x0eallowedIss\ + uers\"H\n\x1cQueryHasVerificationResponse\x12(\n\x0fhasVerification\x18\ + \x01\x20\x01(\x08R\x0fhasVerification\"b\n\x18QueryGetVerificationData\ + \x12\x20\n\x0buserAddress\x18\x01\x20\x01(\x0cR\x0buserAddress\x12$\n\ri\ + ssuerAddress\x18\x02\x20\x01(\x0cR\rissuerAddress\"\x9b\x03\n\x13Verific\ + ationDetails\x12*\n\x10verificationType\x18\x01\x20\x01(\rR\x10verificat\ + ionType\x12&\n\x0everificationID\x18\x02\x20\x01(\x0cR\x0everificationID\ + \x12$\n\rissuerAddress\x18\x03\x20\x01(\x0cR\rissuerAddress\x12\x20\n\ + \x0boriginChain\x18\x04\x20\x01(\tR\x0boriginChain\x12,\n\x11issuanceTim\ + estamp\x18\x05\x20\x01(\rR\x11issuanceTimestamp\x120\n\x13expirationTime\ + stamp\x18\x06\x20\x01(\rR\x13expirationTimestamp\x12\"\n\x0coriginalData\ + \x18\x07\x20\x01(\x0cR\x0coriginalData\x12\x16\n\x06schema\x18\x08\x20\ + \x01(\tR\x06schema\x122\n\x14issuerVerificationId\x18\t\x20\x01(\tR\x14i\ + ssuerVerificationId\x12\x18\n\x07version\x18\n\x20\x01(\rR\x07version\"T\ + \n\x20QueryGetVerificationDataResponse\x120\n\x04data\x18\x01\x20\x03(\ + \x0b2\x1c.ffi.ffi.VerificationDetailsR\x04data\"\xed\t\n\rCosmosRequest\ + \x12:\n\ngetAccount\x18\x01\x20\x01(\x0b2\x18.ffi.ffi.QueryGetAccountH\0\ + R\ngetAccount\x12=\n\x0bcontainsKey\x18\x02\x20\x01(\x0b2\x19.ffi.ffi.Qu\ + eryContainsKeyH\0R\x0bcontainsKey\x12@\n\x0baccountCode\x18\x03\x20\x01(\ + \x0b2\x1c.ffi.ffi.QueryGetAccountCodeH\0R\x0baccountCode\x12>\n\x08codeH\ + ash\x18\x04\x20\x01(\x0b2\x20.ffi.ffi.QueryGetAccountCodeHashH\0R\x08cod\ + eHash\x12>\n\x08codeSize\x18\x05\x20\x01(\x0b2\x20.ffi.ffi.QueryGetAccou\ + ntCodeSizeH\0R\x08codeSize\x12G\n\x0bstorageCell\x18\x06\x20\x01(\x0b2#.\ + ffi.ffi.QueryGetAccountStorageCellH\0R\x0bstorageCell\x12O\n\x11insertAc\ + countCode\x18\x07\x20\x01(\x0b2\x1f.ffi.ffi.QueryInsertAccountCodeH\0R\ + \x11insertAccountCode\x12O\n\x11insertStorageCell\x18\x08\x20\x01(\x0b2\ + \x1f.ffi.ffi.QueryInsertStorageCellH\0R\x11insertStorageCell\x12.\n\x06r\ + emove\x18\t\x20\x01(\x0b2\x14.ffi.ffi.QueryRemoveH\0R\x06remove\x12O\n\ + \x11removeStorageCell\x18\n\x20\x01(\x0b2\x1f.ffi.ffi.QueryRemoveStorage\ + CellH\0R\x11removeStorageCell\x12C\n\rremoveStorage\x18\x0b\x20\x01(\x0b\ + 2\x1b.ffi.ffi.QueryRemoveStorageH\0R\rremoveStorage\x127\n\tblockHash\ + \x18\x0c\x20\x01(\x0b2\x17.ffi.ffi.QueryBlockHashH\0R\tblockHash\x12^\n\ + \x16addVerificationDetails\x18\r\x20\x01(\x0b2$.ffi.ffi.QueryAddVerifica\ + tionDetailsH\0R\x16addVerificationDetails\x12I\n\x0fhasVerification\x18\ + \x0e\x20\x01(\x0b2\x1d.ffi.ffi.QueryHasVerificationH\0R\x0fhasVerificati\ + on\x12U\n\x13getVerificationData\x18\x0f\x20\x01(\x0b2!.ffi.ffi.QueryGet\ + VerificationDataH\0R\x13getVerificationData\x12X\n\x14insertAccountBalan\ + ce\x18\x10\x20\x01(\x0b2\".ffi.ffi.QueryInsertAccountBalanceH\0R\x14inse\ + rtAccountBalance\x12R\n\x12insertAccountNonce\x18\x11\x20\x01(\x0b2\x20.\ + ffi.ffi.QueryInsertAccountNonceH\0R\x12insertAccountNonceB\x05\n\x03req\ + \"\xa0\x02\n\x0fSGXVMCallParams\x12\x12\n\x04from\x18\x01\x20\x01(\x0cR\ + \x04from\x12\x0e\n\x02to\x18\x02\x20\x01(\x0cR\x02to\x12\x12\n\x04data\ + \x18\x03\x20\x01(\x0cR\x04data\x12\x1a\n\x08gasLimit\x18\x04\x20\x01(\ + \x04R\x08gasLimit\x12\x1a\n\x08gasPrice\x18\x05\x20\x01(\x0cR\x08gasPric\ + e\x12\x14\n\x05value\x18\x06\x20\x01(\x0cR\x05value\x127\n\naccessList\ + \x18\x07\x20\x03(\x0b2\x17.ffi.ffi.AccessListItemR\naccessList\x12\x16\n\ + \x06commit\x18\x08\x20\x01(\x08R\x06commit\x12\x14\n\x05nonce\x18\t\x20\ + \x01(\x04R\x05nonce\x12\x20\n\x0bunencrypted\x18\n\x20\x01(\x08R\x0bunen\ + crypted\"\xf0\x01\n\x11SGXVMCreateParams\x12\x12\n\x04from\x18\x01\x20\ + \x01(\x0cR\x04from\x12\x12\n\x04data\x18\x02\x20\x01(\x0cR\x04data\x12\ + \x1a\n\x08gasLimit\x18\x03\x20\x01(\x04R\x08gasLimit\x12\x1a\n\x08gasPri\ + ce\x18\x04\x20\x01(\x0cR\x08gasPrice\x12\x14\n\x05value\x18\x05\x20\x01(\ + \x0cR\x05value\x127\n\naccessList\x18\x06\x20\x03(\x0b2\x17.ffi.ffi.Acce\ + ssListItemR\naccessList\x12\x16\n\x06commit\x18\x07\x20\x01(\x08R\x06com\ + mit\x12\x14\n\x05nonce\x18\x08\x20\x01(\x04R\x05nonce\"{\n\x10SGXVMCallR\ + equest\x120\n\x06params\x18\x01\x20\x01(\x0b2\x18.ffi.ffi.SGXVMCallParam\ + sR\x06params\x125\n\x07context\x18\x02\x20\x01(\x0b2\x1b.ffi.ffi.Transac\ + tionContextR\x07context\"\x7f\n\x12SGXVMCreateRequest\x122\n\x06params\ + \x18\x01\x20\x01(\x0b2\x1a.ffi.ffi.SGXVMCreateParamsR\x06params\x125\n\ + \x07context\x18\x02\x20\x01(\x0b2\x1b.ffi.ffi.TransactionContextR\x07con\ + text\"8\n\x14NodePublicKeyRequest\x12\x20\n\x0bblockNumber\x18\x01\x20\ + \x01(\x04R\x0bblockNumber\"5\n\x15NodePublicKeyResponse\x12\x1c\n\tpubli\ + cKey\x18\x01\x20\x01(\x0cR\tpublicKey\"y\n\tEpochData\x12\x20\n\x0bepoch\ + Number\x18\x01\x20\x01(\rR\x0bepochNumber\x12$\n\rstartingBlock\x18\x02\ + \x20\x01(\x04R\rstartingBlock\x12$\n\rnodePublicKey\x18\x03\x20\x01(\x0c\ + R\rnodePublicKey\"@\n\x12ListEpochsResponse\x12*\n\x06epochs\x18\x01\x20\ + \x03(\x0b2\x12.ffi.ffi.EpochDataR\x06epochs\"\xe4\x01\n\nFFIRequest\x12=\ + \n\x0bcallRequest\x18\x01\x20\x01(\x0b2\x19.ffi.ffi.SGXVMCallRequestH\0R\ + \x0bcallRequest\x12C\n\rcreateRequest\x18\x02\x20\x01(\x0b2\x1b.ffi.ffi.\ + SGXVMCreateRequestH\0R\rcreateRequest\x12K\n\x10publicKeyRequest\x18\x03\ + \x20\x01(\x0b2\x1d.ffi.ffi.NodePublicKeyRequestH\0R\x10publicKeyRequestB\ + \x05\n\x03reqB&Z$github.com/SigmaGmbH/librustgo/typesJ\xebS\n\x07\x12\ + \x05\0\0\xa0\x02\x01\n\x08\n\x01\x0c\x12\x03\0\0\x12\n\x08\n\x01\x02\x12\ + \x03\x02\0\x10\n\x08\n\x01\x08\x12\x03\x04\0;\n\t\n\x02\x08\x0b\x12\x03\ + \x04\0;\n\x1d\n\x02\x04\0\x12\x04\x08\0\x0b\x012\x11\x20General\x20reque\ + st\n\n\n\n\x03\x04\0\x01\x12\x03\x08\x08\x16\n\x0b\n\x04\x04\0\x02\0\x12\ + \x03\t\x02!\n\x0c\n\x05\x04\0\x02\0\x04\x12\x03\t\x02\n\n\x0c\n\x05\x04\ + \0\x02\0\x05\x12\x03\t\x0b\x10\n\x0c\n\x05\x04\0\x02\0\x01\x12\x03\t\x11\ + \x1c\n\x0c\n\x05\x04\0\x02\0\x03\x12\x03\t\x1f\x20\n\x0b\n\x04\x04\0\x02\ + \x01\x12\x03\n\x02\x14\n\x0c\n\x05\x04\0\x02\x01\x05\x12\x03\n\x02\x07\n\ + \x0c\n\x05\x04\0\x02\x01\x01\x12\x03\n\x08\x0f\n\x0c\n\x05\x04\0\x02\x01\ + \x03\x12\x03\n\x12\x13\n\n\n\x02\x04\x01\x12\x04\r\0\x14\x01\n\n\n\x03\ + \x04\x01\x01\x12\x03\r\x08\x17\n\x0b\n\x04\x04\x01\x02\0\x12\x03\x0e\x02\ + \x11\n\x0c\n\x05\x04\x01\x02\0\x05\x12\x03\x0e\x02\x07\n\x0c\n\x05\x04\ + \x01\x02\0\x01\x12\x03\x0e\x08\x0c\n\x0c\n\x05\x04\x01\x02\0\x03\x12\x03\ + \x0e\x0f\x10\n\x0b\n\x04\x04\x01\x02\x01\x12\x03\x0f\x02\x0f\n\x0c\n\x05\ + \x04\x01\x02\x01\x05\x12\x03\x0f\x02\x07\n\x0c\n\x05\x04\x01\x02\x01\x01\ + \x12\x03\x0f\x08\n\n\x0c\n\x05\x04\x01\x02\x01\x03\x12\x03\x0f\r\x0e\n\ + \x0b\n\x04\x04\x01\x02\x02\x12\x03\x10\x02\x11\n\x0c\n\x05\x04\x01\x02\ + \x02\x05\x12\x03\x10\x02\x07\n\x0c\n\x05\x04\x01\x02\x02\x01\x12\x03\x10\ + \x08\x0c\n\x0c\n\x05\x04\x01\x02\x02\x03\x12\x03\x10\x0f\x10\n\x0b\n\x04\ + \x04\x01\x02\x03\x12\x03\x11\x02\x16\n\x0c\n\x05\x04\x01\x02\x03\x05\x12\ + \x03\x11\x02\x08\n\x0c\n\x05\x04\x01\x02\x03\x01\x12\x03\x11\t\x11\n\x0c\ + \n\x05\x04\x01\x02\x03\x03\x12\x03\x11\x14\x15\n\x0b\n\x04\x04\x01\x02\ + \x04\x12\x03\x12\x02\x12\n\x0c\n\x05\x04\x01\x02\x04\x05\x12\x03\x12\x02\ + \x07\n\x0c\n\x05\x04\x01\x02\x04\x01\x12\x03\x12\x08\r\n\x0c\n\x05\x04\ + \x01\x02\x04\x03\x12\x03\x12\x10\x11\n\x0b\n\x04\x04\x01\x02\x05\x12\x03\ + \x13\x02)\n\x0c\n\x05\x04\x01\x02\x05\x04\x12\x03\x13\x02\n\n\x0c\n\x05\ + \x04\x01\x02\x05\x06\x12\x03\x13\x0b\x19\n\x0c\n\x05\x04\x01\x02\x05\x01\ + \x12\x03\x13\x1a$\n\x0c\n\x05\x04\x01\x02\x05\x03\x12\x03\x13'(\n\n\n\ + \x02\x04\x02\x12\x04\x16\0\x1e\x01\n\n\n\x03\x04\x02\x01\x12\x03\x16\x08\ + \x1a\n\x0b\n\x04\x04\x02\x02\0\x12\x03\x17\x02\x16\n\x0c\n\x05\x04\x02\ + \x02\0\x05\x12\x03\x17\x02\x08\n\x0c\n\x05\x04\x02\x02\0\x01\x12\x03\x17\ + \t\x11\n\x0c\n\x05\x04\x02\x02\0\x03\x12\x03\x17\x14\x15\n\x0b\n\x04\x04\ + \x02\x02\x01\x12\x03\x18\x02\x16\n\x0c\n\x05\x04\x02\x02\x01\x05\x12\x03\ + \x18\x02\x07\n\x0c\n\x05\x04\x02\x02\x01\x01\x12\x03\x18\x08\x11\n\x0c\n\ + \x05\x04\x02\x02\x01\x03\x12\x03\x18\x14\x15\n\x0b\n\x04\x04\x02\x02\x02\ + \x12\x03\x19\x02\x17\n\x0c\n\x05\x04\x02\x02\x02\x05\x12\x03\x19\x02\x08\ + \n\x0c\n\x05\x04\x02\x02\x02\x01\x12\x03\x19\t\x12\n\x0c\n\x05\x04\x02\ + \x02\x02\x03\x12\x03\x19\x15\x16\n\x0b\n\x04\x04\x02\x02\x03\x12\x03\x1a\ + \x02\x1d\n\x0c\n\x05\x04\x02\x02\x03\x05\x12\x03\x1a\x02\x08\n\x0c\n\x05\ + \x04\x02\x02\x03\x01\x12\x03\x1a\t\x18\n\x0c\n\x05\x04\x02\x02\x03\x03\ + \x12\x03\x1a\x1b\x1c\n\x0b\n\x04\x04\x02\x02\x04\x12\x03\x1b\x02#\n\x0c\ + \n\x05\x04\x02\x02\x04\x05\x12\x03\x1b\x02\x07\n\x0c\n\x05\x04\x02\x02\ + \x04\x01\x12\x03\x1b\x08\x1e\n\x0c\n\x05\x04\x02\x02\x04\x03\x12\x03\x1b\ + !\"\n\x0b\n\x04\x04\x02\x02\x05\x12\x03\x1c\x02\x1b\n\x0c\n\x05\x04\x02\ + \x02\x05\x05\x12\x03\x1c\x02\x07\n\x0c\n\x05\x04\x02\x02\x05\x01\x12\x03\ + \x1c\x08\x16\n\x0c\n\x05\x04\x02\x02\x05\x03\x12\x03\x1c\x19\x1a\n\x0b\n\ + \x04\x04\x02\x02\x06\x12\x03\x1d\x02\x1a\n\x0c\n\x05\x04\x02\x02\x06\x05\ + \x12\x03\x1d\x02\x08\n\x0c\n\x05\x04\x02\x02\x06\x01\x12\x03\x1d\t\x15\n\ + \x0c\n\x05\x04\x02\x02\x06\x03\x12\x03\x1d\x18\x19\n\n\n\x02\x04\x03\x12\ + \x04\x20\0#\x01\n\n\n\x03\x04\x03\x01\x12\x03\x20\x08\x20\n\x0b\n\x04\ + \x04\x03\x02\0\x12\x03!\x02\x1e\n\x0c\n\x05\x04\x03\x02\0\x06\x12\x03!\ + \x02\x11\n\x0c\n\x05\x04\x03\x02\0\x01\x12\x03!\x12\x19\n\x0c\n\x05\x04\ + \x03\x02\0\x03\x12\x03!\x1c\x1d\n\x0b\n\x04\x04\x03\x02\x01\x12\x03\"\ + \x02$\n\x0c\n\x05\x04\x03\x02\x01\x06\x12\x03\"\x02\x14\n\x0c\n\x05\x04\ + \x03\x02\x01\x01\x12\x03\"\x15\x1f\n\x0c\n\x05\x04\x03\x02\x01\x03\x12\ + \x03\"\"#\n\n\n\x02\x04\x04\x12\x04%\00\x01\n\n\n\x03\x04\x04\x01\x12\ + \x03%\x08!\nZ\n\x04\x04\x04\x02\0\x12\x03(\x02\x18\x1aM\x20logs\x20conta\ + ins\x20the\x20transaction\x20hash\x20and\x20the\x20proto-compatible\x20e\ + thereum\n\x20logs.\n\n\x0c\n\x05\x04\x04\x02\0\x04\x12\x03(\x02\n\n\x0c\ + \n\x05\x04\x04\x02\0\x06\x12\x03(\x0b\x0e\n\x0c\n\x05\x04\x04\x02\0\x01\ + \x12\x03(\x0f\x13\n\x0c\n\x05\x04\x04\x02\0\x03\x12\x03(\x16\x17\n\\\n\ + \x04\x04\x04\x02\x01\x12\x03+\x02\x10\x1aO\x20returned\x20data\x20from\ + \x20evm\x20function\x20(result\x20or\x20data\x20supplied\x20with\x20reve\ + rt\n\x20opcode)\n\n\x0c\n\x05\x04\x04\x02\x01\x05\x12\x03+\x02\x07\n\x0c\ + \n\x05\x04\x04\x02\x01\x01\x12\x03+\x08\x0b\n\x0c\n\x05\x04\x04\x02\x01\ + \x03\x12\x03+\x0e\x0f\n=\n\x04\x04\x04\x02\x02\x12\x03-\x02\x16\x1a0\x20\ + vm\x20error\x20is\x20the\x20error\x20returned\x20by\x20vm\x20execution\n\ + \n\x0c\n\x05\x04\x04\x02\x02\x05\x12\x03-\x02\x08\n\x0c\n\x05\x04\x04\ + \x02\x02\x01\x12\x03-\t\x11\n\x0c\n\x05\x04\x04\x02\x02\x03\x12\x03-\x14\ + \x15\n.\n\x04\x04\x04\x02\x03\x12\x03/\x02\x16\x1a!\x20gas\x20consumed\ + \x20by\x20the\x20transaction\n\n\x0c\n\x05\x04\x04\x02\x03\x05\x12\x03/\ + \x02\x08\n\x0c\n\x05\x04\x04\x02\x03\x01\x12\x03/\t\x11\n\x0c\n\x05\x04\ + \x04\x02\x03\x03\x12\x03/\x14\x15\nc\n\x02\x04\x05\x12\x034\0\"\x1aX\x20\ + Topic\x20represents\x2032-byte\x20words\x20that\x20is\x20used\x20to\x20d\ + escribe\x20what\xe2\x80\x99s\x20going\x20on\x20in\x20an\n\x20event\n\n\n\ + \n\x03\x04\x05\x01\x12\x034\x08\r\n\x0b\n\x04\x04\x05\x02\0\x12\x034\x10\ + \x20\n\x0c\n\x05\x04\x05\x02\0\x05\x12\x034\x10\x15\n\x0c\n\x05\x04\x05\ + \x02\0\x01\x12\x034\x16\x1b\n\x0c\n\x05\x04\x05\x02\0\x03\x12\x034\x1e\ + \x1f\n\x81\x01\n\x02\x04\x06\x12\x049\0@\x01\x1au\x20Log\x20represents\ + \x20an\x20protobuf\x20compatible\x20Ethereum\x20Log\x20that\x20defines\ + \x20a\x20contract\n\x20log\x20event.\n\x20Copied\x20from\x20`devnet/prot\ + o``\n\n\n\n\x03\x04\x06\x01\x12\x039\x08\x0b\n?\n\x04\x04\x06\x02\0\x12\ + \x03;\x02\x14\x1a2\x20address\x20of\x20the\x20contract\x20that\x20genera\ + ted\x20the\x20event\n\n\x0c\n\x05\x04\x06\x02\0\x05\x12\x03;\x02\x07\n\ + \x0c\n\x05\x04\x06\x02\0\x01\x12\x03;\x08\x0f\n\x0c\n\x05\x04\x06\x02\0\ + \x03\x12\x03;\x12\x13\n7\n\x04\x04\x06\x02\x01\x12\x03=\x02\x1c\x1a*\x20\ + list\x20of\x20topics\x20provided\x20by\x20the\x20contract.\n\n\x0c\n\x05\ + \x04\x06\x02\x01\x04\x12\x03=\x02\n\n\x0c\n\x05\x04\x06\x02\x01\x06\x12\ + \x03=\x0b\x10\n\x0c\n\x05\x04\x06\x02\x01\x01\x12\x03=\x11\x17\n\x0c\n\ + \x05\x04\x06\x02\x01\x03\x12\x03=\x1a\x1b\n<\n\x04\x04\x06\x02\x02\x12\ + \x03?\x02\x11\x1a/\x20supplied\x20by\x20the\x20contract,\x20usually\x20A\ + BI-encoded\n\n\x0c\n\x05\x04\x06\x02\x02\x05\x12\x03?\x02\x07\n\x0c\n\ + \x05\x04\x06\x02\x02\x01\x12\x03?\x08\x0c\n\x0c\n\x05\x04\x06\x02\x02\ + \x03\x12\x03?\x0f\x10\nX\n\x02\x04\x07\x12\x04C\0F\x01\x1aL\x20Request\ + \x20for\x20account\x20code\x20(smart\x20contract\x20deployed\x20behind\ + \x20provided\x20address)\n\n\n\n\x03\x04\x07\x01\x12\x03C\x08\x17\n*\n\ + \x04\x04\x07\x02\0\x12\x03E\x02\x14\x1a\x1d\x2020\x20bytes\x20of\x20acco\ + unt\x20address\n\n\x0c\n\x05\x04\x07\x02\0\x05\x12\x03E\x02\x07\n\x0c\n\ + \x05\x04\x07\x02\0\x01\x12\x03E\x08\x0f\n\x0c\n\x05\x04\x07\x02\0\x03\ + \x12\x03E\x12\x13\n'\n\x02\x04\x08\x12\x04I\0N\x01\x1a\x1b\x20Response\ + \x20for\x20account\x20code\n\n\n\n\x03\x04\x08\x01\x12\x03I\x08\x1f\nb\n\ + \x04\x04\x08\x02\0\x12\x03L\x02\x14\x1aU\x20Since\x20both\x20fields\x20a\ + re\x20256-bit\x20unsigned\x20integer,\x20we\x20encode\x20them\x20as\n\ + \x20big-endian\x20bytes\n\n\x0c\n\x05\x04\x08\x02\0\x05\x12\x03L\x02\x07\ + \n\x0c\n\x05\x04\x08\x02\0\x01\x12\x03L\x08\x0f\n\x0c\n\x05\x04\x08\x02\ + \0\x03\x12\x03L\x12\x13\n\x0b\n\x04\x04\x08\x02\x01\x12\x03M\x02\x13\n\ + \x0c\n\x05\x04\x08\x02\x01\x05\x12\x03M\x02\x08\n\x0c\n\x05\x04\x08\x02\ + \x01\x01\x12\x03M\t\x0e\n\x0c\n\x05\x04\x08\x02\x01\x03\x12\x03M\x11\x12\ + \n\n\n\x02\x04\t\x12\x04P\0S\x01\n\n\n\x03\x04\t\x01\x12\x03P\x08!\n\x0b\ + \n\x04\x04\t\x02\0\x12\x03Q\x02\x14\n\x0c\n\x05\x04\t\x02\0\x05\x12\x03Q\ + \x02\x07\n\x0c\n\x05\x04\t\x02\0\x01\x12\x03Q\x08\x0f\n\x0c\n\x05\x04\t\ + \x02\0\x03\x12\x03Q\x12\x13\n\x0b\n\x04\x04\t\x02\x01\x12\x03R\x02\x14\n\ + \x0c\n\x05\x04\t\x02\x01\x05\x12\x03R\x02\x07\n\x0c\n\x05\x04\t\x02\x01\ + \x01\x12\x03R\x08\x0f\n\x0c\n\x05\x04\t\x02\x01\x03\x12\x03R\x12\x13\n\t\ + \n\x02\x04\n\x12\x03T\0,\n\n\n\x03\x04\n\x01\x12\x03T\x08)\n\n\n\x02\x04\ + \x0b\x12\x04V\0Y\x01\n\n\n\x03\x04\x0b\x01\x12\x03V\x08\x1f\n\x0b\n\x04\ + \x04\x0b\x02\0\x12\x03W\x02\x14\n\x0c\n\x05\x04\x0b\x02\0\x05\x12\x03W\ + \x02\x07\n\x0c\n\x05\x04\x0b\x02\0\x01\x12\x03W\x08\x0f\n\x0c\n\x05\x04\ + \x0b\x02\0\x03\x12\x03W\x12\x13\n\x0b\n\x04\x04\x0b\x02\x01\x12\x03X\x02\ + \x13\n\x0c\n\x05\x04\x0b\x02\x01\x05\x12\x03X\x02\x08\n\x0c\n\x05\x04\ + \x0b\x02\x01\x01\x12\x03X\t\x0e\n\x0c\n\x05\x04\x0b\x02\x01\x03\x12\x03X\ + \x11\x12\n\t\n\x02\x04\x0c\x12\x03Z\0)\n\n\n\x03\x04\x0c\x01\x12\x03Z\ + \x08'\n\t\n\x02\x04\r\x12\x03\\\0+\n\n\n\x03\x04\r\x01\x12\x03\\\x08\x18\ + \n\x0b\n\x04\x04\r\x02\0\x12\x03\\\x1b)\n\x0c\n\x05\x04\r\x02\0\x05\x12\ + \x03\\\x1b\x20\n\x0c\n\x05\x04\r\x02\0\x01\x12\x03\\!$\n\x0c\n\x05\x04\r\ + \x02\0\x03\x12\x03\\'(\n\t\n\x02\x04\x0e\x12\x03^\07\n\n\n\x03\x04\x0e\ + \x01\x12\x03^\x08\x20\n\x0b\n\x04\x04\x0e\x02\0\x12\x03^#5\n\x0c\n\x05\ + \x04\x0e\x02\0\x05\x12\x03^#'\n\x0c\n\x05\x04\x0e\x02\0\x01\x12\x03^(0\n\ + \x0c\n\x05\x04\x0e\x02\0\x03\x12\x03^34\n\n\n\x02\x04\x0f\x12\x04`\0c\ + \x01\n\n\n\x03\x04\x0f\x01\x12\x03`\x08\"\n\x0b\n\x04\x04\x0f\x02\0\x12\ + \x03a\x02\x14\n\x0c\n\x05\x04\x0f\x02\0\x05\x12\x03a\x02\x07\n\x0c\n\x05\ + \x04\x0f\x02\0\x01\x12\x03a\x08\x0f\n\x0c\n\x05\x04\x0f\x02\0\x03\x12\ + \x03a\x12\x13\n\x0b\n\x04\x04\x0f\x02\x01\x12\x03b\x02\x12\n\x0c\n\x05\ + \x04\x0f\x02\x01\x05\x12\x03b\x02\x07\n\x0c\n\x05\x04\x0f\x02\x01\x01\ + \x12\x03b\x08\r\n\x0c\n\x05\x04\x0f\x02\x01\x03\x12\x03b\x10\x11\n\t\n\ + \x02\x04\x10\x12\x03e\0?\n\n\n\x03\x04\x10\x01\x12\x03e\x08*\n\x0b\n\x04\ + \x04\x10\x02\0\x12\x03e-=\n\x0c\n\x05\x04\x10\x02\0\x05\x12\x03e-2\n\x0c\ + \n\x05\x04\x10\x02\0\x01\x12\x03e38\n\x0c\n\x05\x04\x10\x02\0\x03\x12\ + \x03e;<\n\t\n\x02\x04\x11\x12\x03g\02\n\n\n\x03\x04\x11\x01\x12\x03g\x08\ + \x1b\n\x0b\n\x04\x04\x11\x02\0\x12\x03g\x1e0\n\x0c\n\x05\x04\x11\x02\0\ + \x05\x12\x03g\x1e#\n\x0c\n\x05\x04\x11\x02\0\x01\x12\x03g$+\n\x0c\n\x05\ + \x04\x11\x02\0\x03\x12\x03g./\n\t\n\x02\x04\x12\x12\x03i\07\n\n\n\x03\ + \x04\x12\x01\x12\x03i\x08#\n\x0b\n\x04\x04\x12\x02\0\x12\x03i&5\n\x0c\n\ + \x05\x04\x12\x02\0\x05\x12\x03i&+\n\x0c\n\x05\x04\x12\x02\0\x01\x12\x03i\ + ,0\n\x0c\n\x05\x04\x12\x02\0\x03\x12\x03i34\n\t\n\x02\x04\x13\x12\x03k\0\ + 6\n\n\n\x03\x04\x13\x01\x12\x03k\x08\x1f\n\x0b\n\x04\x04\x13\x02\0\x12\ + \x03k\"4\n\x0c\n\x05\x04\x13\x02\0\x05\x12\x03k\"'\n\x0c\n\x05\x04\x13\ + \x02\0\x01\x12\x03k(/\n\x0c\n\x05\x04\x13\x02\0\x03\x12\x03k23\n\t\n\x02\ + \x04\x14\x12\x03l\0<\n\n\n\x03\x04\x14\x01\x12\x03l\x08'\n\x0b\n\x04\x04\ + \x14\x02\0\x12\x03l*:\n\x0c\n\x05\x04\x14\x02\0\x05\x12\x03l*0\n\x0c\n\ + \x05\x04\x14\x02\0\x01\x12\x03l15\n\x0c\n\x05\x04\x14\x02\0\x03\x12\x03l\ + 89\n\t\n\x02\x04\x15\x12\x03n\06\n\n\n\x03\x04\x15\x01\x12\x03n\x08\x1f\ + \n\x0b\n\x04\x04\x15\x02\0\x12\x03n\"4\n\x0c\n\x05\x04\x15\x02\0\x05\x12\ + \x03n\"'\n\x0c\n\x05\x04\x15\x02\0\x01\x12\x03n(/\n\x0c\n\x05\x04\x15\ + \x02\0\x03\x12\x03n23\n\t\n\x02\x04\x16\x12\x03o\0;\n\n\n\x03\x04\x16\ + \x01\x12\x03o\x08'\n\x0b\n\x04\x04\x16\x02\0\x12\x03o*9\n\x0c\n\x05\x04\ + \x16\x02\0\x05\x12\x03o*/\n\x0c\n\x05\x04\x16\x02\0\x01\x12\x03o04\n\x0c\ + \n\x05\x04\x16\x02\0\x03\x12\x03o78\n\n\n\x02\x04\x17\x12\x04q\0t\x01\n\ + \n\n\x03\x04\x17\x01\x12\x03q\x08\x1e\n\x0b\n\x04\x04\x17\x02\0\x12\x03r\ + \x02\x14\n\x0c\n\x05\x04\x17\x02\0\x05\x12\x03r\x02\x07\n\x0c\n\x05\x04\ + \x17\x02\0\x01\x12\x03r\x08\x0f\n\x0c\n\x05\x04\x17\x02\0\x03\x12\x03r\ + \x12\x13\n\x0b\n\x04\x04\x17\x02\x01\x12\x03s\x02\x11\n\x0c\n\x05\x04\ + \x17\x02\x01\x05\x12\x03s\x02\x07\n\x0c\n\x05\x04\x17\x02\x01\x01\x12\ + \x03s\x08\x0c\n\x0c\n\x05\x04\x17\x02\x01\x03\x12\x03s\x0f\x10\n\t\n\x02\ + \x04\x18\x12\x03v\0)\n\n\n\x03\x04\x18\x01\x12\x03v\x08&\n\n\n\x02\x04\ + \x19\x12\x04x\0|\x01\n\n\n\x03\x04\x19\x01\x12\x03x\x08\x1e\n\x0b\n\x04\ + \x04\x19\x02\0\x12\x03y\x02\x14\n\x0c\n\x05\x04\x19\x02\0\x05\x12\x03y\ + \x02\x07\n\x0c\n\x05\x04\x19\x02\0\x01\x12\x03y\x08\x0f\n\x0c\n\x05\x04\ + \x19\x02\0\x03\x12\x03y\x12\x13\n\x0b\n\x04\x04\x19\x02\x01\x12\x03z\x02\ + \x12\n\x0c\n\x05\x04\x19\x02\x01\x05\x12\x03z\x02\x07\n\x0c\n\x05\x04\ + \x19\x02\x01\x01\x12\x03z\x08\r\n\x0c\n\x05\x04\x19\x02\x01\x03\x12\x03z\ + \x10\x11\n\x0b\n\x04\x04\x19\x02\x02\x12\x03{\x02\x12\n\x0c\n\x05\x04\ + \x19\x02\x02\x05\x12\x03{\x02\x07\n\x0c\n\x05\x04\x19\x02\x02\x01\x12\ + \x03{\x08\r\n\x0c\n\x05\x04\x19\x02\x02\x03\x12\x03{\x10\x11\n\t\n\x02\ + \x04\x1a\x12\x03~\0)\n\n\n\x03\x04\x1a\x01\x12\x03~\x08&\n\n\n\x02\x04\ + \x1b\x12\x04\x80\x01\0*\n\x0b\n\x03\x04\x1b\x01\x12\x04\x80\x01\x08\x13\ + \n\x0c\n\x04\x04\x1b\x02\0\x12\x04\x80\x01\x16(\n\r\n\x05\x04\x1b\x02\0\ + \x05\x12\x04\x80\x01\x16\x1b\n\r\n\x05\x04\x1b\x02\0\x01\x12\x04\x80\x01\ + \x1c#\n\r\n\x05\x04\x1b\x02\0\x03\x12\x04\x80\x01&'\n\n\n\x02\x04\x1c\ + \x12\x04\x82\x01\0\x1e\n\x0b\n\x03\x04\x1c\x01\x12\x04\x82\x01\x08\x1b\n\ + \x0c\n\x02\x04\x1d\x12\x06\x84\x01\0\x87\x01\x01\n\x0b\n\x03\x04\x1d\x01\ + \x12\x04\x84\x01\x08\x1e\n\x0c\n\x04\x04\x1d\x02\0\x12\x04\x85\x01\x02\ + \x14\n\r\n\x05\x04\x1d\x02\0\x05\x12\x04\x85\x01\x02\x07\n\r\n\x05\x04\ + \x1d\x02\0\x01\x12\x04\x85\x01\x08\x0f\n\r\n\x05\x04\x1d\x02\0\x03\x12\ + \x04\x85\x01\x12\x13\n\x0c\n\x04\x04\x1d\x02\x01\x12\x04\x86\x01\x02\x12\ + \n\r\n\x05\x04\x1d\x02\x01\x05\x12\x04\x86\x01\x02\x07\n\r\n\x05\x04\x1d\ + \x02\x01\x01\x12\x04\x86\x01\x08\r\n\r\n\x05\x04\x1d\x02\x01\x03\x12\x04\ + \x86\x01\x10\x11\n\n\n\x02\x04\x1e\x12\x04\x89\x01\0)\n\x0b\n\x03\x04\ + \x1e\x01\x12\x04\x89\x01\x08&\n\n\n\x02\x04\x1f\x12\x04\x8b\x01\01\n\x0b\ + \n\x03\x04\x1f\x01\x12\x04\x8b\x01\x08\x1a\n\x0c\n\x04\x04\x1f\x02\0\x12\ + \x04\x8b\x01\x1d/\n\r\n\x05\x04\x1f\x02\0\x05\x12\x04\x8b\x01\x1d\"\n\r\ + \n\x05\x04\x1f\x02\0\x01\x12\x04\x8b\x01#*\n\r\n\x05\x04\x1f\x02\0\x03\ + \x12\x04\x8b\x01-.\n\n\n\x02\x04\x20\x12\x04\x8d\x01\0%\n\x0b\n\x03\x04\ + \x20\x01\x12\x04\x8d\x01\x08\"\n\n\n\x02\x04!\x12\x04\x8f\x01\0,\n\x0b\n\ + \x03\x04!\x01\x12\x04\x8f\x01\x08\x16\n\x0c\n\x04\x04!\x02\0\x12\x04\x8f\ + \x01\x19*\n\r\n\x05\x04!\x02\0\x05\x12\x04\x8f\x01\x19\x1e\n\r\n\x05\x04\ + !\x02\0\x01\x12\x04\x8f\x01\x1f%\n\r\n\x05\x04!\x02\0\x03\x12\x04\x8f\ + \x01()\n\n\n\x02\x04\"\x12\x04\x90\x01\02\n\x0b\n\x03\x04\"\x01\x12\x04\ + \x90\x01\x08\x1e\n\x0c\n\x04\x04\"\x02\0\x12\x04\x90\x01!0\n\r\n\x05\x04\ + \"\x02\0\x05\x12\x04\x90\x01!&\n\r\n\x05\x04\"\x02\0\x01\x12\x04\x90\x01\ + '+\n\r\n\x05\x04\"\x02\0\x03\x12\x04\x90\x01./\n\x0c\n\x02\x04#\x12\x06\ + \x92\x01\0\x9d\x01\x01\n\x0b\n\x03\x04#\x01\x12\x04\x92\x01\x08#\n\x0c\n\ + \x04\x04#\x02\0\x12\x04\x93\x01\x02\x18\n\r\n\x05\x04#\x02\0\x05\x12\x04\ + \x93\x01\x02\x07\n\r\n\x05\x04#\x02\0\x01\x12\x04\x93\x01\x08\x13\n\r\n\ + \x05\x04#\x02\0\x03\x12\x04\x93\x01\x16\x17\n\x0c\n\x04\x04#\x02\x01\x12\ + \x04\x94\x01\x02\x1a\n\r\n\x05\x04#\x02\x01\x05\x12\x04\x94\x01\x02\x07\ + \n\r\n\x05\x04#\x02\x01\x01\x12\x04\x94\x01\x08\x15\n\r\n\x05\x04#\x02\ + \x01\x03\x12\x04\x94\x01\x18\x19\n\x0c\n\x04\x04#\x02\x02\x12\x04\x95\ + \x01\x02\x19\n\r\n\x05\x04#\x02\x02\x05\x12\x04\x95\x01\x02\x08\n\r\n\ + \x05\x04#\x02\x02\x01\x12\x04\x95\x01\t\x14\n\r\n\x05\x04#\x02\x02\x03\ + \x12\x04\x95\x01\x17\x18\n\x0c\n\x04\x04#\x02\x03\x12\x04\x96\x01\x02\ + \x1e\n\r\n\x05\x04#\x02\x03\x05\x12\x04\x96\x01\x02\x08\n\r\n\x05\x04#\ + \x02\x03\x01\x12\x04\x96\x01\t\x19\n\r\n\x05\x04#\x02\x03\x03\x12\x04\ + \x96\x01\x1c\x1d\n\x0c\n\x04\x04#\x02\x04\x12\x04\x97\x01\x02\x1f\n\r\n\ + \x05\x04#\x02\x04\x05\x12\x04\x97\x01\x02\x08\n\r\n\x05\x04#\x02\x04\x01\ + \x12\x04\x97\x01\t\x1a\n\r\n\x05\x04#\x02\x04\x03\x12\x04\x97\x01\x1d\ + \x1e\n\x0c\n\x04\x04#\x02\x05\x12\x04\x98\x01\x02!\n\r\n\x05\x04#\x02\ + \x05\x05\x12\x04\x98\x01\x02\x08\n\r\n\x05\x04#\x02\x05\x01\x12\x04\x98\ + \x01\t\x1c\n\r\n\x05\x04#\x02\x05\x03\x12\x04\x98\x01\x1f\x20\n\x0c\n\ + \x04\x04#\x02\x06\x12\x04\x99\x01\x02\x16\n\r\n\x05\x04#\x02\x06\x05\x12\ + \x04\x99\x01\x02\x07\n\r\n\x05\x04#\x02\x06\x01\x12\x04\x99\x01\x08\x11\ + \n\r\n\x05\x04#\x02\x06\x03\x12\x04\x99\x01\x14\x15\n\x0c\n\x04\x04#\x02\ + \x07\x12\x04\x9a\x01\x02\x14\n\r\n\x05\x04#\x02\x07\x05\x12\x04\x9a\x01\ + \x02\x08\n\r\n\x05\x04#\x02\x07\x01\x12\x04\x9a\x01\t\x0f\n\r\n\x05\x04#\ + \x02\x07\x03\x12\x04\x9a\x01\x12\x13\n\x0c\n\x04\x04#\x02\x08\x12\x04\ + \x9b\x01\x02\"\n\r\n\x05\x04#\x02\x08\x05\x12\x04\x9b\x01\x02\x08\n\r\n\ + \x05\x04#\x02\x08\x01\x12\x04\x9b\x01\t\x1d\n\r\n\x05\x04#\x02\x08\x03\ + \x12\x04\x9b\x01\x20!\n\x0c\n\x04\x04#\x02\t\x12\x04\x9c\x01\x02\x16\n\r\ + \n\x05\x04#\x02\t\x05\x12\x04\x9c\x01\x02\x08\n\r\n\x05\x04#\x02\t\x01\ + \x12\x04\x9c\x01\t\x10\n\r\n\x05\x04#\x02\t\x03\x12\x04\x9c\x01\x13\x15\ + \n\x0c\n\x02\x04$\x12\x06\x9e\x01\0\xa0\x01\x01\n\x0b\n\x03\x04$\x01\x12\ + \x04\x9e\x01\x08+\n\x0c\n\x04\x04$\x02\0\x12\x04\x9f\x01\x02\x1b\n\r\n\ + \x05\x04$\x02\0\x05\x12\x04\x9f\x01\x02\x07\n\r\n\x05\x04$\x02\0\x01\x12\ + \x04\x9f\x01\x08\x16\n\r\n\x05\x04$\x02\0\x03\x12\x04\x9f\x01\x19\x1a\n\ + \x0c\n\x02\x04%\x12\x06\xa2\x01\0\xa7\x01\x01\n\x0b\n\x03\x04%\x01\x12\ + \x04\xa2\x01\x08\x1c\n\x0c\n\x04\x04%\x02\0\x12\x04\xa3\x01\x02\x18\n\r\ + \n\x05\x04%\x02\0\x05\x12\x04\xa3\x01\x02\x07\n\r\n\x05\x04%\x02\0\x01\ + \x12\x04\xa3\x01\x08\x13\n\r\n\x05\x04%\x02\0\x03\x12\x04\xa3\x01\x16\ + \x17\n\x0c\n\x04\x04%\x02\x01\x12\x04\xa4\x01\x02\x1e\n\r\n\x05\x04%\x02\ + \x01\x05\x12\x04\xa4\x01\x02\x08\n\r\n\x05\x04%\x02\x01\x01\x12\x04\xa4\ + \x01\t\x19\n\r\n\x05\x04%\x02\x01\x03\x12\x04\xa4\x01\x1c\x1d\n\x0c\n\ + \x04\x04%\x02\x02\x12\x04\xa5\x01\x02!\n\r\n\x05\x04%\x02\x02\x05\x12\ + \x04\xa5\x01\x02\x08\n\r\n\x05\x04%\x02\x02\x01\x12\x04\xa5\x01\t\x1c\n\ + \r\n\x05\x04%\x02\x02\x03\x12\x04\xa5\x01\x1f\x20\n\x0c\n\x04\x04%\x02\ + \x03\x12\x04\xa6\x01\x02$\n\r\n\x05\x04%\x02\x03\x04\x12\x04\xa6\x01\x02\ + \n\n\r\n\x05\x04%\x02\x03\x05\x12\x04\xa6\x01\x0b\x10\n\r\n\x05\x04%\x02\ + \x03\x01\x12\x04\xa6\x01\x11\x1f\n\r\n\x05\x04%\x02\x03\x03\x12\x04\xa6\ + \x01\"#\n\x0c\n\x02\x04&\x12\x06\xa8\x01\0\xaa\x01\x01\n\x0b\n\x03\x04&\ + \x01\x12\x04\xa8\x01\x08$\n\x0c\n\x04\x04&\x02\0\x12\x04\xa9\x01\x02\x1b\ + \n\r\n\x05\x04&\x02\0\x05\x12\x04\xa9\x01\x02\x06\n\r\n\x05\x04&\x02\0\ + \x01\x12\x04\xa9\x01\x07\x16\n\r\n\x05\x04&\x02\0\x03\x12\x04\xa9\x01\ + \x19\x1a\n\x0c\n\x02\x04'\x12\x06\xac\x01\0\xaf\x01\x01\n\x0b\n\x03\x04'\ + \x01\x12\x04\xac\x01\x08\x20\n\x0c\n\x04\x04'\x02\0\x12\x04\xad\x01\x02\ + \x18\n\r\n\x05\x04'\x02\0\x05\x12\x04\xad\x01\x02\x07\n\r\n\x05\x04'\x02\ + \0\x01\x12\x04\xad\x01\x08\x13\n\r\n\x05\x04'\x02\0\x03\x12\x04\xad\x01\ + \x16\x17\n\x0c\n\x04\x04'\x02\x01\x12\x04\xae\x01\x02\x1a\n\r\n\x05\x04'\ + \x02\x01\x05\x12\x04\xae\x01\x02\x07\n\r\n\x05\x04'\x02\x01\x01\x12\x04\ + \xae\x01\x08\x15\n\r\n\x05\x04'\x02\x01\x03\x12\x04\xae\x01\x18\x19\n\ + \xf1\x01\n\x02\x04(\x12\x06\xb3\x01\0\xc8\x01\x01\x1a\xe2\x01\x20Verific\ + ationDetails\x20must\x20have\x20same\x20members\x20with\x20VerificationD\ + etails\x20in\x20\"sgxvm/proto/ffi.proto\"\n\x20including\x20verification\ + \x20type\x20and\x20verification\x20id\x20as\x20key.\n\x20But\x20the\x20m\ + ember\x20types\x20can\x20be\x20different,\x20such\x20as\x20string(addres\ + s)\x20to\x20bytes\n\n\x0b\n\x03\x04(\x01\x12\x04\xb3\x01\x08\x1b\n!\n\ + \x04\x04(\x02\0\x12\x04\xb5\x01\x02\x1e\x1a\x13\x20Verification\x20type\ + \n\n\r\n\x05\x04(\x02\0\x05\x12\x04\xb5\x01\x02\x08\n\r\n\x05\x04(\x02\0\ + \x01\x12\x04\xb5\x01\t\x19\n\r\n\x05\x04(\x02\0\x03\x12\x04\xb5\x01\x1c\ + \x1d\n\x1f\n\x04\x04(\x02\x01\x12\x04\xb7\x01\x02\x1b\x1a\x11\x20Verific\ + ation\x20Id\n\n\r\n\x05\x04(\x02\x01\x05\x12\x04\xb7\x01\x02\x07\n\r\n\ + \x05\x04(\x02\x01\x01\x12\x04\xb7\x01\x08\x16\n\r\n\x05\x04(\x02\x01\x03\ + \x12\x04\xb7\x01\x19\x1a\n+\n\x04\x04(\x02\x02\x12\x04\xb9\x01\x02\x1a\ + \x1a\x1d\x20Verification\x20issuer\x20address\n\n\r\n\x05\x04(\x02\x02\ + \x05\x12\x04\xb9\x01\x02\x07\n\r\n\x05\x04(\x02\x02\x01\x12\x04\xb9\x01\ + \x08\x15\n\r\n\x05\x04(\x02\x02\x03\x12\x04\xb9\x01\x18\x19\n6\n\x04\x04\ + (\x02\x03\x12\x04\xbb\x01\x02\x19\x1a(\x20From\x20which\x20chain\x20proo\ + f\x20was\x20transferred\n\n\r\n\x05\x04(\x02\x03\x05\x12\x04\xbb\x01\x02\ + \x08\n\r\n\x05\x04(\x02\x03\x01\x12\x04\xbb\x01\t\x14\n\r\n\x05\x04(\x02\ + \x03\x03\x12\x04\xbb\x01\x17\x18\n+\n\x04\x04(\x02\x04\x12\x04\xbd\x01\ + \x02\x1f\x1a\x1d\x20Original\x20issuance\x20timestamp\n\n\r\n\x05\x04(\ + \x02\x04\x05\x12\x04\xbd\x01\x02\x08\n\r\n\x05\x04(\x02\x04\x01\x12\x04\ + \xbd\x01\t\x1a\n\r\n\x05\x04(\x02\x04\x03\x12\x04\xbd\x01\x1d\x1e\n-\n\ + \x04\x04(\x02\x05\x12\x04\xbf\x01\x02!\x1a\x1f\x20Original\x20expiration\ + \x20timestamp\n\n\r\n\x05\x04(\x02\x05\x05\x12\x04\xbf\x01\x02\x08\n\r\n\ + \x05\x04(\x02\x05\x01\x12\x04\xbf\x01\t\x1c\n\r\n\x05\x04(\x02\x05\x03\ + \x12\x04\xbf\x01\x1f\x20\n.\n\x04\x04(\x02\x06\x12\x04\xc1\x01\x02\x19\ + \x1a\x20\x20Original\x20proof\x20data\x20(ZK-proof)\n\n\r\n\x05\x04(\x02\ + \x06\x05\x12\x04\xc1\x01\x02\x07\n\r\n\x05\x04(\x02\x06\x01\x12\x04\xc1\ + \x01\x08\x14\n\r\n\x05\x04(\x02\x06\x03\x12\x04\xc1\x01\x17\x18\n(\n\x04\ + \x04(\x02\x07\x12\x04\xc3\x01\x02\x14\x1a\x1a\x20ZK-proof\x20original\ + \x20schema\n\n\r\n\x05\x04(\x02\x07\x05\x12\x04\xc3\x01\x02\x08\n\r\n\ + \x05\x04(\x02\x07\x01\x12\x04\xc3\x01\t\x0f\n\r\n\x05\x04(\x02\x07\x03\ + \x12\x04\xc3\x01\x12\x13\nN\n\x04\x04(\x02\x08\x12\x04\xc5\x01\x02\"\x1a\ + @\x20Verification\x20id\x20for\x20checking(KYC/KYB/AML\x20etc)\x20from\ + \x20issuer\x20side\n\n\r\n\x05\x04(\x02\x08\x05\x12\x04\xc5\x01\x02\x08\ + \n\r\n\x05\x04(\x02\x08\x01\x12\x04\xc5\x01\t\x1d\n\r\n\x05\x04(\x02\x08\ + \x03\x12\x04\xc5\x01\x20!\n\x17\n\x04\x04(\x02\t\x12\x04\xc7\x01\x02\x16\ + \x1a\t\x20Version\n\n\r\n\x05\x04(\x02\t\x05\x12\x04\xc7\x01\x02\x08\n\r\ + \n\x05\x04(\x02\t\x01\x12\x04\xc7\x01\t\x10\n\r\n\x05\x04(\x02\t\x03\x12\ + \x04\xc7\x01\x13\x15\n\x0c\n\x02\x04)\x12\x06\xc9\x01\0\xcb\x01\x01\n\ + \x0b\n\x03\x04)\x01\x12\x04\xc9\x01\x08(\n\x0c\n\x04\x04)\x02\0\x12\x04\ + \xca\x01\x02(\n\r\n\x05\x04)\x02\0\x04\x12\x04\xca\x01\x02\n\n\r\n\x05\ + \x04)\x02\0\x06\x12\x04\xca\x01\x0b\x1e\n\r\n\x05\x04)\x02\0\x01\x12\x04\ + \xca\x01\x1f#\n\r\n\x05\x04)\x02\0\x03\x12\x04\xca\x01&'\n\x0c\n\x02\x04\ + *\x12\x06\xcd\x01\0\xe1\x01\x01\n\x0b\n\x03\x04*\x01\x12\x04\xcd\x01\x08\ + \x15\n\x0e\n\x04\x04*\x08\0\x12\x06\xce\x01\x02\xe0\x01\x03\n\r\n\x05\ + \x04*\x08\0\x01\x12\x04\xce\x01\x08\x0b\n\x0c\n\x04\x04*\x02\0\x12\x04\ + \xcf\x01\x04#\n\r\n\x05\x04*\x02\0\x06\x12\x04\xcf\x01\x04\x13\n\r\n\x05\ + \x04*\x02\0\x01\x12\x04\xcf\x01\x14\x1e\n\r\n\x05\x04*\x02\0\x03\x12\x04\ + \xcf\x01!\"\n\x0c\n\x04\x04*\x02\x01\x12\x04\xd0\x01\x04%\n\r\n\x05\x04*\ + \x02\x01\x06\x12\x04\xd0\x01\x04\x14\n\r\n\x05\x04*\x02\x01\x01\x12\x04\ + \xd0\x01\x15\x20\n\r\n\x05\x04*\x02\x01\x03\x12\x04\xd0\x01#$\n\x0c\n\ + \x04\x04*\x02\x02\x12\x04\xd1\x01\x04(\n\r\n\x05\x04*\x02\x02\x06\x12\ + \x04\xd1\x01\x04\x17\n\r\n\x05\x04*\x02\x02\x01\x12\x04\xd1\x01\x18#\n\r\ + \n\x05\x04*\x02\x02\x03\x12\x04\xd1\x01&'\n\x0c\n\x04\x04*\x02\x03\x12\ + \x04\xd2\x01\x04)\n\r\n\x05\x04*\x02\x03\x06\x12\x04\xd2\x01\x04\x1b\n\r\ + \n\x05\x04*\x02\x03\x01\x12\x04\xd2\x01\x1c$\n\r\n\x05\x04*\x02\x03\x03\ + \x12\x04\xd2\x01'(\n\x0c\n\x04\x04*\x02\x04\x12\x04\xd3\x01\x04)\n\r\n\ + \x05\x04*\x02\x04\x06\x12\x04\xd3\x01\x04\x1b\n\r\n\x05\x04*\x02\x04\x01\ + \x12\x04\xd3\x01\x1c$\n\r\n\x05\x04*\x02\x04\x03\x12\x04\xd3\x01'(\n\x0c\ + \n\x04\x04*\x02\x05\x12\x04\xd4\x01\x04/\n\r\n\x05\x04*\x02\x05\x06\x12\ + \x04\xd4\x01\x04\x1e\n\r\n\x05\x04*\x02\x05\x01\x12\x04\xd4\x01\x1f*\n\r\ + \n\x05\x04*\x02\x05\x03\x12\x04\xd4\x01-.\n\x0c\n\x04\x04*\x02\x06\x12\ + \x04\xd5\x01\x041\n\r\n\x05\x04*\x02\x06\x06\x12\x04\xd5\x01\x04\x1a\n\r\ + \n\x05\x04*\x02\x06\x01\x12\x04\xd5\x01\x1b,\n\r\n\x05\x04*\x02\x06\x03\ + \x12\x04\xd5\x01/0\n\x0c\n\x04\x04*\x02\x07\x12\x04\xd6\x01\x041\n\r\n\ + \x05\x04*\x02\x07\x06\x12\x04\xd6\x01\x04\x1a\n\r\n\x05\x04*\x02\x07\x01\ + \x12\x04\xd6\x01\x1b,\n\r\n\x05\x04*\x02\x07\x03\x12\x04\xd6\x01/0\n\x0c\ + \n\x04\x04*\x02\x08\x12\x04\xd7\x01\x04\x1b\n\r\n\x05\x04*\x02\x08\x06\ + \x12\x04\xd7\x01\x04\x0f\n\r\n\x05\x04*\x02\x08\x01\x12\x04\xd7\x01\x10\ + \x16\n\r\n\x05\x04*\x02\x08\x03\x12\x04\xd7\x01\x19\x1a\n\x0c\n\x04\x04*\ + \x02\t\x12\x04\xd8\x01\x042\n\r\n\x05\x04*\x02\t\x06\x12\x04\xd8\x01\x04\ + \x1a\n\r\n\x05\x04*\x02\t\x01\x12\x04\xd8\x01\x1b,\n\r\n\x05\x04*\x02\t\ + \x03\x12\x04\xd8\x01/1\n\x0c\n\x04\x04*\x02\n\x12\x04\xd9\x01\x04*\n\r\n\ + \x05\x04*\x02\n\x06\x12\x04\xd9\x01\x04\x16\n\r\n\x05\x04*\x02\n\x01\x12\ + \x04\xd9\x01\x17$\n\r\n\x05\x04*\x02\n\x03\x12\x04\xd9\x01')\n\x0c\n\x04\ + \x04*\x02\x0b\x12\x04\xda\x01\x04\"\n\r\n\x05\x04*\x02\x0b\x06\x12\x04\ + \xda\x01\x04\x12\n\r\n\x05\x04*\x02\x0b\x01\x12\x04\xda\x01\x13\x1c\n\r\ + \n\x05\x04*\x02\x0b\x03\x12\x04\xda\x01\x1f!\n\x0c\n\x04\x04*\x02\x0c\ + \x12\x04\xdb\x01\x04<\n\r\n\x05\x04*\x02\x0c\x06\x12\x04\xdb\x01\x04\x1f\ + \n\r\n\x05\x04*\x02\x0c\x01\x12\x04\xdb\x01\x206\n\r\n\x05\x04*\x02\x0c\ + \x03\x12\x04\xdb\x019;\n\x0c\n\x04\x04*\x02\r\x12\x04\xdc\x01\x04.\n\r\n\ + \x05\x04*\x02\r\x06\x12\x04\xdc\x01\x04\x18\n\r\n\x05\x04*\x02\r\x01\x12\ + \x04\xdc\x01\x19(\n\r\n\x05\x04*\x02\r\x03\x12\x04\xdc\x01+-\n\x0c\n\x04\ + \x04*\x02\x0e\x12\x04\xdd\x01\x046\n\r\n\x05\x04*\x02\x0e\x06\x12\x04\ + \xdd\x01\x04\x1c\n\r\n\x05\x04*\x02\x0e\x01\x12\x04\xdd\x01\x1d0\n\r\n\ + \x05\x04*\x02\x0e\x03\x12\x04\xdd\x0135\n\x0c\n\x04\x04*\x02\x0f\x12\x04\ + \xde\x01\x048\n\r\n\x05\x04*\x02\x0f\x06\x12\x04\xde\x01\x04\x1d\n\r\n\ + \x05\x04*\x02\x0f\x01\x12\x04\xde\x01\x1e2\n\r\n\x05\x04*\x02\x0f\x03\ + \x12\x04\xde\x0157\n\x0c\n\x04\x04*\x02\x10\x12\x04\xdf\x01\x044\n\r\n\ + \x05\x04*\x02\x10\x06\x12\x04\xdf\x01\x04\x1b\n\r\n\x05\x04*\x02\x10\x01\ + \x12\x04\xdf\x01\x1c.\n\r\n\x05\x04*\x02\x10\x03\x12\x04\xdf\x0113\nF\n\ + \x02\x04+\x12\x06\xe4\x01\0\xef\x01\x01\x1a8\x20Message\x20with\x20data\ + \x20required\x20to\x20execute\x20`call`\x20operation\n\n\x0b\n\x03\x04+\ + \x01\x12\x04\xe4\x01\x08\x17\n\x0c\n\x04\x04+\x02\0\x12\x04\xe5\x01\x02\ + \x11\n\r\n\x05\x04+\x02\0\x05\x12\x04\xe5\x01\x02\x07\n\r\n\x05\x04+\x02\ + \0\x01\x12\x04\xe5\x01\x08\x0c\n\r\n\x05\x04+\x02\0\x03\x12\x04\xe5\x01\ + \x0f\x10\n\x0c\n\x04\x04+\x02\x01\x12\x04\xe6\x01\x02\x0f\n\r\n\x05\x04+\ + \x02\x01\x05\x12\x04\xe6\x01\x02\x07\n\r\n\x05\x04+\x02\x01\x01\x12\x04\ + \xe6\x01\x08\n\n\r\n\x05\x04+\x02\x01\x03\x12\x04\xe6\x01\r\x0e\n\x0c\n\ + \x04\x04+\x02\x02\x12\x04\xe7\x01\x02\x11\n\r\n\x05\x04+\x02\x02\x05\x12\ + \x04\xe7\x01\x02\x07\n\r\n\x05\x04+\x02\x02\x01\x12\x04\xe7\x01\x08\x0c\ + \n\r\n\x05\x04+\x02\x02\x03\x12\x04\xe7\x01\x0f\x10\n\x0c\n\x04\x04+\x02\ + \x03\x12\x04\xe8\x01\x02\x16\n\r\n\x05\x04+\x02\x03\x05\x12\x04\xe8\x01\ + \x02\x08\n\r\n\x05\x04+\x02\x03\x01\x12\x04\xe8\x01\t\x11\n\r\n\x05\x04+\ + \x02\x03\x03\x12\x04\xe8\x01\x14\x15\n\x0c\n\x04\x04+\x02\x04\x12\x04\ + \xe9\x01\x02\x15\n\r\n\x05\x04+\x02\x04\x05\x12\x04\xe9\x01\x02\x07\n\r\ + \n\x05\x04+\x02\x04\x01\x12\x04\xe9\x01\x08\x10\n\r\n\x05\x04+\x02\x04\ + \x03\x12\x04\xe9\x01\x13\x14\n\x0c\n\x04\x04+\x02\x05\x12\x04\xea\x01\ + \x02\x12\n\r\n\x05\x04+\x02\x05\x05\x12\x04\xea\x01\x02\x07\n\r\n\x05\ + \x04+\x02\x05\x01\x12\x04\xea\x01\x08\r\n\r\n\x05\x04+\x02\x05\x03\x12\ + \x04\xea\x01\x10\x11\n\x0c\n\x04\x04+\x02\x06\x12\x04\xeb\x01\x02)\n\r\n\ + \x05\x04+\x02\x06\x04\x12\x04\xeb\x01\x02\n\n\r\n\x05\x04+\x02\x06\x06\ + \x12\x04\xeb\x01\x0b\x19\n\r\n\x05\x04+\x02\x06\x01\x12\x04\xeb\x01\x1a$\ + \n\r\n\x05\x04+\x02\x06\x03\x12\x04\xeb\x01'(\n\x0c\n\x04\x04+\x02\x07\ + \x12\x04\xec\x01\x02\x12\n\r\n\x05\x04+\x02\x07\x05\x12\x04\xec\x01\x02\ + \x06\n\r\n\x05\x04+\x02\x07\x01\x12\x04\xec\x01\x07\r\n\r\n\x05\x04+\x02\ + \x07\x03\x12\x04\xec\x01\x10\x11\n\x0c\n\x04\x04+\x02\x08\x12\x04\xed\ + \x01\x02\x13\n\r\n\x05\x04+\x02\x08\x05\x12\x04\xed\x01\x02\x08\n\r\n\ + \x05\x04+\x02\x08\x01\x12\x04\xed\x01\t\x0e\n\r\n\x05\x04+\x02\x08\x03\ + \x12\x04\xed\x01\x11\x12\n\x0c\n\x04\x04+\x02\t\x12\x04\xee\x01\x02\x18\ + \n\r\n\x05\x04+\x02\t\x05\x12\x04\xee\x01\x02\x06\n\r\n\x05\x04+\x02\t\ + \x01\x12\x04\xee\x01\x07\x12\n\r\n\x05\x04+\x02\t\x03\x12\x04\xee\x01\ + \x15\x17\nH\n\x02\x04,\x12\x06\xf2\x01\0\xfb\x01\x01\x1a:\x20Message\x20\ with\x20data\x20required\x20to\x20execute\x20`create`\x20operation\n\n\ - \x0b\n\x03\x04&\x01\x12\x04\xe6\x01\x08\x19\n\x0c\n\x04\x04&\x02\0\x12\ - \x04\xe7\x01\x02\x11\n\r\n\x05\x04&\x02\0\x05\x12\x04\xe7\x01\x02\x07\n\ - \r\n\x05\x04&\x02\0\x01\x12\x04\xe7\x01\x08\x0c\n\r\n\x05\x04&\x02\0\x03\ - \x12\x04\xe7\x01\x0f\x10\n\x0c\n\x04\x04&\x02\x01\x12\x04\xe8\x01\x02\ - \x11\n\r\n\x05\x04&\x02\x01\x05\x12\x04\xe8\x01\x02\x07\n\r\n\x05\x04&\ - \x02\x01\x01\x12\x04\xe8\x01\x08\x0c\n\r\n\x05\x04&\x02\x01\x03\x12\x04\ - \xe8\x01\x0f\x10\n\x0c\n\x04\x04&\x02\x02\x12\x04\xe9\x01\x02\x16\n\r\n\ - \x05\x04&\x02\x02\x05\x12\x04\xe9\x01\x02\x08\n\r\n\x05\x04&\x02\x02\x01\ - \x12\x04\xe9\x01\t\x11\n\r\n\x05\x04&\x02\x02\x03\x12\x04\xe9\x01\x14\ - \x15\n\x0c\n\x04\x04&\x02\x03\x12\x04\xea\x01\x02\x12\n\r\n\x05\x04&\x02\ - \x03\x05\x12\x04\xea\x01\x02\x07\n\r\n\x05\x04&\x02\x03\x01\x12\x04\xea\ - \x01\x08\r\n\r\n\x05\x04&\x02\x03\x03\x12\x04\xea\x01\x10\x11\n\x0c\n\ - \x04\x04&\x02\x04\x12\x04\xeb\x01\x02)\n\r\n\x05\x04&\x02\x04\x04\x12\ - \x04\xeb\x01\x02\n\n\r\n\x05\x04&\x02\x04\x06\x12\x04\xeb\x01\x0b\x19\n\ - \r\n\x05\x04&\x02\x04\x01\x12\x04\xeb\x01\x1a$\n\r\n\x05\x04&\x02\x04\ - \x03\x12\x04\xeb\x01'(\n\x0c\n\x04\x04&\x02\x05\x12\x04\xec\x01\x02\x12\ - \n\r\n\x05\x04&\x02\x05\x05\x12\x04\xec\x01\x02\x06\n\r\n\x05\x04&\x02\ - \x05\x01\x12\x04\xec\x01\x07\r\n\r\n\x05\x04&\x02\x05\x03\x12\x04\xec\ - \x01\x10\x11\n\x0c\n\x04\x04&\x02\x06\x12\x04\xed\x01\x02\x13\n\r\n\x05\ - \x04&\x02\x06\x05\x12\x04\xed\x01\x02\x08\n\r\n\x05\x04&\x02\x06\x01\x12\ - \x04\xed\x01\t\x0e\n\r\n\x05\x04&\x02\x06\x03\x12\x04\xed\x01\x11\x12\n3\ - \n\x02\x04'\x12\x06\xf1\x01\0\xf4\x01\x01\x1a%\x20Request\x20to\x20execu\ - te\x20`call`\x20operation\n\n\x0b\n\x03\x04'\x01\x12\x04\xf1\x01\x08\x18\ - \n\x0c\n\x04\x04'\x02\0\x12\x04\xf2\x01\x02\x1d\n\r\n\x05\x04'\x02\0\x06\ - \x12\x04\xf2\x01\x02\x11\n\r\n\x05\x04'\x02\0\x01\x12\x04\xf2\x01\x12\ - \x18\n\r\n\x05\x04'\x02\0\x03\x12\x04\xf2\x01\x1b\x1c\n\x0c\n\x04\x04'\ - \x02\x01\x12\x04\xf3\x01\x02!\n\r\n\x05\x04'\x02\x01\x06\x12\x04\xf3\x01\ - \x02\x14\n\r\n\x05\x04'\x02\x01\x01\x12\x04\xf3\x01\x15\x1c\n\r\n\x05\ - \x04'\x02\x01\x03\x12\x04\xf3\x01\x1f\x20\n5\n\x02\x04(\x12\x06\xf7\x01\ - \0\xfa\x01\x01\x1a'\x20Request\x20to\x20execute\x20`create`\x20operation\ - \n\n\x0b\n\x03\x04(\x01\x12\x04\xf7\x01\x08\x1a\n\x0c\n\x04\x04(\x02\0\ - \x12\x04\xf8\x01\x02\x1f\n\r\n\x05\x04(\x02\0\x06\x12\x04\xf8\x01\x02\ - \x13\n\r\n\x05\x04(\x02\0\x01\x12\x04\xf8\x01\x14\x1a\n\r\n\x05\x04(\x02\ - \0\x03\x12\x04\xf8\x01\x1d\x1e\n\x0c\n\x04\x04(\x02\x01\x12\x04\xf9\x01\ - \x02!\n\r\n\x05\x04(\x02\x01\x06\x12\x04\xf9\x01\x02\x14\n\r\n\x05\x04(\ - \x02\x01\x01\x12\x04\xf9\x01\x15\x1c\n\r\n\x05\x04(\x02\x01\x03\x12\x04\ - \xf9\x01\x1f\x20\n1\n\x02\x04)\x12\x06\xfd\x01\0\xff\x01\x01\x1a#\x20Req\ - uest\x20to\x20obtain\x20node\x20public\x20key\n\n\x0b\n\x03\x04)\x01\x12\ - \x04\xfd\x01\x08\x1c\n\x0c\n\x04\x04)\x02\0\x12\x04\xfe\x01\x02\x19\n\r\ - \n\x05\x04)\x02\0\x05\x12\x04\xfe\x01\x02\x08\n\r\n\x05\x04)\x02\0\x01\ - \x12\x04\xfe\x01\t\x14\n\r\n\x05\x04)\x02\0\x03\x12\x04\xfe\x01\x17\x18\ - \n+\n\x02\x04*\x12\x04\x82\x02\06\x1a\x1f\x20Response\x20with\x20node\ - \x20public\x20key\n\n\x0b\n\x03\x04*\x01\x12\x04\x82\x02\x08\x1d\n\x0c\n\ - \x04\x04*\x02\0\x12\x04\x82\x02\x204\n\r\n\x05\x04*\x02\0\x05\x12\x04\ - \x82\x02\x20%\n\r\n\x05\x04*\x02\0\x01\x12\x04\x82\x02&/\n\r\n\x05\x04*\ - \x02\0\x03\x12\x04\x82\x0223\n\x0c\n\x02\x04+\x12\x06\x84\x02\0\x88\x02\ - \x01\n\x0b\n\x03\x04+\x01\x12\x04\x84\x02\x08\x11\n\x0c\n\x04\x04+\x02\0\ - \x12\x04\x85\x02\x02\x19\n\r\n\x05\x04+\x02\0\x05\x12\x04\x85\x02\x02\ - \x08\n\r\n\x05\x04+\x02\0\x01\x12\x04\x85\x02\t\x14\n\r\n\x05\x04+\x02\0\ - \x03\x12\x04\x85\x02\x17\x18\n\x0c\n\x04\x04+\x02\x01\x12\x04\x86\x02\ - \x02\x1b\n\r\n\x05\x04+\x02\x01\x05\x12\x04\x86\x02\x02\x08\n\r\n\x05\ - \x04+\x02\x01\x01\x12\x04\x86\x02\t\x16\n\r\n\x05\x04+\x02\x01\x03\x12\ - \x04\x86\x02\x19\x1a\n\x0c\n\x04\x04+\x02\x02\x12\x04\x87\x02\x02\x1a\n\ - \r\n\x05\x04+\x02\x02\x05\x12\x04\x87\x02\x02\x07\n\r\n\x05\x04+\x02\x02\ - \x01\x12\x04\x87\x02\x08\x15\n\r\n\x05\x04+\x02\x02\x03\x12\x04\x87\x02\ - \x18\x19\n\x0c\n\x02\x04,\x12\x06\x89\x02\0\x8b\x02\x01\n\x0b\n\x03\x04,\ - \x01\x12\x04\x89\x02\x08\x1a\n\x0c\n\x04\x04,\x02\0\x12\x04\x8a\x02\x02\ - \x20\n\r\n\x05\x04,\x02\0\x04\x12\x04\x8a\x02\x02\n\n\r\n\x05\x04,\x02\0\ - \x06\x12\x04\x8a\x02\x0b\x14\n\r\n\x05\x04,\x02\0\x01\x12\x04\x8a\x02\ - \x15\x1b\n\r\n\x05\x04,\x02\0\x03\x12\x04\x8a\x02\x1e\x1f\n\x0c\n\x02\ - \x04-\x12\x06\x8d\x02\0\x93\x02\x01\n\x0b\n\x03\x04-\x01\x12\x04\x8d\x02\ - \x08\x12\n\x0e\n\x04\x04-\x08\0\x12\x06\x8e\x02\x02\x92\x02\x03\n\r\n\ - \x05\x04-\x08\0\x01\x12\x04\x8e\x02\x08\x0b\n\x0c\n\x04\x04-\x02\0\x12\ - \x04\x8f\x02\x04%\n\r\n\x05\x04-\x02\0\x06\x12\x04\x8f\x02\x04\x14\n\r\n\ - \x05\x04-\x02\0\x01\x12\x04\x8f\x02\x15\x20\n\r\n\x05\x04-\x02\0\x03\x12\ - \x04\x8f\x02#$\n\x0c\n\x04\x04-\x02\x01\x12\x04\x90\x02\x04)\n\r\n\x05\ - \x04-\x02\x01\x06\x12\x04\x90\x02\x04\x16\n\r\n\x05\x04-\x02\x01\x01\x12\ - \x04\x90\x02\x17$\n\r\n\x05\x04-\x02\x01\x03\x12\x04\x90\x02'(\n\x0c\n\ - \x04\x04-\x02\x02\x12\x04\x91\x02\x04.\n\r\n\x05\x04-\x02\x02\x06\x12\ - \x04\x91\x02\x04\x18\n\r\n\x05\x04-\x02\x02\x01\x12\x04\x91\x02\x19)\n\r\ - \n\x05\x04-\x02\x02\x03\x12\x04\x91\x02,-b\x06proto3\ + \x0b\n\x03\x04,\x01\x12\x04\xf2\x01\x08\x19\n\x0c\n\x04\x04,\x02\0\x12\ + \x04\xf3\x01\x02\x11\n\r\n\x05\x04,\x02\0\x05\x12\x04\xf3\x01\x02\x07\n\ + \r\n\x05\x04,\x02\0\x01\x12\x04\xf3\x01\x08\x0c\n\r\n\x05\x04,\x02\0\x03\ + \x12\x04\xf3\x01\x0f\x10\n\x0c\n\x04\x04,\x02\x01\x12\x04\xf4\x01\x02\ + \x11\n\r\n\x05\x04,\x02\x01\x05\x12\x04\xf4\x01\x02\x07\n\r\n\x05\x04,\ + \x02\x01\x01\x12\x04\xf4\x01\x08\x0c\n\r\n\x05\x04,\x02\x01\x03\x12\x04\ + \xf4\x01\x0f\x10\n\x0c\n\x04\x04,\x02\x02\x12\x04\xf5\x01\x02\x16\n\r\n\ + \x05\x04,\x02\x02\x05\x12\x04\xf5\x01\x02\x08\n\r\n\x05\x04,\x02\x02\x01\ + \x12\x04\xf5\x01\t\x11\n\r\n\x05\x04,\x02\x02\x03\x12\x04\xf5\x01\x14\ + \x15\n\x0c\n\x04\x04,\x02\x03\x12\x04\xf6\x01\x02\x15\n\r\n\x05\x04,\x02\ + \x03\x05\x12\x04\xf6\x01\x02\x07\n\r\n\x05\x04,\x02\x03\x01\x12\x04\xf6\ + \x01\x08\x10\n\r\n\x05\x04,\x02\x03\x03\x12\x04\xf6\x01\x13\x14\n\x0c\n\ + \x04\x04,\x02\x04\x12\x04\xf7\x01\x02\x12\n\r\n\x05\x04,\x02\x04\x05\x12\ + \x04\xf7\x01\x02\x07\n\r\n\x05\x04,\x02\x04\x01\x12\x04\xf7\x01\x08\r\n\ + \r\n\x05\x04,\x02\x04\x03\x12\x04\xf7\x01\x10\x11\n\x0c\n\x04\x04,\x02\ + \x05\x12\x04\xf8\x01\x02)\n\r\n\x05\x04,\x02\x05\x04\x12\x04\xf8\x01\x02\ + \n\n\r\n\x05\x04,\x02\x05\x06\x12\x04\xf8\x01\x0b\x19\n\r\n\x05\x04,\x02\ + \x05\x01\x12\x04\xf8\x01\x1a$\n\r\n\x05\x04,\x02\x05\x03\x12\x04\xf8\x01\ + '(\n\x0c\n\x04\x04,\x02\x06\x12\x04\xf9\x01\x02\x12\n\r\n\x05\x04,\x02\ + \x06\x05\x12\x04\xf9\x01\x02\x06\n\r\n\x05\x04,\x02\x06\x01\x12\x04\xf9\ + \x01\x07\r\n\r\n\x05\x04,\x02\x06\x03\x12\x04\xf9\x01\x10\x11\n\x0c\n\ + \x04\x04,\x02\x07\x12\x04\xfa\x01\x02\x13\n\r\n\x05\x04,\x02\x07\x05\x12\ + \x04\xfa\x01\x02\x08\n\r\n\x05\x04,\x02\x07\x01\x12\x04\xfa\x01\t\x0e\n\ + \r\n\x05\x04,\x02\x07\x03\x12\x04\xfa\x01\x11\x12\n3\n\x02\x04-\x12\x06\ + \xfe\x01\0\x81\x02\x01\x1a%\x20Request\x20to\x20execute\x20`call`\x20ope\ + ration\n\n\x0b\n\x03\x04-\x01\x12\x04\xfe\x01\x08\x18\n\x0c\n\x04\x04-\ + \x02\0\x12\x04\xff\x01\x02\x1d\n\r\n\x05\x04-\x02\0\x06\x12\x04\xff\x01\ + \x02\x11\n\r\n\x05\x04-\x02\0\x01\x12\x04\xff\x01\x12\x18\n\r\n\x05\x04-\ + \x02\0\x03\x12\x04\xff\x01\x1b\x1c\n\x0c\n\x04\x04-\x02\x01\x12\x04\x80\ + \x02\x02!\n\r\n\x05\x04-\x02\x01\x06\x12\x04\x80\x02\x02\x14\n\r\n\x05\ + \x04-\x02\x01\x01\x12\x04\x80\x02\x15\x1c\n\r\n\x05\x04-\x02\x01\x03\x12\ + \x04\x80\x02\x1f\x20\n5\n\x02\x04.\x12\x06\x84\x02\0\x87\x02\x01\x1a'\ + \x20Request\x20to\x20execute\x20`create`\x20operation\n\n\x0b\n\x03\x04.\ + \x01\x12\x04\x84\x02\x08\x1a\n\x0c\n\x04\x04.\x02\0\x12\x04\x85\x02\x02\ + \x1f\n\r\n\x05\x04.\x02\0\x06\x12\x04\x85\x02\x02\x13\n\r\n\x05\x04.\x02\ + \0\x01\x12\x04\x85\x02\x14\x1a\n\r\n\x05\x04.\x02\0\x03\x12\x04\x85\x02\ + \x1d\x1e\n\x0c\n\x04\x04.\x02\x01\x12\x04\x86\x02\x02!\n\r\n\x05\x04.\ + \x02\x01\x06\x12\x04\x86\x02\x02\x14\n\r\n\x05\x04.\x02\x01\x01\x12\x04\ + \x86\x02\x15\x1c\n\r\n\x05\x04.\x02\x01\x03\x12\x04\x86\x02\x1f\x20\n1\n\ + \x02\x04/\x12\x06\x8a\x02\0\x8c\x02\x01\x1a#\x20Request\x20to\x20obtain\ + \x20node\x20public\x20key\n\n\x0b\n\x03\x04/\x01\x12\x04\x8a\x02\x08\x1c\ + \n\x0c\n\x04\x04/\x02\0\x12\x04\x8b\x02\x02\x19\n\r\n\x05\x04/\x02\0\x05\ + \x12\x04\x8b\x02\x02\x08\n\r\n\x05\x04/\x02\0\x01\x12\x04\x8b\x02\t\x14\ + \n\r\n\x05\x04/\x02\0\x03\x12\x04\x8b\x02\x17\x18\n+\n\x02\x040\x12\x04\ + \x8f\x02\06\x1a\x1f\x20Response\x20with\x20node\x20public\x20key\n\n\x0b\ + \n\x03\x040\x01\x12\x04\x8f\x02\x08\x1d\n\x0c\n\x04\x040\x02\0\x12\x04\ + \x8f\x02\x204\n\r\n\x05\x040\x02\0\x05\x12\x04\x8f\x02\x20%\n\r\n\x05\ + \x040\x02\0\x01\x12\x04\x8f\x02&/\n\r\n\x05\x040\x02\0\x03\x12\x04\x8f\ + \x0223\n\x0c\n\x02\x041\x12\x06\x91\x02\0\x95\x02\x01\n\x0b\n\x03\x041\ + \x01\x12\x04\x91\x02\x08\x11\n\x0c\n\x04\x041\x02\0\x12\x04\x92\x02\x02\ + \x19\n\r\n\x05\x041\x02\0\x05\x12\x04\x92\x02\x02\x08\n\r\n\x05\x041\x02\ + \0\x01\x12\x04\x92\x02\t\x14\n\r\n\x05\x041\x02\0\x03\x12\x04\x92\x02\ + \x17\x18\n\x0c\n\x04\x041\x02\x01\x12\x04\x93\x02\x02\x1b\n\r\n\x05\x041\ + \x02\x01\x05\x12\x04\x93\x02\x02\x08\n\r\n\x05\x041\x02\x01\x01\x12\x04\ + \x93\x02\t\x16\n\r\n\x05\x041\x02\x01\x03\x12\x04\x93\x02\x19\x1a\n\x0c\ + \n\x04\x041\x02\x02\x12\x04\x94\x02\x02\x1a\n\r\n\x05\x041\x02\x02\x05\ + \x12\x04\x94\x02\x02\x07\n\r\n\x05\x041\x02\x02\x01\x12\x04\x94\x02\x08\ + \x15\n\r\n\x05\x041\x02\x02\x03\x12\x04\x94\x02\x18\x19\n\x0c\n\x02\x042\ + \x12\x06\x96\x02\0\x98\x02\x01\n\x0b\n\x03\x042\x01\x12\x04\x96\x02\x08\ + \x1a\n\x0c\n\x04\x042\x02\0\x12\x04\x97\x02\x02\x20\n\r\n\x05\x042\x02\0\ + \x04\x12\x04\x97\x02\x02\n\n\r\n\x05\x042\x02\0\x06\x12\x04\x97\x02\x0b\ + \x14\n\r\n\x05\x042\x02\0\x01\x12\x04\x97\x02\x15\x1b\n\r\n\x05\x042\x02\ + \0\x03\x12\x04\x97\x02\x1e\x1f\n\x0c\n\x02\x043\x12\x06\x9a\x02\0\xa0\ + \x02\x01\n\x0b\n\x03\x043\x01\x12\x04\x9a\x02\x08\x12\n\x0e\n\x04\x043\ + \x08\0\x12\x06\x9b\x02\x02\x9f\x02\x03\n\r\n\x05\x043\x08\0\x01\x12\x04\ + \x9b\x02\x08\x0b\n\x0c\n\x04\x043\x02\0\x12\x04\x9c\x02\x04%\n\r\n\x05\ + \x043\x02\0\x06\x12\x04\x9c\x02\x04\x14\n\r\n\x05\x043\x02\0\x01\x12\x04\ + \x9c\x02\x15\x20\n\r\n\x05\x043\x02\0\x03\x12\x04\x9c\x02#$\n\x0c\n\x04\ + \x043\x02\x01\x12\x04\x9d\x02\x04)\n\r\n\x05\x043\x02\x01\x06\x12\x04\ + \x9d\x02\x04\x16\n\r\n\x05\x043\x02\x01\x01\x12\x04\x9d\x02\x17$\n\r\n\ + \x05\x043\x02\x01\x03\x12\x04\x9d\x02'(\n\x0c\n\x04\x043\x02\x02\x12\x04\ + \x9e\x02\x04.\n\r\n\x05\x043\x02\x02\x06\x12\x04\x9e\x02\x04\x18\n\r\n\ + \x05\x043\x02\x02\x01\x12\x04\x9e\x02\x19)\n\r\n\x05\x043\x02\x02\x03\ + \x12\x04\x9e\x02,-b\x06proto3\ "; static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { diff --git a/sgxvm/src/storage.rs b/sgxvm/src/storage.rs index a8b92cb3..5d00d2b6 100644 --- a/sgxvm/src/storage.rs +++ b/sgxvm/src/storage.rs @@ -1,4 +1,3 @@ -use evm::backend::Basic; use primitive_types::{H160, H256, U256}; use std::vec::Vec; @@ -84,7 +83,7 @@ impl Storage for FFIStorage { } } - fn get_account(&self, key: &H160) -> Basic { + fn get_account(&self, key: &H160) -> (U256, U256) { let encoded_request = coder::encode_get_account(key); if let Some(result) = querier::make_request(self.querier, encoded_request) { // Decode protobuf @@ -92,34 +91,21 @@ impl Storage for FFIStorage { Ok(res) => res, Err(err) => { println!("Cannot decode protobuf response: {:?}", err); - return Basic::default(); + return (U256::zero(), U256::zero()); } }; - Basic { - balance: U256::from_big_endian(decoded_result.balance.as_slice()), - nonce: U256::from(decoded_result.nonce), - } + ( + U256::from_big_endian(decoded_result.balance.as_slice()), + U256::from(decoded_result.nonce) + ) } else { println!("Get account failed. Empty response"); - Basic::default() - } - } - - fn insert_account(&mut self, key: H160, data: Basic) -> Result<(), Error> { - let encoded_request = coder::encode_insert_account(key, data); - if let Some(result) = querier::make_request(self.querier, encoded_request) { - match protobuf::parse_from_bytes::(result.as_slice()) { - Err(err) => Err(err.into()), - _ => Ok(()) - } - } else { - println!("Insert account failed. Writting error"); - Err(Error::enclave_err("Insert account failed. Empty response")) + (U256::zero(), U256::zero()) } } - fn insert_account_code(&mut self, key: H160, code: Vec) -> Result<(), Error> { + fn insert_account_code(&self, key: H160, code: Vec) -> Result<(), Error> { let encoded_request = coder::encode_insert_account_code(key, code); if let Some(result) = querier::make_request(self.querier, encoded_request) { match protobuf::parse_from_bytes::(result.as_slice()) { @@ -133,7 +119,7 @@ impl Storage for FFIStorage { } } - fn insert_storage_cell(&mut self, key: H160, index: H256, value: H256) -> Result<(), Error> { + fn insert_storage_cell(&self, key: H160, index: H256, value: H256) -> Result<(), Error> { // Encrypt value let encrypted_value = encryption::encrypt_storage_cell( key.as_bytes().to_vec(), @@ -155,7 +141,7 @@ impl Storage for FFIStorage { } } - fn remove(&mut self, key: &H160) -> Result<(), Error> { + fn remove(&self, key: &H160) -> Result<(), Error> { let encoded_request = coder::encode_remove(key); if let Some(result) = querier::make_request(self.querier, encoded_request) { match protobuf::parse_from_bytes::(result.as_slice()) { @@ -169,7 +155,7 @@ impl Storage for FFIStorage { } } - fn remove_storage_cell(&mut self, key: &H160, index: &H256) -> Result<(), Error> { + fn remove_storage_cell(&self, key: &H160, index: &H256) -> Result<(), Error> { let encoded_request = coder::encode_remove_storage_cell(key, index); if let Some(result) = querier::make_request(self.querier, encoded_request) { match protobuf::parse_from_bytes::(result.as_slice()) { @@ -182,6 +168,70 @@ impl Storage for FFIStorage { Err(Error::enclave_err("Remove storage cell failed. Empty response")) } } + + fn insert_account_balance(&self, address: &H160, balance: &U256) -> Result<(), Error> { + let encoded_request = coder::encode_insert_account_balance(address, balance); + if let Some(result) = querier::make_request(self.querier, encoded_request) { + match protobuf::parse_from_bytes::(result.as_slice()) { + Err(err) => { + Err(err.into()) + }, + _ => Ok(()) + } + } else { + Err(Error::enclave_err("Insert account balance failed. Empty response")) + } + } + + fn insert_account_nonce(&self, address: &H160, nonce: &U256) -> Result<(), Error> { + // println!("DEBUG: Insert account nonce disabled"); + // Ok(()) + let encoded_request = coder::encode_insert_account_nonce(address, nonce); + if let Some(result) = querier::make_request(self.querier, encoded_request) { + match protobuf::parse_from_bytes::(result.as_slice()) { + Err(err) => { + Err(err.into()) + }, + _ => Ok(()) + } + } else { + Err(Error::enclave_err("Insert account nonce failed. Empty response")) + } + } + + fn get_account_code_size(&self, address: &H160) -> Result { + let encoded_request = coder::encode_get_account_code_size(address); + if let Some(result) = querier::make_request(self.querier, encoded_request) { + match protobuf::parse_from_bytes::(result.as_slice()) { + Err(err) => { + Err(err.into()) + }, + Ok(res) => { + // println!("Got account code size: {:?}", U256::from(res.size)); + Ok(U256::from(res.size)) + } + } + } else { + Err(Error::enclave_err("Get account code size failed. Empty response")) + } + } + + fn get_account_code_hash(&self, address: &H160) -> Result { + let encoded_request = coder::encode_get_account_code_hash(&address); + if let Some(result) = querier::make_request(self.querier, encoded_request) { + match protobuf::parse_from_bytes::(result.as_slice()) { + Err(err) => { + Err(err.into()) + }, + Ok(res) => { + // println!("Got account code hash: {:?}", H256::from_slice(&res.hash)); + Ok(H256::from_slice(&res.hash)) + } + } + } else { + Err(Error::enclave_err("Get account code size failed. Empty response")) + } + } } impl FFIStorage { diff --git a/sgxvm/src/types.rs b/sgxvm/src/types.rs index bfa2b8f7..9a12010a 100644 --- a/sgxvm/src/types.rs +++ b/sgxvm/src/types.rs @@ -1,11 +1,8 @@ -use evm::Config; -use evm::backend::{ - Apply, - Backend as EvmBackend, - Basic, - Log -}; +use alloc::string::ToString; +use evm::standard::Config; use primitive_types::{H160, H256, U256}; +use ethereum::Log; +use evm::interpreter::error::{ExitError}; use std::{ vec::Vec, string::String, @@ -14,26 +11,7 @@ use std::boxed::Box; use sgx_types::*; use crate::error::Error; -pub static GASOMETER_CONFIG: Config = Config::london(); - -/// Information required by the evm -#[derive(Clone, Default, PartialEq, Eq)] -pub struct Vicinity { - pub origin: H160, - pub nonce: U256, -} - -/// Supertrait for our version of EVM Backend -pub trait ExtendedBackend: EvmBackend { - fn get_logs(&self) -> Vec; - - /// Apply given values and logs at backend. - fn apply(&mut self, values: A, logs: L, delete_empty: bool) -> Result<(), Error> - where - A: IntoIterator>, - I: IntoIterator, - L: IntoIterator; -} +pub static GASOMETER_CONFIG: Config = Config::cancun(); /// A key-value storage trait pub trait Storage { @@ -47,25 +25,30 @@ pub trait Storage { fn get_account_code(&self, key: &H160) -> Option>; /// Returns account basic data (balance and nonce) - fn get_account(&self, account: &H160) -> Basic; - - /// Updates account balance and nonce - fn insert_account(&mut self, key: H160, data: Basic) -> Result<(), Error>; + fn get_account(&self, account: &H160) -> (U256, U256); /// Updates contract bytecode - fn insert_account_code(&mut self, key: H160, code: Vec) -> Result<(), Error>; + fn insert_account_code(&self, key: H160, code: Vec) -> Result<(), Error>; /// Update storage cell value - fn insert_storage_cell(&mut self, key: H160, index: H256, value: H256) -> Result<(), Error>; + fn insert_storage_cell(&self, key: H160, index: H256, value: H256) -> Result<(), Error>; /// Removes account (selfdestruct) - fn remove(&mut self, key: &H160) -> Result<(), Error>; + fn remove(&self, key: &H160) -> Result<(), Error>; /// Removes storage cell value - fn remove_storage_cell(&mut self, key: &H160, index: &H256) -> Result<(), Error>; + fn remove_storage_cell(&self, key: &H160, index: &H256) -> Result<(), Error>; + + fn insert_account_balance(&self, address: &H160, balance: &U256) -> Result<(), Error>; + + fn insert_account_nonce(&self, address: &H160, nonce: &U256) -> Result<(), Error>; + + fn get_account_code_size(&self, address: &H160) -> Result; + + fn get_account_code_hash(&self, address: &H160) -> Result; } -// Struct for allocated buffer outside of SGX Enclave +// Struct for allocated buffer outside SGX Enclave #[repr(C)] #[allow(dead_code)] pub struct AllocatedBuffer { @@ -100,6 +83,20 @@ impl ExecutionResult { data, } } + + pub fn from_exit_error(error: ExitError, data: Vec, gas_used: u64) -> Self { + let vm_error = match error { + ExitError::Reverted => "reverted".to_string(), + ExitError::Fatal(fatal) => { + format!("{:?}", fatal) + }, + ExitError::Exception(exit) => { + format!("{:?}", exit) + } + }; + + ExecutionResult { logs: vec![], data, gas_used, vm_error } + } } #[repr(C)] diff --git a/tests/solidity/contracts/OPCODEs.sol b/tests/solidity/contracts/OPCODEs.sol deleted file mode 100644 index a307ee1b..00000000 --- a/tests/solidity/contracts/OPCODEs.sol +++ /dev/null @@ -1,13 +0,0 @@ -pragma solidity ^0.8.0; - -contract OpCodes { - function test_revert() public { - //revert - assembly{revert(0, 0)} - } - - function test_invalid() public { - //revert - assembly{invalid()} - } -} diff --git a/tests/solidity/contracts/RIP7212.sol b/tests/solidity/contracts/RIP7212.sol index 65127863..9f32c73c 100644 --- a/tests/solidity/contracts/RIP7212.sol +++ b/tests/solidity/contracts/RIP7212.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity ^0.8; contract RIP7212 { /// @dev The address of the pre-compiled p256 verifier contract (following RIP-7212) diff --git a/tests/solidity/contracts/context/BlockInfo.sol b/tests/solidity/contracts/context/BlockInfo.sol new file mode 100644 index 00000000..6985e083 --- /dev/null +++ b/tests/solidity/contracts/context/BlockInfo.sol @@ -0,0 +1,35 @@ +pragma solidity ^0.8; + +contract BlockInfo { + function getBlockBaseFee() public view returns (uint256) { + return block.basefee; + } + + function getBlockChainId() public view returns (uint256) { + return block.chainid; + } + + function getBlockCoinbase() public view returns (address) { + return block.coinbase; + } + + function getBlockDifficulty() public view returns (uint256) { + return block.difficulty; + } + + function getBlockGasLimit() public view returns (uint256) { + return block.gaslimit; + } + + function getBlockNumber() public view returns (uint256) { + return block.number; + } + + function getBlockTimestamp() public view returns (uint256) { + return block.timestamp; + } + + function getBlockhash(uint256 blockNumber) public view returns (bytes32) { + return blockhash(blockNumber); + } +} \ No newline at end of file diff --git a/tests/solidity/contracts/context/MsgInfo.sol b/tests/solidity/contracts/context/MsgInfo.sol new file mode 100644 index 00000000..b3a01664 --- /dev/null +++ b/tests/solidity/contracts/context/MsgInfo.sol @@ -0,0 +1,20 @@ +pragma solidity ^0.8; + +// Contract if msg.* fields are returned correctly +// Correctness of msg.sender value is checked in Sender.sol and its test +contract MsgInfo { + // Stores the value sent with the message + uint256 public storedValue; + + function updateValue() public payable { + storedValue = msg.value; + } + + function getMsgData(uint256 encodedParam) public pure returns (bytes memory) { + return msg.data; + } + + function getMsgSig() public pure returns (bytes4) { + return msg.sig; + } +} diff --git a/tests/solidity/contracts/Sender.sol b/tests/solidity/contracts/context/Sender.sol similarity index 100% rename from tests/solidity/contracts/Sender.sol rename to tests/solidity/contracts/context/Sender.sol diff --git a/tests/solidity/contracts/opcodes/OpcodeTest.sol b/tests/solidity/contracts/opcodes/OpcodeTest.sol new file mode 100644 index 00000000..ca81bd15 --- /dev/null +++ b/tests/solidity/contracts/opcodes/OpcodeTest.sol @@ -0,0 +1,106 @@ +pragma solidity ^0.8; + +contract OpcodeTest { + uint256 public storedValue; + + function testSSTORE(uint256 _value) public { + assembly { + sstore(0, _value) + } + } + + function testMSTORE() public pure returns (uint256) { + uint256 result; + assembly { + mstore(0x80, 42) + result := mload(0x80) + } + return result; + } + + function testEXTCODESIZE(address _addr) public view returns (uint256) { + uint256 size; + assembly { + size := extcodesize(_addr) + } + return size; + } + + function testAdd(uint256 a, uint256 b) public pure returns (uint256 result) { + assembly { + result := add(a, b) + } + } + + function testSub(uint256 a, uint256 b) public pure returns (uint256 result) { + assembly { + result := sub(a, b) + } + } + + function testMul(uint256 a, uint256 b) public pure returns (uint256 result) { + assembly { + result := mul(a, b) + } + } + + function testDiv(uint256 a, uint256 b) public pure returns (uint256 result) { + assembly { + result := div(a, b) + } + } + + function testMod(uint256 a, uint256 b) public pure returns (uint256 result) { + assembly { + result := mod(a, b) + } + } + + function testShl(uint256 a, uint256 b) public pure returns (uint256 result) { + assembly { + result := shl(b, a) + } + } + + function testShr(uint256 a, uint256 b) public pure returns (uint256 result) { + assembly { + result := shr(b, a) + } + } + + function testAnd(uint256 a, uint256 b) public pure returns (uint256 result) { + assembly { + result := and(a, b) + } + } + + function testOr(uint256 a, uint256 b) public pure returns (uint256 result) { + assembly { + result := or(a, b) + } + } + + function testXor(uint256 a, uint256 b) public pure returns (uint256 result) { + assembly { + result := xor(a, b) + } + } + + function testNot(uint256 a) public pure returns (uint256 result) { + assembly { + result := not(a) + } + } + + function testRevert() public { + assembly{ + revert(0, 0) + } + } + + function testInvalid() public { + assembly{ + invalid() + } + } +} \ No newline at end of file diff --git a/tests/solidity/contracts/opcodes/TransientStorage.sol b/tests/solidity/contracts/opcodes/TransientStorage.sol new file mode 100644 index 00000000..1cbdf545 --- /dev/null +++ b/tests/solidity/contracts/opcodes/TransientStorage.sol @@ -0,0 +1,32 @@ +pragma solidity 0.8.27; + +contract MulService { + function setMultiplier(uint multiplier) external { + assembly { + tstore(0, multiplier) + } + } + + function getMultiplier() private view returns (uint multiplier) { + assembly { + multiplier := tload(0) + } + } + + function multiply(uint value) external view returns (uint) { + return value * getMultiplier(); + } +} + +contract MulCaller { + MulService public mulService; + + constructor(MulService _mulService) { + mulService = _mulService; + } + + function runMultiply(uint multiplier, uint value) public returns (uint) { + mulService.setMultiplier(multiplier); + return mulService.multiply(value); + } +} \ No newline at end of file diff --git a/tests/solidity/contracts/ERC20Token.sol b/tests/solidity/contracts/tokens/ERC20Token.sol similarity index 100% rename from tests/solidity/contracts/ERC20Token.sol rename to tests/solidity/contracts/tokens/ERC20Token.sol diff --git a/tests/solidity/contracts/ERC721Token.sol b/tests/solidity/contracts/tokens/ERC721Token.sol similarity index 58% rename from tests/solidity/contracts/ERC721Token.sol rename to tests/solidity/contracts/tokens/ERC721Token.sol index b045421e..9b20c021 100644 --- a/tests/solidity/contracts/ERC721Token.sol +++ b/tests/solidity/contracts/tokens/ERC721Token.sol @@ -1,21 +1,18 @@ -// SPDX-License-Identifier: UNLICENSED pragma solidity ^0.8.0; import "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol"; -import "@openzeppelin/contracts/utils/Counters.sol"; contract ERC721Token is ERC721URIStorage { - using Counters for Counters.Counter; - Counters.Counter private _tokenIds; + uint256 private _tokenIdCounter; constructor(string memory name, string memory symbol) ERC721(name, symbol) {} function createItem(address player, string memory tokenURI) public returns (uint256) { - uint256 newItemId = _tokenIds.current(); - _mint(player, newItemId); + uint256 newItemId = _tokenIdCounter; + _safeMint(player, newItemId); _setTokenURI(newItemId, tokenURI); - _tokenIds.increment(); + _tokenIdCounter += 1; return newItemId; } } diff --git a/tests/solidity/contracts/Token.sol b/tests/solidity/contracts/tokens/Token.sol similarity index 100% rename from tests/solidity/contracts/Token.sol rename to tests/solidity/contracts/tokens/Token.sol diff --git a/tests/solidity/contracts/tokens/WETH9.sol b/tests/solidity/contracts/tokens/WETH9.sol new file mode 100644 index 00000000..aefcb0ad --- /dev/null +++ b/tests/solidity/contracts/tokens/WETH9.sol @@ -0,0 +1,756 @@ +// Copyright (C) 2015, 2016, 2017 Dapphub + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +pragma solidity >=0.4.22 <0.6; + +contract WETH9 { + string public name = "Wrapped Ether"; + string public symbol = "WETH"; + uint8 public decimals = 18; + + event Approval(address indexed src, address indexed guy, uint wad); + event Transfer(address indexed src, address indexed dst, uint wad); + event Deposit(address indexed dst, uint wad); + event Withdrawal(address indexed src, uint wad); + + mapping (address => uint) public balanceOf; + mapping (address => mapping (address => uint)) public allowance; + + function() external payable { + deposit(); + } + function deposit() public payable { + balanceOf[msg.sender] += msg.value; + emit Deposit(msg.sender, msg.value); + } + function withdraw(uint wad) public { + require(balanceOf[msg.sender] >= wad); + balanceOf[msg.sender] -= wad; + msg.sender.transfer(wad); + emit Withdrawal(msg.sender, wad); + } + + function totalSupply() public view returns (uint) { + return address(this).balance; + } + + function approve(address guy, uint wad) public returns (bool) { + allowance[msg.sender][guy] = wad; + emit Approval(msg.sender, guy, wad); + return true; + } + + function transfer(address dst, uint wad) public returns (bool) { + return transferFrom(msg.sender, dst, wad); + } + + function transferFrom(address src, address dst, uint wad) + public + returns (bool) + { + require(balanceOf[src] >= wad); + + if (src != msg.sender && allowance[src][msg.sender] != uint(-1)) { + require(allowance[src][msg.sender] >= wad); + allowance[src][msg.sender] -= wad; + } + + balanceOf[src] -= wad; + balanceOf[dst] += wad; + + emit Transfer(src, dst, wad); + + return true; + } +} + + +/* + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. + +*/ \ No newline at end of file diff --git a/tests/solidity/hardhat.config.js b/tests/solidity/hardhat.config.js index 05cca63b..af08662e 100644 --- a/tests/solidity/hardhat.config.js +++ b/tests/solidity/hardhat.config.js @@ -2,13 +2,28 @@ require("@nomicfoundation/hardhat-toolbox"); /** @type import('hardhat/config').HardhatUserConfig */ module.exports = { - solidity: "0.8.17", + solidity: { + compilers: [ + {version: "0.8.24"}, + ], + overrides: { + "contracts/tokens/WETH9.sol": { + version: "0.5.5" + }, + "contracts/opcodes/TransientStorage.sol": { + version: "0.8.27", + settings: { + evmVersion: "cancun" + } + } + } + }, networks: { tronik: { url: "http://localhost:8545", accounts: [ - "DBE7E6AE8303E055B68CEFBF01DEC07E76957FF605E5333FA21B6A8022EA7B55", "D5DA6D43250C8EB630C1AB8A80F19C673267A6B210C10C41065D5C34FC369DCB", + "DBE7E6AE8303E055B68CEFBF01DEC07E76957FF605E5333FA21B6A8022EA7B55", ], chainId: 1291 }, diff --git a/tests/solidity/package-lock.json b/tests/solidity/package-lock.json index b896369c..887d06af 100644 --- a/tests/solidity/package-lock.json +++ b/tests/solidity/package-lock.json @@ -6,28 +6,21 @@ "": { "name": "solidity-test", "dependencies": { - "@ethersproject/providers": "^5.4.7", "@nomicfoundation/hardhat-chai-matchers": "^1.0.0", "@nomicfoundation/hardhat-network-helpers": "^1.0.0", - "@nomiclabs/hardhat-ethers": "^2.0.0", - "@nomiclabs/hardhat-etherscan": "^3.0.0", - "@openzeppelin/contracts": "^4.8.1", + "@openzeppelin/contracts": "^5.0.2", "@swisstronik/swisstronik.js": "^1.0.0", - "@typechain/ethers-v5": "^10.1.0", - "@typechain/hardhat": "^6.1.2", "@types/chai": "^4.2.0", "@types/mocha": ">=9.1.0", "chai": "^4.2.0", - "ethers": "^5.4.7", - "hardhat-gas-reporter": "^1.0.8", - "solidity-coverage": "^0.7.22", "solidity-rlp": "^2.0.8", "ts-node": ">=8.0.0", - "typechain": "^8.1.0", "typescript": ">=4.5.0" }, "devDependencies": { "@nomicfoundation/hardhat-toolbox": "^1.0.2", + "@uniswap/v3-core": "^1.0.1", + "@uniswap/v3-periphery": "^1.4.4", "hardhat": "^2.12.7" } }, @@ -46,6 +39,8 @@ "version": "2.5.0", "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.5.0.tgz", "integrity": "sha512-DEHjW6e38o+JmB/NO3GZBpW4lpaiBpkFgXF6jLcJ6gETBYpEyaA5nTimsWBUJR3Vmtm/didUEbNjajskugZORg==", + "dev": true, + "peer": true, "dependencies": { "crc-32": "^1.2.0", "ethereumjs-util": "^7.1.1" @@ -55,6 +50,8 @@ "version": "3.3.2", "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.3.2.tgz", "integrity": "sha512-6AaJhwg4ucmwTvw/1qLaZUX5miWrwZ4nLOUsKyb/HtzS3BMw/CasKhdi1ims9mBKeK9sOJCH4qGKOBGyJCeeog==", + "dev": true, + "peer": true, "dependencies": { "@ethereumjs/common": "^2.5.0", "ethereumjs-util": "^7.1.2" @@ -64,6 +61,8 @@ "version": "8.1.0", "resolved": "https://registry.npmjs.org/@ethereumjs/util/-/util-8.1.0.tgz", "integrity": "sha512-zQ0IqbdX8FZ9aw11vP+dZkKDkS+kgIvQPHnSAXzP9pLu+Rfu3D3XEeLbicvoXJTYnhZiPmsZUxgdzXwNKxRPbA==", + "dev": true, + "peer": true, "dependencies": { "@ethereumjs/rlp": "^4.0.1", "ethereum-cryptography": "^2.0.0", @@ -77,6 +76,8 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/@ethereumjs/rlp/-/rlp-4.0.1.tgz", "integrity": "sha512-tqsQiBQDQdmPWE1xkkBq4rlSW5QZpLOUJ5RJh2/9fug+q9tnUhuZoVLk7s0scUIKTOzEtR72DFBXI4WiZcMpvw==", + "dev": true, + "peer": true, "bin": { "rlp": "bin/rlp" }, @@ -88,6 +89,8 @@ "version": "1.3.3", "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.3.tgz", "integrity": "sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA==", + "dev": true, + "peer": true, "engines": { "node": ">= 16" }, @@ -99,6 +102,8 @@ "version": "1.3.3", "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.3.3.tgz", "integrity": "sha512-LJaN3HwRbfQK0X1xFSi0Q9amqOgzQnnDngIt+ZlsBC3Bm7/nE7K0kwshZHyaru79yIVRv/e1mQAjZyuZG6jOFQ==", + "dev": true, + "peer": true, "dependencies": { "@noble/curves": "~1.3.0", "@noble/hashes": "~1.3.2", @@ -112,6 +117,8 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.2.2.tgz", "integrity": "sha512-HYf9TUXG80beW+hGAt3TRM8wU6pQoYur9iNypTROm42dorCGmLnFe3eWjz3gOq6G62H2WRh0FCzAR1PI+29zIA==", + "dev": true, + "peer": true, "dependencies": { "@noble/hashes": "~1.3.2", "@scure/base": "~1.1.4" @@ -124,6 +131,8 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.1.3.tgz", "integrity": "sha512-BlwbIL7/P45W8FGW2r7LGuvoEZ+7PWsniMvQ4p5s2xCyw9tmaDlpfsN9HjAucbF+t/qpVHwZUisgfK24TCW8aA==", + "dev": true, + "peer": true, "dependencies": { "@noble/curves": "1.3.0", "@noble/hashes": "1.3.3", @@ -257,6 +266,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "peer": true, "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/properties": "^5.7.0" @@ -332,6 +342,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "peer": true, "dependencies": { "@ethersproject/abi": "^5.7.0", "@ethersproject/abstract-provider": "^5.7.0", @@ -385,6 +396,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "peer": true, "dependencies": { "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/basex": "^5.7.0", @@ -414,6 +426,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "peer": true, "dependencies": { "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/address": "^5.7.0", @@ -496,6 +509,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "peer": true, "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/sha2": "^5.7.0" @@ -533,6 +547,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "peer": true, "dependencies": { "@ethersproject/abstract-provider": "^5.7.0", "@ethersproject/abstract-signer": "^5.7.0", @@ -570,6 +585,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "peer": true, "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/logger": "^5.7.0" @@ -608,6 +624,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "peer": true, "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/logger": "^5.7.0", @@ -651,6 +668,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "peer": true, "dependencies": { "@ethersproject/bignumber": "^5.7.0", "@ethersproject/bytes": "^5.7.0", @@ -720,6 +738,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "peer": true, "dependencies": { "@ethersproject/bignumber": "^5.7.0", "@ethersproject/constants": "^5.7.0", @@ -740,6 +759,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "peer": true, "dependencies": { "@ethersproject/abstract-provider": "^5.7.0", "@ethersproject/abstract-signer": "^5.7.0", @@ -794,6 +814,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "peer": true, "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/hash": "^5.7.0", @@ -878,6 +899,8 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.3.0.tgz", "integrity": "sha512-t01iSXPuN+Eqzb4eBX0S5oubSqXbK/xXa1Ne18Hj8f9pStxztHCE2gfboSp/dZRLSqfuLpRK2nDXDK+W9puocA==", + "dev": true, + "peer": true, "dependencies": { "@noble/hashes": "1.3.3" }, @@ -889,6 +912,8 @@ "version": "1.3.3", "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.3.tgz", "integrity": "sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA==", + "dev": true, + "peer": true, "engines": { "node": ">= 16" }, @@ -922,6 +947,8 @@ "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "peer": true, "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" @@ -934,6 +961,8 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "peer": true, "engines": { "node": ">= 8" } @@ -942,6 +971,8 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "peer": true, "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" @@ -1374,6 +1405,7 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/@nomiclabs/hardhat-ethers/-/hardhat-ethers-2.2.3.tgz", "integrity": "sha512-YhzPdzb612X591FOe68q+qXVXGG2ANZRvDo0RRUtimev85rCrAlv/TLMEZw5c+kq9AbzocLTVX/h2jVIFPL9Xg==", + "peer": true, "peerDependencies": { "ethers": "^5.0.0", "hardhat": "^2.0.0" @@ -1384,6 +1416,8 @@ "resolved": "https://registry.npmjs.org/@nomiclabs/hardhat-etherscan/-/hardhat-etherscan-3.1.8.tgz", "integrity": "sha512-v5F6IzQhrsjHh6kQz4uNrym49brK9K5bYCq2zQZ729RYRaifI9hHbtmK+KkIVevfhut7huQFEQ77JLRMAzWYjQ==", "deprecated": "The @nomiclabs/hardhat-etherscan package is deprecated, please use @nomicfoundation/hardhat-verify instead", + "dev": true, + "peer": true, "dependencies": { "@ethersproject/abi": "^5.1.2", "@ethersproject/address": "^5.0.2", @@ -1410,9 +1444,9 @@ } }, "node_modules/@openzeppelin/contracts": { - "version": "4.9.6", - "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-4.9.6.tgz", - "integrity": "sha512-xSmezSupL+y9VkHZJGDoCBpmnB2ogM13ccaYDWqJTfS3dbuHkgjuwDFUmaFauBCboQMGB/S5UqUl2y54X99BmA==" + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.0.2.tgz", + "integrity": "sha512-ytPc6eLGcHHnapAZ9S+5qsdomhjo6QBHTDRRBFfTxXIpsicMhVPouPgmUPebZZZGX7vt9USA+Z+0M0dSVtSUEA==" }, "node_modules/@scure/base": { "version": "1.1.6", @@ -1582,6 +1616,8 @@ "version": "4.6.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", + "dev": true, + "peer": true, "engines": { "node": ">=10" }, @@ -1593,6 +1629,8 @@ "version": "0.14.5", "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.14.5.tgz", "integrity": "sha512-6dKnHZn7fg/iQATVEzqyUOyEidbn05q7YA2mQ9hC0MMXhhV3/JrsxmFSYZAcr7j1yUP700LLhTruvJ3MiQmjJg==", + "dev": true, + "peer": true, "dependencies": { "antlr4ts": "^0.5.0-alpha.4" } @@ -1612,6 +1650,8 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz", "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==", + "dev": true, + "peer": true, "dependencies": { "defer-to-connect": "^2.0.1" }, @@ -1623,13 +1663,17 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/@truffle/error/-/error-0.1.1.tgz", "integrity": "sha512-sE7c9IHIGdbK4YayH4BC8i8qMjoAOeg6nUXUDZZp8wlU21/EMpaG+CLx+KqcIPyR+GSWIW3Dm0PXkr2nlggFDA==", - "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info." + "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", + "dev": true, + "peer": true }, "node_modules/@truffle/interface-adapter": { "version": "0.5.37", "resolved": "https://registry.npmjs.org/@truffle/interface-adapter/-/interface-adapter-0.5.37.tgz", "integrity": "sha512-lPH9MDgU+7sNDlJSClwyOwPCfuOimqsCx0HfGkznL3mcFRymc1pukAR1k17zn7ErHqBwJjiKAZ6Ri72KkS+IWw==", "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^5.1.3", "ethers": "^4.0.32", @@ -1643,6 +1687,8 @@ "version": "4.0.49", "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.49.tgz", "integrity": "sha512-kPltTvWiyu+OktYy1IStSO16i2e7cS9D9OxZ81q2UUaiNPVrm/RTcbxamCXF9VUSKzJIdJV68EAIhTEVBalRWg==", + "dev": true, + "peer": true, "dependencies": { "aes-js": "3.0.0", "bn.js": "^4.11.9", @@ -1658,12 +1704,16 @@ "node_modules/@truffle/interface-adapter/node_modules/ethers/node_modules/bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true, + "peer": true }, "node_modules/@truffle/interface-adapter/node_modules/hash.js": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", + "dev": true, + "peer": true, "dependencies": { "inherits": "^2.0.3", "minimalistic-assert": "^1.0.0" @@ -1672,23 +1722,31 @@ "node_modules/@truffle/interface-adapter/node_modules/js-sha3": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz", - "integrity": "sha512-GII20kjaPX0zJ8wzkTbNDYMY7msuZcTWk8S5UOh6806Jq/wz1J8/bnr8uGU0DAUmYDjj2Mr4X1cW8v/GLYnR+g==" + "integrity": "sha512-GII20kjaPX0zJ8wzkTbNDYMY7msuZcTWk8S5UOh6806Jq/wz1J8/bnr8uGU0DAUmYDjj2Mr4X1cW8v/GLYnR+g==", + "dev": true, + "peer": true }, "node_modules/@truffle/interface-adapter/node_modules/scrypt-js": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.4.tgz", - "integrity": "sha512-4KsaGcPnuhtCZQCxFxN3GVYIhKFPTdLd8PLC552XwbMndtD0cjRFAhDuuydXQ0h08ZfPgzqe6EKHozpuH74iDw==" + "integrity": "sha512-4KsaGcPnuhtCZQCxFxN3GVYIhKFPTdLd8PLC552XwbMndtD0cjRFAhDuuydXQ0h08ZfPgzqe6EKHozpuH74iDw==", + "dev": true, + "peer": true }, "node_modules/@truffle/interface-adapter/node_modules/setimmediate": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz", - "integrity": "sha512-/TjEmXQVEzdod/FFskf3o7oOAsGhHf2j1dZqRFbDzq4F3mvvxflIIi4Hd3bLQE9y/CpwqfSQam5JakI/mi3Pog==" + "integrity": "sha512-/TjEmXQVEzdod/FFskf3o7oOAsGhHf2j1dZqRFbDzq4F3mvvxflIIi4Hd3bLQE9y/CpwqfSQam5JakI/mi3Pog==", + "dev": true, + "peer": true }, "node_modules/@truffle/interface-adapter/node_modules/web3": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3/-/web3-1.10.0.tgz", "integrity": "sha512-YfKY9wSkGcM8seO+daR89oVTcbu18NsVfvOngzqMYGUU0pPSQmE57qQDvQzUeoIOHAnXEBNzrhjQJmm8ER0rng==", + "dev": true, "hasInstallScript": true, + "peer": true, "dependencies": { "web3-bzz": "1.10.0", "web3-core": "1.10.0", @@ -1706,6 +1764,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.0.tgz", "integrity": "sha512-kSaCM0uMcZTNUSmn5vMEhlo02RObGNRRCkdX0V9UTAU0+lrvn0HSaudyCo6CQzuXUsnuY2ERJGCGPfeWmv19Rg==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^5.2.1", "ethereum-bloom-filters": "^1.0.6", @@ -1724,6 +1784,8 @@ "resolved": "https://registry.npmjs.org/@truffle/provider/-/provider-0.2.64.tgz", "integrity": "sha512-ZwPsofw4EsCq/2h0t73SPnnFezu4YQWBmK4FxFaOUX0F+o8NsZuHKyfJzuZwyZbiktYmefM3yD9rM0Dj4BhNbw==", "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", + "dev": true, + "peer": true, "dependencies": { "@truffle/error": "^0.1.1", "@truffle/interface-adapter": "^0.5.25", @@ -1755,6 +1817,8 @@ "version": "10.2.1", "resolved": "https://registry.npmjs.org/@typechain/ethers-v5/-/ethers-v5-10.2.1.tgz", "integrity": "sha512-n3tQmCZjRE6IU4h6lqUGiQ1j866n5MTCBJreNEHHVWXa2u9GJTaeYyU1/k+1qLutkyw+sS6VAN+AbeiTqsxd/A==", + "dev": true, + "peer": true, "dependencies": { "lodash": "^4.17.15", "ts-essentials": "^7.0.1" @@ -1771,6 +1835,8 @@ "version": "6.1.6", "resolved": "https://registry.npmjs.org/@typechain/hardhat/-/hardhat-6.1.6.tgz", "integrity": "sha512-BiVnegSs+ZHVymyidtK472syodx1sXYlYJJixZfRstHVGYTi8V1O7QG4nsjyb0PC/LORcq7sfBUcHto1y6UgJA==", + "dev": true, + "peer": true, "dependencies": { "fs-extra": "^9.1.0" }, @@ -1787,6 +1853,8 @@ "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "peer": true, "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", @@ -1801,6 +1869,8 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "peer": true, "dependencies": { "universalify": "^2.0.0" }, @@ -1812,6 +1882,8 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "peer": true, "engines": { "node": ">= 10.0.0" } @@ -1828,6 +1900,8 @@ "version": "6.0.3", "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz", "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==", + "dev": true, + "peer": true, "dependencies": { "@types/http-cache-semantics": "*", "@types/keyv": "^3.1.4", @@ -1852,6 +1926,8 @@ "version": "1.6.1", "resolved": "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-1.6.1.tgz", "integrity": "sha512-eHE4cQPoj6ngxBZMvVf6Hw7Mh4jMW4U9lpGmS5GBPB9RYxlFg+CHaVN7ErNY4W9XfLIEn20b4VDYaIrbq0q4uA==", + "dev": true, + "peer": true, "dependencies": { "@types/node": "*" } @@ -1860,6 +1936,8 @@ "version": "0.0.33", "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-0.0.33.tgz", "integrity": "sha512-8BSvG1kGm83cyJITQMZSulnl6QV8jqAGreJsc5tPu1Jq0vTSOiY/k24Wx82JRpWwZSqrala6sd5rWi6aNXvqcw==", + "dev": true, + "peer": true, "dependencies": { "@types/node": "*" } @@ -1868,6 +1946,8 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", + "dev": true, + "peer": true, "dependencies": { "@types/minimatch": "*", "@types/node": "*" @@ -1876,12 +1956,16 @@ "node_modules/@types/http-cache-semantics": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz", - "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==" + "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==", + "dev": true, + "peer": true }, "node_modules/@types/keyv": { "version": "3.1.4", "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz", "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==", + "dev": true, + "peer": true, "dependencies": { "@types/node": "*" } @@ -1894,7 +1978,9 @@ "node_modules/@types/minimatch": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", - "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==" + "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", + "dev": true, + "peer": true }, "node_modules/@types/mocha": { "version": "9.1.1", @@ -1920,17 +2006,23 @@ "node_modules/@types/prettier": { "version": "2.7.3", "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz", - "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==" + "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==", + "dev": true, + "peer": true }, "node_modules/@types/qs": { "version": "6.9.15", "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz", - "integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==" + "integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==", + "dev": true, + "peer": true }, "node_modules/@types/responselike": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz", "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==", + "dev": true, + "peer": true, "dependencies": { "@types/node": "*" } @@ -1943,20 +2035,75 @@ "@types/node": "*" } }, + "node_modules/@uniswap/lib": { + "version": "4.0.1-alpha", + "resolved": "https://registry.npmjs.org/@uniswap/lib/-/lib-4.0.1-alpha.tgz", + "integrity": "sha512-f6UIliwBbRsgVLxIaBANF6w09tYqc6Y/qXdsrbEmXHyFA7ILiKrIwRFXe1yOg8M3cksgVsO9N7yuL2DdCGQKBA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/@uniswap/v2-core": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@uniswap/v2-core/-/v2-core-1.0.1.tgz", + "integrity": "sha512-MtybtkUPSyysqLY2U210NBDeCHX+ltHt3oADGdjqoThZaFRDKwM6k1Nb3F0A3hk5hwuQvytFWhrWHOEq6nVJ8Q==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/@uniswap/v3-core": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@uniswap/v3-core/-/v3-core-1.0.1.tgz", + "integrity": "sha512-7pVk4hEm00j9tc71Y9+ssYpO6ytkeI0y7WE9P6UcmNzhxPePwyAxImuhVsTqWK9YFvzgtvzJHi64pBl4jUzKMQ==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/@uniswap/v3-periphery": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/@uniswap/v3-periphery/-/v3-periphery-1.4.4.tgz", + "integrity": "sha512-S4+m+wh8HbWSO3DKk4LwUCPZJTpCugIsHrWR86m/OrUyvSqGDTXKFfc2sMuGXCZrD1ZqO3rhQsKgdWg3Hbb2Kw==", + "dev": true, + "dependencies": { + "@openzeppelin/contracts": "3.4.2-solc-0.7", + "@uniswap/lib": "^4.0.1-alpha", + "@uniswap/v2-core": "^1.0.1", + "@uniswap/v3-core": "^1.0.0", + "base64-sol": "1.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@uniswap/v3-periphery/node_modules/@openzeppelin/contracts": { + "version": "3.4.2-solc-0.7", + "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-3.4.2-solc-0.7.tgz", + "integrity": "sha512-W6QmqgkADuFcTLzHL8vVoNBtkwjvQRpYIAom7KiUNoLKghyx3FgH0GBjt8NRvigV1ZmMOBllvE1By1C+bi8WpA==", + "dev": true + }, "node_modules/abbrev": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", - "integrity": "sha512-LEyx4aLEC3x6T0UguF6YILf+ntvmOaWsVfENmIW0E9H09vKlLDGelMjjSm0jkDHALj8A8quZ/HapKNigzwge+Q==" + "integrity": "sha512-LEyx4aLEC3x6T0UguF6YILf+ntvmOaWsVfENmIW0E9H09vKlLDGelMjjSm0jkDHALj8A8quZ/HapKNigzwge+Q==", + "dev": true, + "peer": true }, "node_modules/abortcontroller-polyfill": { "version": "1.7.5", "resolved": "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.5.tgz", - "integrity": "sha512-JMJ5soJWP18htbbxJjG7bG6yuI6pRhgJ0scHHTfkUjf6wjP912xZWvM+A4sJK3gqd9E8fcPbDnOefbA9Th/FIQ==" + "integrity": "sha512-JMJ5soJWP18htbbxJjG7bG6yuI6pRhgJ0scHHTfkUjf6wjP912xZWvM+A4sJK3gqd9E8fcPbDnOefbA9Th/FIQ==", + "dev": true, + "peer": true }, "node_modules/accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "dev": true, + "peer": true, "dependencies": { "mime-types": "~2.1.34", "negotiator": "0.6.3" @@ -1988,6 +2135,8 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/address/-/address-1.2.2.tgz", "integrity": "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==", + "dev": true, + "peer": true, "engines": { "node": ">= 10.0.0" } @@ -2003,7 +2152,8 @@ "node_modules/aes-js": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz", - "integrity": "sha512-H7wUZRn8WpTq9jocdxQ2c8x2sKo9ZVmzfRE13GiNJXfp7NcKYEdvl3vspKjXox6RIG2VtaRe4JFvxG4rqp2Zuw==" + "integrity": "sha512-H7wUZRn8WpTq9jocdxQ2c8x2sKo9ZVmzfRE13GiNJXfp7NcKYEdvl3vspKjXox6RIG2VtaRe4JFvxG4rqp2Zuw==", + "peer": true }, "node_modules/agent-base": { "version": "6.0.2", @@ -2032,6 +2182,8 @@ "version": "8.13.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz", "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==", + "dev": true, + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "json-schema-traverse": "^1.0.0", @@ -2047,7 +2199,9 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==", + "dev": true, "optional": true, + "peer": true, "engines": { "node": ">=0.4.2" } @@ -2104,7 +2258,9 @@ "node_modules/antlr4ts": { "version": "0.5.0-alpha.4", "resolved": "https://registry.npmjs.org/antlr4ts/-/antlr4ts-0.5.0-alpha.4.tgz", - "integrity": "sha512-WPQDt1B74OfPv/IMS2ekXAKkTZIHl88uMetg6q3OTqgFxZ/dxDXI0EWLyZid/1Pe6hTftyg5N7gel5wNAGxXyQ==" + "integrity": "sha512-WPQDt1B74OfPv/IMS2ekXAKkTZIHl88uMetg6q3OTqgFxZ/dxDXI0EWLyZid/1Pe6hTftyg5N7gel5wNAGxXyQ==", + "dev": true, + "peer": true }, "node_modules/anymatch": { "version": "3.1.3", @@ -2132,6 +2288,8 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz", "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==", + "dev": true, + "peer": true, "engines": { "node": ">=6" } @@ -2139,12 +2297,16 @@ "node_modules/array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", + "dev": true, + "peer": true }, "node_modules/array-union": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "peer": true, "engines": { "node": ">=8" } @@ -2153,6 +2315,8 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==", + "dev": true, + "peer": true, "engines": { "node": ">=0.10.0" } @@ -2160,12 +2324,16 @@ "node_modules/asap": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==" + "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==", + "dev": true, + "peer": true }, "node_modules/asn1": { "version": "0.2.6", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", + "dev": true, + "peer": true, "dependencies": { "safer-buffer": "~2.1.0" } @@ -2174,6 +2342,8 @@ "version": "4.10.1", "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^4.0.0", "inherits": "^2.0.1", @@ -2183,12 +2353,16 @@ "node_modules/asn1.js/node_modules/bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true, + "peer": true }, "node_modules/assert-plus": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", + "dev": true, + "peer": true, "engines": { "node": ">=0.8" } @@ -2205,6 +2379,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "dev": true, + "peer": true, "engines": { "node": ">=8" } @@ -2212,12 +2388,16 @@ "node_modules/async": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==" + "integrity": "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==", + "dev": true, + "peer": true }, "node_modules/async-limiter": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", - "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==" + "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==", + "dev": true, + "peer": true }, "node_modules/asynckit": { "version": "0.4.0", @@ -2228,6 +2408,8 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "dev": true, + "peer": true, "engines": { "node": ">= 4.0.0" } @@ -2236,6 +2418,8 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "dev": true, + "peer": true, "dependencies": { "possible-typed-array-names": "^1.0.0" }, @@ -2250,6 +2434,8 @@ "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==", + "dev": true, + "peer": true, "engines": { "node": "*" } @@ -2257,7 +2443,9 @@ "node_modules/aws4": { "version": "1.12.0", "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz", - "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==" + "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==", + "dev": true, + "peer": true }, "node_modules/axios": { "version": "1.6.8", @@ -2286,6 +2474,7 @@ "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true, "funding": [ { "type": "github", @@ -2299,12 +2488,21 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "peer": true + }, + "node_modules/base64-sol": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/base64-sol/-/base64-sol-1.0.1.tgz", + "integrity": "sha512-ld3cCNMeXt4uJXmLZBHFGMvVpK9KsLVEhPpFRXnvSVAqABKbuNZg/+dsq3NuM+wxFLb/UrVkz7m1ciWmkMfTbg==", + "dev": true }, "node_modules/bcrypt-pbkdf": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", + "dev": true, + "peer": true, "dependencies": { "tweetnacl": "^0.14.3" } @@ -2312,17 +2510,22 @@ "node_modules/bcrypt-pbkdf/node_modules/tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==" + "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==", + "dev": true, + "peer": true }, "node_modules/bech32": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz", - "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==" + "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==", + "peer": true }, "node_modules/bignumber.js": { "version": "9.1.2", "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz", "integrity": "sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==", + "dev": true, + "peer": true, "engines": { "node": "*" } @@ -2346,7 +2549,9 @@ "node_modules/bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", + "dev": true, + "peer": true }, "node_modules/bn.js": { "version": "5.2.1", @@ -2357,6 +2562,8 @@ "version": "1.20.2", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "dev": true, + "peer": true, "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -2380,6 +2587,8 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "peer": true, "dependencies": { "ms": "2.0.0" } @@ -2387,12 +2596,16 @@ "node_modules/body-parser/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true, + "peer": true }, "node_modules/body-parser/node_modules/qs": { "version": "6.11.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "dev": true, + "peer": true, "dependencies": { "side-channel": "^1.0.4" }, @@ -2545,6 +2758,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", + "dev": true, + "peer": true, "dependencies": { "browserify-aes": "^1.0.4", "browserify-des": "^1.0.0", @@ -2555,6 +2770,8 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", + "dev": true, + "peer": true, "dependencies": { "cipher-base": "^1.0.1", "des.js": "^1.0.0", @@ -2566,6 +2783,8 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz", "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^5.0.0", "randombytes": "^2.0.1" @@ -2575,6 +2794,8 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.3.tgz", "integrity": "sha512-JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^5.2.1", "browserify-rsa": "^4.1.0", @@ -2595,6 +2816,8 @@ "version": "6.5.5", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.5.tgz", "integrity": "sha512-7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^4.11.9", "brorand": "^1.1.0", @@ -2608,12 +2831,16 @@ "node_modules/browserify-sign/node_modules/elliptic/node_modules/bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true, + "peer": true }, "node_modules/browserify-sign/node_modules/hash-base": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", "integrity": "sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==", + "dev": true, + "peer": true, "dependencies": { "inherits": "^2.0.1", "safe-buffer": "^5.0.1" @@ -2626,6 +2853,8 @@ "version": "2.3.8", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "dev": true, + "peer": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -2639,12 +2868,16 @@ "node_modules/browserify-sign/node_modules/readable-stream/node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true, + "peer": true }, "node_modules/browserify-sign/node_modules/string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "peer": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -2652,7 +2885,9 @@ "node_modules/browserify-sign/node_modules/string_decoder/node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true, + "peer": true }, "node_modules/bs58": { "version": "4.0.1", @@ -2684,6 +2919,7 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "dev": true, "funding": [ { "type": "github", @@ -2698,6 +2934,7 @@ "url": "https://feross.org/support" } ], + "peer": true, "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" @@ -2711,7 +2948,9 @@ "node_modules/buffer-to-arraybuffer": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/buffer-to-arraybuffer/-/buffer-to-arraybuffer-0.0.5.tgz", - "integrity": "sha512-3dthu5CYiVB1DEJp61FtApNnNndTckcqe4pFcLdvHtrpG+kcyekCJKg4MRiDcFW7A6AODnXB9U4dwQiCW5kzJQ==" + "integrity": "sha512-3dthu5CYiVB1DEJp61FtApNnNndTckcqe4pFcLdvHtrpG+kcyekCJKg4MRiDcFW7A6AODnXB9U4dwQiCW5kzJQ==", + "dev": true, + "peer": true }, "node_modules/buffer-xor": { "version": "1.0.3", @@ -2722,7 +2961,9 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.8.tgz", "integrity": "sha512-4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw==", + "devOptional": true, "hasInstallScript": true, + "peer": true, "dependencies": { "node-gyp-build": "^4.3.0" }, @@ -2742,6 +2983,8 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-6.1.0.tgz", "integrity": "sha512-KJ/Dmo1lDDhmW2XDPMo+9oiy/CeqosPguPCrgcVzKyZrL6pM1gU2GmPY/xo6OQPTUaA/c0kwHuywB4E6nmT9ww==", + "dev": true, + "peer": true, "engines": { "node": ">=10.6.0" } @@ -2750,6 +2993,8 @@ "version": "7.0.4", "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz", "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==", + "dev": true, + "peer": true, "dependencies": { "clone-response": "^1.0.2", "get-stream": "^5.1.0", @@ -2767,6 +3012,8 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dev": true, + "peer": true, "dependencies": { "pump": "^3.0.0" }, @@ -2781,6 +3028,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", + "dev": true, + "peer": true, "engines": { "node": ">=8" } @@ -2789,6 +3038,8 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "dev": true, + "peer": true, "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -2817,12 +3068,16 @@ "node_modules/caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==" + "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==", + "dev": true, + "peer": true }, "node_modules/cbor": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/cbor/-/cbor-8.1.0.tgz", "integrity": "sha512-DwGjNW9omn6EwP70aXsn7FQJx5kO12tX0bZkaTjzdVFM6/7nhA4t0EENocKGx6D2Bch9PE2KzCUf5SceBdeijg==", + "dev": true, + "peer": true, "dependencies": { "nofilter": "^3.1.0" }, @@ -2875,6 +3130,8 @@ "version": "0.0.2", "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz", "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==", + "dev": true, + "peer": true, "engines": { "node": "*" } @@ -2919,7 +3176,9 @@ "node_modules/chownr": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "dev": true, + "peer": true }, "node_modules/ci-info": { "version": "2.0.0", @@ -2931,6 +3190,8 @@ "resolved": "https://registry.npmjs.org/cids/-/cids-0.7.5.tgz", "integrity": "sha512-zT7mPeghoWAu+ppn8+BS1tQ5qGmbMfB4AregnQjA/qHY3GC1m1ptI9GkWNlgeu38r7CuRdXB47uY2XgAYt6QVA==", "deprecated": "This module has been superseded by the multiformats module", + "dev": true, + "peer": true, "dependencies": { "buffer": "^5.5.0", "class-is": "^1.1.0", @@ -2948,6 +3209,8 @@ "resolved": "https://registry.npmjs.org/multicodec/-/multicodec-1.0.4.tgz", "integrity": "sha512-NDd7FeS3QamVtbgfvu5h7fd1IlbaC4EQ0/pgU4zqE2vdHCmBGsUa0TiM8/TdSeG6BMPC92OOCf8F1ocE/Wkrrg==", "deprecated": "This module has been superseded by the multiformats module", + "dev": true, + "peer": true, "dependencies": { "buffer": "^5.6.0", "varint": "^5.0.0" @@ -2965,7 +3228,9 @@ "node_modules/class-is": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/class-is/-/class-is-1.1.0.tgz", - "integrity": "sha512-rhjH9AG1fvabIDoGRVH587413LPjTZgmDF9fOFCbFJQV4yuocX1mHxxvXI4g3cGwbVY9wAYIoKlg1N79frJKQw==" + "integrity": "sha512-rhjH9AG1fvabIDoGRVH587413LPjTZgmDF9fOFCbFJQV4yuocX1mHxxvXI4g3cGwbVY9wAYIoKlg1N79frJKQw==", + "dev": true, + "peer": true }, "node_modules/clean-stack": { "version": "2.2.0", @@ -2990,6 +3255,8 @@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz", "integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==", + "dev": true, + "peer": true, "dependencies": { "object-assign": "^4.1.0", "string-width": "^2.1.1" @@ -3005,6 +3272,8 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", + "dev": true, + "peer": true, "engines": { "node": ">=4" } @@ -3013,6 +3282,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", + "dev": true, + "peer": true, "engines": { "node": ">=4" } @@ -3021,6 +3292,8 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "peer": true, "dependencies": { "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^4.0.0" @@ -3033,6 +3306,8 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==", + "dev": true, + "peer": true, "dependencies": { "ansi-regex": "^3.0.0" }, @@ -3054,6 +3329,8 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz", "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==", + "dev": true, + "peer": true, "dependencies": { "mimic-response": "^1.0.0" }, @@ -3078,6 +3355,8 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", + "dev": true, + "peer": true, "engines": { "node": ">=0.1.90" } @@ -3102,6 +3381,8 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.2.1.tgz", "integrity": "sha512-H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg==", + "dev": true, + "peer": true, "dependencies": { "array-back": "^3.1.0", "find-replace": "^3.0.0", @@ -3116,6 +3397,8 @@ "version": "6.1.3", "resolved": "https://registry.npmjs.org/command-line-usage/-/command-line-usage-6.1.3.tgz", "integrity": "sha512-sH5ZSPr+7UStsloltmDh7Ce5fb8XPlHyoPzTpyyMuYCtervL65+ubVZ6Q61cFtFl62UyJlc8/JwERRbAFPUqgw==", + "dev": true, + "peer": true, "dependencies": { "array-back": "^4.0.2", "chalk": "^2.4.2", @@ -3130,6 +3413,8 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz", "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==", + "dev": true, + "peer": true, "engines": { "node": ">=8" } @@ -3138,6 +3423,8 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz", "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==", + "dev": true, + "peer": true, "engines": { "node": ">=8" } @@ -3156,9 +3443,11 @@ "version": "1.6.2", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", + "dev": true, "engines": [ "node >= 0.8" ], + "peer": true, "dependencies": { "buffer-from": "^1.0.0", "inherits": "^2.0.3", @@ -3170,6 +3459,8 @@ "version": "2.3.8", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "dev": true, + "peer": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -3183,12 +3474,16 @@ "node_modules/concat-stream/node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true, + "peer": true }, "node_modules/concat-stream/node_modules/string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "peer": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -3197,6 +3492,8 @@ "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "dev": true, + "peer": true, "dependencies": { "safe-buffer": "5.2.1" }, @@ -3208,6 +3505,8 @@ "version": "2.5.2", "resolved": "https://registry.npmjs.org/content-hash/-/content-hash-2.5.2.tgz", "integrity": "sha512-FvIQKy0S1JaWV10sMsA7TRx8bpU+pqPkhbsfvOJAdjRXvYxEckAwQWGwtRjiaJfh+E0DvcWUGqcdjwMGFjsSdw==", + "dev": true, + "peer": true, "dependencies": { "cids": "^0.7.1", "multicodec": "^0.5.5", @@ -3218,6 +3517,8 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.6" } @@ -3226,6 +3527,8 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.6" } @@ -3233,22 +3536,30 @@ "node_modules/cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", + "dev": true, + "peer": true }, "node_modules/cookiejar": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz", - "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==" + "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==", + "dev": true, + "peer": true }, "node_modules/core-util-is": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", + "dev": true, + "peer": true }, "node_modules/cors": { "version": "2.8.5", "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "dev": true, + "peer": true, "dependencies": { "object-assign": "^4", "vary": "^1" @@ -3261,6 +3572,8 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==", + "dev": true, + "peer": true, "bin": { "crc32": "bin/crc32.njs" }, @@ -3272,6 +3585,8 @@ "version": "4.0.4", "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^4.1.0", "elliptic": "^6.5.3" @@ -3280,7 +3595,9 @@ "node_modules/create-ecdh/node_modules/bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true, + "peer": true }, "node_modules/create-hash": { "version": "1.2.0", @@ -3316,6 +3633,8 @@ "version": "3.1.8", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz", "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==", + "dev": true, + "peer": true, "dependencies": { "node-fetch": "^2.6.12" } @@ -3324,6 +3643,8 @@ "version": "0.0.2", "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz", "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==", + "dev": true, + "peer": true, "engines": { "node": "*" } @@ -3332,6 +3653,8 @@ "version": "3.12.0", "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", + "dev": true, + "peer": true, "dependencies": { "browserify-cipher": "^1.0.0", "browserify-sign": "^4.0.0", @@ -3353,6 +3676,8 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/d/-/d-1.0.2.tgz", "integrity": "sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==", + "dev": true, + "peer": true, "dependencies": { "es5-ext": "^0.10.64", "type": "^2.7.2" @@ -3365,6 +3690,8 @@ "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==", + "dev": true, + "peer": true, "dependencies": { "assert-plus": "^1.0.0" }, @@ -3375,7 +3702,9 @@ "node_modules/death": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/death/-/death-1.1.0.tgz", - "integrity": "sha512-vsV6S4KVHvTGxbEcij7hkWRv0It+sGGWVOM67dQde/o5Xjnr+KmLjxWJii2uEObIrt1CcM9w0Yaovx+iOlIL+w==" + "integrity": "sha512-vsV6S4KVHvTGxbEcij7hkWRv0It+sGGWVOM67dQde/o5Xjnr+KmLjxWJii2uEObIrt1CcM9w0Yaovx+iOlIL+w==", + "dev": true, + "peer": true }, "node_modules/debug": { "version": "4.3.4", @@ -3408,6 +3737,8 @@ "version": "0.2.2", "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==", + "dev": true, + "peer": true, "engines": { "node": ">=0.10" } @@ -3416,6 +3747,8 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "dev": true, + "peer": true, "dependencies": { "mimic-response": "^3.1.0" }, @@ -3430,6 +3763,8 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", + "dev": true, + "peer": true, "engines": { "node": ">=10" }, @@ -3452,6 +3787,8 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "dev": true, + "peer": true, "engines": { "node": ">=4.0.0" } @@ -3459,12 +3796,16 @@ "node_modules/deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, + "peer": true }, "node_modules/defer-to-connect": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", + "dev": true, + "peer": true, "engines": { "node": ">=10" } @@ -3473,6 +3814,8 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dev": true, + "peer": true, "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -3505,6 +3848,8 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz", "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==", + "dev": true, + "peer": true, "dependencies": { "inherits": "^2.0.1", "minimalistic-assert": "^1.0.0" @@ -3514,6 +3859,8 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.8", "npm": "1.2.8000 || >= 1.4.16" @@ -3523,6 +3870,8 @@ "version": "1.6.1", "resolved": "https://registry.npmjs.org/detect-port/-/detect-port-1.6.1.tgz", "integrity": "sha512-CmnVc+Hek2egPx1PeTFVta2W78xy2K/9Rkf6cC4T59S50tVnzKj+tnx5mmx5lwvCkujZ4uRrpRSuV+IVs3f90Q==", + "dev": true, + "peer": true, "dependencies": { "address": "^1.0.1", "debug": "4" @@ -3547,6 +3896,8 @@ "version": "5.0.3", "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^4.1.0", "miller-rabin": "^4.0.0", @@ -3556,12 +3907,16 @@ "node_modules/diffie-hellman/node_modules/bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true, + "peer": true }, "node_modules/dir-glob": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "peer": true, "dependencies": { "path-type": "^4.0.0" }, @@ -3572,17 +3927,23 @@ "node_modules/dom-walk": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz", - "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==" + "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==", + "dev": true, + "peer": true }, "node_modules/duplexer3": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz", - "integrity": "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==" + "integrity": "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==", + "dev": true, + "peer": true }, "node_modules/ecc-jsbn": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==", + "dev": true, + "peer": true, "dependencies": { "jsbn": "~0.1.0", "safer-buffer": "^2.1.0" @@ -3591,7 +3952,9 @@ "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", + "dev": true, + "peer": true }, "node_modules/elliptic": { "version": "6.5.4", @@ -3621,6 +3984,8 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.8" } @@ -3629,6 +3994,8 @@ "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dev": true, + "peer": true, "dependencies": { "once": "^1.4.0" } @@ -3657,6 +4024,8 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dev": true, + "peer": true, "dependencies": { "get-intrinsic": "^1.2.4" }, @@ -3668,6 +4037,8 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.4" } @@ -3676,7 +4047,9 @@ "version": "0.10.64", "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz", "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==", + "dev": true, "hasInstallScript": true, + "peer": true, "dependencies": { "es6-iterator": "^2.0.3", "es6-symbol": "^3.1.3", @@ -3691,6 +4064,8 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==", + "dev": true, + "peer": true, "dependencies": { "d": "1", "es5-ext": "^0.10.35", @@ -3700,12 +4075,16 @@ "node_modules/es6-promise": { "version": "4.2.8", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", - "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==" + "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==", + "dev": true, + "peer": true }, "node_modules/es6-symbol": { "version": "3.1.4", "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz", "integrity": "sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==", + "dev": true, + "peer": true, "dependencies": { "d": "^1.0.2", "ext": "^1.7.0" @@ -3725,7 +4104,9 @@ "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", + "dev": true, + "peer": true }, "node_modules/escape-string-regexp": { "version": "1.0.5", @@ -3739,6 +4120,8 @@ "version": "1.8.1", "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", "integrity": "sha512-yhi5S+mNTOuRvyW4gWlg5W1byMaQGWWSYHXsuFZ7GBo7tpyOwi2EdzMP/QWxh9hwkD2m+wDVHJsxhRIj+v/b/A==", + "dev": true, + "peer": true, "dependencies": { "esprima": "^2.7.1", "estraverse": "^1.9.1", @@ -3760,6 +4143,8 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz", "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==", + "dev": true, + "peer": true, "dependencies": { "d": "^1.0.1", "es5-ext": "^0.10.62", @@ -3774,6 +4159,8 @@ "version": "2.7.3", "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", "integrity": "sha512-OarPfz0lFCiW4/AV2Oy1Rp9qu0iusTKqykwTspGCZtPxmF81JR4MmIebvF1F9+UOKth2ZubLQ4XGGaU+hSn99A==", + "dev": true, + "peer": true, "bin": { "esparse": "bin/esparse.js", "esvalidate": "bin/esvalidate.js" @@ -3786,6 +4173,8 @@ "version": "1.9.3", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", "integrity": "sha512-25w1fMXQrGdoquWnScXZGckOv+Wes+JDnuN/+7ex3SauFRS72r2lFDec0EKPt2YD1wUJ/IrfEex+9yp4hfSOJA==", + "dev": true, + "peer": true, "engines": { "node": ">=0.10.0" } @@ -3794,6 +4183,8 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "peer": true, "engines": { "node": ">=0.10.0" } @@ -3802,6 +4193,8 @@ "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.6" } @@ -3810,6 +4203,8 @@ "version": "2.0.8", "resolved": "https://registry.npmjs.org/eth-ens-namehash/-/eth-ens-namehash-2.0.8.tgz", "integrity": "sha512-VWEI1+KJfz4Km//dadyvBBoBeSQ0MHTXPvr8UIXiLW6IanxvAV+DmlZAijZwAyggqGUfwQBeHf7tc9wzc1piSw==", + "dev": true, + "peer": true, "dependencies": { "idna-uts46-hx": "^2.3.1", "js-sha3": "^0.5.7" @@ -3818,12 +4213,16 @@ "node_modules/eth-ens-namehash/node_modules/js-sha3": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz", - "integrity": "sha512-GII20kjaPX0zJ8wzkTbNDYMY7msuZcTWk8S5UOh6806Jq/wz1J8/bnr8uGU0DAUmYDjj2Mr4X1cW8v/GLYnR+g==" + "integrity": "sha512-GII20kjaPX0zJ8wzkTbNDYMY7msuZcTWk8S5UOh6806Jq/wz1J8/bnr8uGU0DAUmYDjj2Mr4X1cW8v/GLYnR+g==", + "dev": true, + "peer": true }, "node_modules/eth-gas-reporter": { "version": "0.2.27", "resolved": "https://registry.npmjs.org/eth-gas-reporter/-/eth-gas-reporter-0.2.27.tgz", "integrity": "sha512-femhvoAM7wL0GcI8ozTdxfuBtBFJ9qsyIAsmKVjlWAHUbdnnXHt+lKzz/kmldM5lA9jLuNHGwuIxorNpLbR1Zw==", + "dev": true, + "peer": true, "dependencies": { "@solidity-parser/parser": "^0.14.0", "axios": "^1.5.1", @@ -3852,17 +4251,21 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.2.0.tgz", "integrity": "sha512-FZfhjEDbT5GRswV3C6uvLPHMiVD6lQBmpoX5+eSiPaMTXte/IKqI5dykDxzZB/WBeK/CDuQRBWarPdi3FNY2zQ==", + "dev": true, "funding": [ { "type": "individual", "url": "https://paulmillr.com/funding/" } - ] + ], + "peer": true }, "node_modules/eth-gas-reporter/node_modules/ethereum-cryptography": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-1.2.0.tgz", "integrity": "sha512-6yFQC9b5ug6/17CQpCyE3k9eKBMdhyVjzUy1WkiuY/E4vj/SXDBbCw8QEIaXqf0Mf2SnY6RmpDcwlUmBSS0EJw==", + "dev": true, + "peer": true, "dependencies": { "@noble/hashes": "1.2.0", "@noble/secp256k1": "1.7.1", @@ -3874,6 +4277,8 @@ "version": "0.1.29", "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.1.29.tgz", "integrity": "sha512-bfttrr3/7gG4E02HoWTDUcDDslN003OlOoBxk9virpAZQ1ja/jDgwkWB8QfJF7ojuEowrqy+lzp9VcJG7/k5bQ==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^4.11.6", "elliptic": "^6.4.0", @@ -3886,17 +4291,23 @@ "node_modules/eth-lib/node_modules/bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true, + "peer": true }, "node_modules/eth-lib/node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true, + "peer": true }, "node_modules/eth-lib/node_modules/ws": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", + "dev": true, + "peer": true, "dependencies": { "async-limiter": "~1.0.0", "safe-buffer": "~5.1.0", @@ -3907,6 +4318,8 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/ethereum-bloom-filters/-/ethereum-bloom-filters-1.1.0.tgz", "integrity": "sha512-J1gDRkLpuGNvWYzWslBQR9cDV4nd4kfvVTE/Wy4Kkm4yb3EYRSlyi0eB/inTsSTTVyA0+HyzHgbr95Fn/Z1fSw==", + "dev": true, + "peer": true, "dependencies": { "@noble/hashes": "^1.4.0" } @@ -3998,6 +4411,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "peer": true, "dependencies": { "@ethersproject/abi": "5.7.0", "@ethersproject/abstract-provider": "5.7.0", @@ -4035,6 +4449,8 @@ "version": "0.1.6", "resolved": "https://registry.npmjs.org/ethjs-unit/-/ethjs-unit-0.1.6.tgz", "integrity": "sha512-/Sn9Y0oKl0uqQuvgFk/zQgR7aw1g36qX/jzSQ5lSwlO0GigPymk4eGQfeNTD03w1dPOqfz8V77Cy43jH56pagw==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "4.11.6", "number-to-bn": "1.7.0" @@ -4047,7 +4463,9 @@ "node_modules/ethjs-unit/node_modules/bn.js": { "version": "4.11.6", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha512-XWwnNNFCuuSQ0m3r3C4LE3EiORltHd9M05pq6FOlVeiophzRbMo50Sbz1ehl8K3Z+jw9+vmgnXefY1hz8X+2wA==" + "integrity": "sha512-XWwnNNFCuuSQ0m3r3C4LE3EiORltHd9M05pq6FOlVeiophzRbMo50Sbz1ehl8K3Z+jw9+vmgnXefY1hz8X+2wA==", + "dev": true, + "peer": true }, "node_modules/ethjs-util": { "version": "0.1.6", @@ -4066,6 +4484,8 @@ "version": "0.3.5", "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==", + "dev": true, + "peer": true, "dependencies": { "d": "1", "es5-ext": "~0.10.14" @@ -4074,7 +4494,9 @@ "node_modules/eventemitter3": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz", - "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==" + "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==", + "dev": true, + "peer": true }, "node_modules/evp_bytestokey": { "version": "1.0.3", @@ -4089,6 +4511,8 @@ "version": "4.19.2", "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "dev": true, + "peer": true, "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", @@ -4130,6 +4554,8 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "peer": true, "dependencies": { "ms": "2.0.0" } @@ -4137,12 +4563,16 @@ "node_modules/express/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true, + "peer": true }, "node_modules/express/node_modules/qs": { "version": "6.11.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "dev": true, + "peer": true, "dependencies": { "side-channel": "^1.0.4" }, @@ -4157,6 +4587,8 @@ "version": "1.7.0", "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz", "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==", + "dev": true, + "peer": true, "dependencies": { "type": "^2.7.2" } @@ -4164,25 +4596,33 @@ "node_modules/extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "dev": true, + "peer": true }, "node_modules/extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==", + "dev": true, "engines": [ "node >=0.6.0" - ] + ], + "peer": true }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, + "peer": true }, "node_modules/fast-glob": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "dev": true, + "peer": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -4197,17 +4637,23 @@ "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "peer": true }, "node_modules/fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true, + "peer": true }, "node_modules/fastq": { "version": "1.17.1", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "dev": true, + "peer": true, "dependencies": { "reusify": "^1.0.4" } @@ -4227,6 +4673,8 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "dev": true, + "peer": true, "dependencies": { "debug": "2.6.9", "encodeurl": "~1.0.2", @@ -4244,6 +4692,8 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "peer": true, "dependencies": { "ms": "2.0.0" } @@ -4251,12 +4701,16 @@ "node_modules/finalhandler/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true, + "peer": true }, "node_modules/find-replace": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz", "integrity": "sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==", + "dev": true, + "peer": true, "dependencies": { "array-back": "^3.0.1" }, @@ -4310,6 +4764,8 @@ "version": "0.3.3", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "dev": true, + "peer": true, "dependencies": { "is-callable": "^1.1.3" } @@ -4318,6 +4774,8 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==", + "dev": true, + "peer": true, "engines": { "node": "*" } @@ -4338,12 +4796,16 @@ "node_modules/form-data-encoder": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.7.1.tgz", - "integrity": "sha512-EFRDrsMm/kyqbTQocNvRXMLjc7Es2Vk+IQFx/YW7hkUH1eBl4J1fqiP34l74Yt0pFLCNpc06fkbVk00008mzjg==" + "integrity": "sha512-EFRDrsMm/kyqbTQocNvRXMLjc7Es2Vk+IQFx/YW7hkUH1eBl4J1fqiP34l74Yt0pFLCNpc06fkbVk00008mzjg==", + "dev": true, + "peer": true }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.6" } @@ -4357,6 +4819,8 @@ "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.6" } @@ -4378,6 +4842,8 @@ "version": "1.2.7", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", + "dev": true, + "peer": true, "dependencies": { "minipass": "^2.6.0" } @@ -4385,7 +4851,9 @@ "node_modules/fs-readdir-recursive": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz", - "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==" + "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==", + "dev": true, + "peer": true }, "node_modules/fs.realpath": { "version": "1.0.0", @@ -4409,6 +4877,8 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "peer": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -4433,6 +4903,8 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "dev": true, + "peer": true, "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2", @@ -4451,6 +4923,8 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz", "integrity": "sha512-x5UJKlgeUiNT8nyo/AcnwLnZuZNcSjSw0kogRB+Whd1fjjFq4B1hySFxSFWWSn4mIBzg3sRNUDFYc4g5gjPoLg==", + "dev": true, + "peer": true, "engines": { "node": ">=4" } @@ -4459,6 +4933,8 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true, + "peer": true, "engines": { "node": ">=10" }, @@ -4470,6 +4946,8 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==", + "dev": true, + "peer": true, "dependencies": { "assert-plus": "^1.0.0" } @@ -4478,6 +4956,8 @@ "version": "0.0.2", "resolved": "https://registry.npmjs.org/ghost-testrpc/-/ghost-testrpc-0.0.2.tgz", "integrity": "sha512-i08dAEgJ2g8z5buJIrCTduwPIhih3DP+hOCTyyryikfV8T0bNvHnGXO67i0DD1H4GBDETTclPy9njZbfluQYrQ==", + "dev": true, + "peer": true, "dependencies": { "chalk": "^2.4.2", "node-emoji": "^1.10.0" @@ -4519,6 +4999,8 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz", "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==", + "dev": true, + "peer": true, "dependencies": { "min-document": "^2.19.0", "process": "^0.11.10" @@ -4528,6 +5010,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", + "dev": true, + "peer": true, "dependencies": { "global-prefix": "^3.0.0" }, @@ -4539,6 +5023,8 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", + "dev": true, + "peer": true, "dependencies": { "ini": "^1.3.5", "kind-of": "^6.0.2", @@ -4552,6 +5038,8 @@ "version": "10.0.2", "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz", "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==", + "dev": true, + "peer": true, "dependencies": { "@types/glob": "^7.1.1", "array-union": "^2.1.0", @@ -4570,6 +5058,8 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "peer": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4579,6 +5069,8 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "peer": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -4598,6 +5090,8 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "peer": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -4609,6 +5103,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dev": true, + "peer": true, "dependencies": { "get-intrinsic": "^1.1.3" }, @@ -4620,6 +5116,8 @@ "version": "12.1.0", "resolved": "https://registry.npmjs.org/got/-/got-12.1.0.tgz", "integrity": "sha512-hBv2ty9QN2RdbJJMK3hesmSkFTjVIHyIDDbssCKnSmq62edGgImJWD10Eb1k77TiV1bxloxqcFAVK8+9pkhOig==", + "dev": true, + "peer": true, "dependencies": { "@sindresorhus/is": "^4.6.0", "@szmarczak/http-timer": "^5.0.1", @@ -4651,6 +5149,8 @@ "version": "4.7.8", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", + "dev": true, + "peer": true, "dependencies": { "minimist": "^1.2.5", "neo-async": "^2.6.2", @@ -4671,6 +5171,8 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "peer": true, "engines": { "node": ">=0.10.0" } @@ -4679,6 +5181,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==", + "dev": true, + "peer": true, "engines": { "node": ">=4" } @@ -4688,6 +5192,8 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", "deprecated": "this library is no longer supported", + "dev": true, + "peer": true, "dependencies": { "ajv": "^6.12.3", "har-schema": "^2.0.0" @@ -4700,6 +5206,8 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -4714,7 +5222,9 @@ "node_modules/har-validator/node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "peer": true }, "node_modules/hardhat": { "version": "2.22.3", @@ -4785,6 +5295,8 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/hardhat-gas-reporter/-/hardhat-gas-reporter-1.0.10.tgz", "integrity": "sha512-02N4+So/fZrzJ88ci54GqwVA3Zrf0C9duuTyGt0CFRIh/CdNwbnTgkXkRfojOMLBQ+6t+lBIkgbsOtqMvNwikA==", + "dev": true, + "peer": true, "dependencies": { "array-uniq": "1.0.3", "eth-gas-reporter": "^0.2.25", @@ -4939,6 +5451,8 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "dev": true, + "peer": true, "dependencies": { "es-define-property": "^1.0.0" }, @@ -4950,6 +5464,8 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.4" }, @@ -4961,6 +5477,8 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.4" }, @@ -4972,6 +5490,8 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dev": true, + "peer": true, "dependencies": { "has-symbols": "^1.0.3" }, @@ -5008,6 +5528,8 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dev": true, + "peer": true, "dependencies": { "function-bind": "^1.1.2" }, @@ -5037,6 +5559,8 @@ "version": "8.1.3", "resolved": "https://registry.npmjs.org/http-basic/-/http-basic-8.1.3.tgz", "integrity": "sha512-/EcDMwJZh3mABI2NhGfHOGOeOZITqfkEO4p/xK+l3NpyncIHUQBoMvCSF/b5GqvKtySC2srL/GGG3+EtlqlmCw==", + "dev": true, + "peer": true, "dependencies": { "caseless": "^0.12.0", "concat-stream": "^1.6.2", @@ -5050,7 +5574,9 @@ "node_modules/http-cache-semantics": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", - "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", + "dev": true, + "peer": true }, "node_modules/http-errors": { "version": "2.0.0", @@ -5070,12 +5596,16 @@ "node_modules/http-https": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/http-https/-/http-https-1.0.0.tgz", - "integrity": "sha512-o0PWwVCSp3O0wS6FvNr6xfBCHgt0m1tvPLFOCc2iFDKTRAXhB7m8klDf7ErowFH8POa6dVdGatKU5I1YYwzUyg==" + "integrity": "sha512-o0PWwVCSp3O0wS6FvNr6xfBCHgt0m1tvPLFOCc2iFDKTRAXhB7m8klDf7ErowFH8POa6dVdGatKU5I1YYwzUyg==", + "dev": true, + "peer": true }, "node_modules/http-response-object": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/http-response-object/-/http-response-object-3.0.2.tgz", "integrity": "sha512-bqX0XTF6fnXSQcEJ2Iuyr75yVakyjIDCqroJQ/aHfSdlM743Cwqoi2nDYMzLGWUcuTWGWy8AAvOKXTfiv6q9RA==", + "dev": true, + "peer": true, "dependencies": { "@types/node": "^10.0.3" } @@ -5083,12 +5613,16 @@ "node_modules/http-response-object/node_modules/@types/node": { "version": "10.17.60", "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz", - "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==" + "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==", + "dev": true, + "peer": true }, "node_modules/http-signature": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==", + "dev": true, + "peer": true, "dependencies": { "assert-plus": "^1.0.0", "jsprim": "^1.2.2", @@ -5103,6 +5637,8 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz", "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==", + "dev": true, + "peer": true, "dependencies": { "quick-lru": "^5.1.1", "resolve-alpn": "^1.2.0" @@ -5138,6 +5674,8 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/idna-uts46-hx/-/idna-uts46-hx-2.3.1.tgz", "integrity": "sha512-PWoF9Keq6laYdIRwwCdhTPl60xRqAloYNMQLiyUnG42VjT53oW07BXIRM+NK7eQjzXjAk2gUvX9caRxlnF9TAA==", + "dev": true, + "peer": true, "dependencies": { "punycode": "2.1.0" }, @@ -5149,6 +5687,8 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz", "integrity": "sha512-Yxz2kRwT90aPiWEMHVYnEf4+rhwF1tBmmZ4KepCP+Wkium9JxtWnUm1nqGwpiAHr/tnTSeHqr3wb++jgSkXjhA==", + "dev": true, + "peer": true, "engines": { "node": ">=6" } @@ -5157,6 +5697,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "dev": true, "funding": [ { "type": "github", @@ -5170,12 +5711,15 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "peer": true }, "node_modules/ignore": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", + "dev": true, + "peer": true, "engines": { "node": ">= 4" } @@ -5210,12 +5754,16 @@ "node_modules/ini": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "dev": true, + "peer": true }, "node_modules/interpret": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.10" } @@ -5232,6 +5780,8 @@ "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.10" } @@ -5240,6 +5790,8 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", + "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -5266,6 +5818,8 @@ "version": "1.2.7", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.4" }, @@ -5292,12 +5846,16 @@ "node_modules/is-function": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz", - "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==" + "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==", + "dev": true, + "peer": true }, "node_modules/is-generator-function": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", + "dev": true, + "peer": true, "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -5348,6 +5906,8 @@ "version": "1.1.13", "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", + "dev": true, + "peer": true, "dependencies": { "which-typed-array": "^1.1.14" }, @@ -5361,7 +5921,9 @@ "node_modules/is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==" + "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", + "dev": true, + "peer": true }, "node_modules/is-unicode-supported": { "version": "0.1.0", @@ -5377,17 +5939,23 @@ "node_modules/isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true, + "peer": true }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "peer": true }, "node_modules/isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==" + "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==", + "dev": true, + "peer": true }, "node_modules/js-sha3": { "version": "0.8.0", @@ -5408,27 +5976,37 @@ "node_modules/jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==" + "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==", + "dev": true, + "peer": true }, "node_modules/json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true, + "peer": true }, "node_modules/json-schema": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", - "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==" + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", + "dev": true, + "peer": true }, "node_modules/json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true, + "peer": true }, "node_modules/json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==" + "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", + "dev": true, + "peer": true }, "node_modules/jsonfile": { "version": "4.0.0", @@ -5442,6 +6020,8 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.1.tgz", "integrity": "sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==", + "dev": true, + "peer": true, "engines": { "node": "*" } @@ -5450,6 +6030,8 @@ "version": "1.4.2", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", + "dev": true, + "peer": true, "dependencies": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", @@ -5478,6 +6060,8 @@ "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "peer": true, "dependencies": { "json-buffer": "3.0.1" } @@ -5486,6 +6070,8 @@ "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, + "peer": true, "engines": { "node": ">=0.10.0" } @@ -5502,6 +6088,8 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", + "dev": true, + "peer": true, "dependencies": { "prelude-ls": "~1.1.2", "type-check": "~0.3.2" @@ -5532,12 +6120,16 @@ "node_modules/lodash.camelcase": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==" + "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==", + "dev": true, + "peer": true }, "node_modules/lodash.truncate": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", - "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==" + "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==", + "dev": true, + "peer": true }, "node_modules/log-symbols": { "version": "4.1.0", @@ -5630,6 +6222,8 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz", "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==", + "dev": true, + "peer": true, "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, @@ -5650,7 +6244,9 @@ "node_modules/markdown-table": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.3.tgz", - "integrity": "sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q==" + "integrity": "sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q==", + "dev": true, + "peer": true }, "node_modules/md5.js": { "version": "1.3.5", @@ -5666,6 +6262,8 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.6" } @@ -5681,12 +6279,16 @@ "node_modules/merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==", + "dev": true, + "peer": true }, "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "peer": true, "engines": { "node": ">= 8" } @@ -5695,6 +6297,8 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.6" } @@ -5702,12 +6306,16 @@ "node_modules/micro-ftch": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/micro-ftch/-/micro-ftch-0.3.1.tgz", - "integrity": "sha512-/0LLxhzP0tfiR5hcQebtudP56gUurs2CLkGarnCiB/OqEyUFQ6U3paQi/tgLv0hBJYt2rnr9MNpxz4fiiugstg==" + "integrity": "sha512-/0LLxhzP0tfiR5hcQebtudP56gUurs2CLkGarnCiB/OqEyUFQ6U3paQi/tgLv0hBJYt2rnr9MNpxz4fiiugstg==", + "dev": true, + "peer": true }, "node_modules/micromatch": { "version": "4.0.5", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dev": true, + "peer": true, "dependencies": { "braces": "^3.0.2", "picomatch": "^2.3.1" @@ -5720,6 +6328,8 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^4.0.0", "brorand": "^1.0.1" @@ -5731,12 +6341,16 @@ "node_modules/miller-rabin/node_modules/bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true, + "peer": true }, "node_modules/mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "dev": true, + "peer": true, "bin": { "mime": "cli.js" }, @@ -5767,6 +6381,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", + "dev": true, + "peer": true, "engines": { "node": ">=4" } @@ -5775,6 +6391,8 @@ "version": "2.19.0", "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz", "integrity": "sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==", + "dev": true, + "peer": true, "dependencies": { "dom-walk": "^0.1.0" } @@ -5804,6 +6422,8 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "peer": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -5812,6 +6432,8 @@ "version": "2.9.0", "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", + "dev": true, + "peer": true, "dependencies": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5821,6 +6443,8 @@ "version": "1.3.3", "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz", "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", + "dev": true, + "peer": true, "dependencies": { "minipass": "^2.9.0" } @@ -5829,6 +6453,8 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==", + "dev": true, + "peer": true, "bin": { "mkdirp": "dist/cjs/src/bin.js" }, @@ -5844,6 +6470,8 @@ "resolved": "https://registry.npmjs.org/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz", "integrity": "sha512-Hepn5kb1lJPtVW84RFT40YG1OddBNTOVUZR2bzQUHc+Z03en8/3uX0+060JDhcEzyO08HmipsN9DcnFMxhIL9w==", "deprecated": "This package is broken and no longer maintained. 'mkdirp' itself supports promises now, please switch to that.", + "dev": true, + "peer": true, "dependencies": { "mkdirp": "*" }, @@ -5934,7 +6562,9 @@ "node_modules/mock-fs": { "version": "4.14.0", "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-4.14.0.tgz", - "integrity": "sha512-qYvlv/exQ4+svI3UOvPUpLDF0OMX5euvUH0Ny4N5QyRyhNdgAgUrVH3iUINSzEPLvx0kbo/Bp28GJKIqvE7URw==" + "integrity": "sha512-qYvlv/exQ4+svI3UOvPUpLDF0OMX5euvUH0Ny4N5QyRyhNdgAgUrVH3iUINSzEPLvx0kbo/Bp28GJKIqvE7URw==", + "dev": true, + "peer": true }, "node_modules/ms": { "version": "2.1.2", @@ -5946,6 +6576,8 @@ "resolved": "https://registry.npmjs.org/multibase/-/multibase-0.6.1.tgz", "integrity": "sha512-pFfAwyTjbbQgNc3G7D48JkJxWtoJoBMaR4xQUOuB8RnCgRqaYmWNFeJTTvrJ2w51bjLq2zTby6Rqj9TQ9elSUw==", "deprecated": "This module has been superseded by the multiformats module", + "dev": true, + "peer": true, "dependencies": { "base-x": "^3.0.8", "buffer": "^5.5.0" @@ -5956,6 +6588,8 @@ "resolved": "https://registry.npmjs.org/multicodec/-/multicodec-0.5.7.tgz", "integrity": "sha512-PscoRxm3f+88fAtELwUnZxGDkduE2HD9Q6GHUOywQLjOGT/HAdhjLDYNZ1e7VR0s0TP0EwZ16LNUTFpoBGivOA==", "deprecated": "This module has been superseded by the multiformats module", + "dev": true, + "peer": true, "dependencies": { "varint": "^5.0.0" } @@ -5964,6 +6598,8 @@ "version": "0.4.21", "resolved": "https://registry.npmjs.org/multihashes/-/multihashes-0.4.21.tgz", "integrity": "sha512-uVSvmeCWf36pU2nB4/1kzYZjsXD9vofZKpgudqkceYY5g2aZZXJ5r9lxuzoRLl1OAp28XljXsEJ/X/85ZsKmKw==", + "dev": true, + "peer": true, "dependencies": { "buffer": "^5.5.0", "multibase": "^0.7.0", @@ -5975,6 +6611,8 @@ "resolved": "https://registry.npmjs.org/multibase/-/multibase-0.7.0.tgz", "integrity": "sha512-TW8q03O0f6PNFTQDvh3xxH03c8CjGaaYrjkl9UQPG6rz53TQzzxJVCIWVjzcbN/Q5Y53Zd0IBQBMVktVgNx4Fg==", "deprecated": "This module has been superseded by the multiformats module", + "dev": true, + "peer": true, "dependencies": { "base-x": "^3.0.8", "buffer": "^5.5.0" @@ -5983,12 +6621,16 @@ "node_modules/nano-json-stream-parser": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz", - "integrity": "sha512-9MqxMH/BSJC7dnLsEMPyfN5Dvoo49IsPFYMcHw3Bcfc2kN0lpHRBSzlMSVx4HGyJ7s9B31CyBTVehWJoQ8Ctew==" + "integrity": "sha512-9MqxMH/BSJC7dnLsEMPyfN5Dvoo49IsPFYMcHw3Bcfc2kN0lpHRBSzlMSVx4HGyJ7s9B31CyBTVehWJoQ8Ctew==", + "dev": true, + "peer": true }, "node_modules/negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.6" } @@ -5996,12 +6638,16 @@ "node_modules/neo-async": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true, + "peer": true }, "node_modules/next-tick": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", - "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==" + "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==", + "dev": true, + "peer": true }, "node_modules/node-addon-api": { "version": "2.0.2", @@ -6012,6 +6658,8 @@ "version": "1.11.0", "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz", "integrity": "sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==", + "dev": true, + "peer": true, "dependencies": { "lodash": "^4.17.21" } @@ -6020,6 +6668,8 @@ "version": "2.7.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dev": true, + "peer": true, "dependencies": { "whatwg-url": "^5.0.0" }, @@ -6049,6 +6699,8 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/nofilter/-/nofilter-3.1.0.tgz", "integrity": "sha512-l2NNj07e9afPnhAhvgVrCD/oy2Ai1yfLpuo3EpiO1jFTsB4sFz6oIfAfSZyQzVpkZQ9xS8ZS5g1jCBgq4Hwo0g==", + "dev": true, + "peer": true, "engines": { "node": ">=12.19" } @@ -6057,6 +6709,8 @@ "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==", + "dev": true, + "peer": true, "dependencies": { "abbrev": "1" }, @@ -6076,6 +6730,8 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", + "dev": true, + "peer": true, "engines": { "node": ">=10" }, @@ -6087,6 +6743,8 @@ "version": "1.7.0", "resolved": "https://registry.npmjs.org/number-to-bn/-/number-to-bn-1.7.0.tgz", "integrity": "sha512-wsJ9gfSz1/s4ZsJN01lyonwuxA1tml6X1yBDnfpMglypcBRFZZkus26EdPSlqS5GJfYddVZa22p3VNb3z5m5Ig==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "4.11.6", "strip-hex-prefix": "1.0.0" @@ -6099,12 +6757,16 @@ "node_modules/number-to-bn/node_modules/bn.js": { "version": "4.11.6", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha512-XWwnNNFCuuSQ0m3r3C4LE3EiORltHd9M05pq6FOlVeiophzRbMo50Sbz1ehl8K3Z+jw9+vmgnXefY1hz8X+2wA==" + "integrity": "sha512-XWwnNNFCuuSQ0m3r3C4LE3EiORltHd9M05pq6FOlVeiophzRbMo50Sbz1ehl8K3Z+jw9+vmgnXefY1hz8X+2wA==", + "dev": true, + "peer": true }, "node_modules/oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", + "dev": true, + "peer": true, "engines": { "node": "*" } @@ -6113,6 +6775,8 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "dev": true, + "peer": true, "engines": { "node": ">=0.10.0" } @@ -6121,6 +6785,8 @@ "version": "1.13.1", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", + "dev": true, + "peer": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -6134,6 +6800,8 @@ "version": "2.1.5", "resolved": "https://registry.npmjs.org/oboe/-/oboe-2.1.5.tgz", "integrity": "sha512-zRFWiF+FoicxEs3jNI/WYUrVEgA7DeET/InK0XQuudGHRg8iIob3cNPrJTKaz4004uaA9Pbe+Dwa8iluhjLZWA==", + "dev": true, + "peer": true, "dependencies": { "http-https": "^1.0.0" } @@ -6142,6 +6810,8 @@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "dev": true, + "peer": true, "dependencies": { "ee-first": "1.1.1" }, @@ -6161,6 +6831,8 @@ "version": "0.8.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "peer": true, "dependencies": { "deep-is": "~0.1.3", "fast-levenshtein": "~2.0.6", @@ -6190,6 +6862,8 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz", "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==", + "dev": true, + "peer": true, "engines": { "node": ">=12.20" } @@ -6248,6 +6922,8 @@ "version": "5.1.7", "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.7.tgz", "integrity": "sha512-CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg==", + "dev": true, + "peer": true, "dependencies": { "asn1.js": "^4.10.1", "browserify-aes": "^1.2.0", @@ -6264,6 +6940,8 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", "integrity": "sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==", + "dev": true, + "peer": true, "dependencies": { "inherits": "^2.0.1", "safe-buffer": "^5.0.1" @@ -6275,17 +6953,23 @@ "node_modules/parse-cache-control": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parse-cache-control/-/parse-cache-control-1.0.1.tgz", - "integrity": "sha512-60zvsJReQPX5/QP0Kzfd/VrpjScIQ7SHBW6bFCYfEP+fp0Eppr1SHhIO5nd1PjZtvclzSzES9D/p5nFJurwfWg==" + "integrity": "sha512-60zvsJReQPX5/QP0Kzfd/VrpjScIQ7SHBW6bFCYfEP+fp0Eppr1SHhIO5nd1PjZtvclzSzES9D/p5nFJurwfWg==", + "dev": true, + "peer": true }, "node_modules/parse-headers": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.5.tgz", - "integrity": "sha512-ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA==" + "integrity": "sha512-ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA==", + "dev": true, + "peer": true }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.8" } @@ -6314,12 +6998,16 @@ "node_modules/path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" + "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", + "dev": true, + "peer": true }, "node_modules/path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "peer": true, "engines": { "node": ">=8" } @@ -6350,7 +7038,9 @@ "node_modules/performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==" + "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==", + "dev": true, + "peer": true }, "node_modules/picomatch": { "version": "2.3.1", @@ -6367,6 +7057,8 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true, + "peer": true, "engines": { "node": ">=6" } @@ -6375,6 +7067,8 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.4" } @@ -6383,6 +7077,8 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.8.0" } @@ -6391,6 +7087,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==", + "dev": true, + "peer": true, "engines": { "node": ">=4" } @@ -6399,6 +7097,8 @@ "version": "2.8.8", "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "dev": true, + "peer": true, "bin": { "prettier": "bin-prettier.js" }, @@ -6413,6 +7113,8 @@ "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.6.0" } @@ -6420,12 +7122,16 @@ "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "dev": true, + "peer": true }, "node_modules/promise": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/promise/-/promise-8.3.0.tgz", "integrity": "sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==", + "dev": true, + "peer": true, "dependencies": { "asap": "~2.0.6" } @@ -6434,6 +7140,8 @@ "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "dev": true, + "peer": true, "dependencies": { "forwarded": "0.2.0", "ipaddr.js": "1.9.1" @@ -6450,12 +7158,16 @@ "node_modules/psl": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", - "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==" + "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", + "dev": true, + "peer": true }, "node_modules/public-encrypt": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^4.1.0", "browserify-rsa": "^4.0.0", @@ -6468,12 +7180,16 @@ "node_modules/public-encrypt/node_modules/bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true, + "peer": true }, "node_modules/pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, + "peer": true, "dependencies": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -6483,14 +7199,18 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "peer": true, "engines": { "node": ">=6" } }, "node_modules/qs": { - "version": "6.12.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.1.tgz", - "integrity": "sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "dev": true, + "peer": true, "dependencies": { "side-channel": "^1.0.6" }, @@ -6505,6 +7225,8 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz", "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==", + "dev": true, + "peer": true, "dependencies": { "decode-uri-component": "^0.2.0", "object-assign": "^4.1.0", @@ -6518,6 +7240,7 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, "funding": [ { "type": "github", @@ -6531,12 +7254,15 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "peer": true }, "node_modules/quick-lru": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", + "dev": true, + "peer": true, "engines": { "node": ">=10" }, @@ -6556,6 +7282,8 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", + "dev": true, + "peer": true, "dependencies": { "randombytes": "^2.0.5", "safe-buffer": "^5.1.0" @@ -6565,6 +7293,8 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.6" } @@ -6611,6 +7341,8 @@ "version": "0.6.2", "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", "integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==", + "dev": true, + "peer": true, "dependencies": { "resolve": "^1.1.6" }, @@ -6622,6 +7354,8 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz", "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==", + "dev": true, + "peer": true, "dependencies": { "minimatch": "^3.0.5" }, @@ -6633,6 +7367,8 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "peer": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -6642,6 +7378,8 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "peer": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -6653,6 +7391,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz", "integrity": "sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==", + "dev": true, + "peer": true, "engines": { "node": ">=6" } @@ -6661,6 +7401,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/req-cwd/-/req-cwd-2.0.0.tgz", "integrity": "sha512-ueoIoLo1OfB6b05COxAA9UpeoscNpYyM+BqYlA7H6LVF4hKGPXQQSSaD2YmvDVJMkk4UDpAHIeU1zG53IqjvlQ==", + "dev": true, + "peer": true, "dependencies": { "req-from": "^2.0.0" }, @@ -6672,6 +7414,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/req-from/-/req-from-2.0.0.tgz", "integrity": "sha512-LzTfEVDVQHBRfjOUMgNBA+V6DWsSnoeKzf42J7l0xa/B4jyPOuuF5MlNSmomLNGemWTnV2TIdjSSLnEn95fOQA==", + "dev": true, + "peer": true, "dependencies": { "resolve-from": "^3.0.0" }, @@ -6684,6 +7428,8 @@ "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", + "dev": true, + "peer": true, "dependencies": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -6714,6 +7460,8 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "dev": true, + "peer": true, "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", @@ -6727,6 +7475,8 @@ "version": "6.5.3", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", + "dev": true, + "peer": true, "engines": { "node": ">=0.6" } @@ -6736,6 +7486,8 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", + "dev": true, + "peer": true, "bin": { "uuid": "bin/uuid" } @@ -6759,17 +7511,23 @@ "node_modules/resolve": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==" + "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==", + "dev": true, + "peer": true }, "node_modules/resolve-alpn": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", - "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==" + "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==", + "dev": true, + "peer": true }, "node_modules/resolve-from": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", "integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==", + "dev": true, + "peer": true, "engines": { "node": ">=4" } @@ -6778,6 +7536,8 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz", "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==", + "dev": true, + "peer": true, "dependencies": { "lowercase-keys": "^2.0.0" }, @@ -6789,6 +7549,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", + "dev": true, + "peer": true, "engines": { "node": ">=8" } @@ -6797,6 +7559,8 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "peer": true, "engines": { "iojs": ">=1.0.0", "node": ">=0.10.0" @@ -6876,6 +7640,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, "funding": [ { "type": "github", @@ -6890,6 +7655,7 @@ "url": "https://feross.org/support" } ], + "peer": true, "dependencies": { "queue-microtask": "^1.2.2" } @@ -6922,6 +7688,8 @@ "version": "0.4.6", "resolved": "https://registry.npmjs.org/sc-istanbul/-/sc-istanbul-0.4.6.tgz", "integrity": "sha512-qJFF/8tW/zJsbyfh/iT/ZM5QNHE3CXxtLJbZsL+CzdJLBsPD7SedJZoUA4d8iAcN2IoMp/Dx80shOOd2x96X/g==", + "dev": true, + "peer": true, "dependencies": { "abbrev": "1.0.x", "async": "1.x", @@ -6946,6 +7714,8 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "peer": true, "dependencies": { "sprintf-js": "~1.0.2" } @@ -6954,6 +7724,8 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "peer": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -6963,6 +7735,8 @@ "version": "5.0.15", "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==", + "dev": true, + "peer": true, "dependencies": { "inflight": "^1.0.4", "inherits": "2", @@ -6978,6 +7752,8 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==", + "dev": true, + "peer": true, "engines": { "node": ">=0.10.0" } @@ -6986,6 +7762,8 @@ "version": "3.14.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "peer": true, "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -6998,6 +7776,8 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true, + "peer": true, "bin": { "esparse": "bin/esparse.js", "esvalidate": "bin/esvalidate.js" @@ -7010,6 +7790,8 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "peer": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -7021,6 +7803,8 @@ "version": "0.5.6", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "dev": true, + "peer": true, "dependencies": { "minimist": "^1.2.6" }, @@ -7032,6 +7816,8 @@ "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==", + "dev": true, + "peer": true, "dependencies": { "has-flag": "^1.0.0" }, @@ -7070,6 +7856,8 @@ "version": "0.18.0", "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "dev": true, + "peer": true, "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -7093,6 +7881,8 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "peer": true, "dependencies": { "ms": "2.0.0" } @@ -7100,12 +7890,16 @@ "node_modules/send/node_modules/debug/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true, + "peer": true }, "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "peer": true }, "node_modules/serialize-javascript": { "version": "6.0.0", @@ -7119,6 +7913,8 @@ "version": "1.15.0", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "dev": true, + "peer": true, "dependencies": { "encodeurl": "~1.0.2", "escape-html": "~1.0.3", @@ -7133,6 +7929,8 @@ "version": "0.1.12", "resolved": "https://registry.npmjs.org/servify/-/servify-0.1.12.tgz", "integrity": "sha512-/xE6GvsKKqyo1BAY+KxOWXcLpPsUUyji7Qg3bVD7hh1eRze5bR1uYiuDA/k3Gof1s9BTzQZEJK8sNcNGFIzeWw==", + "dev": true, + "peer": true, "dependencies": { "body-parser": "^1.16.0", "cors": "^2.8.1", @@ -7148,6 +7946,8 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dev": true, + "peer": true, "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", @@ -7186,6 +7986,8 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/sha1/-/sha1-1.1.1.tgz", "integrity": "sha512-dZBS6OrMjtgVkopB1Gmo4RQCDKiZsqcpAQpkV/aaj+FCrCg8r4I4qMkDPQjBgLIxlmu9k4nUbWq6ohXahOneYA==", + "dev": true, + "peer": true, "dependencies": { "charenc": ">= 0.0.1", "crypt": ">= 0.0.1" @@ -7198,6 +8000,8 @@ "version": "0.8.5", "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz", "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==", + "dev": true, + "peer": true, "dependencies": { "glob": "^7.0.0", "interpret": "^1.0.0", @@ -7214,6 +8018,8 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "peer": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7223,6 +8029,8 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "peer": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -7242,6 +8050,8 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "peer": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -7253,6 +8063,8 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", + "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.7", "es-errors": "^1.3.0", @@ -7270,6 +8082,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", + "dev": true, "funding": [ { "type": "github", @@ -7283,12 +8096,15 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "peer": true }, "node_modules/simple-get": { "version": "2.8.2", "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-2.8.2.tgz", "integrity": "sha512-Ijd/rV5o+mSBBs4F/x9oDPtTx9Zb6X9brmnXvMW4J7IR15ngi9q5xxqWBKU744jTZiaXtxaPL7uHG6vtN8kUkw==", + "dev": true, + "peer": true, "dependencies": { "decompress-response": "^3.3.0", "once": "^1.3.1", @@ -7299,6 +8115,8 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==", + "dev": true, + "peer": true, "dependencies": { "mimic-response": "^1.0.0" }, @@ -7310,6 +8128,8 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "peer": true, "engines": { "node": ">=8" } @@ -7318,6 +8138,8 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", + "dev": true, + "peer": true, "dependencies": { "ansi-styles": "^4.0.0", "astral-regex": "^2.0.0", @@ -7334,6 +8156,8 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "peer": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -7348,6 +8172,8 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "peer": true, "dependencies": { "color-name": "~1.1.4" }, @@ -7358,7 +8184,9 @@ "node_modules/slice-ansi/node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "peer": true }, "node_modules/solc": { "version": "0.7.3", @@ -7414,6 +8242,8 @@ "version": "0.7.22", "resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.7.22.tgz", "integrity": "sha512-I6Zd5tsFY+gmj1FDIp6w7OrUePx6ZpMgKQZg7dWgPaQHePLi3Jk+iJ8lwZxsWEoNy2Lcv91rMxATWHqRaFdQpw==", + "dev": true, + "peer": true, "dependencies": { "@solidity-parser/parser": "^0.14.0", "@truffle/provider": "^0.2.24", @@ -7442,6 +8272,8 @@ "version": "8.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dev": true, + "peer": true, "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^4.0.0", @@ -7455,6 +8287,8 @@ "version": "7.6.2", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "dev": true, + "peer": true, "bin": { "semver": "bin/semver.js" }, @@ -7471,7 +8305,9 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", "integrity": "sha512-CBdZ2oa/BHhS4xj5DlhjWNHcan57/5YuvfdLf17iVmIpd9KRm+DFLmC6nBNj+6Ua7Kt3TmOjDpQT1aTYOQtoUA==", + "dev": true, "optional": true, + "peer": true, "dependencies": { "amdefine": ">=0.0.4" }, @@ -7499,12 +8335,16 @@ "node_modules/sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true, + "peer": true }, "node_modules/sshpk": { "version": "1.18.0", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz", "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==", + "dev": true, + "peer": true, "dependencies": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", @@ -7528,7 +8368,9 @@ "node_modules/sshpk/node_modules/tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==" + "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==", + "dev": true, + "peer": true }, "node_modules/stacktrace-parser": { "version": "0.1.10", @@ -7561,6 +8403,8 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", "integrity": "sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==", + "dev": true, + "peer": true, "engines": { "node": ">=0.10.0" } @@ -7576,7 +8420,9 @@ "node_modules/string-format": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/string-format/-/string-format-2.0.0.tgz", - "integrity": "sha512-bbEs3scLeYNXLecRRuk6uJxdXUSj6le/8rNPHChIJTn2V79aXVTR1EH2OH5zLKKoz0V02fOUKZZcw01pLUShZA==" + "integrity": "sha512-bbEs3scLeYNXLecRRuk6uJxdXUSj6le/8rNPHChIJTn2V79aXVTR1EH2OH5zLKKoz0V02fOUKZZcw01pLUShZA==", + "dev": true, + "peer": true }, "node_modules/string-width": { "version": "4.2.3", @@ -7640,6 +8486,8 @@ "version": "0.1.42", "resolved": "https://registry.npmjs.org/swarm-js/-/swarm-js-0.1.42.tgz", "integrity": "sha512-BV7c/dVlA3R6ya1lMlSSNPLYrntt0LUq4YMgy3iwpCIc6rZnS5W2wUoctarZ5pXlpKtxDDf9hNziEkcfrxdhqQ==", + "dev": true, + "peer": true, "dependencies": { "bluebird": "^3.5.0", "buffer": "^5.0.5", @@ -7658,6 +8506,8 @@ "version": "4.0.6", "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", + "dev": true, + "peer": true, "dependencies": { "defer-to-connect": "^2.0.0" }, @@ -7669,6 +8519,8 @@ "version": "5.0.4", "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==", + "dev": true, + "peer": true, "engines": { "node": ">=10.6.0" } @@ -7677,6 +8529,8 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", + "dev": true, + "peer": true, "dependencies": { "graceful-fs": "^4.1.2", "jsonfile": "^4.0.0", @@ -7687,6 +8541,8 @@ "version": "11.8.6", "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz", "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==", + "dev": true, + "peer": true, "dependencies": { "@sindresorhus/is": "^4.0.0", "@szmarczak/http-timer": "^4.0.5", @@ -7711,6 +8567,8 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==", + "dev": true, + "peer": true, "dependencies": { "quick-lru": "^5.1.1", "resolve-alpn": "^1.0.0" @@ -7723,6 +8581,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", + "dev": true, + "peer": true, "engines": { "node": ">=8" } @@ -7731,6 +8591,8 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", + "dev": true, + "peer": true, "engines": { "node": ">=8" } @@ -7739,6 +8601,8 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/sync-request/-/sync-request-6.1.0.tgz", "integrity": "sha512-8fjNkrNlNCrVc/av+Jn+xxqfCjYaBoHqCsDz6mt030UMxJGr+GSfCV1dQt2gRtlL63+VPidwDVLr7V2OcTSdRw==", + "dev": true, + "peer": true, "dependencies": { "http-response-object": "^3.0.1", "sync-rpc": "^1.2.1", @@ -7752,6 +8616,8 @@ "version": "1.3.6", "resolved": "https://registry.npmjs.org/sync-rpc/-/sync-rpc-1.3.6.tgz", "integrity": "sha512-J8jTXuZzRlvU7HemDgHi3pGnh/rkoqR/OZSjhTyyZrEkkYQbk7Z33AXp37mkPfPpfdOuj7Ex3H/TJM1z48uPQw==", + "dev": true, + "peer": true, "dependencies": { "get-port": "^3.1.0" } @@ -7760,6 +8626,8 @@ "version": "6.8.2", "resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz", "integrity": "sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==", + "dev": true, + "peer": true, "dependencies": { "ajv": "^8.0.1", "lodash.truncate": "^4.4.2", @@ -7775,6 +8643,8 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/table-layout/-/table-layout-1.0.2.tgz", "integrity": "sha512-qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A==", + "dev": true, + "peer": true, "dependencies": { "array-back": "^4.0.1", "deep-extend": "~0.6.0", @@ -7789,6 +8659,8 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz", "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==", + "dev": true, + "peer": true, "engines": { "node": ">=8" } @@ -7797,6 +8669,8 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz", "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==", + "dev": true, + "peer": true, "engines": { "node": ">=8" } @@ -7805,6 +8679,8 @@ "version": "4.4.19", "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz", "integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==", + "dev": true, + "peer": true, "dependencies": { "chownr": "^1.1.4", "fs-minipass": "^1.2.7", @@ -7822,6 +8698,8 @@ "version": "0.5.6", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "dev": true, + "peer": true, "dependencies": { "minimist": "^1.2.6" }, @@ -7833,6 +8711,8 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/then-request/-/then-request-6.0.2.tgz", "integrity": "sha512-3ZBiG7JvP3wbDzA9iNY5zJQcHL4jn/0BWtXIkagfz7QgOL/LqjCEOBQuJNZfu0XYnv5JhKh+cDxCPM4ILrqruA==", + "dev": true, + "peer": true, "dependencies": { "@types/concat-stream": "^1.6.0", "@types/form-data": "0.0.33", @@ -7853,12 +8733,16 @@ "node_modules/then-request/node_modules/@types/node": { "version": "8.10.66", "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.66.tgz", - "integrity": "sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==" + "integrity": "sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==", + "dev": true, + "peer": true }, "node_modules/then-request/node_modules/form-data": { "version": "2.5.1", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz", "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==", + "dev": true, + "peer": true, "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", @@ -7872,6 +8756,8 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", "integrity": "sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA==", + "dev": true, + "peer": true, "engines": { "node": ">=0.10.0" } @@ -7891,6 +8777,8 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==", + "dev": true, + "peer": true, "engines": { "node": ">=6" } @@ -7918,6 +8806,8 @@ "version": "2.5.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "dev": true, + "peer": true, "dependencies": { "psl": "^1.1.28", "punycode": "^2.1.1" @@ -7929,12 +8819,16 @@ "node_modules/tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "dev": true, + "peer": true }, "node_modules/ts-command-line-args": { "version": "2.5.1", "resolved": "https://registry.npmjs.org/ts-command-line-args/-/ts-command-line-args-2.5.1.tgz", "integrity": "sha512-H69ZwTw3rFHb5WYpQya40YAX2/w7Ut75uUECbgBIsLmM+BNuYnxsltfyyLMxy6sEeKxgijLTnQtLd0nKd6+IYw==", + "dev": true, + "peer": true, "dependencies": { "chalk": "^4.1.0", "command-line-args": "^5.1.1", @@ -7949,6 +8843,8 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "peer": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -7963,6 +8859,8 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "peer": true, "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -7978,6 +8876,8 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "peer": true, "dependencies": { "color-name": "~1.1.4" }, @@ -7988,12 +8888,16 @@ "node_modules/ts-command-line-args/node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "peer": true }, "node_modules/ts-command-line-args/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "peer": true, "engines": { "node": ">=8" } @@ -8002,6 +8906,8 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "peer": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -8013,6 +8919,8 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-7.0.3.tgz", "integrity": "sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ==", + "dev": true, + "peer": true, "peerDependencies": { "typescript": ">=3.7.0" } @@ -8081,6 +8989,8 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", + "dev": true, + "peer": true, "dependencies": { "safe-buffer": "^5.0.1" }, @@ -8101,12 +9011,16 @@ "node_modules/type": { "version": "2.7.2", "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz", - "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==" + "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==", + "dev": true, + "peer": true }, "node_modules/type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", + "dev": true, + "peer": true, "dependencies": { "prelude-ls": "~1.1.2" }, @@ -8137,6 +9051,8 @@ "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "dev": true, + "peer": true, "dependencies": { "media-typer": "0.3.0", "mime-types": "~2.1.24" @@ -8149,6 +9065,8 @@ "version": "8.3.2", "resolved": "https://registry.npmjs.org/typechain/-/typechain-8.3.2.tgz", "integrity": "sha512-x/sQYr5w9K7yv3es7jo4KTX05CLxOf7TRWwoHlrjRh8H82G64g+k7VuWPJlgMo6qrjfCulOdfBjiaDtmhFYD/Q==", + "dev": true, + "peer": true, "dependencies": { "@types/prettier": "^2.1.1", "debug": "^4.3.1", @@ -8172,6 +9090,8 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "peer": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -8181,6 +9101,8 @@ "version": "7.1.7", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", + "dev": true, + "peer": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -8200,6 +9122,8 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "peer": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -8211,6 +9135,8 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true, + "peer": true, "bin": { "mkdirp": "bin/cmd.js" }, @@ -8221,12 +9147,16 @@ "node_modules/typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==" + "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==", + "dev": true, + "peer": true }, "node_modules/typedarray-to-buffer": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "dev": true, + "peer": true, "dependencies": { "is-typedarray": "^1.0.0" } @@ -8247,6 +9177,8 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz", "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==", + "dev": true, + "peer": true, "engines": { "node": ">=8" } @@ -8255,7 +9187,9 @@ "version": "3.17.4", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz", "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==", + "dev": true, "optional": true, + "peer": true, "bin": { "uglifyjs": "bin/uglifyjs" }, @@ -8271,7 +9205,9 @@ "node_modules/ultron": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", - "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==" + "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==", + "dev": true, + "peer": true }, "node_modules/undici": { "version": "5.28.4", @@ -8309,6 +9245,8 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "peer": true, "dependencies": { "punycode": "^2.1.0" } @@ -8317,6 +9255,8 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", "integrity": "sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==", + "dev": true, + "peer": true, "dependencies": { "prepend-http": "^2.0.0" }, @@ -8327,13 +9267,17 @@ "node_modules/url-set-query": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/url-set-query/-/url-set-query-1.0.0.tgz", - "integrity": "sha512-3AChu4NiXquPfeckE5R5cGdiHCMWJx1dwCWOmWIL4KHAziJNOFIYJlpGFeKDvwLPHovZRCxK3cYlwzqI9Vp+Gg==" + "integrity": "sha512-3AChu4NiXquPfeckE5R5cGdiHCMWJx1dwCWOmWIL4KHAziJNOFIYJlpGFeKDvwLPHovZRCxK3cYlwzqI9Vp+Gg==", + "dev": true, + "peer": true }, "node_modules/utf-8-validate": { "version": "5.0.10", "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz", "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==", + "devOptional": true, "hasInstallScript": true, + "peer": true, "dependencies": { "node-gyp-build": "^4.3.0" }, @@ -8344,12 +9288,16 @@ "node_modules/utf8": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz", - "integrity": "sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ==" + "integrity": "sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ==", + "dev": true, + "peer": true }, "node_modules/util": { "version": "0.12.5", "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==", + "dev": true, + "peer": true, "dependencies": { "inherits": "^2.0.3", "is-arguments": "^1.0.4", @@ -8367,6 +9315,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.4.0" } @@ -8375,7 +9325,9 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz", "integrity": "sha512-nWg9+Oa3qD2CQzHIP4qKUqwNfzKn8P0LtFhotaCTFchsV7ZfDhAybeip/HZVeMIpZi9JgY1E3nUlwaCmZT1sEg==", - "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details." + "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", + "dev": true, + "peer": true }, "node_modules/v8-compile-cache-lib": { "version": "3.0.1", @@ -8385,12 +9337,16 @@ "node_modules/varint": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/varint/-/varint-5.0.2.tgz", - "integrity": "sha512-lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow==" + "integrity": "sha512-lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow==", + "dev": true, + "peer": true }, "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "dev": true, + "peer": true, "engines": { "node": ">= 0.8" } @@ -8399,9 +9355,11 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==", + "dev": true, "engines": [ "node >=0.6.0" ], + "peer": true, "dependencies": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", @@ -8411,13 +9369,17 @@ "node_modules/verror/node_modules/core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==" + "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==", + "dev": true, + "peer": true }, "node_modules/web3": { "version": "1.7.4", "resolved": "https://registry.npmjs.org/web3/-/web3-1.7.4.tgz", "integrity": "sha512-iFGK5jO32vnXM/ASaJBaI0+gVR6uHozvYdxkdhaeOCD6HIQ4iIXadbO2atVpE9oc/H8l2MovJ4LtPhG7lIBN8A==", + "dev": true, "hasInstallScript": true, + "peer": true, "dependencies": { "web3-bzz": "1.7.4", "web3-core": "1.7.4", @@ -8435,7 +9397,9 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.10.0.tgz", "integrity": "sha512-o9IR59io3pDUsXTsps5pO5hW1D5zBmg46iNc2t4j2DkaYHNdDLwk2IP9ukoM2wg47QILfPEJYzhTfkS/CcX0KA==", + "dev": true, "hasInstallScript": true, + "peer": true, "dependencies": { "@types/node": "^12.12.6", "got": "12.1.0", @@ -8448,12 +9412,16 @@ "node_modules/web3-bzz/node_modules/@types/node": { "version": "12.20.55", "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz", - "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==" + "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==", + "dev": true, + "peer": true }, "node_modules/web3-core": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.10.0.tgz", "integrity": "sha512-fWySwqy2hn3TL89w5TM8wXF1Z2Q6frQTKHWmP0ppRQorEK8NcHJRfeMiv/mQlSKoTS1F6n/nv2uyZsixFycjYQ==", + "dev": true, + "peer": true, "dependencies": { "@types/bn.js": "^5.1.1", "@types/node": "^12.12.6", @@ -8471,6 +9439,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.10.0.tgz", "integrity": "sha512-pIxAzFDS5vnbXvfvLSpaA1tfRykAe9adw43YCKsEYQwH0gCLL0kMLkaCX3q+Q8EVmAh+e1jWL/nl9U0de1+++g==", + "dev": true, + "peer": true, "dependencies": { "web3-eth-iban": "1.10.0", "web3-utils": "1.10.0" @@ -8483,6 +9453,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.0.tgz", "integrity": "sha512-kSaCM0uMcZTNUSmn5vMEhlo02RObGNRRCkdX0V9UTAU0+lrvn0HSaudyCo6CQzuXUsnuY2ERJGCGPfeWmv19Rg==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^5.2.1", "ethereum-bloom-filters": "^1.0.6", @@ -8500,6 +9472,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.10.0.tgz", "integrity": "sha512-4R700jTLAMKDMhQ+nsVfIXvH6IGJlJzGisIfMKWAIswH31h5AZz7uDUW2YctI+HrYd+5uOAlS4OJeeT9bIpvkA==", + "dev": true, + "peer": true, "dependencies": { "@ethersproject/transactions": "^5.6.2", "web3-core-helpers": "1.10.0", @@ -8515,6 +9489,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.0.tgz", "integrity": "sha512-kSaCM0uMcZTNUSmn5vMEhlo02RObGNRRCkdX0V9UTAU0+lrvn0HSaudyCo6CQzuXUsnuY2ERJGCGPfeWmv19Rg==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^5.2.1", "ethereum-bloom-filters": "^1.0.6", @@ -8532,6 +9508,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.10.0.tgz", "integrity": "sha512-68N7k5LWL5R38xRaKFrTFT2pm2jBNFaM4GioS00YjAKXRQ3KjmhijOMG3TICz6Aa5+6GDWYelDNx21YAeZ4YTg==", + "dev": true, + "peer": true, "dependencies": { "eventemitter3": "4.0.4" }, @@ -8543,6 +9521,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.10.0.tgz", "integrity": "sha512-3z/JKE++Os62APml4dvBM+GAuId4h3L9ckUrj7ebEtS2AR0ixyQPbrBodgL91Sv7j7cQ3Y+hllaluqjguxvSaQ==", + "dev": true, + "peer": true, "dependencies": { "util": "^0.12.5", "web3-core-helpers": "1.10.0", @@ -8558,6 +9538,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.10.0.tgz", "integrity": "sha512-HGm1PbDqsxejI075gxBc5OSkwymilRWZufIy9zEpnWKNmfbuv5FfHgW1/chtJP6aP3Uq2vHkvTDl3smQBb8l+g==", + "dev": true, + "peer": true, "dependencies": { "eventemitter3": "4.0.4", "web3-core-helpers": "1.10.0" @@ -8569,12 +9551,16 @@ "node_modules/web3-core/node_modules/@types/node": { "version": "12.20.55", "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz", - "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==" + "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==", + "dev": true, + "peer": true }, "node_modules/web3-core/node_modules/web3-utils": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.0.tgz", "integrity": "sha512-kSaCM0uMcZTNUSmn5vMEhlo02RObGNRRCkdX0V9UTAU0+lrvn0HSaudyCo6CQzuXUsnuY2ERJGCGPfeWmv19Rg==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^5.2.1", "ethereum-bloom-filters": "^1.0.6", @@ -8592,6 +9578,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.10.0.tgz", "integrity": "sha512-Z5vT6slNMLPKuwRyKGbqeGYC87OAy8bOblaqRTgg94CXcn/mmqU7iPIlG4506YdcdK3x6cfEDG7B6w+jRxypKA==", + "dev": true, + "peer": true, "dependencies": { "web3-core": "1.10.0", "web3-core-helpers": "1.10.0", @@ -8614,6 +9602,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.10.0.tgz", "integrity": "sha512-cwS+qRBWpJ43aI9L3JS88QYPfFcSJJ3XapxOQ4j40v6mk7ATpA8CVK1vGTzpihNlOfMVRBkR95oAj7oL6aiDOg==", + "dev": true, + "peer": true, "dependencies": { "@ethersproject/abi": "^5.6.3", "web3-utils": "1.10.0" @@ -8626,6 +9616,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.0.tgz", "integrity": "sha512-kSaCM0uMcZTNUSmn5vMEhlo02RObGNRRCkdX0V9UTAU0+lrvn0HSaudyCo6CQzuXUsnuY2ERJGCGPfeWmv19Rg==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^5.2.1", "ethereum-bloom-filters": "^1.0.6", @@ -8643,6 +9635,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.10.0.tgz", "integrity": "sha512-wiq39Uc3mOI8rw24wE2n15hboLE0E9BsQLdlmsL4Zua9diDS6B5abXG0XhFcoNsXIGMWXVZz4TOq3u4EdpXF/Q==", + "dev": true, + "peer": true, "dependencies": { "@ethereumjs/common": "2.5.0", "@ethereumjs/tx": "3.3.2", @@ -8662,12 +9656,16 @@ "node_modules/web3-eth-accounts/node_modules/bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true, + "peer": true }, "node_modules/web3-eth-accounts/node_modules/eth-lib": { "version": "0.2.8", "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz", "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^4.11.6", "elliptic": "^6.4.0", @@ -8678,10 +9676,12 @@ "version": "9.0.1", "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "dev": true, "funding": [ "https://github.com/sponsors/broofa", "https://github.com/sponsors/ctavan" ], + "peer": true, "bin": { "uuid": "dist/bin/uuid" } @@ -8690,6 +9690,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.0.tgz", "integrity": "sha512-kSaCM0uMcZTNUSmn5vMEhlo02RObGNRRCkdX0V9UTAU0+lrvn0HSaudyCo6CQzuXUsnuY2ERJGCGPfeWmv19Rg==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^5.2.1", "ethereum-bloom-filters": "^1.0.6", @@ -8706,12 +9708,16 @@ "node_modules/web3-eth-accounts/node_modules/web3-utils/node_modules/bn.js": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", - "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" + "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==", + "dev": true, + "peer": true }, "node_modules/web3-eth-contract": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.10.0.tgz", "integrity": "sha512-MIC5FOzP/+2evDksQQ/dpcXhSqa/2hFNytdl/x61IeWxhh6vlFeSjq0YVTAyIzdjwnL7nEmZpjfI6y6/Ufhy7w==", + "dev": true, + "peer": true, "dependencies": { "@types/bn.js": "^5.1.1", "web3-core": "1.10.0", @@ -8730,6 +9736,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.0.tgz", "integrity": "sha512-kSaCM0uMcZTNUSmn5vMEhlo02RObGNRRCkdX0V9UTAU0+lrvn0HSaudyCo6CQzuXUsnuY2ERJGCGPfeWmv19Rg==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^5.2.1", "ethereum-bloom-filters": "^1.0.6", @@ -8747,6 +9755,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.10.0.tgz", "integrity": "sha512-3hpGgzX3qjgxNAmqdrC2YUQMTfnZbs4GeLEmy8aCWziVwogbuqQZ+Gzdfrym45eOZodk+lmXyLuAdqkNlvkc1g==", + "dev": true, + "peer": true, "dependencies": { "content-hash": "^2.5.2", "eth-ens-namehash": "2.0.8", @@ -8765,6 +9775,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.0.tgz", "integrity": "sha512-kSaCM0uMcZTNUSmn5vMEhlo02RObGNRRCkdX0V9UTAU0+lrvn0HSaudyCo6CQzuXUsnuY2ERJGCGPfeWmv19Rg==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^5.2.1", "ethereum-bloom-filters": "^1.0.6", @@ -8782,6 +9794,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.10.0.tgz", "integrity": "sha512-0l+SP3IGhInw7Q20LY3IVafYEuufo4Dn75jAHT7c2aDJsIolvf2Lc6ugHkBajlwUneGfbRQs/ccYPQ9JeMUbrg==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^5.2.1", "web3-utils": "1.10.0" @@ -8794,6 +9808,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.0.tgz", "integrity": "sha512-kSaCM0uMcZTNUSmn5vMEhlo02RObGNRRCkdX0V9UTAU0+lrvn0HSaudyCo6CQzuXUsnuY2ERJGCGPfeWmv19Rg==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^5.2.1", "ethereum-bloom-filters": "^1.0.6", @@ -8811,6 +9827,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.10.0.tgz", "integrity": "sha512-anseKn98w/d703eWq52uNuZi7GhQeVjTC5/svrBWEKob0WZ5kPdo+EZoFN0sp5a5ubbrk/E0xSl1/M5yORMtpg==", + "dev": true, + "peer": true, "dependencies": { "@types/node": "^12.12.6", "web3-core": "1.10.0", @@ -8826,12 +9844,16 @@ "node_modules/web3-eth-personal/node_modules/@types/node": { "version": "12.20.55", "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz", - "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==" + "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==", + "dev": true, + "peer": true }, "node_modules/web3-eth-personal/node_modules/web3-utils": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.0.tgz", "integrity": "sha512-kSaCM0uMcZTNUSmn5vMEhlo02RObGNRRCkdX0V9UTAU0+lrvn0HSaudyCo6CQzuXUsnuY2ERJGCGPfeWmv19Rg==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^5.2.1", "ethereum-bloom-filters": "^1.0.6", @@ -8849,6 +9871,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.0.tgz", "integrity": "sha512-kSaCM0uMcZTNUSmn5vMEhlo02RObGNRRCkdX0V9UTAU0+lrvn0HSaudyCo6CQzuXUsnuY2ERJGCGPfeWmv19Rg==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^5.2.1", "ethereum-bloom-filters": "^1.0.6", @@ -8866,6 +9890,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.10.0.tgz", "integrity": "sha512-NLH/N3IshYWASpxk4/18Ge6n60GEvWBVeM8inx2dmZJVmRI6SJIlUxbL8jySgiTn3MMZlhbdvrGo8fpUW7a1GA==", + "dev": true, + "peer": true, "dependencies": { "web3-core": "1.10.0", "web3-core-method": "1.10.0", @@ -8879,6 +9905,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.0.tgz", "integrity": "sha512-kSaCM0uMcZTNUSmn5vMEhlo02RObGNRRCkdX0V9UTAU0+lrvn0HSaudyCo6CQzuXUsnuY2ERJGCGPfeWmv19Rg==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^5.2.1", "ethereum-bloom-filters": "^1.0.6", @@ -8896,6 +9924,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.10.0.tgz", "integrity": "sha512-eNr965YB8a9mLiNrkjAWNAPXgmQWfpBfkkn7tpEFlghfww0u3I0tktMZiaToJVcL2+Xq+81cxbkpeWJ5XQDwOA==", + "dev": true, + "peer": true, "dependencies": { "abortcontroller-polyfill": "^1.7.3", "cross-fetch": "^3.1.4", @@ -8910,6 +9940,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.10.0.tgz", "integrity": "sha512-OfXG1aWN8L1OUqppshzq8YISkWrYHaATW9H8eh0p89TlWMc1KZOL9vttBuaBEi96D/n0eYDn2trzt22bqHWfXA==", + "dev": true, + "peer": true, "dependencies": { "oboe": "2.1.5", "web3-core-helpers": "1.10.0" @@ -8922,6 +9954,8 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.10.0.tgz", "integrity": "sha512-sK0fNcglW36yD5xjnjtSGBnEtf59cbw4vZzJ+CmOWIKGIR96mP5l684g0WD0Eo+f4NQc2anWWXG74lRc9OVMCQ==", + "dev": true, + "peer": true, "dependencies": { "eventemitter3": "4.0.4", "web3-core-helpers": "1.10.0", @@ -8935,7 +9969,9 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.10.0.tgz", "integrity": "sha512-uNUUuNsO2AjX41GJARV9zJibs11eq6HtOe6Wr0FtRUcj8SN6nHeYIzwstAvJ4fXA53gRqFMTxdntHEt9aXVjpg==", + "dev": true, "hasInstallScript": true, + "peer": true, "dependencies": { "web3-core": "1.10.0", "web3-core-method": "1.10.0", @@ -8950,6 +9986,8 @@ "version": "1.10.4", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.4.tgz", "integrity": "sha512-tsu8FiKJLk2PzhDl9fXbGUWTkkVXYhtTA+SmEFkKft+9BgwLxfCRpU96sWv7ICC8zixBNd3JURVoiR3dUXgP8A==", + "dev": true, + "peer": true, "dependencies": { "@ethereumjs/util": "^8.1.0", "bn.js": "^5.2.1", @@ -8968,6 +10006,8 @@ "version": "1.3.3", "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.3.tgz", "integrity": "sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA==", + "dev": true, + "peer": true, "engines": { "node": ">= 16" }, @@ -8979,6 +10019,8 @@ "version": "1.3.3", "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.3.3.tgz", "integrity": "sha512-LJaN3HwRbfQK0X1xFSi0Q9amqOgzQnnDngIt+ZlsBC3Bm7/nE7K0kwshZHyaru79yIVRv/e1mQAjZyuZG6jOFQ==", + "dev": true, + "peer": true, "dependencies": { "@noble/curves": "~1.3.0", "@noble/hashes": "~1.3.2", @@ -8992,6 +10034,8 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.2.2.tgz", "integrity": "sha512-HYf9TUXG80beW+hGAt3TRM8wU6pQoYur9iNypTROm42dorCGmLnFe3eWjz3gOq6G62H2WRh0FCzAR1PI+29zIA==", + "dev": true, + "peer": true, "dependencies": { "@noble/hashes": "~1.3.2", "@scure/base": "~1.1.4" @@ -9004,6 +10048,8 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.1.3.tgz", "integrity": "sha512-BlwbIL7/P45W8FGW2r7LGuvoEZ+7PWsniMvQ4p5s2xCyw9tmaDlpfsN9HjAucbF+t/qpVHwZUisgfK24TCW8aA==", + "dev": true, + "peer": true, "dependencies": { "@noble/curves": "1.3.0", "@noble/hashes": "1.3.3", @@ -9015,6 +10061,8 @@ "version": "0.14.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==", + "dev": true, + "peer": true, "engines": { "node": ">=6" } @@ -9023,6 +10071,8 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", + "dev": true, + "peer": true, "dependencies": { "defer-to-connect": "^1.0.1" }, @@ -9033,12 +10083,16 @@ "node_modules/web3/node_modules/@types/node": { "version": "12.20.55", "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz", - "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==" + "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==", + "dev": true, + "peer": true }, "node_modules/web3/node_modules/cacheable-request": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", + "dev": true, + "peer": true, "dependencies": { "clone-response": "^1.0.2", "get-stream": "^5.1.0", @@ -9056,6 +10110,8 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dev": true, + "peer": true, "dependencies": { "pump": "^3.0.0" }, @@ -9070,6 +10126,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", + "dev": true, + "peer": true, "engines": { "node": ">=8" } @@ -9078,6 +10136,8 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==", + "dev": true, + "peer": true, "dependencies": { "mimic-response": "^1.0.0" }, @@ -9088,12 +10148,16 @@ "node_modules/web3/node_modules/defer-to-connect": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", - "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" + "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==", + "dev": true, + "peer": true }, "node_modules/web3/node_modules/eth-lib": { "version": "0.2.8", "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz", "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^4.11.6", "elliptic": "^6.4.0", @@ -9103,12 +10167,16 @@ "node_modules/web3/node_modules/eth-lib/node_modules/bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true, + "peer": true }, "node_modules/web3/node_modules/get-stream": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "dev": true, + "peer": true, "dependencies": { "pump": "^3.0.0" }, @@ -9120,6 +10188,8 @@ "version": "9.6.0", "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", + "dev": true, + "peer": true, "dependencies": { "@sindresorhus/is": "^0.14.0", "@szmarczak/http-timer": "^1.1.2", @@ -9140,12 +10210,16 @@ "node_modules/web3/node_modules/json-buffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", - "integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==" + "integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==", + "dev": true, + "peer": true }, "node_modules/web3/node_modules/keyv": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", + "dev": true, + "peer": true, "dependencies": { "json-buffer": "3.0.0" } @@ -9154,6 +10228,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", + "dev": true, + "peer": true, "engines": { "node": ">=0.10.0" } @@ -9162,6 +10238,8 @@ "version": "4.5.1", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz", "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==", + "dev": true, + "peer": true, "engines": { "node": ">=8" } @@ -9170,6 +10248,8 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==", + "dev": true, + "peer": true, "engines": { "node": ">=6" } @@ -9178,6 +10258,8 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", "integrity": "sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==", + "dev": true, + "peer": true, "dependencies": { "lowercase-keys": "^1.0.0" } @@ -9187,6 +10269,8 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", + "dev": true, + "peer": true, "bin": { "uuid": "bin/uuid" } @@ -9195,7 +10279,9 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.7.4.tgz", "integrity": "sha512-w9zRhyEqTK/yi0LGRHjZMcPCfP24LBjYXI/9YxFw9VqsIZ9/G0CRCnUt12lUx0A56LRAMpF7iQ8eA73aBcO29Q==", + "dev": true, "hasInstallScript": true, + "peer": true, "dependencies": { "@types/node": "^12.12.6", "got": "9.6.0", @@ -9209,6 +10295,8 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.7.4.tgz", "integrity": "sha512-L0DCPlIh9bgIED37tYbe7bsWrddoXYc897ANGvTJ6MFkSNGiMwDkTLWSgYd9Mf8qu8b4iuPqXZHMwIo4atoh7Q==", + "dev": true, + "peer": true, "dependencies": { "@types/bn.js": "^5.1.0", "@types/node": "^12.12.6", @@ -9226,6 +10314,8 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.7.4.tgz", "integrity": "sha512-F8PH11qIkE/LpK4/h1fF/lGYgt4B6doeMi8rukeV/s4ivseZHHslv1L6aaijLX/g/j4PsFmR42byynBI/MIzFg==", + "dev": true, + "peer": true, "dependencies": { "web3-eth-iban": "1.7.4", "web3-utils": "1.7.4" @@ -9238,6 +10328,8 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.7.4.tgz", "integrity": "sha512-56K7pq+8lZRkxJyzf5MHQPI9/VL3IJLoy4L/+q8HRdZJ3CkB1DkXYaXGU2PeylG1GosGiSzgIfu1ljqS7CP9xQ==", + "dev": true, + "peer": true, "dependencies": { "@ethersproject/transactions": "^5.6.2", "web3-core-helpers": "1.7.4", @@ -9253,6 +10345,8 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.7.4.tgz", "integrity": "sha512-o4uxwXKDldN7ER7VUvDfWsqTx9nQSP1aDssi1XYXeYC2xJbVo0n+z6ryKtmcoWoRdRj7uSpVzal3nEmlr480mA==", + "dev": true, + "peer": true, "dependencies": { "eventemitter3": "4.0.4" }, @@ -9264,6 +10358,8 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.7.4.tgz", "integrity": "sha512-IuXdAm65BQtPL4aI6LZJJOrKAs0SM5IK2Cqo2/lMNvVMT9Kssq6qOk68Uf7EBDH0rPuINi+ReLP+uH+0g3AnPA==", + "dev": true, + "peer": true, "dependencies": { "util": "^0.12.0", "web3-core-helpers": "1.7.4", @@ -9279,6 +10375,8 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.7.4.tgz", "integrity": "sha512-VJvKWaXRyxk2nFWumOR94ut9xvjzMrRtS38c4qj8WBIRSsugrZr5lqUwgndtj0qx4F+50JhnU++QEqUEAtKm3g==", + "dev": true, + "peer": true, "dependencies": { "eventemitter3": "4.0.4", "web3-core-helpers": "1.7.4" @@ -9291,6 +10389,8 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.7.4.tgz", "integrity": "sha512-JG0tTMv0Ijj039emXNHi07jLb0OiWSA9O24MRSk5vToTQyDNXihdF2oyq85LfHuF690lXZaAXrjhtLNlYqb7Ug==", + "dev": true, + "peer": true, "dependencies": { "web3-core": "1.7.4", "web3-core-helpers": "1.7.4", @@ -9313,6 +10413,8 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.7.4.tgz", "integrity": "sha512-eMZr8zgTbqyL9MCTCAvb67RbVyN5ZX7DvA0jbLOqRWCiw+KlJKTGnymKO6jPE8n5yjk4w01e165Qb11hTDwHgg==", + "dev": true, + "peer": true, "dependencies": { "@ethersproject/abi": "^5.6.3", "web3-utils": "1.7.4" @@ -9325,6 +10427,8 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.7.4.tgz", "integrity": "sha512-Y9vYLRKP7VU7Cgq6wG1jFaG2k3/eIuiTKAG8RAuQnb6Cd9k5BRqTm5uPIiSo0AP/u11jDomZ8j7+WEgkU9+Btw==", + "dev": true, + "peer": true, "dependencies": { "@ethereumjs/common": "^2.5.0", "@ethereumjs/tx": "^3.3.2", @@ -9346,6 +10450,8 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.7.4.tgz", "integrity": "sha512-ZgSZMDVI1pE9uMQpK0T0HDT2oewHcfTCv0osEqf5qyn5KrcQDg1GT96/+S0dfqZ4HKj4lzS5O0rFyQiLPQ8LzQ==", + "dev": true, + "peer": true, "dependencies": { "@types/bn.js": "^5.1.0", "web3-core": "1.7.4", @@ -9364,6 +10470,8 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.7.4.tgz", "integrity": "sha512-Gw5CVU1+bFXP5RVXTCqJOmHn71X2ghNk9VcEH+9PchLr0PrKbHTA3hySpsPco1WJAyK4t8SNQVlNr3+bJ6/WZA==", + "dev": true, + "peer": true, "dependencies": { "content-hash": "^2.5.2", "eth-ens-namehash": "2.0.8", @@ -9382,6 +10490,8 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.7.4.tgz", "integrity": "sha512-XyrsgWlZQMv5gRcjXMsNvAoCRvV5wN7YCfFV5+tHUCqN8g9T/o4XUS20vDWD0k4HNiAcWGFqT1nrls02MGZ08w==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^5.2.1", "web3-utils": "1.7.4" @@ -9394,6 +10504,8 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.7.4.tgz", "integrity": "sha512-O10C1Hln5wvLQsDhlhmV58RhXo+GPZ5+W76frSsyIrkJWLtYQTCr5WxHtRC9sMD1idXLqODKKgI2DL+7xeZ0/g==", + "dev": true, + "peer": true, "dependencies": { "@types/node": "^12.12.6", "web3-core": "1.7.4", @@ -9410,6 +10522,8 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.7.4.tgz", "integrity": "sha512-d2Gj+DIARHvwIdmxFQ4PwAAXZVxYCR2lET0cxz4KXbE5Og3DNjJi+MoPkX+WqoUXqimu/EOd4Cd+7gefqVAFDg==", + "dev": true, + "peer": true, "dependencies": { "web3-core": "1.7.4", "web3-core-method": "1.7.4", @@ -9423,6 +10537,8 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.7.4.tgz", "integrity": "sha512-AU+/S+49rcogUER99TlhW+UBMk0N2DxvN54CJ2pK7alc2TQ7+cprNPLHJu4KREe8ndV0fT6JtWUfOMyTvl+FRA==", + "dev": true, + "peer": true, "dependencies": { "web3-core-helpers": "1.7.4", "xhr2-cookies": "1.1.0" @@ -9435,6 +10551,8 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.7.4.tgz", "integrity": "sha512-jhArOZ235dZy8fS8090t60nTxbd1ap92ibQw5xIrAQ9m7LcZKNfmLAQUVsD+3dTFvadRMi6z1vCO7zRi84gWHw==", + "dev": true, + "peer": true, "dependencies": { "oboe": "2.1.5", "web3-core-helpers": "1.7.4" @@ -9447,6 +10565,8 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.7.4.tgz", "integrity": "sha512-g72X77nrcHMFU8hRzQJzfgi/072n8dHwRCoTw+WQrGp+XCQ71fsk2qIu3Tp+nlp5BPn8bRudQbPblVm2uT4myQ==", + "dev": true, + "peer": true, "dependencies": { "eventemitter3": "4.0.4", "web3-core-helpers": "1.7.4", @@ -9460,7 +10580,9 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.7.4.tgz", "integrity": "sha512-mlSZxSYcMkuMCxqhTYnZkUdahZ11h+bBv/8TlkXp/IHpEe4/Gg+KAbmfudakq3EzG/04z70XQmPgWcUPrsEJ+A==", + "dev": true, "hasInstallScript": true, + "peer": true, "dependencies": { "web3-core": "1.7.4", "web3-core-method": "1.7.4", @@ -9475,6 +10597,8 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.7.4.tgz", "integrity": "sha512-acBdm6Evd0TEZRnChM/MCvGsMwYKmSh7OaUfNf5OKG0CIeGWD/6gqLOWIwmwSnre/2WrA1nKGId5uW2e5EfluA==", + "dev": true, + "peer": true, "dependencies": { "bn.js": "^5.2.1", "ethereum-bloom-filters": "^1.0.6", @@ -9491,12 +10615,16 @@ "node_modules/webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "dev": true, + "peer": true }, "node_modules/websocket": { "version": "1.0.35", "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.35.tgz", "integrity": "sha512-/REy6amwPZl44DDzvRCkaI1q1bIiQB0mEFQLUrhz3z2EK91cp3n72rAjUlrTP0zV22HJIUOVHQGPxhFRjxjt+Q==", + "dev": true, + "peer": true, "dependencies": { "bufferutil": "^4.0.1", "debug": "^2.2.0", @@ -9513,6 +10641,8 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "peer": true, "dependencies": { "ms": "2.0.0" } @@ -9520,12 +10650,16 @@ "node_modules/websocket/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true, + "peer": true }, "node_modules/whatwg-url": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dev": true, + "peer": true, "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -9535,6 +10669,8 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "peer": true, "dependencies": { "isexe": "^2.0.0" }, @@ -9546,6 +10682,8 @@ "version": "1.1.15", "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", + "dev": true, + "peer": true, "dependencies": { "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.7", @@ -9575,6 +10713,8 @@ "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "peer": true, "engines": { "node": ">=0.10.0" } @@ -9582,12 +10722,16 @@ "node_modules/wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==" + "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", + "dev": true, + "peer": true }, "node_modules/wordwrapjs": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.1.tgz", "integrity": "sha512-kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA==", + "dev": true, + "peer": true, "dependencies": { "reduce-flatten": "^2.0.0", "typical": "^5.2.0" @@ -9600,6 +10744,8 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz", "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==", + "dev": true, + "peer": true, "engines": { "node": ">=8" } @@ -9684,6 +10830,8 @@ "version": "2.6.0", "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.6.0.tgz", "integrity": "sha512-/eCGLb5rxjx5e3mF1A7s+pLlR6CGyqWN91fv1JgER5mVWg1MZmlhBvy9kjcsOdRk8RrIujotWyJamfyrp+WIcA==", + "dev": true, + "peer": true, "dependencies": { "global": "~4.4.0", "is-function": "^1.0.1", @@ -9695,6 +10843,8 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/xhr-request/-/xhr-request-1.1.0.tgz", "integrity": "sha512-Y7qzEaR3FDtL3fP30k9wO/e+FBnBByZeybKOhASsGP30NIkRAAkKD/sCnLvgEfAIEC1rcmK7YG8f4oEnIrrWzA==", + "dev": true, + "peer": true, "dependencies": { "buffer-to-arraybuffer": "^0.0.5", "object-assign": "^4.1.1", @@ -9709,6 +10859,8 @@ "version": "0.1.3", "resolved": "https://registry.npmjs.org/xhr-request-promise/-/xhr-request-promise-0.1.3.tgz", "integrity": "sha512-YUBytBsuwgitWtdRzXDDkWAXzhdGB8bYm0sSzMPZT7Z2MBjMSTHFsyCT1yCRATY+XC69DUrQraRAEgcoCRaIPg==", + "dev": true, + "peer": true, "dependencies": { "xhr-request": "^1.1.0" } @@ -9717,6 +10869,8 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/xhr2-cookies/-/xhr2-cookies-1.1.0.tgz", "integrity": "sha512-hjXUA6q+jl/bd8ADHcVfFsSPIf+tyLIjuO9TwJC9WI6JP2zKcS7C+p56I9kCLLsaCiNT035iYvEUUzdEFj/8+g==", + "dev": true, + "peer": true, "dependencies": { "cookiejar": "^2.1.1" } @@ -9725,6 +10879,8 @@ "version": "1.8.0", "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz", "integrity": "sha512-58Im/U0mlVBLM38NdZjHyhuMtCqa61469k2YP/AaPbvCoV9aQGUpbJBj1QRm2ytRiVQBD/fsw7L2bJGDVQswBA==", + "dev": true, + "peer": true, "engines": { "node": ">=0.4.0" } @@ -9733,6 +10889,8 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "dev": true, + "peer": true, "engines": { "node": ">=0.4" } @@ -9749,6 +10907,8 @@ "version": "0.0.6", "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz", "integrity": "sha512-MvQa//+KcZCUkBTIC9blM+CU9J2GzuTytsOUwf2lidtvkx/6gnEp1QvJv34t9vdjhFmha/mUiNDbN0D0mJWdug==", + "dev": true, + "peer": true, "engines": { "node": ">=0.10.32" } @@ -9756,7 +10916,9 @@ "node_modules/yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true, + "peer": true }, "node_modules/yargs": { "version": "16.2.0", diff --git a/tests/solidity/package.json b/tests/solidity/package.json index c7922671..36f55573 100644 --- a/tests/solidity/package.json +++ b/tests/solidity/package.json @@ -2,6 +2,8 @@ "name": "solidity-test", "devDependencies": { "@nomicfoundation/hardhat-toolbox": "^1.0.2", + "@uniswap/v3-core": "^1.0.1", + "@uniswap/v3-periphery": "^1.4.4", "hardhat": "^2.12.7" }, "scripts": { @@ -9,24 +11,15 @@ "test": "hardhat test --network tronik" }, "dependencies": { - "@ethersproject/providers": "^5.4.7", "@nomicfoundation/hardhat-chai-matchers": "^1.0.0", "@nomicfoundation/hardhat-network-helpers": "^1.0.0", - "@nomiclabs/hardhat-ethers": "^2.0.0", - "@nomiclabs/hardhat-etherscan": "^3.0.0", - "@openzeppelin/contracts": "^4.8.1", + "@openzeppelin/contracts": "^5.0.2", "@swisstronik/swisstronik.js": "^1.0.0", - "@typechain/ethers-v5": "^10.1.0", - "@typechain/hardhat": "^6.1.2", "@types/chai": "^4.2.0", "@types/mocha": ">=9.1.0", "chai": "^4.2.0", - "ethers": "^5.4.7", - "hardhat-gas-reporter": "^1.0.8", - "solidity-coverage": "^0.7.22", "solidity-rlp": "^2.0.8", "ts-node": ">=8.0.0", - "typechain": "^8.1.0", "typescript": ">=4.5.0" } } diff --git a/tests/solidity/test/BlockInfo.js b/tests/solidity/test/BlockInfo.js new file mode 100644 index 00000000..2af7b075 --- /dev/null +++ b/tests/solidity/test/BlockInfo.js @@ -0,0 +1,209 @@ +const { expect } = require("chai"); +const { ethers } = require("hardhat"); +const { sendShieldedQuery } = require("./testUtils") + +describe("BlockInfo", function () { + describe('Unencrypted',() => { + const unencryptedProvider = new ethers.providers.JsonRpcProvider('http://localhost:8547') + const unencryptedSigner = new ethers.Wallet("DBE7E6AE8303E055B68CEFBF01DEC07E76957FF605E5333FA21B6A8022EA7B55", unencryptedProvider) + + let blockInfoContract + + before(async () => { + const factory = await ethers.getContractFactory('BlockInfo') + blockInfoContract = await factory.connect(unencryptedSigner).deploy() + await blockInfoContract.connect(unencryptedProvider).deployed() + }) + + it("Should retrieve block base fee", async () => { + const baseFee = await blockInfoContract.connect(unencryptedProvider).getBlockBaseFee(); + expect(baseFee).to.be.gt(0); + }); + + it("Should retrieve block chain id", async () => { + const chainId = await blockInfoContract.connect(unencryptedProvider).getBlockChainId(); + const providerChainId = await unencryptedProvider.getNetwork().then(n => n.chainId) + expect(chainId).to.equal(providerChainId); + }); + + it("Should retrieve block coinbase", async () => { + const coinbase = await blockInfoContract.connect(unencryptedProvider).getBlockCoinbase(); + expect(ethers.utils.isAddress(coinbase)).to.be.true; + }); + + it("Should retrieve block difficulty", async () => { + const difficulty = await blockInfoContract.connect(unencryptedProvider).getBlockDifficulty(); + expect(difficulty).to.be.equal(0); + }); + + // it("Should retrieve block gas limit", async () => { + // const gasLimit = await blockInfoContract.connect(unencryptedProvider).getBlockGasLimit(); + // expect(gasLimit).to.be.gt(0); + // }); + + it("Should retrieve block number", async () => { + const blockNumber = await blockInfoContract.connect(unencryptedProvider).getBlockNumber(); + expect(blockNumber).to.be.gt(0); + }); + + it("Should retrieve block timestamp", async () => { + const timestamp = await blockInfoContract.connect(unencryptedProvider).getBlockTimestamp(); + expect(timestamp).to.be.gt(0); + }); + + it("Should retrieve blockhash of a previous block", async () => { + const currentBlock = await unencryptedProvider.getBlockNumber(); + const blockHash = await blockInfoContract.connect(unencryptedProvider).getBlockhash(currentBlock - 1); + expect(blockHash).to.not.equal('0x0000000000000000000000000000000000000000000000000000000000000000'); + }); + + describe("Edge cases", function () { + it("Should return zero for block hash of a future block", async () => { + const currentBlock = await unencryptedProvider.getBlockNumber(); + const futureBlockHash = await blockInfoContract.connect(unencryptedProvider).getBlockhash(currentBlock + 1000); + expect(futureBlockHash).to.equal('0x0000000000000000000000000000000000000000000000000000000000000000'); + }); + + it("Should return zero for block hash of a block more than 256 blocks ago", async () => { + const currentBlock = await unencryptedProvider.getBlockNumber(); + if (currentBlock > 256) { + const oldBlockHash = await blockInfoContract.connect(unencryptedProvider).getBlockhash(currentBlock - 257); + expect(oldBlockHash).to.equal('0x0000000000000000000000000000000000000000000000000000000000000000'); + } + }); + }); + }) + + describe('Encrypted',() => { + let blockInfoContract, signer + + before(async () => { + const factory = await ethers.getContractFactory('BlockInfo') + blockInfoContract = await factory.deploy() + await blockInfoContract.deployed() + + const [ethersSigner] = await ethers.getSigners() + signer = ethersSigner + }) + + it("Should retrieve block base fee", async () => { + const baseFeeRes = await sendShieldedQuery( + signer.provider, + blockInfoContract.address, + blockInfoContract.interface.encodeFunctionData("getBlockBaseFee", []) + ); + const baseFee = blockInfoContract.interface.decodeFunctionResult("getBlockBaseFee", baseFeeRes)[0] + + expect(baseFee).to.be.gt(0) + }); + + it("Should retrieve block chain id", async () => { + const [signer] = await ethers.getSigners() + const providerChainId = await signer.provider.getNetwork().then(n => n.chainId) + + const chainIdRes = await sendShieldedQuery( + signer.provider, + blockInfoContract.address, + blockInfoContract.interface.encodeFunctionData("getBlockChainId", []) + ); + const chainId = blockInfoContract.interface.decodeFunctionResult("getBlockChainId", chainIdRes)[0] + + expect(chainId).to.equal(providerChainId) + }); + + it("Should retrieve block coinbase", async () => { + const coinbaseRes = await sendShieldedQuery( + signer.provider, + blockInfoContract.address, + blockInfoContract.interface.encodeFunctionData("getBlockCoinbase", []) + ); + const coinbase = blockInfoContract.interface.decodeFunctionResult("getBlockCoinbase", coinbaseRes)[0] + + expect(ethers.utils.isAddress(coinbase)).to.be.true + }); + + it("Should retrieve block difficulty", async () => { + const difficultyRes = await sendShieldedQuery( + signer.provider, + blockInfoContract.address, + blockInfoContract.interface.encodeFunctionData("getBlockDifficulty", []) + ); + const difficulty = blockInfoContract.interface.decodeFunctionResult("getBlockDifficulty", difficultyRes)[0] + + expect(difficulty).to.be.equal(0) + }); + + // it("Should retrieve block gas limit", async () => { + // const gasLimitRes = await sendShieldedQuery( + // signer.provider, + // blockInfoContract.address, + // blockInfoContract.interface.encodeFunctionData("getBlockGasLimit", []) + // ); + // const gasLimit = blockInfoContract.interface.decodeFunctionResult("getBlockGasLimit", gasLimitRes)[0] + // + // expect(gasLimit).to.be.gt(0) + // }); + + it("Should retrieve block number", async () => { + const blockNumberRes = await sendShieldedQuery( + signer.provider, + blockInfoContract.address, + blockInfoContract.interface.encodeFunctionData("getBlockNumber", []) + ); + const blockNumber = blockInfoContract.interface.decodeFunctionResult("getBlockNumber", blockNumberRes)[0] + + expect(blockNumber).to.be.gt(0) + }); + + it("Should retrieve block timestamp", async () => { + const timestampRes = await sendShieldedQuery( + signer.provider, + blockInfoContract.address, + blockInfoContract.interface.encodeFunctionData("getBlockTimestamp", []) + ); + const timestamp = blockInfoContract.interface.decodeFunctionResult("getBlockTimestamp", timestampRes)[0] + + expect(timestamp).to.be.gt(0) + }); + + it("Should retrieve blockhash of a previous block", async () => { + const currentBlock = await signer.provider.getBlockNumber(); + const blockHashRes = await sendShieldedQuery( + signer.provider, + blockInfoContract.address, + blockInfoContract.interface.encodeFunctionData("getBlockhash", [currentBlock - 1]) + ); + const blockHash = blockInfoContract.interface.decodeFunctionResult("getBlockhash", blockHashRes)[0] + + expect(blockHash).to.not.equal('0x0000000000000000000000000000000000000000000000000000000000000000'); + }); + + describe("Edge cases", function () { + it("Should return zero for block hash of a future block", async () => { + const currentBlock = await signer.provider.getBlockNumber(); + + const blockHashRes = await sendShieldedQuery( + signer.provider, + blockInfoContract.address, + blockInfoContract.interface.encodeFunctionData("getBlockhash", [currentBlock + 1000]) + ); + const futureBlockHash = blockInfoContract.interface.decodeFunctionResult("getBlockhash", blockHashRes)[0] + + expect(futureBlockHash).to.equal('0x0000000000000000000000000000000000000000000000000000000000000000'); + }); + + it("Should return zero for block hash of a block more than 256 blocks ago", async () => { + const currentBlock = await signer.provider.getBlockNumber(); + if (currentBlock > 256) { + const blockHashRes = await sendShieldedQuery( + signer.provider, + blockInfoContract.address, + blockInfoContract.interface.encodeFunctionData("getBlockhash", [currentBlock - 257]) + ); + const oldBlockHash = blockInfoContract.interface.decodeFunctionResult("getBlockhash", blockHashRes)[0] + expect(oldBlockHash).to.equal('0x0000000000000000000000000000000000000000000000000000000000000000'); + } + }); + }); + }) +}); \ No newline at end of file diff --git a/tests/solidity/test/ComplianceBridge.js b/tests/solidity/test/ComplianceBridge.js index 8b67e95c..e9d7b02a 100644 --- a/tests/solidity/test/ComplianceBridge.js +++ b/tests/solidity/test/ComplianceBridge.js @@ -4,14 +4,13 @@ const { sendShieldedTransaction, sendShieldedQuery } = require('./testUtils') const unencryptedProvider = new ethers.providers.JsonRpcProvider('http://localhost:8547') // Unencrypted rpc url +const CONTRACT_ADDRESS = '0x2fc0b35e41a9a2ea248a275269af1c8b3a061167' + describe('ComplianceBridge', () => { - const CONTRACT_ADDRESS = '0x30252afe8c1683fd184c99a3c44aa5d547d59dd4' let contract before(async () => { - const [signer] = await ethers.getSigners() - const ComplianceProxyFactory = await ethers.getContractFactory('ComplianceProxy') - contract = new ethers.Contract(CONTRACT_ADDRESS, ComplianceProxyFactory.interface, signer) + contract = await ethers.getContractAt('ComplianceProxy', CONTRACT_ADDRESS) }) describe('Should not change any state', async () => { diff --git a/tests/solidity/test/Counter.js b/tests/solidity/test/Counter.js index 7b5f6411..7510ec9b 100644 --- a/tests/solidity/test/Counter.js +++ b/tests/solidity/test/Counter.js @@ -7,7 +7,7 @@ describe('Counter', () => { before(async () => { const Counter = await ethers.getContractFactory('Counter') - counterContract = await Counter.deploy() + counterContract = await Counter.deploy({gasLimit: 1_000_000}) await counterContract.deployed() console.log('Counter deployed to: ', counterContract.address) @@ -73,18 +73,12 @@ describe('Counter', () => { it('Should revert correctly', async () => { const [signer] = await ethers.getSigners() - let failed = false - try { - const tx = await sendShieldedTransaction( + await expect( + sendShieldedTransaction( signer, counterContract.address, counterContract.interface.encodeFunctionData("subtract", []) ) - await tx.wait() - } catch (e) { - failed = e.reason.indexOf('reverted') !== -1 - } - - expect(failed).to.be.true + ).to.be.rejectedWith("COUNTER_TOO_LOW") }) }) \ No newline at end of file diff --git a/tests/solidity/test/ED25519VerifyPrecompile.js b/tests/solidity/test/ED25519VerifyPrecompile.js index 31c1ac44..4b363c83 100644 --- a/tests/solidity/test/ED25519VerifyPrecompile.js +++ b/tests/solidity/test/ED25519VerifyPrecompile.js @@ -20,7 +20,6 @@ describe('ED25519VerifyPrecompile', () => { contract.interface.encodeFunctionData("checkPrecompile", []) ); const result = contract.interface.decodeFunctionResult("checkPrecompile", isAvailableResponse)[0] - console.log(result); expect(result).to.be.true }) }) \ No newline at end of file diff --git a/tests/solidity/test/ERC20Unencrypted.js b/tests/solidity/test/ERC20Unencrypted.js index a7f718c4..994fcfbe 100644 --- a/tests/solidity/test/ERC20Unencrypted.js +++ b/tests/solidity/test/ERC20Unencrypted.js @@ -2,8 +2,8 @@ const { expect } = require("chai") const { ethers } = require("hardhat") const provider = new ethers.providers.JsonRpcProvider('http://localhost:8547') -const sender = new ethers.Wallet("DBE7E6AE8303E055B68CEFBF01DEC07E76957FF605E5333FA21B6A8022EA7B55", provider) -const receiver = new ethers.Wallet("D5DA6D43250C8EB630C1AB8A80F19C673267A6B210C10C41065D5C34FC369DCB", provider) +const sender = new ethers.Wallet("D5DA6D43250C8EB630C1AB8A80F19C673267A6B210C10C41065D5C34FC369DCB", provider) +const receiver = new ethers.Wallet("DBE7E6AE8303E055B68CEFBF01DEC07E76957FF605E5333FA21B6A8022EA7B55", provider) describe('ERC20 Unencrypted', () => { let tokenContract diff --git a/tests/solidity/test/MsgInfo.js b/tests/solidity/test/MsgInfo.js new file mode 100644 index 00000000..eeb2aca6 --- /dev/null +++ b/tests/solidity/test/MsgInfo.js @@ -0,0 +1,106 @@ +const { expect } = require("chai"); +const { ethers } = require("hardhat"); +const { sendShieldedTransaction, sendShieldedQuery } = require("./testUtils") + +describe("MsgInfo", function () { + describe('Unencrypted', () => { + const unencryptedProvider = new ethers.providers.JsonRpcProvider('http://localhost:8547') + const unencryptedSigner = new ethers.Wallet("DBE7E6AE8303E055B68CEFBF01DEC07E76957FF605E5333FA21B6A8022EA7B55", unencryptedProvider) + + let msgInfoContract + + before(async () => { + const factory = await ethers.getContractFactory('MsgInfo') + msgInfoContract = await factory.connect(unencryptedSigner).deploy() + await msgInfoContract.connect(unencryptedProvider).deployed() + }) + + it('Should be initialized properly', async() => { + const storedValue = await msgInfoContract.connect(unencryptedProvider).storedValue() + expect(storedValue).to.be.equal(0) + }) + + it("Should update storedValue with msg.value", async () => { + const sendValue = ethers.utils.parseEther("0.1") + + const tx = await msgInfoContract.connect(unencryptedSigner).updateValue({ value: sendValue }) + await tx.wait() + + expect(await msgInfoContract.connect(unencryptedProvider).storedValue()).to.equal(sendValue) + }) + + it('Should return correct msg.sig', async () => { + const functionSignature = ethers.utils.id("getMsgSig()").slice(0, 10) + const msgSig = await msgInfoContract.connect(unencryptedProvider).getMsgSig() + expect(msgSig).to.equal(functionSignature) + }) + + it('Should return correct msg.data', async () => { + const param = Math.floor(Math.random() * 10000) + const encodedData = msgInfoContract.interface.encodeFunctionData("getMsgData(uint256)", [param]) + const msgData = await msgInfoContract.connect(unencryptedProvider).getMsgData(param) + expect(msgData).to.equal(encodedData) + }) + }) + + describe('Encrypted', () => { + let msgInfoContract, signer + + before(async () => { + const factory = await ethers.getContractFactory('MsgInfo') + msgInfoContract = await factory.deploy() + await msgInfoContract.deployed() + + const [ethersSigner] = await ethers.getSigners() + signer = ethersSigner + }) + + it("Should update storedValue with msg.value", async () => { + const sendValue = ethers.utils.parseEther("0.2") + + const tx = await sendShieldedTransaction( + signer, + msgInfoContract.address, + msgInfoContract.interface.encodeFunctionData("updateValue", []), + sendValue + ) + await tx.wait() + + const storedValueRes = await sendShieldedQuery( + signer.provider, + msgInfoContract.address, + msgInfoContract.interface.encodeFunctionData("storedValue", []) + ); + const storedValue = msgInfoContract.interface.decodeFunctionResult("storedValue", storedValueRes)[0] + + expect(storedValue).to.equal(sendValue) + }) + + it('Should return correct msg.sig', async () => { + const functionSignature = ethers.utils.id("getMsgSig()").slice(0, 10) + + const msgSigRes = await sendShieldedQuery( + signer.provider, + msgInfoContract.address, + msgInfoContract.interface.encodeFunctionData("getMsgSig", []) + ); + const msgSig = msgInfoContract.interface.decodeFunctionResult("getMsgSig", msgSigRes)[0] + + expect(msgSig).to.equal(functionSignature) + }) + + it('Should return correct msg.data', async () => { + const param = Math.floor(Math.random() * 10000) + const encodedData = msgInfoContract.interface.encodeFunctionData("getMsgData(uint256)", [param]) + + const msgDataRes = await sendShieldedQuery( + signer.provider, + msgInfoContract.address, + msgInfoContract.interface.encodeFunctionData("getMsgData(uint256)", [param]) + ); + const msgData = msgInfoContract.interface.decodeFunctionResult("getMsgData", msgDataRes)[0] + + expect(msgData).to.equal(encodedData) + }) + }) +}); \ No newline at end of file diff --git a/tests/solidity/test/OPCODEs.js b/tests/solidity/test/OPCODEs.js deleted file mode 100644 index 4fada846..00000000 --- a/tests/solidity/test/OPCODEs.js +++ /dev/null @@ -1,46 +0,0 @@ -const { expect } = require('chai') -const { sendShieldedTransaction } = require("./testUtils") - -describe('OPCODE test', () => { - let contractInstance - - beforeEach(async () => { - const OpcodesContract = await ethers.getContractFactory('OpCodes') - contractInstance = await OpcodesContract.deploy() - await contractInstance.deployed() - }) - - it('Should throw invalid op code', async () => { - const [signer] = await ethers.getSigners() - let failed = false - try { - const tx = await sendShieldedTransaction( - signer, - contractInstance.address, - contractInstance.interface.encodeFunctionData("test_invalid", []) - ) - await tx.wait() - } catch (e) { - failed = true - } - - expect(failed).to.be.true - }) - - it('Should revert', async () => { - const [signer] = await ethers.getSigners() - let failed = false - try { - const tx = await sendShieldedTransaction( - signer, - contractInstance.address, - contractInstance.interface.encodeFunctionData("test_revert", []) - ) - await tx.wait() - } catch (e) { - failed = e.reason.indexOf('reverted') !== -1 - } - - expect(failed).to.be.true - }) -}); \ No newline at end of file diff --git a/tests/solidity/test/OpcodeTest.js b/tests/solidity/test/OpcodeTest.js new file mode 100644 index 00000000..41d8562d --- /dev/null +++ b/tests/solidity/test/OpcodeTest.js @@ -0,0 +1,88 @@ +const { expect } = require('chai') +const {ethers} = require("hardhat"); + +const provider = new ethers.providers.JsonRpcProvider('http://localhost:8547') +const signer = new ethers.Wallet("D5DA6D43250C8EB630C1AB8A80F19C673267A6B210C10C41065D5C34FC369DCB", provider) + +describe('OPCODE test', () => { + let opcodeTest + + before(async () => { + const factory = await ethers.getContractFactory('OpcodeTest', signer) + opcodeTest = await factory.deploy() + await opcodeTest.deployed() + }) + + it('Should throw invalid op code', async () => { + await expect(opcodeTest.testInvalid()).to.be.rejectedWith("InvalidOpcode(Opcode(254))") + }) + + it('Should revert', async () => { + await expect(opcodeTest.testRevert()).to.be.rejectedWith("reverted") + }) + + it("should correctly perform addition", async function () { + expect(await opcodeTest.testAdd(5, 3)).to.equal(8); + }); + + it("should correctly perform subtraction", async function () { + expect(await opcodeTest.testSub(10, 4)).to.equal(6); + }); + + it("should correctly perform multiplication", async function () { + expect(await opcodeTest.testMul(7, 6)).to.equal(42); + }); + + it("should correctly perform division", async function () { + expect(await opcodeTest.testDiv(20, 5)).to.equal(4); + }); + + it("should correctly perform modulo", async function () { + expect(await opcodeTest.testMod(17, 5)).to.equal(2); + }); + + it("should correctly perform left shift", async function () { + expect(await opcodeTest.testShl(1, 2)).to.equal(4); + }); + + it("should correctly perform right shift", async function () { + expect(await opcodeTest.testShr(8, 2)).to.equal(2); + }); + + it("should correctly perform bitwise AND", async function () { + expect(await opcodeTest.testAnd(12, 5)).to.equal(4); + }); + + it("should correctly perform bitwise OR", async function () { + expect(await opcodeTest.testOr(12, 5)).to.equal(13); + }); + + it("should correctly perform bitwise XOR", async function () { + expect(await opcodeTest.testXor(12, 5)).to.equal(9); + }); + + it("should correctly perform bitwise NOT", async function () { + expect(await opcodeTest.testNot(0)).to.equal(ethers.constants.MaxUint256); + }); + + it("should correctly perform SSTORE operation", async function () { + const tx = await opcodeTest.testSSTORE(42); + await tx.wait() + + expect(await opcodeTest.storedValue()).to.equal(42); + }); + + it("should correctly perform MSTORE operation", async function () { + expect(await opcodeTest.testMSTORE()).to.equal(42); + }); + + it("should correctly perform EXTCODESIZE operation", async function () { + const size = await opcodeTest.testEXTCODESIZE(opcodeTest.address); + expect(size).to.be.gt(0); + }); + + it("should return 0 for EXTCODESIZE of EOA", async function () { + const size = await opcodeTest.testEXTCODESIZE(signer.address); + expect(size).to.equal(0); + }); +}); \ No newline at end of file diff --git a/tests/solidity/test/RIP7212.js b/tests/solidity/test/RIP7212.js index 76b1c824..148ac995 100644 --- a/tests/solidity/test/RIP7212.js +++ b/tests/solidity/test/RIP7212.js @@ -20,7 +20,6 @@ describe('RIP7212', () => { contract.interface.encodeFunctionData("isPreCompiledP256Available", []) ); const result = contract.interface.decodeFunctionResult("isPreCompiledP256Available", isAvailableResponse)[0] - console.log(result); expect(result).to.be.true }) }) \ No newline at end of file diff --git a/tests/solidity/test/Revert.js b/tests/solidity/test/Revert.js index 1ec67780..2c9d73e1 100644 --- a/tests/solidity/test/Revert.js +++ b/tests/solidity/test/Revert.js @@ -13,20 +13,14 @@ describe('Revert / Error', () => { await revertContract.deployed() }) - it('testRevert: should revert if provided value < 10', async () => { - let reason = "" - try { - const tx = await sendShieldedTransaction( + it('testRevert: should revert if provided value < 10', async () => { + await expect( + sendShieldedTransaction( signer, revertContract.address, revertContract.interface.encodeFunctionData("testRevert", [5]) ) - await tx.wait() - } catch (e) { - reason = e.reason - } - - expect(reason).to.contain("Expected value >= 10") + ).to.be.rejectedWith("Expected value >= 10") }) it('testRevert: should not revert if provided value >= 10', async () => { diff --git a/tests/solidity/test/StressTesting.js b/tests/solidity/test/StressTesting.js deleted file mode 100644 index ef8a85ff..00000000 --- a/tests/solidity/test/StressTesting.js +++ /dev/null @@ -1,115 +0,0 @@ -const { expect } = require("chai") -const { ethers } = require("hardhat") -const { sendShieldedTransaction, sendShieldedQuery } = require("./testUtils") - -const NUM_TESTING_ACCOUNTS = 50; - -const getTokenBalance = async (contract, address) => { - const balanceResponse = await sendShieldedQuery( - ethers.provider, - contract.address, - contract.interface.encodeFunctionData("balanceOf", [address]) - ); - return contract.interface.decodeFunctionResult("balanceOf", balanceResponse)[0] -} - -const transferERC20Token = async (sender, receiverAddress, tokenContract, amountToTransfer) => { - const senderBalanceBefore = await getTokenBalance(tokenContract, sender.address) - const receiverBalanceBefore = await getTokenBalance(tokenContract, receiverAddress) - - const tx = await sendShieldedTransaction( - sender, - tokenContract.address, - tokenContract.interface.encodeFunctionData("transfer", [receiverAddress, amountToTransfer]) - ) - await tx.wait() - const senderBalanceAfter = await getTokenBalance(tokenContract, sender.address) - const receiverBalanceAfter = await getTokenBalance(tokenContract, receiverAddress) - - return [senderBalanceBefore.toNumber(), senderBalanceAfter.toNumber(), receiverBalanceBefore.toNumber(), receiverBalanceAfter.toNumber()] -} - -const transferFromERC20Token = async (sender, receiver, tokenContract, amountToTransfer) => { - const approveTx = await sendShieldedTransaction( - sender, - tokenContract.address, - tokenContract.interface.encodeFunctionData("approve", [receiver.address, amountToTransfer]) - ) - const approveTxReceipt = await approveTx.wait() - const approveTxLogs = approveTxReceipt.logs.map(log => tokenContract.interface.parseLog(log)) - expect(approveTxLogs.some(log => log.name === 'Approval' && log.args[0] == sender.address && log.args[1] == receiver.address && log.args[2].toNumber() == amountToTransfer)).to.be.true - - const senderBalanceBefore = await getTokenBalance(tokenContract, sender.address) - const receiverBalanceBefore = await getTokenBalance(tokenContract, receiver.address) - - const transferTx = await sendShieldedTransaction( - receiver, - tokenContract.address, - tokenContract.interface.encodeFunctionData("transferFrom", [sender.address, receiver.address, amountToTransfer]) - ) - const transferTxReceipt = await transferTx.wait() - const transferTxLogs = transferTxReceipt.logs.map(log => tokenContract.interface.parseLog(log)) - expect(transferTxLogs.some(log => log.name === 'Transfer' && log.args[0] == sender.address && log.args[1] == receiver.address && log.args[2].toNumber() == amountToTransfer)).to.be.true - - const senderBalanceAfter = await getTokenBalance(tokenContract, sender.address) - const receiverBalanceAfter = await getTokenBalance(tokenContract, receiver.address) - - return [senderBalanceBefore.toNumber(), senderBalanceAfter.toNumber(), receiverBalanceBefore.toNumber(), receiverBalanceAfter.toNumber()] -} - -describe('--------Stress Testing----------', () => { - let tokenContract - let wallets = []; - - before(async () => { - console.log("-------Preparing random wallets--------") - const ERC20 = await ethers.getContractFactory('ERC20Token') - tokenContract = await ERC20.deploy('test token', 'TT', 10000000) - await tokenContract.deployed() - - const [sender] = await ethers.getSigners() - const senderBalanceBefore = await getTokenBalance(tokenContract, sender.address) - console.log("Sender Balance:", senderBalanceBefore) - - // prepare NUM_TESTING_ACCOUNTS accounts and prefund it - for (let i = 0; i < NUM_TESTING_ACCOUNTS; i++) { - const wallet = ethers.Wallet.createRandom().connect(ethers.provider) - - const tx = await sender.sendTransaction({ - to: wallet.address, - value: "1000000000" - }) - await tx.wait() - - // Transfer ERC20 token - console.log("Transferring 10000 ERC20 token from", sender.address, "To", wallet.address) - await transferERC20Token(sender, wallet.address, tokenContract, 10000) - console.log("Wallet", (i+1), "is ready among", NUM_TESTING_ACCOUNTS, "wallets. Address:", wallet.address) - const senderBalanceBefore = await getTokenBalance(tokenContract, wallet.address) - console.log("Balance:", senderBalanceBefore) - wallets.push(wallet) - } - }) - - it('Stress ERC20 transfer', async () => { - const promises = []; - for (let i = 1 ; i < NUM_TESTING_ACCOUNTS; i++) { - promises.push( - transferERC20Token(wallets[i-1], wallets[i].address, tokenContract, 10) - ); - } - - const res = await Promise.all(promises); - console.log(res) - }) - - it('Stress ERC20 transferFrom', async () => { - const promises = []; - for (let i = 1 ; i < NUM_TESTING_ACCOUNTS; i++) { - promises.push(transferFromERC20Token(wallets[i-1], wallets[i], tokenContract, 10)); - } - - const res = await Promise.all(promises); - console.log(res) - }) -}) \ No newline at end of file diff --git a/tests/solidity/test/TransientStorage.js b/tests/solidity/test/TransientStorage.js new file mode 100644 index 00000000..55a23213 --- /dev/null +++ b/tests/solidity/test/TransientStorage.js @@ -0,0 +1,56 @@ +const { expect } = require("chai"); +const { ethers } = require("hardhat"); + +const provider = new ethers.providers.JsonRpcProvider('http://localhost:8547') +const signer = new ethers.Wallet("D5DA6D43250C8EB630C1AB8A80F19C673267A6B210C10C41065D5C34FC369DCB", provider) +const otherSigner = new ethers.Wallet("DBE7E6AE8303E055B68CEFBF01DEC07E76957FF605E5333FA21B6A8022EA7B55", provider) + +describe("MulCaller", function () { + let mulService, mulCaller; + + before(async () => { + // Deploy MulService + const MulService = await ethers.getContractFactory("MulService", signer); + mulService = await MulService.deploy(); + await mulService.deployed(); + + // Deploy MulCaller + const MulCaller = await ethers.getContractFactory("MulCaller", signer); + mulCaller = await MulCaller.deploy(mulService.address); + await mulCaller.deployed(); + }); + + it("should correctly set multiplier and multiply", async () => { + const multiplier = 5; + const value = 10; + const expectedResult = multiplier * value; + + const result = await mulCaller.callStatic.runMultiply(multiplier, value); + + expect(result).to.equal(expectedResult); + }); + + it("should use transient storage (multiplier not persisting between calls)", async () => { + const multiplier1 = 5; + const value1 = 10; + const multiplier2 = 3; + const value2 = 7; + + const tx = await mulCaller.runMultiply(multiplier1, value1); + await tx.wait() + + const result = await mulCaller.callStatic.runMultiply(multiplier2, value2); + + expect(result).to.equal(multiplier2 * value2); + }); + + it("should handle zero multiplier", async () => { + const multiplier = 0; + const value = 100; + + const result = await mulCaller.callStatic.runMultiply(multiplier, value); + + expect(result).to.equal(0); + }); + +}); \ No newline at end of file diff --git a/tests/solidity/test/Uniswap.js b/tests/solidity/test/Uniswap.js new file mode 100644 index 00000000..1eb27e5c --- /dev/null +++ b/tests/solidity/test/Uniswap.js @@ -0,0 +1,170 @@ +const { expect } = require("chai"); +const { ethers } = require("hardhat"); +const { abi: FACTORY_ABI, bytecode: FACTORY_BYTECODE } = require('@uniswap/v3-core/artifacts/contracts/UniswapV3Factory.sol/UniswapV3Factory.json'); +const { abi: POOL_ABI } = require('@uniswap/v3-core/artifacts/contracts/UniswapV3Pool.sol/UniswapV3Pool.json'); +const { abi: NFT_MANAGER_ABI, bytecode: NFT_MANAGER_BYTECODE } = require('@uniswap/v3-periphery/artifacts/contracts/NonfungiblePositionManager.sol/NonfungiblePositionManager.json'); +const { abi: ROUTER_ABI, bytecode: ROUTER_BYTECODE } = require('@uniswap/v3-periphery/artifacts/contracts/SwapRouter.sol/SwapRouter.json'); + +const provider = new ethers.providers.JsonRpcProvider('http://localhost:8547') +const signer = new ethers.Wallet("D5DA6D43250C8EB630C1AB8A80F19C673267A6B210C10C41065D5C34FC369DCB", provider) +const receiver = new ethers.Wallet("DBE7E6AE8303E055B68CEFBF01DEC07E76957FF605E5333FA21B6A8022EA7B55", provider) + +const FEE_TIER = 3000; // 0.3% fee tier +const INITIAL_LIQUIDITY = ethers.utils.parseEther("10"); +const SWAP_AMOUNT = ethers.utils.parseEther("1") + +describe("Uniswap V3", function() { + let weth, factory, router, nftManager, erc20First, erc20Second + + before(async () => { + // Deploy WETH + const WETH9 = await ethers.getContractFactory("WETH9", signer); + weth = await WETH9.deploy(); + await weth.deployed(); + + // Deploy Factory + const Factory = new ethers.ContractFactory(FACTORY_ABI, FACTORY_BYTECODE, signer); + factory = await Factory.deploy(); + await factory.deployed(); + + // Deploy Router + const Router = new ethers.ContractFactory(ROUTER_ABI, ROUTER_BYTECODE, signer); + router = await Router.deploy(factory.address, weth.address); + await router.deployed(); + + // Deploy NFT Position Manager + const NFTManager = new ethers.ContractFactory(NFT_MANAGER_ABI, NFT_MANAGER_BYTECODE, signer); + nftManager = await NFTManager.deploy(factory.address, weth.address, ethers.constants.AddressZero); + await nftManager.deployed(); + + // Deploy token contracts + const Token = await ethers.getContractFactory("Token", signer); + erc20First = await Token.deploy("First", "F"); + await erc20First.deployed(); + erc20Second = await Token.deploy("Second", "S"); + await erc20Second.deployed(); + }) + + it("should create a new pool", async function() { + // Ensure tokens are in the correct order (lower address first) + const [token0Address, token1Address] = erc20First.address.toLowerCase() < erc20Second.address.toLowerCase() + ? [erc20First.address, erc20Second.address] + : [erc20Second.address, erc20First.address]; + + // Create the pool + const tx = await factory.createPool(token0Address, token1Address, FEE_TIER) + const receipt = await tx.wait() + const logs = receipt.logs.map(log => factory.interface.parseLog(log)) + + expect(logs[0].name).to.be.equal("PoolCreated") + expect(logs[0].args[0]).to.be.equal(token0Address) + expect(logs[0].args[1]).to.be.equal(token1Address) + expect(logs[0].args[2]).to.be.equal(FEE_TIER) + + // Get the pool address + const poolAddress = await factory.getPool(token0Address, token1Address, FEE_TIER); + expect(poolAddress).to.not.equal(ethers.constants.AddressZero); + }); + + it("should initialize the pool", async function() { + const [token0Address, token1Address] = erc20First.address.toLowerCase() < erc20Second.address.toLowerCase() + ? [erc20First.address, erc20Second.address] + : [erc20Second.address, erc20First.address]; + + const poolAddress = await factory.getPool(token0Address, token1Address, FEE_TIER); + const pool = await ethers.getContractAt(POOL_ABI, poolAddress, signer); + + // Set the initial price (1:1 in this case) + const initialSqrtPrice = ethers.BigNumber.from("79228162514264337593543950336"); + const tx = await pool.initialize(initialSqrtPrice); + await tx.wait() + + // Verify the pool is initialized + const slot0 = await pool.slot0(); + expect(slot0.sqrtPriceX96).to.equal(initialSqrtPrice); + }); + + it("should add liquidity to the pool", async function() { + const [token0Address, token1Address] = erc20First.address.toLowerCase() < erc20Second.address.toLowerCase() + ? [erc20First.address, erc20Second.address] + : [erc20Second.address, erc20First.address]; + + // Approve tokens for NFT manager + const tx1 = await erc20First.connect(signer).approve(nftManager.address, INITIAL_LIQUIDITY); + await tx1.wait() + + const tx2 = await erc20Second.connect(signer).approve(nftManager.address, INITIAL_LIQUIDITY); + await tx2.wait() + + // Calculate min and max tick for full range + const minTick = getMinTick(FEE_TIER); + const maxTick = getMaxTick(FEE_TIER); + + // Add liquidity + const tx = await nftManager.connect(signer).mint({ + token0: token0Address, + token1: token1Address, + fee: FEE_TIER, + tickLower: minTick, + tickUpper: maxTick, + amount0Desired: INITIAL_LIQUIDITY, + amount1Desired: INITIAL_LIQUIDITY, + amount0Min: 0, + amount1Min: 0, + recipient: signer.address, + deadline: Math.floor(Date.now() / 1000) + 300 + }); + const receipt = await tx.wait() + + // Get the tokenId of the newly minted position + const mintEvent = receipt.events.find(event => event.event === 'IncreaseLiquidity'); + const tokenId = mintEvent.args.tokenId; + + // Fetch position info + const position = await nftManager.positions(tokenId); + + // Check that liquidity has been added + expect(position.liquidity).to.be.gt(0); + }); + + + it("should swap tokens", async function() { + // User approves router to spend tokens + const approveTx = await erc20First.approve(router.address, SWAP_AMOUNT); + await approveTx.wait() + + // Record balances before swap + const token0BalanceBefore = await erc20First.balanceOf(signer.address); + const token1BalanceBefore = await erc20Second.balanceOf(signer.address); + + // Perform swap + const swapParams = { + tokenIn: erc20First.address, + tokenOut: erc20Second.address, + fee: FEE_TIER, + recipient: signer.address, + deadline: Math.floor(Date.now() / 1000) + 300, + amountIn: SWAP_AMOUNT, + amountOutMinimum: 0, + sqrtPriceLimitX96: 0 + } + + const tx = await router.exactInputSingle(swapParams); + await tx.wait() + + // Check balances after swap + const token0BalanceAfter = await erc20First.balanceOf(signer.address); + const token1BalanceAfter = await erc20Second.balanceOf(signer.address); + + expect(token0BalanceAfter).to.be.lt(token0BalanceBefore); + expect(token1BalanceAfter).to.be.gt(token1BalanceBefore); + }); +}) + +function getMinTick(tickSpacing) { + return Math.ceil(-887272 / tickSpacing) * tickSpacing; +} + +function getMaxTick(tickSpacing) { + return Math.floor(887272 / tickSpacing) * tickSpacing; +} \ No newline at end of file diff --git a/tests/solidity/test/WETH9.js b/tests/solidity/test/WETH9.js new file mode 100644 index 00000000..bec36b50 --- /dev/null +++ b/tests/solidity/test/WETH9.js @@ -0,0 +1,152 @@ +const { expect } = require("chai"); +const { ethers } = require("hardhat"); + +const provider = new ethers.providers.JsonRpcProvider('http://localhost:8547') +const signer = new ethers.Wallet("D5DA6D43250C8EB630C1AB8A80F19C673267A6B210C10C41065D5C34FC369DCB", provider) +const receiver = new ethers.Wallet("DBE7E6AE8303E055B68CEFBF01DEC07E76957FF605E5333FA21B6A8022EA7B55", provider) + +describe("WETH9", function() { + let weth; + + before(async function() { + const factory = await ethers.getContractFactory("WETH9", signer); + weth = await factory.deploy(); + await weth.deployed(); + }); + + describe("Deployment", function() { + it("should set the correct name, symbol, and decimals", async function() { + expect(await weth.name()).to.equal("Wrapped Ether"); + expect(await weth.symbol()).to.equal("WETH"); + expect(await weth.decimals()).to.equal(18); + }); + }); + + describe("Deposit", function() { + it("should accept deposits and update balance", async function() { + const depositAmount = ethers.utils.parseEther("1"); + await expect(weth.connect(signer).deposit({ value: depositAmount })) + .to.emit(weth, "Deposit") + .withArgs(signer.address, depositAmount); + + const balance = await weth.balanceOf(signer.address); + expect(balance).to.equal(depositAmount); + }); + + it("should accept deposits via fallback function", async function() { + const balanceBefore = await weth.balanceOf(signer.address) + + const depositAmount = ethers.utils.parseEther("1"); + const tx = await signer.sendTransaction({ + to: weth.address, + value: depositAmount + }); + await tx.wait() + + const balanceAfter = await weth.balanceOf(signer.address) + expect(balanceAfter).to.equal(balanceBefore.add(depositAmount)); + }); + }); + + describe("Withdraw", function() { + it("should allow withdrawals and update balance", async function() { + const balanceBefore = await weth.balanceOf(signer.address) + + const tx = await weth.connect(signer).withdraw(balanceBefore) + const receipt = await tx.wait() + + const logs = receipt.logs.map(log => weth.interface.parseLog(log)) + expect(logs.length).to.be.equal(1) + expect(logs[0].name).to.be.equal('Withdrawal') + expect(logs[0].args[0]).to.be.equal(signer.address) + expect(logs[0].args[1]).to.be.equal(balanceBefore) + + const balanceAfter = await weth.balanceOf(signer.address); + expect(balanceAfter).to.equal(0); + }); + + it("should revert when trying to withdraw more than balance", async function() { + const withdrawAmount = ethers.utils.parseEther("10000000"); + await expect(weth.connect(signer).withdraw(withdrawAmount)) + .to.be.rejectedWith("reverted"); + }); + }); + + describe("Total Supply", function() { + it("should return the correct total supply", async function() { + const totalSupplyBefore = await weth.totalSupply() + const depositAmount = ethers.utils.parseEther("1") + + const tx = await weth.connect(signer).deposit({ value: depositAmount }); + await tx.wait() + + const totalSupplyAfter = await weth.totalSupply(); + expect(totalSupplyAfter).to.equal(totalSupplyBefore.add(depositAmount)); + }); + }); + + describe("Approve and TransferFrom", function() { + it("should approve and allow transferFrom", async function() { + const depositAmount = ethers.utils.parseEther("1"); + const transferAmount = ethers.utils.parseEther("0.5"); + + const depositTx = await weth.connect(signer).deposit({ value: depositAmount }); + await depositTx.wait() + + const senderBalanceBefore = await weth.balanceOf(signer.address) + const receiverBalanceBefore = await weth.balanceOf(receiver.address) + + const approvalTx = await weth.connect(signer).approve(receiver.address, transferAmount) + const approvalReceipt = await approvalTx.wait() + + const approvalLogs = approvalReceipt.logs.map(log => weth.interface.parseLog(log)) + expect(approvalLogs.length).to.be.equal(1) + expect(approvalLogs[0].name).to.be.equal('Approval') + expect(approvalLogs[0].args[0]).to.be.equal(signer.address) + expect(approvalLogs[0].args[1]).to.be.equal(receiver.address) + expect(approvalLogs[0].args[2]).to.be.equal(transferAmount) + + const transferFromTx = await weth.connect(receiver).transferFrom(signer.address, receiver.address, transferAmount) + const transferFromReceipt = await transferFromTx.wait() + const transferFromLogs = transferFromReceipt.logs.map(log => weth.interface.parseLog(log)) + expect(transferFromLogs.length).to.be.equal(1) + expect(transferFromLogs[0].name).to.be.equal('Transfer') + expect(transferFromLogs[0].args[0]).to.be.equal(signer.address) + expect(transferFromLogs[0].args[1]).to.be.equal(receiver.address) + expect(transferFromLogs[0].args[2]).to.be.equal(transferAmount) + + const senderBalanceAfter = await weth.balanceOf(signer.address) + const receiverBalanceAfter = await weth.balanceOf(receiver.address) + + expect(senderBalanceAfter).to.equal(senderBalanceBefore.sub(transferAmount)); + expect(receiverBalanceAfter).to.equal(receiverBalanceBefore.add(transferAmount)); + }); + }); + + describe("Transfer", function() { + it("should transfer tokens between accounts", async function() { + const depositAmount = ethers.utils.parseEther("1"); + const tx = await weth.connect(signer).deposit({ value: depositAmount }); + await tx.wait() + + const senderBalanceBefore = await weth.balanceOf(signer.address) + const receiverBalanceBefore = await weth.balanceOf(receiver.address) + + const transferTx = await weth.connect(signer).transfer(receiver.address, depositAmount) + const receipt = await transferTx.wait() + + const logs = receipt.logs.map(log => weth.interface.parseLog(log)) + expect(logs.length).to.be.equal(1) + expect(logs[0].name).to.be.equal('Transfer') + expect(logs[0].args[0]).to.be.equal(signer.address) + expect(logs[0].args[1]).to.be.equal(receiver.address) + expect(logs[0].args[2]).to.be.equal(depositAmount) + + const senderBalanceAfter = await weth.balanceOf(signer.address) + const receiverBalanceAfter = await weth.balanceOf(receiver.address) + + expect(senderBalanceAfter).to.equal(senderBalanceBefore.sub(depositAmount)) + expect(receiverBalanceAfter).to.equal(receiverBalanceBefore.add(depositAmount)); + }); + }); +}); \ No newline at end of file diff --git a/x/evm/handler_test.go b/x/evm/handler_test.go index bbb6a314..03c75075 100644 --- a/x/evm/handler_test.go +++ b/x/evm/handler_test.go @@ -499,9 +499,7 @@ func (suite *EvmTestSuite) TestErrorWhenDeployContract() { _ = proto.Unmarshal(result.Data, &res) - suite.Require().Equal("evm error: InvalidCode(Opcode(166))", res.VmError, "correct evm error") - - // TODO: snapshot checking + suite.Require().Equal(res.VmError, "InvalidOpcode(Opcode(166))", "correct evm error") } // DeployTestContract deploy a test erc20 contract and returns the contract address @@ -549,13 +547,13 @@ func (suite *EvmTestSuite) TestERC20TransferReverted() { "no hooks", intrinsicGas, // enough for intrinsicGas, but not enough for execution nil, - "evm error: OutOfGas", + "OutOfGas", }, { "success hooks", intrinsicGas, // enough for intrinsicGas, but not enough for execution &DummyHook{}, - "evm error: OutOfGas", + "OutOfGas", }, { "failure hooks", @@ -629,7 +627,7 @@ func (suite *EvmTestSuite) TestERC20TransferReverted() { after := k.GetBalance(suite.ctx, suite.from) - if tc.expErr == "evm error: OutOfGas" { + if tc.expErr == "OutOfGas" { suite.Require().Equal(tc.gasLimit, res.GasUsed) } else { suite.Require().Greater(tc.gasLimit, res.GasUsed) @@ -637,10 +635,6 @@ func (suite *EvmTestSuite) TestERC20TransferReverted() { // check gas refund works: only deducted fee for gas used, rather than gas limit. suite.Require().Equal(new(big.Int).Mul(gasPrice, big.NewInt(int64(res.GasUsed))), new(big.Int).Sub(before, after)) - - // nonce should not be increased. - nonce2 := k.GetNonce(suite.ctx, suite.from) - suite.Require().Equal(nonce, nonce2) }) } } diff --git a/x/evm/keeper/config.go b/x/evm/keeper/config.go index 055174a8..8899e217 100644 --- a/x/evm/keeper/config.go +++ b/x/evm/keeper/config.go @@ -19,11 +19,9 @@ import ( "math/big" errorsmod "cosmossdk.io/errors" - "swisstronik/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/vm" + "swisstronik/x/evm/types" ) // EVMConfig creates the EVMConfig based on current state @@ -55,24 +53,3 @@ func (k *Keeper) TxConfig(ctx sdk.Context, txHash common.Hash) types.TxConfig { uint(k.GetLogSizeTransient(ctx)), // LogIndex ) } - -// VMConfig creates an EVM configuration from the debug setting and the extra EIPs enabled on the -// module parameters. The config generated uses the default JumpTable from the EVM. -func (k Keeper) VMConfig(ctx sdk.Context, msg core.Message, cfg *types.EVMConfig, tracer vm.EVMLogger) vm.Config { - noBaseFee := true - if types.IsLondon(cfg.ChainConfig, ctx.BlockHeight()) { - noBaseFee = k.feeMarketKeeper.GetParams(ctx).NoBaseFee - } - - var debug bool - if _, ok := tracer.(types.NoOpTracer); !ok { - debug = true - } - - return vm.Config{ - Debug: debug, - Tracer: tracer, - NoBaseFee: noBaseFee, - ExtraEips: cfg.Params.EIPs(), - } -} diff --git a/x/evm/keeper/grpc_query.go b/x/evm/keeper/grpc_query.go index d843fa0e..57a5701a 100644 --- a/x/evm/keeper/grpc_query.go +++ b/x/evm/keeper/grpc_query.go @@ -366,7 +366,8 @@ func (k Keeper) EstimateGas(c context.Context, req *types.EthCallRequest) (*type if failed { if result != nil && result.VmError != vm.ErrOutOfGas.Error() { if len(result.Ret) > 0 { - return nil, types.NewExecErrorWithReason(result.Ret) + // We return failure reason in EstimateGasResponse to make it possible to decode + return &types.EstimateGasResponse{Gas: 0, Failed: true, ReturnValue: result.Ret}, nil } return nil, errors.New(result.VmError) } diff --git a/x/evm/keeper/grpc_query_test.go b/x/evm/keeper/grpc_query_test.go index fe4b331f..97543df3 100644 --- a/x/evm/keeper/grpc_query_test.go +++ b/x/evm/keeper/grpc_query_test.go @@ -517,7 +517,7 @@ func (suite *KeeperTestSuite) TestEstimateGas() { } }, true, - 1186778, + 1187108, false, }, // estimate gas of an erc20 transfer, the exact gas number is checked with geth @@ -534,7 +534,7 @@ func (suite *KeeperTestSuite) TestEstimateGas() { args = types.TransactionArgs{To: &contractAddr, From: &suite.address, Data: (*hexutil.Bytes)(&encryptedTransferData)} }, true, - 49080, + 51880, false, }, // repeated tests with enableFeemarket @@ -596,7 +596,7 @@ func (suite *KeeperTestSuite) TestEstimateGas() { } }, true, - 1186778, + 1187108, true, }, // For some reason rust/evm returns different gas estimation. Geth: 51880, SputnikVM: 49080 @@ -612,7 +612,7 @@ func (suite *KeeperTestSuite) TestEstimateGas() { args = types.TransactionArgs{To: &contractAddr, From: &suite.address, Data: (*hexutil.Bytes)(&encryptedTransferData)} }, true, - 49080, + 51880, true, }, { diff --git a/x/evm/keeper/sgxvm.go b/x/evm/keeper/sgxvm.go index 115dd30c..779b37f5 100644 --- a/x/evm/keeper/sgxvm.go +++ b/x/evm/keeper/sgxvm.go @@ -292,6 +292,7 @@ func (k *Keeper) ApplyMessageWithConfig( var res *librustgo.HandleTransactionResponse if contractCreation { + k.SetNonce(ctx, msg.From(), msg.Nonce()) res, err = librustgo.Create( connector, msg.From().Bytes(), @@ -299,10 +300,12 @@ func (k *Keeper) ApplyMessageWithConfig( msg.Value().Bytes(), msg.AccessList(), leftoverGas, + msg.GasPrice().Bytes(), msg.Nonce(), txContext, commit, ) + k.SetNonce(ctx, msg.From(), msg.Nonce()+1) } else { res, err = librustgo.Call( connector, @@ -312,6 +315,7 @@ func (k *Keeper) ApplyMessageWithConfig( msg.Value().Bytes(), msg.AccessList(), leftoverGas, + msg.GasPrice().Bytes(), msg.Nonce(), txContext, commit, diff --git a/x/evm/keeper/sgxvm_connector.go b/x/evm/keeper/sgxvm_connector.go index 6c866f4e..d78ee6ab 100644 --- a/x/evm/keeper/sgxvm_connector.go +++ b/x/evm/keeper/sgxvm_connector.go @@ -7,7 +7,6 @@ import ( "github.com/SigmaGmbH/librustgo" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" "github.com/golang/protobuf/proto" compliancetypes "swisstronik/x/compliance/types" @@ -16,8 +15,6 @@ import ( // Connector allows our VM interact with existing Cosmos application. // It is passed by pointer into SGX to make it accessible for our VM. type Connector struct { - // GetHashFn returns the hash corresponding to n - GetHashFn vm.GetHashFunc // Keeper used to store and obtain state EVMKeeper *Keeper // Context used to make Keeper calls available @@ -35,9 +32,6 @@ func (q Connector) Query(req []byte) ([]byte, error) { // Handle request for account data such as balance and nonce case *librustgo.CosmosRequest_GetAccount: return q.GetAccount(request) - // Handles request for updating account data - case *librustgo.CosmosRequest_InsertAccount: - return q.InsertAccount(request) // Handles request if such account exists case *librustgo.CosmosRequest_ContainsKey: return q.ContainsKey(request) @@ -68,6 +62,14 @@ func (q Connector) Query(req []byte) ([]byte, error) { return q.HasVerification(request) case *librustgo.CosmosRequest_GetVerificationData: return q.GetVerificationData(request) + case *librustgo.CosmosRequest_InsertAccountNonce: + return q.InsertAccountNonce(request) + case *librustgo.CosmosRequest_InsertAccountBalance: + return q.InsertAccountBalance(request) + case *librustgo.CosmosRequest_GetAccountCodeHash: + return q.GetAccountCodeHash(request) + case *librustgo.CosmosRequest_GetAccountCodeSize: + return q.GetAccountCodeSize(request) } return nil, errors.New("wrong query received") @@ -134,7 +136,7 @@ func (q Connector) BlockHash(req *librustgo.CosmosRequest_BlockHash) ([]byte, er blockNumber := &big.Int{} blockNumber.SetBytes(req.BlockHash.Number) - blockHash := q.GetHashFn(blockNumber.Uint64()) + blockHash := q.EVMKeeper.GetHashFn(q.Context)(blockNumber.Uint64()) return proto.Marshal(&librustgo.QueryBlockHashResponse{Hash: blockHash.Bytes()}) } @@ -176,29 +178,47 @@ func (q Connector) GetAccountCode(req *librustgo.CosmosRequest_AccountCode) ([]b }) } -// InsertAccount handles incoming protobuf-encoded request for inserting new account data -// such as balance and nonce. If there is deployed contract behind given address, its bytecode -// or code hash won't be changed -func (q Connector) InsertAccount(req *librustgo.CosmosRequest_InsertAccount) ([]byte, error) { - //println("Connector::Query Request to insert account code") - ethAddress := common.BytesToAddress(req.InsertAccount.Address) +func (q Connector) InsertAccountNonce(req *librustgo.CosmosRequest_InsertAccountNonce) ([]byte, error) { + ethAddress := common.BytesToAddress(req.InsertAccountNonce.Address) + nonce := req.InsertAccountNonce.Nonce + if err := q.EVMKeeper.SetNonce(q.Context, ethAddress, nonce); err != nil { + return nil, err + } + + return proto.Marshal(&librustgo.QueryInsertAccountNonceResponse{}) +} + +func (q Connector) InsertAccountBalance(req *librustgo.CosmosRequest_InsertAccountBalance) ([]byte, error) { + ethAddress := common.BytesToAddress(req.InsertAccountBalance.Address) balance := &big.Int{} - balance.SetBytes(req.InsertAccount.Balance) - nonce := req.InsertAccount.Nonce + balance.SetBytes(req.InsertAccountBalance.Balance) - account := q.EVMKeeper.GetAccountOrEmpty(q.Context, ethAddress) if err := q.EVMKeeper.SetBalance(q.Context, ethAddress, balance); err != nil { return nil, err } - account.Balance = balance - account.Nonce = nonce - if err := q.EVMKeeper.SetAccount(q.Context, ethAddress, account); err != nil { - return nil, err + return proto.Marshal(&librustgo.QueryInsertAccountBalanceResponse{}) +} + +func (q Connector) GetAccountCodeHash(req *librustgo.CosmosRequest_GetAccountCodeHash) ([]byte, error) { + ethAddress := common.BytesToAddress(req.CodeHash.Address) + account := q.EVMKeeper.GetAccountOrEmpty(q.Context, ethAddress) + + return proto.Marshal(&librustgo.QueryAccountCodeHashResponse{Hash: account.CodeHash}) +} + +func (q Connector) GetAccountCodeSize(req *librustgo.CosmosRequest_GetAccountCodeSize) ([]byte, error) { + ethAddress := common.BytesToAddress(req.CodeSize.Address) + account := q.EVMKeeper.GetAccountWithoutBalance(q.Context, ethAddress) + if account == nil { + return proto.Marshal(&librustgo.QueryAccountCodeSizeResponse{ + Size: 0, + }) } - return proto.Marshal(&librustgo.QueryInsertAccountResponse{}) + code := q.EVMKeeper.GetCode(q.Context, common.BytesToHash(account.CodeHash)) + return proto.Marshal(&librustgo.QueryAccountCodeSizeResponse{Size: uint32(len(code))}) } // AddVerificationDetails writes provided verification details to x/compliance module diff --git a/x/evm/keeper/sgxvm_connector_test.go b/x/evm/keeper/sgxvm_connector_test.go index 4853ad39..5c2a66b7 100644 --- a/x/evm/keeper/sgxvm_connector_test.go +++ b/x/evm/keeper/sgxvm_connector_test.go @@ -23,29 +23,33 @@ func insertAccount( balance, nonce *big.Int, ) error { // Encode request - request, encodeErr := proto.Marshal(&librustgo.CosmosRequest{ - Req: &librustgo.CosmosRequest_InsertAccount{ - InsertAccount: &librustgo.QueryInsertAccount{ + requestInsertBalance, _ := proto.Marshal(&librustgo.CosmosRequest{ + Req: &librustgo.CosmosRequest_InsertAccountBalance{ + InsertAccountBalance: &librustgo.QueryInsertAccountBalance{ Address: address.Bytes(), Balance: balance.Bytes(), - Nonce: nonce.Uint64(), }, }, }) - if encodeErr != nil { - return encodeErr - } + // Encode request + requestInsertNonce, _ := proto.Marshal(&librustgo.CosmosRequest{ + Req: &librustgo.CosmosRequest_InsertAccountNonce{ + InsertAccountNonce: &librustgo.QueryInsertAccountNonce{ + Address: address.Bytes(), + Nonce: nonce.Uint64(), + }, + }, + }) - responseBytes, queryErr := connector.Query(request) + _, queryErr := connector.Query(requestInsertBalance) if queryErr != nil { return queryErr } - response := &librustgo.QueryInsertAccountResponse{} - decodingError := proto.Unmarshal(responseBytes, response) - if decodingError != nil { - return decodingError + _, queryErr = connector.Query(requestInsertNonce) + if queryErr != nil { + return queryErr } return nil diff --git a/x/evm/keeper/sgxvm_test.go b/x/evm/keeper/sgxvm_test.go index 08da238f..723068b6 100644 --- a/x/evm/keeper/sgxvm_test.go +++ b/x/evm/keeper/sgxvm_test.go @@ -93,7 +93,7 @@ func (suite *KeeperTestSuite) TestNativeCurrencyTransfer() { res, err := suite.app.EvmKeeper.HandleTx(suite.ctx, msg) if tc.expErr { - suite.Require().Equal(res.VmError, "evm error: OutOfFund") + suite.Require().Equal("OutOfFund", res.VmError) suite.Require().NoError(err) return } else { diff --git a/x/evm/keeper/state_transition.go b/x/evm/keeper/state_transition.go index c0da2f22..b4ab132c 100644 --- a/x/evm/keeper/state_transition.go +++ b/x/evm/keeper/state_transition.go @@ -58,7 +58,7 @@ func (k Keeper) GetHashFn(ctx sdk.Context) vm.GetHashFunc { headerHash = header.Hash() return common.BytesToHash(headerHash) - case ctx.BlockHeight() > h: + case ctx.BlockHeight() > h && ctx.BlockHeight()-h <= 256: // Case 2: if the chain is not the current height we need to retrieve the hash from the store for the // current chain epoch. This only applies if the current height is greater than the requested height. histInfo, found := k.stakingKeeper.GetHistoricalInfo(ctx, h) diff --git a/x/evm/types/errors.go b/x/evm/types/errors.go index 6e621b32..727c2962 100644 --- a/x/evm/types/errors.go +++ b/x/evm/types/errors.go @@ -16,13 +16,12 @@ package types import ( + errorsmod "cosmossdk.io/errors" "errors" "fmt" - - errorsmod "cosmossdk.io/errors" + "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/vm" ) diff --git a/x/evm/types/query.pb.go b/x/evm/types/query.pb.go index 0485d636..129ad0da 100644 --- a/x/evm/types/query.pb.go +++ b/x/evm/types/query.pb.go @@ -870,7 +870,9 @@ func (m *EthCallRequest) GetUnencrypted() bool { // EstimateGasResponse defines EstimateGas response type EstimateGasResponse struct { // gas returns the estimated gas - Gas uint64 `protobuf:"varint,1,opt,name=gas,proto3" json:"gas,omitempty"` + Gas uint64 `protobuf:"varint,1,opt,name=gas,proto3" json:"gas,omitempty"` + Failed bool `protobuf:"varint,2,opt,name=failed,proto3" json:"failed,omitempty"` + ReturnValue []byte `protobuf:"bytes,3,opt,name=return_value,json=returnValue,proto3" json:"return_value,omitempty"` } func (m *EstimateGasResponse) Reset() { *m = EstimateGasResponse{} } @@ -913,6 +915,20 @@ func (m *EstimateGasResponse) GetGas() uint64 { return 0 } +func (m *EstimateGasResponse) GetFailed() bool { + if m != nil { + return m.Failed + } + return false +} + +func (m *EstimateGasResponse) GetReturnValue() []byte { + if m != nil { + return m.ReturnValue + } + return nil +} + // QueryTraceTxRequest defines TraceTx request type QueryTraceTxRequest struct { // msg is the MsgEthereumTx for the requested transaction @@ -1422,103 +1438,105 @@ func init() { func init() { proto.RegisterFile("ethermint/evm/v1/query.proto", fileDescriptor_e15a877459347994) } var fileDescriptor_e15a877459347994 = []byte{ - // 1532 bytes of a gzipped FileDescriptorProto + // 1561 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x56, 0x5b, 0x6f, 0x1b, 0xc5, - 0x17, 0xcf, 0xc6, 0x4e, 0xec, 0x1c, 0x27, 0x6d, 0xfe, 0xd3, 0xf4, 0x5f, 0x77, 0x49, 0x62, 0x77, - 0xdb, 0x5c, 0x9b, 0xee, 0x92, 0x80, 0x8a, 0xe8, 0x0b, 0x4d, 0x42, 0x7a, 0xa1, 0x17, 0x15, 0x53, - 0xf1, 0x80, 0x54, 0x59, 0xe3, 0xdd, 0xe9, 0xda, 0x8a, 0xbd, 0xeb, 0xee, 0x8c, 0x8d, 0xd3, 0x52, - 0x84, 0x90, 0xa8, 0x8a, 0x8a, 0x50, 0x25, 0xde, 0x51, 0xbf, 0x01, 0x5f, 0xa3, 0x8f, 0x95, 0x78, - 0x01, 0x1e, 0x0a, 0x6a, 0x79, 0xe0, 0x33, 0xf0, 0x80, 0xd0, 0xcc, 0xce, 0xda, 0xbb, 0x5e, 0xaf, - 0x93, 0xa2, 0xf2, 0xc4, 0xd3, 0xee, 0xcc, 0x9c, 0xcb, 0xef, 0x9c, 0x39, 0x73, 0xce, 0x0f, 0x66, - 0x09, 0xab, 0x12, 0xaf, 0x51, 0x73, 0x98, 0x41, 0xda, 0x0d, 0xa3, 0xbd, 0x6e, 0xdc, 0x69, 0x11, - 0x6f, 0x4f, 0x6f, 0x7a, 0x2e, 0x73, 0xd1, 0x74, 0xf7, 0x54, 0x27, 0xed, 0x86, 0xde, 0x5e, 0x57, - 0x57, 0x4d, 0x97, 0x36, 0x5c, 0x6a, 0x54, 0x30, 0x25, 0xbe, 0xa8, 0xd1, 0x5e, 0xaf, 0x10, 0x86, - 0xd7, 0x8d, 0x26, 0xb6, 0x6b, 0x0e, 0x66, 0x35, 0xd7, 0xf1, 0xb5, 0x55, 0x35, 0x66, 0x9b, 0x1b, - 0xf1, 0xcf, 0x8e, 0xc7, 0xce, 0x58, 0x47, 0x1e, 0xcd, 0xd8, 0xae, 0xed, 0x8a, 0x5f, 0x83, 0xff, - 0xc9, 0xdd, 0x59, 0xdb, 0x75, 0xed, 0x3a, 0x31, 0x70, 0xb3, 0x66, 0x60, 0xc7, 0x71, 0x99, 0xf0, - 0x44, 0xe5, 0x69, 0x41, 0x9e, 0x8a, 0x55, 0xa5, 0x75, 0xdb, 0x60, 0xb5, 0x06, 0xa1, 0x0c, 0x37, - 0x9a, 0xbe, 0x80, 0xf6, 0x2e, 0x1c, 0xf9, 0x90, 0xa3, 0xdd, 0x34, 0x4d, 0xb7, 0xe5, 0xb0, 0x12, - 0xb9, 0xd3, 0x22, 0x94, 0xa1, 0x3c, 0x64, 0xb0, 0x65, 0x79, 0x84, 0xd2, 0xbc, 0x52, 0x54, 0x96, - 0x27, 0x4a, 0xc1, 0xf2, 0x5c, 0xf6, 0xe1, 0x93, 0xc2, 0xc8, 0x1f, 0x4f, 0x0a, 0x23, 0x9a, 0x09, - 0x33, 0x51, 0x55, 0xda, 0x74, 0x1d, 0x4a, 0xb8, 0x6e, 0x05, 0xd7, 0xb1, 0x63, 0x92, 0x40, 0x57, - 0x2e, 0xd1, 0x1b, 0x30, 0x61, 0xba, 0x16, 0x29, 0x57, 0x31, 0xad, 0xe6, 0x47, 0xc5, 0x59, 0x96, - 0x6f, 0x5c, 0xc2, 0xb4, 0x8a, 0x66, 0x60, 0xcc, 0x71, 0xb9, 0x52, 0xaa, 0xa8, 0x2c, 0xa7, 0x4b, - 0xfe, 0x42, 0x7b, 0x0f, 0x8e, 0x0b, 0x27, 0xdb, 0x22, 0xbd, 0xff, 0x00, 0xe5, 0x03, 0x05, 0xd4, - 0x41, 0x16, 0x24, 0xd8, 0x05, 0x38, 0xe4, 0xdf, 0x5c, 0x39, 0x6a, 0x69, 0xca, 0xdf, 0xdd, 0xf4, - 0x37, 0x91, 0x0a, 0x59, 0xca, 0x9d, 0x72, 0x7c, 0xa3, 0x02, 0x5f, 0x77, 0xcd, 0x4d, 0x60, 0xdf, - 0x6a, 0xd9, 0x69, 0x35, 0x2a, 0xc4, 0x93, 0x11, 0x4c, 0xc9, 0xdd, 0xeb, 0x62, 0x53, 0xbb, 0x02, - 0xb3, 0x02, 0xc7, 0xc7, 0xb8, 0x5e, 0xb3, 0x30, 0x73, 0xbd, 0xbe, 0x60, 0x4e, 0xc0, 0xa4, 0xe9, - 0x3a, 0xfd, 0x38, 0x72, 0x7c, 0x6f, 0x33, 0x16, 0xd5, 0x23, 0x05, 0xe6, 0x12, 0xac, 0xc9, 0xc0, - 0x96, 0xe0, 0x70, 0x80, 0x2a, 0x6a, 0x31, 0x00, 0xfb, 0x1a, 0x43, 0x0b, 0x8a, 0x68, 0xcb, 0xbf, - 0xe7, 0x57, 0xb9, 0x9e, 0x37, 0x65, 0x11, 0x75, 0x55, 0xf7, 0x2b, 0x22, 0xed, 0x8a, 0x74, 0xf6, - 0x11, 0x73, 0x3d, 0x6c, 0xef, 0xef, 0x0c, 0x4d, 0x43, 0x6a, 0x97, 0xec, 0xc9, 0x7a, 0xe3, 0xbf, - 0x21, 0xf7, 0x6b, 0xd2, 0x7d, 0xd7, 0x98, 0x74, 0x3f, 0x03, 0x63, 0x6d, 0x5c, 0x6f, 0x05, 0xce, - 0xfd, 0x85, 0x76, 0x16, 0xa6, 0x65, 0x29, 0x59, 0xaf, 0x14, 0xe4, 0x12, 0xfc, 0x2f, 0xa4, 0x27, - 0x5d, 0x20, 0x48, 0xf3, 0xda, 0x17, 0x5a, 0x93, 0x25, 0xf1, 0xaf, 0xdd, 0x05, 0x24, 0x04, 0x6f, - 0x76, 0xae, 0xba, 0x36, 0x0d, 0x5c, 0x20, 0x48, 0x8b, 0x17, 0xe3, 0xdb, 0x17, 0xff, 0xe8, 0x02, - 0x40, 0xaf, 0xaf, 0x88, 0xd8, 0x72, 0x1b, 0x8b, 0xba, 0x5f, 0xb4, 0x3a, 0x6f, 0x42, 0xba, 0xdf, - 0xaf, 0x64, 0x13, 0xd2, 0x6f, 0xf4, 0x52, 0x55, 0x0a, 0x69, 0x86, 0x40, 0x7e, 0xad, 0xc8, 0xc4, - 0x06, 0xce, 0x25, 0xce, 0x15, 0x48, 0xd7, 0x5d, 0x9b, 0x47, 0x97, 0x5a, 0xce, 0x6d, 0x1c, 0xd5, - 0xfb, 0x5b, 0x9f, 0x7e, 0xd5, 0xb5, 0x4b, 0x42, 0x04, 0x5d, 0x1c, 0x00, 0x6a, 0x69, 0x5f, 0x50, - 0xbe, 0x9f, 0x30, 0x2a, 0x6d, 0x46, 0xe6, 0xe1, 0x06, 0xf6, 0x70, 0x23, 0xc8, 0x83, 0x76, 0x4d, - 0x02, 0x0c, 0x76, 0x25, 0xc0, 0xb3, 0x30, 0xde, 0x14, 0x3b, 0x22, 0x41, 0xb9, 0x8d, 0x7c, 0x1c, - 0xa2, 0xaf, 0xb1, 0x95, 0x7e, 0xfa, 0xbc, 0x30, 0x52, 0x92, 0xd2, 0xda, 0xcf, 0x0a, 0x1c, 0xda, - 0x61, 0xd5, 0x6d, 0x5c, 0xaf, 0x87, 0x32, 0x8d, 0x3d, 0x9b, 0x06, 0x77, 0xc2, 0xff, 0xd1, 0x31, - 0xc8, 0xd8, 0x98, 0x96, 0x4d, 0xdc, 0x94, 0xcf, 0x63, 0xdc, 0xc6, 0x74, 0x1b, 0x37, 0xd1, 0x2d, - 0x98, 0x6e, 0x7a, 0x6e, 0xd3, 0xa5, 0xc4, 0xeb, 0x3e, 0x31, 0xfe, 0x3c, 0x26, 0xb7, 0x36, 0xfe, - 0x7c, 0x5e, 0xd0, 0xed, 0x1a, 0xab, 0xb6, 0x2a, 0xba, 0xe9, 0x36, 0x0c, 0x39, 0x1b, 0xfc, 0xcf, - 0x19, 0x6a, 0xed, 0x1a, 0x6c, 0xaf, 0x49, 0xa8, 0xbe, 0xdd, 0x7b, 0xdb, 0xa5, 0xc3, 0x81, 0xad, - 0xe0, 0x5d, 0x1e, 0x87, 0xac, 0x59, 0xc5, 0x35, 0xa7, 0x5c, 0xb3, 0xf2, 0xe9, 0xa2, 0xb2, 0x9c, - 0x2a, 0x65, 0xc4, 0xfa, 0xb2, 0x85, 0x8a, 0x90, 0x6b, 0x39, 0xc4, 0x31, 0xbd, 0xbd, 0x26, 0x23, - 0x56, 0x7e, 0xac, 0xa8, 0x2c, 0x67, 0x4b, 0xe1, 0x2d, 0x6d, 0x09, 0x8e, 0xec, 0x50, 0x56, 0x6b, - 0x60, 0x46, 0x2e, 0xe2, 0x5e, 0xaa, 0xa6, 0x21, 0x65, 0x63, 0x3f, 0xbc, 0x74, 0x89, 0xff, 0x6a, - 0x7f, 0xa5, 0x82, 0x5b, 0xf7, 0xb0, 0x49, 0x6e, 0x76, 0x82, 0x4c, 0x18, 0x90, 0x6a, 0x50, 0x5b, - 0x66, 0x74, 0x2e, 0x9e, 0xd1, 0x6b, 0xd4, 0xbe, 0x84, 0x1d, 0xab, 0xce, 0x55, 0xb8, 0x24, 0x3a, - 0x0f, 0x93, 0x8c, 0x9b, 0x28, 0x9b, 0xae, 0x73, 0xbb, 0x66, 0x8b, 0x4c, 0x0c, 0xd4, 0x14, 0x8e, - 0xb6, 0x85, 0x50, 0x29, 0xc7, 0x7a, 0x0b, 0xb4, 0x09, 0x93, 0x4d, 0x8f, 0x58, 0xc4, 0x24, 0x94, - 0xba, 0x1e, 0xcd, 0xa7, 0x45, 0xc1, 0xed, 0xe3, 0x3b, 0xa2, 0xc2, 0x7b, 0x68, 0xa5, 0xee, 0x9a, - 0xbb, 0x41, 0xb7, 0x1a, 0x13, 0x79, 0xcb, 0x89, 0x3d, 0xbf, 0x57, 0xa1, 0x39, 0x00, 0x5f, 0x44, - 0x3c, 0xa9, 0x71, 0xf1, 0xa4, 0x26, 0xc4, 0x8e, 0x98, 0x42, 0xdb, 0xc1, 0x31, 0x1f, 0x94, 0xf9, - 0x8c, 0x08, 0x42, 0xd5, 0xfd, 0x29, 0xaa, 0x07, 0x53, 0x54, 0xbf, 0x19, 0x4c, 0xd1, 0xad, 0x2c, - 0x2f, 0xa9, 0xc7, 0xbf, 0x16, 0x14, 0x69, 0x84, 0x9f, 0x0c, 0xac, 0x8c, 0xec, 0xbf, 0x53, 0x19, - 0x13, 0x43, 0x2b, 0x03, 0x62, 0x95, 0xf1, 0x41, 0x3a, 0x3b, 0x3a, 0x9d, 0x2a, 0x65, 0x59, 0xa7, - 0x5c, 0x73, 0x2c, 0xd2, 0xd1, 0x56, 0x65, 0x07, 0xec, 0xde, 0x7f, 0xaf, 0x3d, 0x59, 0x98, 0xe1, - 0xe0, 0x29, 0xf0, 0x7f, 0xed, 0x9b, 0x14, 0xfc, 0xbf, 0x27, 0xbc, 0xc5, 0xe3, 0x0d, 0xd5, 0x0b, - 0xeb, 0x04, 0x4d, 0x62, 0xbf, 0x7a, 0x61, 0x1d, 0xfa, 0x1a, 0xea, 0xe5, 0xbf, 0x7e, 0xd9, 0xda, - 0x19, 0x38, 0x16, 0xbb, 0x8d, 0x21, 0xb7, 0x77, 0xb4, 0x3b, 0xa5, 0x29, 0xb9, 0x40, 0x82, 0x69, - 0xa0, 0xdd, 0xea, 0x4e, 0x60, 0xb9, 0x2d, 0x4d, 0xec, 0x40, 0x96, 0xb7, 0xec, 0xf2, 0x6d, 0x22, - 0xa7, 0xe0, 0xd6, 0xea, 0x2f, 0xcf, 0x0b, 0x8b, 0x07, 0x88, 0xe7, 0xb2, 0xc3, 0xf8, 0xb8, 0x16, - 0xe6, 0xb4, 0x77, 0x64, 0x2b, 0xbf, 0xee, 0x5a, 0xe4, 0x46, 0xab, 0x52, 0xaf, 0x99, 0x57, 0xc8, - 0x5e, 0xec, 0xee, 0xfc, 0x8e, 0x14, 0xbe, 0x3b, 0xed, 0x7d, 0xc9, 0xdb, 0x22, 0x8a, 0x5d, 0x74, - 0x8b, 0x70, 0xd8, 0xe1, 0x54, 0xb2, 0x29, 0x4e, 0xca, 0x7c, 0xc0, 0x4b, 0xe2, 0xe6, 0x84, 0xe5, - 0x37, 0xbe, 0x38, 0x04, 0x63, 0xc2, 0x0c, 0xfa, 0x4a, 0x81, 0x8c, 0x24, 0x49, 0x68, 0x21, 0x5e, - 0x66, 0x03, 0x58, 0xb0, 0xba, 0xb8, 0x9f, 0x98, 0x0f, 0x46, 0x3b, 0xfd, 0xe5, 0x8f, 0xbf, 0x7f, - 0x37, 0xba, 0x80, 0x4e, 0x1a, 0x31, 0xf6, 0x2e, 0x89, 0x92, 0x71, 0x4f, 0x96, 0xc6, 0x7d, 0xf4, - 0xbd, 0x02, 0x53, 0x11, 0x2e, 0x8a, 0x4e, 0x27, 0xb8, 0x19, 0xc4, 0x79, 0xd5, 0xb5, 0x83, 0x09, - 0x4b, 0x64, 0x1b, 0x02, 0xd9, 0x1a, 0x5a, 0x8d, 0x23, 0x0b, 0x68, 0x6f, 0x0c, 0xe0, 0x0f, 0x0a, - 0x4c, 0xf7, 0xd3, 0x4a, 0xa4, 0x27, 0xb8, 0x4d, 0x60, 0xb3, 0xaa, 0x71, 0x60, 0x79, 0x89, 0xf4, - 0x9c, 0x40, 0xfa, 0x36, 0xda, 0x88, 0x23, 0x6d, 0x07, 0x3a, 0x3d, 0xb0, 0x61, 0xa6, 0x7c, 0x1f, - 0x3d, 0x50, 0x20, 0x23, 0x09, 0x64, 0xe2, 0xd5, 0x46, 0xb9, 0x69, 0xe2, 0xd5, 0xf6, 0xf1, 0x50, - 0x6d, 0x4d, 0xc0, 0x5a, 0x44, 0xa7, 0xe2, 0xb0, 0x24, 0x21, 0xa5, 0xa1, 0xd4, 0x3d, 0x52, 0x20, - 0x23, 0xa9, 0x64, 0x22, 0x90, 0x28, 0x6f, 0x4d, 0x04, 0xd2, 0xc7, 0x48, 0xb5, 0x75, 0x01, 0xe4, - 0x34, 0x5a, 0x89, 0x03, 0xa1, 0xbe, 0x68, 0x0f, 0x87, 0x71, 0x6f, 0x97, 0xec, 0xdd, 0x47, 0x77, - 0x21, 0xcd, 0x19, 0x27, 0xd2, 0x12, 0x4b, 0xa6, 0x4b, 0x63, 0xd5, 0x93, 0x43, 0x65, 0x24, 0x86, - 0x15, 0x81, 0xe1, 0x24, 0x3a, 0x31, 0xa8, 0x9a, 0xac, 0x48, 0x26, 0x3e, 0x85, 0x71, 0x9f, 0x74, - 0xa1, 0x53, 0x09, 0x96, 0x23, 0xdc, 0x4e, 0x5d, 0xd8, 0x47, 0x4a, 0x22, 0x28, 0x0a, 0x04, 0x2a, - 0xca, 0xc7, 0x11, 0xf8, 0xac, 0x0e, 0x75, 0x20, 0x23, 0x49, 0x1d, 0x2a, 0xc6, 0x6d, 0x46, 0xf9, - 0x9e, 0xba, 0x34, 0x70, 0x50, 0xed, 0xf0, 0x3d, 0xd2, 0x6a, 0xf4, 0xa6, 0xa1, 0xa6, 0x09, 0xbf, - 0xb3, 0x48, 0x8d, 0xfb, 0x25, 0xac, 0x5a, 0x36, 0xb9, 0xbb, 0xcf, 0x21, 0x17, 0xe2, 0x5c, 0x07, - 0xf0, 0x3e, 0x20, 0xe6, 0x01, 0xa4, 0x4d, 0x5b, 0x14, 0xbe, 0x8b, 0x68, 0x7e, 0x80, 0x6f, 0x29, - 0x5e, 0xb6, 0x31, 0x45, 0x9f, 0x41, 0x46, 0x0e, 0xf1, 0xc4, 0xda, 0x8b, 0x92, 0xbc, 0xc4, 0xda, - 0xeb, 0xe3, 0x02, 0xc3, 0xa2, 0xf7, 0x67, 0x38, 0xeb, 0xa0, 0x87, 0x0a, 0x40, 0x6f, 0x10, 0xa1, - 0xe5, 0x61, 0xa6, 0xc3, 0xcc, 0x41, 0x5d, 0x39, 0x80, 0xa4, 0xc4, 0xb1, 0x20, 0x70, 0x14, 0xd0, - 0x5c, 0x12, 0x0e, 0x31, 0x3f, 0x78, 0x22, 0xe4, 0x30, 0x1b, 0xd2, 0x0d, 0xc2, 0x33, 0x70, 0x48, - 0x37, 0x88, 0xcc, 0xc4, 0x61, 0x89, 0x08, 0x66, 0x25, 0xfa, 0x56, 0x81, 0xa9, 0xe8, 0xb0, 0x4b, - 0x7a, 0x01, 0x11, 0xa9, 0xc4, 0xc6, 0x3e, 0x70, 0xfe, 0x0d, 0x7b, 0x8a, 0x7d, 0x73, 0x71, 0xeb, - 0xfc, 0xd3, 0x17, 0xf3, 0xca, 0xb3, 0x17, 0xf3, 0xca, 0x6f, 0x2f, 0xe6, 0x95, 0xc7, 0x2f, 0xe7, - 0x47, 0x9e, 0xbd, 0x9c, 0x1f, 0xf9, 0xe9, 0xe5, 0xfc, 0xc8, 0x27, 0xe1, 0x61, 0x4e, 0xda, 0x7c, - 0x96, 0xf7, 0x8c, 0x75, 0x84, 0x39, 0x31, 0xd0, 0x2b, 0xe3, 0x82, 0x0b, 0xbd, 0xf5, 0x77, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x40, 0x96, 0xea, 0xca, 0x15, 0x13, 0x00, 0x00, + 0x17, 0xcf, 0xc6, 0x4e, 0xec, 0x8c, 0x93, 0x36, 0xff, 0x69, 0xda, 0xba, 0xfb, 0x4f, 0x62, 0x77, + 0xdb, 0x5c, 0x9b, 0xee, 0x92, 0x80, 0x8a, 0xe8, 0x0b, 0x4d, 0x42, 0x7a, 0xa1, 0x17, 0x95, 0xa5, + 0xea, 0x03, 0x52, 0x65, 0x8d, 0x77, 0x27, 0x6b, 0x2b, 0xf6, 0xae, 0xbb, 0x33, 0x36, 0x4e, 0x4b, + 0x11, 0x42, 0xa2, 0x2a, 0x2a, 0x42, 0x95, 0x78, 0x47, 0xfd, 0x06, 0x7c, 0x8d, 0x3e, 0x56, 0xe2, + 0x05, 0x78, 0x28, 0xa8, 0xe5, 0x81, 0xcf, 0xc0, 0x03, 0x42, 0x73, 0x59, 0x7b, 0xd7, 0xeb, 0xb5, + 0x53, 0x54, 0x9e, 0x78, 0xda, 0x9d, 0x33, 0xe7, 0xf2, 0x3b, 0x33, 0x67, 0xce, 0xf9, 0x81, 0x59, + 0x4c, 0x2b, 0xd8, 0xaf, 0x57, 0x5d, 0x6a, 0xe0, 0x56, 0xdd, 0x68, 0xad, 0x1b, 0x77, 0x9b, 0xd8, + 0xdf, 0xd7, 0x1b, 0xbe, 0x47, 0x3d, 0x38, 0xdd, 0xd9, 0xd5, 0x71, 0xab, 0xae, 0xb7, 0xd6, 0xd5, + 0x55, 0xcb, 0x23, 0x75, 0x8f, 0x18, 0x65, 0x44, 0xb0, 0x50, 0x35, 0x5a, 0xeb, 0x65, 0x4c, 0xd1, + 0xba, 0xd1, 0x40, 0x4e, 0xd5, 0x45, 0xb4, 0xea, 0xb9, 0xc2, 0x5a, 0x55, 0x63, 0xbe, 0x99, 0x13, + 0xb1, 0x77, 0x22, 0xb6, 0x47, 0xdb, 0x72, 0x6b, 0xc6, 0xf1, 0x1c, 0x8f, 0xff, 0x1a, 0xec, 0x4f, + 0x4a, 0x67, 0x1d, 0xcf, 0x73, 0x6a, 0xd8, 0x40, 0x8d, 0xaa, 0x81, 0x5c, 0xd7, 0xa3, 0x3c, 0x12, + 0x91, 0xbb, 0x05, 0xb9, 0xcb, 0x57, 0xe5, 0xe6, 0xae, 0x41, 0xab, 0x75, 0x4c, 0x28, 0xaa, 0x37, + 0x84, 0x82, 0xf6, 0x1e, 0x38, 0xf2, 0x11, 0x43, 0xbb, 0x69, 0x59, 0x5e, 0xd3, 0xa5, 0x26, 0xbe, + 0xdb, 0xc4, 0x84, 0xc2, 0x3c, 0xc8, 0x20, 0xdb, 0xf6, 0x31, 0x21, 0x79, 0xa5, 0xa8, 0x2c, 0x4f, + 0x98, 0xc1, 0xf2, 0x7c, 0xf6, 0xd1, 0xd3, 0xc2, 0xc8, 0x1f, 0x4f, 0x0b, 0x23, 0x9a, 0x05, 0x66, + 0xa2, 0xa6, 0xa4, 0xe1, 0xb9, 0x04, 0x33, 0xdb, 0x32, 0xaa, 0x21, 0xd7, 0xc2, 0x81, 0xad, 0x5c, + 0xc2, 0xff, 0x83, 0x09, 0xcb, 0xb3, 0x71, 0xa9, 0x82, 0x48, 0x25, 0x3f, 0xca, 0xf7, 0xb2, 0x4c, + 0x70, 0x19, 0x91, 0x0a, 0x9c, 0x01, 0x63, 0xae, 0xc7, 0x8c, 0x52, 0x45, 0x65, 0x39, 0x6d, 0x8a, + 0x85, 0xf6, 0x3e, 0x38, 0xc1, 0x83, 0x6c, 0xf3, 0xe3, 0xfd, 0x07, 0x28, 0x1f, 0x2a, 0x40, 0xed, + 0xe7, 0x41, 0x82, 0x5d, 0x00, 0x87, 0xc4, 0xcd, 0x95, 0xa2, 0x9e, 0xa6, 0x84, 0x74, 0x53, 0x08, + 0xa1, 0x0a, 0xb2, 0x84, 0x05, 0x65, 0xf8, 0x46, 0x39, 0xbe, 0xce, 0x9a, 0xb9, 0x40, 0xc2, 0x6b, + 0xc9, 0x6d, 0xd6, 0xcb, 0xd8, 0x97, 0x19, 0x4c, 0x49, 0xe9, 0x0d, 0x2e, 0xd4, 0xae, 0x82, 0x59, + 0x8e, 0xe3, 0x36, 0xaa, 0x55, 0x6d, 0x44, 0x3d, 0xbf, 0x27, 0x99, 0x93, 0x60, 0xd2, 0xf2, 0xdc, + 0x5e, 0x1c, 0x39, 0x26, 0xdb, 0x8c, 0x65, 0xf5, 0x58, 0x01, 0x73, 0x09, 0xde, 0x64, 0x62, 0x4b, + 0xe0, 0x70, 0x80, 0x2a, 0xea, 0x31, 0x00, 0xfb, 0x06, 0x53, 0x0b, 0x8a, 0x68, 0x4b, 0xdc, 0xf3, + 0xeb, 0x5c, 0xcf, 0x5b, 0xb2, 0x88, 0x3a, 0xa6, 0xc3, 0x8a, 0x48, 0xbb, 0x2a, 0x83, 0x7d, 0x4c, + 0x3d, 0x1f, 0x39, 0xc3, 0x83, 0xc1, 0x69, 0x90, 0xda, 0xc3, 0xfb, 0xb2, 0xde, 0xd8, 0x6f, 0x28, + 0xfc, 0x9a, 0x0c, 0xdf, 0x71, 0x26, 0xc3, 0xcf, 0x80, 0xb1, 0x16, 0xaa, 0x35, 0x83, 0xe0, 0x62, + 0xa1, 0x9d, 0x03, 0xd3, 0xb2, 0x94, 0xec, 0xd7, 0x4a, 0x72, 0x09, 0xfc, 0x2f, 0x64, 0x27, 0x43, + 0x40, 0x90, 0x66, 0xb5, 0xcf, 0xad, 0x26, 0x4d, 0xfe, 0xaf, 0xdd, 0x03, 0x90, 0x2b, 0xde, 0x6a, + 0x5f, 0xf3, 0x1c, 0x12, 0x84, 0x80, 0x20, 0xcd, 0x5f, 0x8c, 0xf0, 0xcf, 0xff, 0xe1, 0x45, 0x00, + 0xba, 0x7d, 0x85, 0xe7, 0x96, 0xdb, 0x58, 0xd4, 0x45, 0xd1, 0xea, 0xac, 0x09, 0xe9, 0xa2, 0x5f, + 0xc9, 0x26, 0xa4, 0xdf, 0xec, 0x1e, 0x95, 0x19, 0xb2, 0x0c, 0x81, 0xfc, 0x5a, 0x91, 0x07, 0x1b, + 0x04, 0x97, 0x38, 0x57, 0x40, 0xba, 0xe6, 0x39, 0x2c, 0xbb, 0xd4, 0x72, 0x6e, 0xe3, 0xa8, 0xde, + 0xdb, 0xfa, 0xf4, 0x6b, 0x9e, 0x63, 0x72, 0x15, 0x78, 0xa9, 0x0f, 0xa8, 0xa5, 0xa1, 0xa0, 0x44, + 0x9c, 0x30, 0x2a, 0x6d, 0x46, 0x9e, 0xc3, 0x4d, 0xe4, 0xa3, 0x7a, 0x70, 0x0e, 0xda, 0x75, 0x09, + 0x30, 0x90, 0x4a, 0x80, 0xe7, 0xc0, 0x78, 0x83, 0x4b, 0xf8, 0x01, 0xe5, 0x36, 0xf2, 0x71, 0x88, + 0xc2, 0x62, 0x2b, 0xfd, 0xec, 0x45, 0x61, 0xc4, 0x94, 0xda, 0xda, 0xcf, 0x0a, 0x38, 0xb4, 0x43, + 0x2b, 0xdb, 0xa8, 0x56, 0x0b, 0x9d, 0x34, 0xf2, 0x1d, 0x12, 0xdc, 0x09, 0xfb, 0x87, 0xc7, 0x41, + 0xc6, 0x41, 0xa4, 0x64, 0xa1, 0x86, 0x7c, 0x1e, 0xe3, 0x0e, 0x22, 0xdb, 0xa8, 0x01, 0xef, 0x80, + 0xe9, 0x86, 0xef, 0x35, 0x3c, 0x82, 0xfd, 0xce, 0x13, 0x63, 0xcf, 0x63, 0x72, 0x6b, 0xe3, 0xcf, + 0x17, 0x05, 0xdd, 0xa9, 0xd2, 0x4a, 0xb3, 0xac, 0x5b, 0x5e, 0xdd, 0x90, 0xb3, 0x41, 0x7c, 0xce, + 0x12, 0x7b, 0xcf, 0xa0, 0xfb, 0x0d, 0x4c, 0xf4, 0xed, 0xee, 0xdb, 0x36, 0x0f, 0x07, 0xbe, 0x82, + 0x77, 0x79, 0x02, 0x64, 0xad, 0x0a, 0xaa, 0xba, 0xa5, 0xaa, 0x9d, 0x4f, 0x17, 0x95, 0xe5, 0x94, + 0x99, 0xe1, 0xeb, 0x2b, 0x36, 0x2c, 0x82, 0x5c, 0xd3, 0xc5, 0xae, 0xe5, 0xef, 0x37, 0x28, 0xb6, + 0xf3, 0x63, 0x45, 0x65, 0x39, 0x6b, 0x86, 0x45, 0x5a, 0x19, 0x1c, 0xd9, 0x21, 0xb4, 0x5a, 0x47, + 0x14, 0x5f, 0x42, 0xdd, 0xa3, 0x9a, 0x06, 0x29, 0x07, 0x89, 0xf4, 0xd2, 0x26, 0xfb, 0x85, 0xc7, + 0xc0, 0xf8, 0x2e, 0xaa, 0xd6, 0xb0, 0xcd, 0x93, 0xcb, 0x9a, 0x72, 0xc5, 0xba, 0x91, 0x8f, 0x69, + 0xd3, 0x77, 0x4b, 0xe2, 0x1d, 0xf0, 0xc4, 0xcc, 0x9c, 0x90, 0xdd, 0xe6, 0xaf, 0xe1, 0xaf, 0x54, + 0x50, 0x30, 0x3e, 0xb2, 0xf0, 0xad, 0x76, 0x70, 0x88, 0x06, 0x48, 0xd5, 0x89, 0x23, 0x2f, 0x63, + 0x2e, 0x7e, 0x19, 0xd7, 0x89, 0x73, 0x19, 0xb9, 0x76, 0x8d, 0x99, 0x30, 0x4d, 0x78, 0x01, 0x4c, + 0x52, 0xe6, 0xa2, 0x64, 0x79, 0xee, 0x6e, 0xd5, 0xe1, 0xb1, 0xfa, 0x5a, 0xf2, 0x40, 0xdb, 0x5c, + 0xc9, 0xcc, 0xd1, 0xee, 0x02, 0x6e, 0x82, 0xc9, 0x86, 0x8f, 0x6d, 0x6c, 0x61, 0x42, 0x3c, 0x9f, + 0xe4, 0xd3, 0xbc, 0x56, 0x87, 0xc4, 0x8e, 0x98, 0xb0, 0x84, 0xcb, 0x35, 0xcf, 0xda, 0x0b, 0x1a, + 0xdd, 0x18, 0x3f, 0xf2, 0x1c, 0x97, 0x89, 0x36, 0x07, 0xe7, 0x00, 0x10, 0x2a, 0xfc, 0x35, 0x8e, + 0xf3, 0xd7, 0x38, 0xc1, 0x25, 0x7c, 0x80, 0x6d, 0x07, 0xdb, 0x6c, 0xc6, 0xe6, 0x33, 0x3c, 0x09, + 0x55, 0x17, 0x03, 0x58, 0x0f, 0x06, 0xb0, 0x7e, 0x2b, 0x18, 0xc0, 0x5b, 0x59, 0x56, 0x8d, 0x4f, + 0x7e, 0x2d, 0x28, 0xd2, 0x09, 0xdb, 0xe9, 0x5b, 0x54, 0xd9, 0x7f, 0xa7, 0xa8, 0x26, 0x06, 0x16, + 0x15, 0x88, 0x15, 0xd5, 0x87, 0xe9, 0xec, 0xe8, 0x74, 0xca, 0xcc, 0xd2, 0x76, 0xa9, 0xea, 0xda, + 0xb8, 0xad, 0xad, 0xca, 0xe6, 0xd9, 0xb9, 0xff, 0x6e, 0x67, 0xb3, 0x11, 0x45, 0xc1, 0x2b, 0x62, + 0xff, 0xda, 0x37, 0x29, 0x70, 0xac, 0xab, 0xbc, 0xc5, 0xf2, 0x0d, 0xd5, 0x0b, 0x6d, 0x07, 0xfd, + 0x65, 0x58, 0xbd, 0xd0, 0x36, 0x79, 0x03, 0xf5, 0xf2, 0x5f, 0xbf, 0x6c, 0xed, 0x2c, 0x38, 0x1e, + 0xbb, 0x8d, 0x01, 0xb7, 0x77, 0xb4, 0x33, 0xe0, 0x09, 0xbe, 0x88, 0x83, 0x41, 0xa2, 0xdd, 0xe9, + 0x0c, 0x6f, 0x29, 0x96, 0x2e, 0x76, 0x40, 0x96, 0x75, 0xfb, 0xd2, 0x2e, 0x96, 0x03, 0x74, 0x6b, + 0xf5, 0x97, 0x17, 0x85, 0xc5, 0x03, 0xe4, 0x73, 0xc5, 0xa5, 0x6c, 0xd2, 0x73, 0x77, 0xda, 0xbb, + 0x72, 0x0a, 0xdc, 0xf0, 0x6c, 0x7c, 0xb3, 0x59, 0xae, 0x55, 0xad, 0xab, 0x78, 0x3f, 0x76, 0x77, + 0xa2, 0x99, 0x85, 0xef, 0x4e, 0xfb, 0x40, 0x52, 0xbe, 0x88, 0x61, 0x07, 0xdd, 0x22, 0x38, 0xec, + 0x32, 0x16, 0xda, 0xe0, 0x3b, 0x25, 0xc6, 0x0d, 0x24, 0xe7, 0x73, 0xc3, 0xfa, 0x1b, 0x5f, 0x1c, + 0x02, 0x63, 0xdc, 0x0d, 0xfc, 0x4a, 0x01, 0x19, 0xc9, 0xaf, 0xe0, 0x42, 0xbc, 0xcc, 0xfa, 0x10, + 0x68, 0x75, 0x71, 0x98, 0x9a, 0x00, 0xa3, 0x9d, 0xf9, 0xf2, 0xc7, 0xdf, 0xbf, 0x1b, 0x5d, 0x80, + 0xa7, 0x8c, 0x18, 0xf1, 0x97, 0x1c, 0xcb, 0xb8, 0x2f, 0x4b, 0xe3, 0x01, 0xfc, 0x5e, 0x01, 0x53, + 0x11, 0x1a, 0x0b, 0xcf, 0x24, 0x84, 0xe9, 0x47, 0x97, 0xd5, 0xb5, 0x83, 0x29, 0x4b, 0x64, 0x1b, + 0x1c, 0xd9, 0x1a, 0x5c, 0x8d, 0x23, 0x0b, 0x18, 0x73, 0x0c, 0xe0, 0x0f, 0x0a, 0x98, 0xee, 0x65, + 0xa4, 0x50, 0x4f, 0x08, 0x9b, 0x40, 0x84, 0x55, 0xe3, 0xc0, 0xfa, 0x12, 0xe9, 0x79, 0x8e, 0xf4, + 0x1d, 0xb8, 0x11, 0x47, 0xda, 0x0a, 0x6c, 0xba, 0x60, 0xc3, 0x24, 0xfb, 0x01, 0x7c, 0xa8, 0x80, + 0x8c, 0xe4, 0x9e, 0x89, 0x57, 0x1b, 0xa5, 0xb5, 0x89, 0x57, 0xdb, 0x43, 0x61, 0xb5, 0x35, 0x0e, + 0x6b, 0x11, 0x9e, 0x8e, 0xc3, 0x92, 0x5c, 0x96, 0x84, 0x8e, 0xee, 0xb1, 0x02, 0x32, 0x92, 0x85, + 0x26, 0x02, 0x89, 0x52, 0xde, 0x44, 0x20, 0x3d, 0x64, 0x56, 0x5b, 0xe7, 0x40, 0xce, 0xc0, 0x95, + 0x38, 0x10, 0x22, 0x54, 0xbb, 0x38, 0x8c, 0xfb, 0x7b, 0x78, 0xff, 0x01, 0xbc, 0x07, 0xd2, 0x8c, + 0xac, 0x42, 0x2d, 0xb1, 0x64, 0x3a, 0x0c, 0x58, 0x3d, 0x35, 0x50, 0x47, 0x62, 0x58, 0xe1, 0x18, + 0x4e, 0xc1, 0x93, 0xfd, 0xaa, 0xc9, 0x8e, 0x9c, 0xc4, 0xa7, 0x60, 0x5c, 0xf0, 0x35, 0x78, 0x3a, + 0xc1, 0x73, 0x84, 0x16, 0xaa, 0x0b, 0x43, 0xb4, 0x24, 0x82, 0x22, 0x47, 0xa0, 0xc2, 0x7c, 0x1c, + 0x81, 0x20, 0x84, 0xb0, 0x0d, 0x32, 0x92, 0x0f, 0xc2, 0x62, 0xdc, 0x67, 0x94, 0x2a, 0xaa, 0x4b, + 0x7d, 0x07, 0xd5, 0x0e, 0x93, 0xe1, 0x66, 0xbd, 0x3b, 0x0d, 0x35, 0x8d, 0xc7, 0x9d, 0x85, 0x6a, + 0x3c, 0x2e, 0xa6, 0x95, 0x92, 0xc5, 0xc2, 0x7d, 0x0e, 0x72, 0x21, 0xba, 0x76, 0x80, 0xe8, 0x7d, + 0x72, 0xee, 0xc3, 0xf7, 0xb4, 0x45, 0x1e, 0xbb, 0x08, 0xe7, 0xfb, 0xc4, 0x96, 0xea, 0x25, 0xc6, + 0x02, 0x3f, 0x03, 0x19, 0x39, 0xc4, 0x13, 0x6b, 0x2f, 0x4a, 0xf2, 0x12, 0x6b, 0xaf, 0x87, 0x0b, + 0x0c, 0xca, 0x5e, 0xcc, 0x70, 0xda, 0x86, 0x8f, 0x14, 0x00, 0xba, 0x83, 0x08, 0x2e, 0x0f, 0x72, + 0x1d, 0x66, 0x0e, 0xea, 0xca, 0x01, 0x34, 0x25, 0x8e, 0x05, 0x8e, 0xa3, 0x00, 0xe7, 0x92, 0x70, + 0xf0, 0xf9, 0xc1, 0x0e, 0x42, 0x0e, 0xb3, 0x01, 0xdd, 0x20, 0x3c, 0x03, 0x07, 0x74, 0x83, 0xc8, + 0x4c, 0x1c, 0x74, 0x10, 0xc1, 0xac, 0x84, 0xdf, 0x2a, 0x60, 0x2a, 0x3a, 0xec, 0x92, 0x5e, 0x40, + 0x44, 0x2b, 0xb1, 0xb1, 0xf7, 0x9d, 0x7f, 0x83, 0x9e, 0x62, 0xcf, 0x5c, 0xdc, 0xba, 0xf0, 0xec, + 0xe5, 0xbc, 0xf2, 0xfc, 0xe5, 0xbc, 0xf2, 0xdb, 0xcb, 0x79, 0xe5, 0xc9, 0xab, 0xf9, 0x91, 0xe7, + 0xaf, 0xe6, 0x47, 0x7e, 0x7a, 0x35, 0x3f, 0xf2, 0x49, 0x78, 0x98, 0xe3, 0x16, 0x9b, 0xe5, 0x5d, + 0x67, 0x6d, 0xee, 0x8e, 0x0f, 0xf4, 0xf2, 0x38, 0xe7, 0x42, 0x6f, 0xff, 0x1d, 0x00, 0x00, 0xff, + 0xff, 0xf5, 0x67, 0x75, 0xe3, 0x50, 0x13, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2690,6 +2708,23 @@ func (m *EstimateGasResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.ReturnValue) > 0 { + i -= len(m.ReturnValue) + copy(dAtA[i:], m.ReturnValue) + i = encodeVarintQuery(dAtA, i, uint64(len(m.ReturnValue))) + i-- + dAtA[i] = 0x1a + } + if m.Failed { + i-- + if m.Failed { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x10 + } if m.Gas != 0 { i = encodeVarintQuery(dAtA, i, uint64(m.Gas)) i-- @@ -3339,6 +3374,13 @@ func (m *EstimateGasResponse) Size() (n int) { if m.Gas != 0 { n += 1 + sovQuery(uint64(m.Gas)) } + if m.Failed { + n += 2 + } + l = len(m.ReturnValue) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } return n } @@ -5238,6 +5280,60 @@ func (m *EstimateGasResponse) Unmarshal(dAtA []byte) error { break } } + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Failed", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.Failed = bool(v != 0) + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ReturnValue", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ReturnValue = append(m.ReturnValue[:0], dAtA[iNdEx:postIndex]...) + if m.ReturnValue == nil { + m.ReturnValue = []byte{} + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) diff --git a/x/vesting/keeper/integration_test.go b/x/vesting/keeper/integration_test.go index 59b398dc..6d475d8d 100644 --- a/x/vesting/keeper/integration_test.go +++ b/x/vesting/keeper/integration_test.go @@ -1031,7 +1031,7 @@ var _ = Describe("Monthly Vesting Account", Ordered, func() { Expect(err).To(BeNil()) _, err = testutil.DeliverEthTx(s.app, s.vaPrivKey, msg) Expect(err).ToNot(BeNil()) - Expect(err).Should(MatchError(ContainSubstring("Insert account failed. Empty response"))) + Expect(err).Should(MatchError(ContainSubstring("Insert account balance failed. Empty response"))) }) })