From dd306f723816d20614f4de081cbda2e880cc12d1 Mon Sep 17 00:00:00 2001 From: Roland Sherwin Date: Mon, 28 Oct 2024 23:37:49 +0530 Subject: [PATCH 1/3] chore: do not transfer funds if amount is zero --- src/funding.rs | 43 +++++++++++++++++++++++-------------------- src/main.rs | 10 ++++------ 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/funding.rs b/src/funding.rs index b980461b..a0b9849c 100644 --- a/src/funding.rs +++ b/src/funding.rs @@ -174,8 +174,8 @@ impl AnsibleProvisioner { debug!("No gas tokens to drain from wallet: {to_address}"); } else { from_wallet - // 0.0001 gas - .transfer_gas_tokens(to_address, gas_balance - U256::from_str("1_000_000_000_000").unwrap()).await + // 0.001 gas + .transfer_gas_tokens(to_address, gas_balance - U256::from_str("10_000_000_000_000").unwrap()).await .inspect_err(|err| { debug!( "Failed to transfer {gas_balance} gas tokens from {to_address} with err: {err:?}", @@ -354,47 +354,50 @@ impl AnsibleProvisioner { println!("Funding wallet gas balance: {gas_balance}"); debug!("Funding wallet token balance: {token_balance:?} and gas balance {gas_balance}"); - // let (tokens_for_each_uploader, _quotient) = token_balance.div_rem(U256::from(sk_count)); - - // // +1 to make sure we have enough gas - // let (gas_tokens_for_each_uploader, _quotient) = - // gas_balance.div_rem(U256::from(sk_count + 1)); - let default_token_amount = U256::from_str("1_000_000_000_000_000_000").unwrap(); let default_gas_amount = U256::from_str("100_000_000_000_000_000").unwrap(); let tokens_for_each_uploader = options.token_amount.unwrap_or(default_token_amount); - let gas_tokens_for_each_uploader = options.gas_amount.unwrap_or(default_gas_amount); + let gas_for_each_uploader = options.gas_amount.unwrap_or(default_gas_amount); - println!("Transferring {tokens_for_each_uploader} tokens and {gas_tokens_for_each_uploader} gas tokens to each uploader"); - debug!("Transferring {tokens_for_each_uploader} tokens and {gas_tokens_for_each_uploader} gas tokens to each uploader"); + println!("Transferring {tokens_for_each_uploader} tokens and {gas_for_each_uploader} gas tokens to each uploader"); + debug!("Transferring {tokens_for_each_uploader} tokens and {gas_for_each_uploader} gas tokens to each uploader"); for (vm, sks_per_machine) in all_secret_keys.iter() { debug!("Transferring funds for uploader vm: {}", vm.name); for sk in sks_per_machine.iter() { sk.address(); - debug!( - "Transferring funds for uploader vm: {} with public key: {}", - vm.name, - sk.address() - ); - from_wallet + if !tokens_for_each_uploader.is_zero() { + debug!( + "Transferring {tokens_for_each_uploader} tokens for uploader vm: {} with public key: {}", + vm.name, + sk.address() + ); + from_wallet .transfer_tokens(sk.address(), tokens_for_each_uploader) .await.inspect_err(|err| { debug!( "Failed to transfer {tokens_for_each_uploader} tokens to {} with err: {err:?}", sk.address() ) })?; - from_wallet - .transfer_gas_tokens(sk.address(), gas_tokens_for_each_uploader) + } + if !gas_for_each_uploader.is_zero() { + debug!( + "Transferring {gas_for_each_uploader} gas for uploader vm: {} with public key: {}", + vm.name, + sk.address() + ); + from_wallet + .transfer_gas_tokens(sk.address(), gas_for_each_uploader) .await .inspect_err(|err| { debug!( - "Failed to transfer {gas_tokens_for_each_uploader} gas tokens to {} with err: {err:?}", sk.address() + "Failed to transfer {gas_for_each_uploader} gas tokens to {} with err: {err:?}", sk.address() ) }) ?; + } } } println!("All Funds transferred successfully"); diff --git a/src/main.rs b/src/main.rs index 49ec6efb..b6ba8d1c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1109,6 +1109,8 @@ enum FundsCommand { #[clap(long)] funding_wallet_secret_key: Option, /// The number of gas to transfer, in U256 + /// + /// 1 ETH = 1_000_000_000_000_000_000. Defaults to 0.1 ETH #[arg(long)] gas_to_transfer: Option, /// The name of the environment. @@ -1118,6 +1120,8 @@ enum FundsCommand { #[clap(long, value_parser = parse_provider, verbatim_doc_comment, default_value_t = CloudProvider::DigitalOcean)] provider: CloudProvider, /// The number of tokens to transfer, in U256 + /// + /// 1 Token = 1_000_000_000_000_000_000. Defaults to 1 token. #[arg(long)] tokens_to_transfer: Option, }, @@ -1559,12 +1563,6 @@ async fn main() -> Result<()> { )); } - if gas_to_transfer.is_none() && tokens_to_transfer.is_none() { - return Err(eyre!( - "At least one of 'gas-to-transfer' or 'tokens-to-transfer' must be provided" - )); - } - let options = FundingOptions { custom_evm_testnet_data: environment_details.evm_testnet_data, evm_network: environment_details.evm_network, From 009370e3685b702f5dc54b03eeea5497326bb0c5 Mon Sep 17 00:00:00 2001 From: Roland Sherwin Date: Wed, 30 Oct 2024 19:21:34 +0530 Subject: [PATCH 2/3] chore: bump dependencies --- Cargo.lock | 257 ++++++++++++++++++++++++++++++++++++++++------------- Cargo.toml | 6 +- 2 files changed, 199 insertions(+), 64 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d174da20..8f816689 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -35,6 +35,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "getrandom", "once_cell", "version_check", "zerocopy", @@ -57,9 +58,9 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "alloy" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "056f2c01b2aed86e15b43c47d109bfc8b82553dc34e66452875e51247ec31ab2" +checksum = "ea8ebf106e84a1c37f86244df7da0c7587e697b71a0d565cce079449b85ac6f8" dependencies = [ "alloy-consensus", "alloy-contract", @@ -91,9 +92,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705687d5bfd019fee57cf9e206b27b30a9a9617535d5590a02b171e813208f8e" +checksum = "41ed961a48297c732a5d97ee321aa8bb5009ecadbcb077d8bec90cb54e651629" dependencies = [ "alloy-eips", "alloy-primitives", @@ -107,9 +108,9 @@ dependencies = [ [[package]] name = "alloy-contract" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "917f7d12cf3971dc8c11c9972f732b35ccb9aaaf5f28f2f87e9e6523bee3a8ad" +checksum = "460ab80ce4bda1c80bcf96fe7460520476f2c7b734581c6567fac2708e2a60ef" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", @@ -168,20 +169,21 @@ dependencies = [ [[package]] name = "alloy-eip7702" -version = "0.1.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea59dc42102bc9a1905dc57901edc6dd48b9f38115df86c7d252acba70d71d04" +checksum = "64ffc577390ce50234e02d841214b3dc0bea6aaaae8e04bbf3cb82e9a45da9eb" dependencies = [ "alloy-primitives", "alloy-rlp", + "derive_more", "serde", ] [[package]] name = "alloy-eips" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ffb906284a1e1f63c4607da2068c8197458a352d0b3e9796e67353d72a9be85" +checksum = "b69e06cf9c37be824b9d26d6d101114fdde6af0c87de2828b414c05c4b3daa71" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -197,9 +199,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8429cf4554eed9b40feec7f4451113e76596086447550275e3def933faf47ce3" +checksum = "dde15e14944a88bd6a57d325e9a49b75558746fe16aaccc79713ae50a6a9574c" dependencies = [ "alloy-primitives", "alloy-serde", @@ -220,9 +222,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fa8a1a3c4cbd221f2b8e3693aeb328fca79a757fe556ed08e47bbbc2a70db7" +checksum = "af5979e0d5a7bf9c7eb79749121e8256e59021af611322aee56e77e20776b4b3" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -234,9 +236,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85fa23a6a9d612b52e402c995f2d582c25165ec03ac6edf64c861a76bc5b87cd" +checksum = "204237129086ce5dc17a58025e93739b01b45313841f98fa339eb1d780511e57" dependencies = [ "alloy-consensus", "alloy-eips", @@ -255,9 +257,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "801492711d4392b2ccf5fc0bc69e299fa1aab15167d74dcaa9aab96a54f684bd" +checksum = "514f70ee2a953db21631cd817b13a1571474ec77ddc03d47616d5e8203489fde" dependencies = [ "alloy-consensus", "alloy-eips", @@ -268,9 +270,9 @@ dependencies = [ [[package]] name = "alloy-node-bindings" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1334a738aa1710cb8227441b3fcc319202ce78e967ef37406940242df4a454" +checksum = "27444ea67d360508753022807cdd0b49a95c878924c9c5f8f32668b7d7768245" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -313,9 +315,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcfaa4ffec0af04e3555686b8aacbcdf7d13638133a0672749209069750f78a6" +checksum = "4814d141ede360bb6cd1b4b064f1aab9de391e7c4d0d4d50ac89ea4bc1e25fbd" dependencies = [ "alloy-chains", "alloy-consensus", @@ -328,6 +330,7 @@ dependencies = [ "alloy-rpc-client", "alloy-rpc-types-anvil", "alloy-rpc-types-eth", + "alloy-signer", "alloy-signer-local", "alloy-transport", "alloy-transport-http", @@ -338,14 +341,17 @@ dependencies = [ "futures", "futures-utils-wasm", "lru", + "parking_lot", "pin-project", "reqwest 0.12.5", + "schnellru", "serde", "serde_json", "thiserror", "tokio", "tracing", "url", + "wasmtimer", ] [[package]] @@ -372,9 +378,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "370143ed581aace6e663342d21d209c6b2e34ee6142f7d6675adb518deeaf0dc" +checksum = "7fc2bd1e7403463a5f2c61e955bcc9d3072b63aa177442b0f9aa6a6d22a941e3" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -390,13 +396,14 @@ dependencies = [ "tower 0.5.1", "tracing", "url", + "wasmtimer", ] [[package]] name = "alloy-rpc-types" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ffc534b7919e18f35e3aa1f507b6f3d9d92ec298463a9f6beaac112809d8d06" +checksum = "eea9bf1abdd506f985a53533f5ac01296bcd6102c5e139bbc5d40bc468d2c916" dependencies = [ "alloy-primitives", "alloy-rpc-types-anvil", @@ -407,9 +414,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d780adaa5d95b07ad92006b2feb68ecfa7e2015f7d5976ceaac4c906c73ebd07" +checksum = "2382fc63fb0cf3e02818d547b80cb66cc49a31f8803d0c328402b2008bc13650" dependencies = [ "alloy-primitives", "alloy-serde", @@ -418,9 +425,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413f4aa3ccf2c3e4234a047c5fa4727916d7daf25a89f9b765df0ba09784fd87" +checksum = "00b034779a4850b4b03f5be5ea674a1cf7d746b2da762b34d1860ab45e48ca27" dependencies = [ "alloy-consensus", "alloy-eips", @@ -437,9 +444,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dff0ab1cdd43ca001e324dc27ee0e8606bd2161d6623c63e0e0b8c4dfc13600" +checksum = "028e72eaa9703e4882344983cfe7636ce06d8cce104a78ea62fd19b46659efc4" dependencies = [ "alloy-primitives", "serde", @@ -448,9 +455,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd4e0ad79c81a27ca659be5d176ca12399141659fef2bcbfdc848da478f4504" +checksum = "592c185d7100258c041afac51877660c7bf6213447999787197db4842f0e938e" dependencies = [ "alloy-primitives", "async-trait", @@ -462,9 +469,9 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494e0a256f3e99f2426f994bcd1be312c02cb8f88260088dacb33a8b8936475f" +checksum = "6614f02fc1d5b079b2a4a5320018317b506fd0a6d67c1fd5542a71201724986c" dependencies = [ "alloy-consensus", "alloy-network", @@ -551,9 +558,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac3e97dad3d31770db0fc89bd6a63b789fbae78963086733f960cf32c483904" +checksum = "be77579633ebbc1266ae6fd7694f75c408beb1aeb6865d0b18f22893c265a061" dependencies = [ "alloy-json-rpc", "base64 0.22.1", @@ -566,13 +573,14 @@ dependencies = [ "tower 0.5.1", "tracing", "url", + "wasmtimer", ] [[package]] name = "alloy-transport-http" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b367dcccada5b28987c2296717ee04b9a5637aacd78eacb1726ef211678b5212" +checksum = "91fd1a5d0827939847983b46f2f79510361f901dc82f8e3c38ac7397af142c6e" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -2495,9 +2503,9 @@ dependencies = [ [[package]] name = "evmlib" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aee21224a621767cf01cce53442f564363b2c62993ece253c7178c9c175e45ba" +checksum = "1fc3aa8c834024f43d63a60956645e3f016ecd56db9986b7dd34553474decb4d" dependencies = [ "alloy", "dirs-next", @@ -2893,6 +2901,12 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" + [[package]] name = "hashbrown" version = "0.14.5" @@ -3572,14 +3586,36 @@ dependencies = [ "futures-timer", "getrandom", "instant", - "libp2p-allow-block-list", - "libp2p-connection-limits", - "libp2p-core", + "libp2p-allow-block-list 0.3.0", + "libp2p-connection-limits 0.3.1", + "libp2p-core 0.41.3", "libp2p-identify", "libp2p-identity", "libp2p-kad", "libp2p-metrics", - "libp2p-swarm", + "libp2p-swarm 0.44.2", + "multiaddr", + "pin-project", + "rw-stream-sink", + "thiserror", +] + +[[package]] +name = "libp2p" +version = "0.54.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbbe80f9c7e00526cd6b838075b9c171919404a4732cb2fa8ece0a093223bfc4" +dependencies = [ + "bytes", + "either", + "futures", + "futures-timer", + "getrandom", + "libp2p-allow-block-list 0.4.0", + "libp2p-connection-limits 0.4.0", + "libp2p-core 0.42.0", + "libp2p-identity", + "libp2p-swarm 0.45.1", "multiaddr", "pin-project", "rw-stream-sink", @@ -3592,9 +3628,21 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "107b238b794cb83ab53b74ad5dcf7cca3200899b72fe662840cfb52f5b0a32e6" dependencies = [ - "libp2p-core", + "libp2p-core 0.41.3", + "libp2p-identity", + "libp2p-swarm 0.44.2", + "void", +] + +[[package]] +name = "libp2p-allow-block-list" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1027ccf8d70320ed77e984f273bc8ce952f623762cb9bf2d126df73caef8041" +dependencies = [ + "libp2p-core 0.42.0", "libp2p-identity", - "libp2p-swarm", + "libp2p-swarm 0.45.1", "void", ] @@ -3604,9 +3652,21 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7cd50a78ccfada14de94cbacd3ce4b0138157f376870f13d3a8422cd075b4fd" dependencies = [ - "libp2p-core", + "libp2p-core 0.41.3", "libp2p-identity", - "libp2p-swarm", + "libp2p-swarm 0.44.2", + "void", +] + +[[package]] +name = "libp2p-connection-limits" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d003540ee8baef0d254f7b6bfd79bac3ddf774662ca0abf69186d517ef82ad8" +dependencies = [ + "libp2p-core 0.42.0", + "libp2p-identity", + "libp2p-swarm 0.45.1", "void", ] @@ -3638,6 +3698,34 @@ dependencies = [ "web-time", ] +[[package]] +name = "libp2p-core" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a61f26c83ed111104cd820fe9bc3aaabbac5f1652a1d213ed6e900b7918a1298" +dependencies = [ + "either", + "fnv", + "futures", + "futures-timer", + "libp2p-identity", + "multiaddr", + "multihash", + "multistream-select", + "once_cell", + "parking_lot", + "pin-project", + "quick-protobuf", + "rand", + "rw-stream-sink", + "smallvec", + "thiserror", + "tracing", + "unsigned-varint 0.8.0", + "void", + "web-time", +] + [[package]] name = "libp2p-identify" version = "0.44.2" @@ -3649,9 +3737,9 @@ dependencies = [ "futures", "futures-bounded", "futures-timer", - "libp2p-core", + "libp2p-core 0.41.3", "libp2p-identity", - "libp2p-swarm", + "libp2p-swarm 0.44.2", "lru", "quick-protobuf", "quick-protobuf-codec", @@ -3694,9 +3782,9 @@ dependencies = [ "futures-bounded", "futures-timer", "instant", - "libp2p-core", + "libp2p-core 0.41.3", "libp2p-identity", - "libp2p-swarm", + "libp2p-swarm 0.44.2", "quick-protobuf", "quick-protobuf-codec", "rand", @@ -3716,11 +3804,11 @@ checksum = "fdac91ae4f291046a3b2660c039a2830c931f84df2ee227989af92f7692d3357" dependencies = [ "futures", "instant", - "libp2p-core", + "libp2p-core 0.41.3", "libp2p-identify", "libp2p-identity", "libp2p-kad", - "libp2p-swarm", + "libp2p-swarm 0.44.2", "pin-project", "prometheus-client", ] @@ -3736,7 +3824,28 @@ dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core", + "libp2p-core 0.41.3", + "libp2p-identity", + "lru", + "multistream-select", + "once_cell", + "rand", + "smallvec", + "tracing", + "void", +] + +[[package]] +name = "libp2p-swarm" +version = "0.45.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7dd6741793d2c1fb2088f67f82cf07261f25272ebe3c0b0c311e0c6b50e851a" +dependencies = [ + "either", + "fnv", + "futures", + "futures-timer", + "libp2p-core 0.42.0", "libp2p-identity", "lru", "multistream-select", @@ -3745,6 +3854,7 @@ dependencies = [ "smallvec", "tracing", "void", + "web-time", ] [[package]] @@ -5102,6 +5212,17 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "schnellru" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9a8ef13a93c54d20580de1e5c413e624e53121d42fc7e2c11d10ef7f8b02367" +dependencies = [ + "ahash", + "cfg-if", + "hashbrown 0.13.2", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -5477,7 +5598,7 @@ dependencies = [ "httpmock", "indicatif", "inquire", - "libp2p", + "libp2p 0.54.1", "log", "prost", "rand", @@ -5522,7 +5643,7 @@ dependencies = [ "dirs-next", "hex", "lazy_static", - "libp2p", + "libp2p 0.53.2", "prost", "rmp-serde", "serde", @@ -5563,7 +5684,7 @@ checksum = "13dcad57c54dff30ce11db94e2fc306f2b693d81f7de9d61c2da9d5529778cae" dependencies = [ "async-trait", "dirs-next", - "libp2p", + "libp2p 0.53.2", "libp2p-identity", "prost", "semver 1.0.23", @@ -5593,7 +5714,7 @@ dependencies = [ "fs2", "hex", "lazy_static", - "libp2p", + "libp2p 0.53.2", "rand", "rayon", "rmp-serde", @@ -6503,6 +6624,20 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +[[package]] +name = "wasmtimer" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7ed9d8b15c7fb594d72bfb4b5a276f3d2029333cd93a932f376f5937f6f80ee" +dependencies = [ + "futures", + "js-sys", + "parking_lot", + "pin-utils", + "slab", + "wasm-bindgen", +] + [[package]] name = "web-sys" version = "0.3.69" diff --git a/Cargo.toml b/Cargo.toml index d0de2746..32a5c981 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ path="src/main.rs" name="testnet-deploy" [dependencies] -alloy = { version = "0.4.2", default-features = false, features = ["signers"] } +alloy = { version = "0.5.3", default-features = false, features = ["signers"] } async-recursion = "1.0.4" aws-config = "0.56.0" aws-sdk-s3 = "0.29.0" @@ -24,11 +24,11 @@ colored = "2.0.4" dirs-next = "2.0.0" dotenv = "0.15.0" env_logger = "0.10.0" -evmlib = "~0.1.1" +evmlib = "~0.1.2" flate2 = "1.0" futures = "~0.3.13" fs_extra = "1.2.0" -libp2p = { version = "0.53", features = [] } +libp2p = { version = "0.54.1", features = [] } log = "0.4" indicatif = "0.17.3" inquire = "0.6.2" From ac60ac699fcf1edb04d616af7d9a8c219ac30bd5 Mon Sep 17 00:00:00 2001 From: Roland Sherwin Date: Thu, 31 Oct 2024 16:47:16 +0530 Subject: [PATCH 3/3] fix: generate inventory during funding --- src/main.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main.rs b/src/main.rs index b6ba8d1c..c09c244c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1551,6 +1551,9 @@ async fn main() -> Result<()> { .provider(provider) .build()?; let inventory_services = DeploymentInventoryService::from(&testnet_deployer); + inventory_services + .generate_or_retrieve_inventory(&name, true, None) + .await?; let environment_details = get_environment_details(&name, &inventory_services.s3_repository).await?; @@ -1589,6 +1592,9 @@ async fn main() -> Result<()> { .build()?; let inventory_services = DeploymentInventoryService::from(&testnet_deployer); + inventory_services + .generate_or_retrieve_inventory(&name, true, None) + .await?; let environment_details = get_environment_details(&name, &inventory_services.s3_repository).await?;