diff --git a/Cargo.lock b/Cargo.lock index a167f1e..379db9e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1452,18 +1452,18 @@ dependencies = [ [[package]] name = "derive_more" -version = "1.0.0-beta.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3249c0372e72f5f93b5c0ca54c0ab76bbf6216b6f718925476fd9bc4ffabb4fe" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" dependencies = [ "derive_more-impl", ] [[package]] name = "derive_more-impl" -version = "1.0.0-beta.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27d919ced7590fc17b5d5a3c63b662e8a7d2324212c4e4dbbed975cafd22d16d" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", @@ -1471,6 +1471,12 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "diatomic-waker" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab03c107fafeb3ee9f5925686dbb7a73bc76e3932abb0d2b365cb64b169cf04c" + [[package]] name = "diff" version = "0.1.13" @@ -2280,7 +2286,6 @@ dependencies = [ [[package]] name = "fendermint_actor_accumulator" version = "0.1.0" -source = "git+ssh://git@github.com/hokunet/ipc.git?rev=036fe03e89b7be2ae8cf49a1310416c2d5969a82#036fe03e89b7be2ae8cf49a1310416c2d5969a82" dependencies = [ "anyhow", "cid", @@ -2300,7 +2305,6 @@ dependencies = [ [[package]] name = "fendermint_actor_blobs_shared" version = "0.1.0" -source = "git+ssh://git@github.com/hokunet/ipc.git?rev=036fe03e89b7be2ae8cf49a1310416c2d5969a82#036fe03e89b7be2ae8cf49a1310416c2d5969a82" dependencies = [ "data-encoding", "fil_actors_runtime", @@ -2316,7 +2320,6 @@ dependencies = [ [[package]] name = "fendermint_actor_eam" version = "0.1.0" -source = "git+ssh://git@github.com/hokunet/ipc.git?rev=036fe03e89b7be2ae8cf49a1310416c2d5969a82#036fe03e89b7be2ae8cf49a1310416c2d5969a82" dependencies = [ "anyhow", "cid", @@ -2337,7 +2340,6 @@ dependencies = [ [[package]] name = "fendermint_actor_machine" version = "0.1.0" -source = "git+ssh://git@github.com/hokunet/ipc.git?rev=036fe03e89b7be2ae8cf49a1310416c2d5969a82#036fe03e89b7be2ae8cf49a1310416c2d5969a82" dependencies = [ "anyhow", "fil_actor_adm", @@ -2352,7 +2354,6 @@ dependencies = [ [[package]] name = "fendermint_actor_objectstore" version = "0.1.0" -source = "git+ssh://git@github.com/hokunet/ipc.git?rev=036fe03e89b7be2ae8cf49a1310416c2d5969a82#036fe03e89b7be2ae8cf49a1310416c2d5969a82" dependencies = [ "anyhow", "cid", @@ -2374,7 +2375,6 @@ dependencies = [ [[package]] name = "fendermint_crypto" version = "0.1.0" -source = "git+ssh://git@github.com/hokunet/ipc.git?rev=036fe03e89b7be2ae8cf49a1310416c2d5969a82#036fe03e89b7be2ae8cf49a1310416c2d5969a82" dependencies = [ "anyhow", "base64 0.21.7", @@ -2386,7 +2386,6 @@ dependencies = [ [[package]] name = "fendermint_vm_actor_interface" version = "0.1.0" -source = "git+ssh://git@github.com/hokunet/ipc.git?rev=036fe03e89b7be2ae8cf49a1310416c2d5969a82#036fe03e89b7be2ae8cf49a1310416c2d5969a82" dependencies = [ "anyhow", "cid", @@ -2414,7 +2413,6 @@ dependencies = [ [[package]] name = "fendermint_vm_core" version = "0.1.0" -source = "git+ssh://git@github.com/hokunet/ipc.git?rev=036fe03e89b7be2ae8cf49a1310416c2d5969a82#036fe03e89b7be2ae8cf49a1310416c2d5969a82" dependencies = [ "cid", "fnv", @@ -2428,7 +2426,6 @@ dependencies = [ [[package]] name = "fendermint_vm_encoding" version = "0.1.0" -source = "git+ssh://git@github.com/hokunet/ipc.git?rev=036fe03e89b7be2ae8cf49a1310416c2d5969a82#036fe03e89b7be2ae8cf49a1310416c2d5969a82" dependencies = [ "cid", "fvm_shared", @@ -2441,7 +2438,6 @@ dependencies = [ [[package]] name = "fendermint_vm_genesis" version = "0.1.0" -source = "git+ssh://git@github.com/hokunet/ipc.git?rev=036fe03e89b7be2ae8cf49a1310416c2d5969a82#036fe03e89b7be2ae8cf49a1310416c2d5969a82" dependencies = [ "anyhow", "fendermint_actor_eam", @@ -2459,7 +2455,6 @@ dependencies = [ [[package]] name = "fendermint_vm_message" version = "0.1.0" -source = "git+ssh://git@github.com/hokunet/ipc.git?rev=036fe03e89b7be2ae8cf49a1310416c2d5969a82#036fe03e89b7be2ae8cf49a1310416c2d5969a82" dependencies = [ "anyhow", "blake2b_simd", @@ -2471,7 +2466,7 @@ dependencies = [ "fvm_ipld_encoding", "fvm_shared", "ipc-api", - "iroh-base 0.23.0", + "iroh-base", "lazy_static", "num-traits", "serde", @@ -2500,7 +2495,6 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "fil_actor_adm" version = "12.0.0" -source = "git+ssh://git@github.com/hokunet/ipc.git?rev=036fe03e89b7be2ae8cf49a1310416c2d5969a82#036fe03e89b7be2ae8cf49a1310416c2d5969a82" dependencies = [ "anyhow", "cid", @@ -2520,7 +2514,6 @@ dependencies = [ [[package]] name = "fil_actor_eam" version = "12.0.0" -source = "git+ssh://git@github.com/hokunet/ipc.git?rev=036fe03e89b7be2ae8cf49a1310416c2d5969a82#036fe03e89b7be2ae8cf49a1310416c2d5969a82" dependencies = [ "anyhow", "cid", @@ -2541,7 +2534,6 @@ dependencies = [ [[package]] name = "fil_actors_evm_shared" version = "12.0.0" -source = "git+ssh://git@github.com/hokunet/ipc.git?rev=036fe03e89b7be2ae8cf49a1310416c2d5969a82#036fe03e89b7be2ae8cf49a1310416c2d5969a82" dependencies = [ "fil_actors_runtime", "fvm_ipld_encoding", @@ -2554,7 +2546,6 @@ dependencies = [ [[package]] name = "fil_actors_runtime" version = "12.0.0" -source = "git+ssh://git@github.com/hokunet/ipc.git?rev=036fe03e89b7be2ae8cf49a1310416c2d5969a82#036fe03e89b7be2ae8cf49a1310416c2d5969a82" dependencies = [ "anyhow", "base64 0.21.7", @@ -2840,12 +2831,12 @@ dependencies = [ [[package]] name = "futures-buffered" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02dcae03ee5afa5ea17b1aebc793806b8ddfc6dc500e0b8e8e1eb30b9dad22c0" +checksum = "91fa130f3777d0d4b0993653c20bc433026d3290627693c4ed1b18dd237357ab" dependencies = [ + "diatomic-waker", "futures-core", - "futures-util", "pin-project-lite", ] @@ -4055,7 +4046,6 @@ dependencies = [ [[package]] name = "ipc-api" version = "0.1.0" -source = "git+ssh://git@github.com/hokunet/ipc.git?rev=036fe03e89b7be2ae8cf49a1310416c2d5969a82#036fe03e89b7be2ae8cf49a1310416c2d5969a82" dependencies = [ "anyhow", "cid", @@ -4083,7 +4073,6 @@ dependencies = [ [[package]] name = "ipc-types" version = "0.1.0" -source = "git+ssh://git@github.com/hokunet/ipc.git?rev=036fe03e89b7be2ae8cf49a1310416c2d5969a82#036fe03e89b7be2ae8cf49a1310416c2d5969a82" dependencies = [ "anyhow", "cid", @@ -4107,7 +4096,6 @@ dependencies = [ [[package]] name = "ipc_actors_abis" version = "0.1.0" -source = "git+ssh://git@github.com/hokunet/ipc.git?rev=036fe03e89b7be2ae8cf49a1310416c2d5969a82#036fe03e89b7be2ae8cf49a1310416c2d5969a82" dependencies = [ "anyhow", "ethers", @@ -4134,21 +4122,21 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "iroh" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4fdb4406f9637ede6df54538a024d4c6d41172c5702b21229474f3a53e4e82" +checksum = "abda3be73097cc12c2e0fd3dd8babc37aad43711bb7ff9c8952ff6a33986a45a" dependencies = [ "anyhow", "async-channel", "bao-tree", "bytes", - "derive_more 1.0.0-beta.7", + "derive_more 1.0.0", "futures-buffered", "futures-lite 2.3.0", "futures-util", "genawaiter", "hex", - "iroh-base 0.25.0", + "iroh-base", "iroh-blobs", "iroh-docs", "iroh-gossip", @@ -4179,43 +4167,15 @@ dependencies = [ [[package]] name = "iroh-base" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8d60492b6099a5e94b674d0f4c564b3fa63a211836a090bc34c14d422721c19" -dependencies = [ - "aead", - "anyhow", - "crypto_box", - "data-encoding", - "derive_more 1.0.0-beta.7", - "ed25519-dalek", - "getrandom", - "hex", - "iroh-blake3", - "once_cell", - "postcard", - "rand", - "rand_core", - "serde", - "serde-error", - "ssh-key", - "thiserror", - "ttl_cache", - "url", - "zeroize", -] - -[[package]] -name = "iroh-base" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545424889bce87e44fd08dac9e6889635630fdbdaaa858a3c5a5f0adbb8d3779" +checksum = "973c0b3c7851fa2e8e6cf4cb81c9f4cab1373848828fafa43dfe25b123a89ff2" dependencies = [ "aead", "anyhow", "crypto_box", "data-encoding", - "derive_more 1.0.0-beta.7", + "derive_more 1.0.0", "ed25519-dalek", "getrandom", "hex", @@ -4249,22 +4209,22 @@ dependencies = [ [[package]] name = "iroh-blobs" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ede5a40500cd76ff4d0ed48d206b036992b9f7aac0c1cc8d1977ef10c5da6a" +checksum = "9afc7ad5c2aaa1b17071fe99065c6cfbe7a3f0597ecc44381afdddb47965521f" dependencies = [ "anyhow", "async-channel", "bao-tree", "bytes", "chrono", - "derive_more 1.0.0-beta.7", + "derive_more 1.0.0", "futures-buffered", "futures-lite 2.3.0", "genawaiter", "hashlink", "hex", - "iroh-base 0.25.0", + "iroh-base", "iroh-io", "iroh-metrics", "iroh-net", @@ -4292,20 +4252,20 @@ dependencies = [ [[package]] name = "iroh-docs" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87f18b1c7934c8b55bc6aad89dad9e6705fc0cd639362cb930fdb903f9b5275" +checksum = "8138011bd4e9a5b24a6bdddd50232aa2778a8b430d0f91d32ddba5f88a126ddc" dependencies = [ "anyhow", "async-channel", "bytes", - "derive_more 1.0.0-beta.7", + "derive_more 1.0.0", "ed25519-dalek", "futures-buffered", "futures-lite 2.3.0", "futures-util", "hex", - "iroh-base 0.25.0", + "iroh-base", "iroh-blake3", "iroh-blobs", "iroh-gossip", @@ -4331,20 +4291,20 @@ dependencies = [ [[package]] name = "iroh-gossip" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a5489a563e407fb2be654e950536da4230e46642111f12b16d7013228164aae" +checksum = "b44749f361aca7cddcb357b62ef84cad1023771aee03d427c8922991fc4a9561" dependencies = [ "anyhow", "async-channel", "bytes", - "derive_more 1.0.0-beta.7", + "derive_more 1.0.0", "ed25519-dalek", "futures-concurrency", "futures-lite 2.3.0", "futures-util", "indexmap 2.2.6", - "iroh-base 0.25.0", + "iroh-base", "iroh-blake3", "iroh-metrics", "iroh-net", @@ -4372,9 +4332,9 @@ dependencies = [ [[package]] name = "iroh-metrics" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb6ab80f7cccde80be07a643308e1ff925d5be91721ec65ba96b261a0bcb5e5" +checksum = "02edfa7ca1aa89b0b9793d94671e32b79c97d61e9022f082c5eb2b95b64e90c0" dependencies = [ "anyhow", "erased_set", @@ -4393,16 +4353,16 @@ dependencies = [ [[package]] name = "iroh-net" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a099a60478cb9319153756a9cf2ff41aa03d18403690a91e60f049ad467b057" +checksum = "329553be056a92eec7802e1c087eed951eec6e60f0f0740491ef16a295be4ca2" dependencies = [ "anyhow", "backoff", "base64 0.22.1", "bytes", "der", - "derive_more 1.0.0-beta.7", + "derive_more 1.0.0", "duct", "futures-buffered", "futures-concurrency", @@ -4420,7 +4380,7 @@ dependencies = [ "hyper 1.4.1", "hyper-util", "igd-next", - "iroh-base 0.25.0", + "iroh-base", "iroh-metrics", "iroh-quinn", "iroh-quinn-proto", @@ -4888,7 +4848,6 @@ dependencies = [ [[package]] name = "merkle-tree-rs" version = "0.1.0" -source = "git+ssh://git@github.com/hokunet/ipc.git?rev=036fe03e89b7be2ae8cf49a1310416c2d5969a82#036fe03e89b7be2ae8cf49a1310416c2d5969a82" dependencies = [ "anyhow", "ethers", @@ -6277,7 +6236,7 @@ checksum = "77b3ae032988c83ac7ce072be3c2605e90671e8830a34d6ebf24095add68b4d5" dependencies = [ "anyhow", "bincode", - "derive_more 1.0.0-beta.7", + "derive_more 1.0.0", "educe", "flume 0.11.0", "futures-lite 2.3.0", @@ -8852,7 +8811,6 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vm_api" version = "1.0.0" -source = "git+ssh://git@github.com/hokunet/ipc.git?rev=036fe03e89b7be2ae8cf49a1310416c2d5969a82#036fe03e89b7be2ae8cf49a1310416c2d5969a82" dependencies = [ "anyhow", "cid", diff --git a/Cargo.toml b/Cargo.toml index 5525f99..4227b52 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ futures-util = "0.3.17" humantime = "2.1.0" hex = "0.4.3" indicatif = "0.17.8" -iroh = "0.25.0" +iroh = "0.26.0" lazy_static = "1.4.0" log = "0.4.22" num-traits = "0.2.18" @@ -70,16 +70,16 @@ tendermint-rpc = { version = "0.31.1", features = [ fvm_shared = "4.1.0" fvm_ipld_encoding = "0.4.0" -fendermint_actor_accumulator = { git = "ssh://git@github.com/hokunet/ipc.git", rev = "036fe03e89b7be2ae8cf49a1310416c2d5969a82" } -fendermint_actor_blobs_shared = { git = "ssh://git@github.com/hokunet/ipc.git", rev = "036fe03e89b7be2ae8cf49a1310416c2d5969a82" } -fendermint_actor_machine = { git = "ssh://git@github.com/hokunet/ipc.git", rev = "036fe03e89b7be2ae8cf49a1310416c2d5969a82" } -fendermint_actor_objectstore = { git = "ssh://git@github.com/hokunet/ipc.git", rev = "036fe03e89b7be2ae8cf49a1310416c2d5969a82" } -fendermint_crypto = { git = "ssh://git@github.com/hokunet/ipc.git", rev = "036fe03e89b7be2ae8cf49a1310416c2d5969a82" } -fendermint_vm_actor_interface = { git = "ssh://git@github.com/hokunet/ipc.git", rev = "036fe03e89b7be2ae8cf49a1310416c2d5969a82" } -fendermint_vm_message = { git = "ssh://git@github.com/hokunet/ipc.git", rev = "036fe03e89b7be2ae8cf49a1310416c2d5969a82" } +fendermint_actor_accumulator = { git = "ssh://git@github.com/hokunet/ipc.git", rev = "0f539f82593b755ed5336a6b25178aeea255dc07" } +fendermint_actor_blobs_shared = { git = "ssh://git@github.com/hokunet/ipc.git", rev = "0f539f82593b755ed5336a6b25178aeea255dc07" } +fendermint_actor_machine = { git = "ssh://git@github.com/hokunet/ipc.git", rev = "0f539f82593b755ed5336a6b25178aeea255dc07" } +fendermint_actor_objectstore = { git = "ssh://git@github.com/hokunet/ipc.git", rev = "0f539f82593b755ed5336a6b25178aeea255dc07" } +fendermint_crypto = { git = "ssh://git@github.com/hokunet/ipc.git", rev = "0f539f82593b755ed5336a6b25178aeea255dc07" } +fendermint_vm_actor_interface = { git = "ssh://git@github.com/hokunet/ipc.git", rev = "0f539f82593b755ed5336a6b25178aeea255dc07" } +fendermint_vm_message = { git = "ssh://git@github.com/hokunet/ipc.git", rev = "0f539f82593b755ed5336a6b25178aeea255dc07" } -ipc_actors_abis = { git = "ssh://git@github.com/hokunet/ipc.git", rev = "036fe03e89b7be2ae8cf49a1310416c2d5969a82" } -ipc-api = { git = "ssh://git@github.com/hokunet/ipc.git", rev = "036fe03e89b7be2ae8cf49a1310416c2d5969a82" } +ipc_actors_abis = { git = "ssh://git@github.com/hokunet/ipc.git", rev = "0f539f82593b755ed5336a6b25178aeea255dc07" } +ipc-api = { git = "ssh://git@github.com/hokunet/ipc.git", rev = "0f539f82593b755ed5336a6b25178aeea255dc07" } # Use below when working locally on ipc and this repo simultaneously. # Assumes the ipc checkout is in a sibling directory with the same name. diff --git a/sdk/src/network.rs b/sdk/src/network.rs index 845b668..7ddf246 100644 --- a/sdk/src/network.rs +++ b/sdk/src/network.rs @@ -16,7 +16,7 @@ use hoku_signer::SubnetID; use crate::ipc::subnet::EVMSubnet; const TESTNET_SUBNET_ID: &str = "/r314159/t410f26ejh7sqkimbhw5ojbeyvvkqnequ7ktxy5gyxyq"; // chain ID: 1717203960113192 -const LOCALNET_SUBNET_ID: &str = "/r31337/t410f6dl55afbyjbpupdtrmedyqrnmxdmpk7rxuduafq"; // chain ID: 3620398568294336 +const LOCALNET_SUBNET_ID: &str = "/r31337/t410fkzrz3mlkyufisiuae3scumllgalzuu3wxlxa2ly"; // chain ID: 4362550583360910 const DEVNET_SUBNET_ID: &str = "test"; const TESTNET_RPC_URL: &str = "https://rpc-testnet-validator-0.3box.io"; @@ -39,7 +39,7 @@ const TESTNET_PARENT_EVM_GATEWAY_ADDRESS: &str = "0x141Ef571Fd6C9e7f51FAf697f479 const TESTNET_PARENT_EVM_REGISTRY_ADDRESS: &str = "0x89D8029d5cF4bAEbd0b43E39B547c34eAa8c5C54"; const LOCALNET_PARENT_EVM_RPC_URL: &str = "http://127.0.0.1:8545"; const LOCALNET_PARENT_EVM_GATEWAY_ADDRESS: &str = "0x9A676e781A523b5d0C0e43731313A708CB607508"; -const LOCALNET_PARENT_EVM_REGISTRY_ADDRESS: &str = "0xc5a5C42992dECbae36851359345FE25997F5C42d"; +const LOCALNET_PARENT_EVM_REGISTRY_ADDRESS: &str = "0x4ed7c70F96B99c776995fB64377f0d4aB3B0e1C1"; const TESTNET_OBJECT_API_URL: &str = "https://object-api-testnet-validator-0.3box.io"; const LOCALNET_OBJECT_API_URL: &str = "http://127.0.0.1:8001";