diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/system.exp b/crates/iota-graphql-e2e-tests/tests/transactions/system.exp index 6ce2c77e8ea..0f59c9030d8 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/system.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/system.exp @@ -7,7 +7,7 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "EjxArvXVR7U8yu5Yi2oDmELwV74gwJFinZKhnPuTKj83", + "digest": "4tReNGdXxGZo3su5zTWX47wjadMEreXffEzSbBsrutX1", "sender": null, "signatures": [ "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==" @@ -407,7 +407,7 @@ Response: { "json": { "id": "0x0000000000000000000000000000000000000000000000000000000000000008", "inner": { - "id": "0x3f92eceed239ba443daf612dcdf621f85feba71f3698d53c9f2a6e4b4246b1c6", + "id": "0xb6368d157cdd013550ec803dc90104b7049bb8ba18bac9f946db2dc0d6945050", "version": "1" } } @@ -489,7 +489,7 @@ Response: { "json": { "id": "0x0000000000000000000000000000000000000000000000000000000000000403", "lists": { - "id": "0x799c22e253a384f3545724b35277ac6b27595603f051828e5f4cece335c1cf1c", + "id": "0x20f3fcc2599b7976c624ef2d27d8c3953dcc513009522da5b8b83a7dfad3ec5e", "size": "0" } } @@ -586,18 +586,20 @@ Response: { { "cursor": "eyJpIjo5LCJjIjowfQ", "node": { - "address": "0x1b19651d3c2723e7f6c1eca23c13b72cd7f274524223391e75994dad311828df", + "address": "0x2ea13c0bbe0ba130f4e4ae61bf40f9fa31320be5f399cf949bdf04d5ff07ed61", "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" }, "json": { - "id": "0x1b19651d3c2723e7f6c1eca23c13b72cd7f274524223391e75994dad311828df", - "name": "0", + "id": "0x2ea13c0bbe0ba130f4e4ae61bf40f9fa31320be5f399cf949bdf04d5ff07ed61", + "name": "1", "value": { - "iota_amount": "0", - "pool_token_amount": "0" + "version": "1", + "epoch": "0", + "randomness_round": "0", + "random_bytes": [] } } } @@ -608,16 +610,18 @@ Response: { { "cursor": "eyJpIjoxMCwiYyI6MH0", "node": { - "address": "0x27982f48a697a9f61e3f738993c2d00e16b89938eedb74af1849ba6c6d82303b", + "address": "0x5a37bb4511d9f9ef9c8aa7b817765a898d7c38fe56f2b4f7bd5ceabeaa1382db", "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000003::staking_pool::StakedIota" }, "json": { - "id": "0x27982f48a697a9f61e3f738993c2d00e16b89938eedb74af1849ba6c6d82303b", - "balance": { - "value": "30000000000000000" + "id": "0x5a37bb4511d9f9ef9c8aa7b817765a898d7c38fe56f2b4f7bd5ceabeaa1382db", + "pool_id": "0x449d449710a053ea35448947ec1722c88b866b1c33ce721813e554f265631a85", + "stake_activation_epoch": "0", + "principal": { + "value": "1500000000000000" } } } @@ -643,7 +647,7 @@ Response: { "system_state_version": "1", "iota_treasury_cap": { "inner": { - "id": "0x509e22a8bb835eeb98bed81a1a50c196383345279d4238f47714f2301c9bfbe6", + "id": "0xef508938475742472574225d29713993fe6e98d567c3016bc55b1269e7124674", "total_supply": { "value": "31800000000000000" } @@ -890,15 +894,15 @@ Response: { "next_epoch_p2p_address": null, "next_epoch_primary_address": null, "extra_fields": { - "id": "0x6c8759462593f9ef531bbec3f6402e9a9d53e369ecb7982b59635843471eb271", + "id": "0xbe5a7ef55c6adbeea78c93ee3db77dbf9582e93331fbc27c187eb04cb22738eb", "size": "0" } }, "voting_power": "10000", - "operation_cap_id": "0xa0f947f895ffe5715ab529ed16659e9c099bee48524f56c8d5a2eab8e842bd99", + "operation_cap_id": "0x905219918de443bea9354cca0398473483a659cefe5697105fe0910855e2e532", "gas_price": "1000", "staking_pool": { - "id": "0x7aea65806e468642f39bb0a0f7a40a4b16afc9588d1980e8d9a9d20936541b7e", + "id": "0x449d449710a053ea35448947ec1722c88b866b1c33ce721813e554f265631a85", "activation_epoch": "0", "deactivation_epoch": null, "iota_balance": "1500000000000000", @@ -907,14 +911,14 @@ Response: { }, "pool_token_balance": "1500000000000000", "exchange_rates": { - "id": "0x044bc64e9c5eaa0143019c38bea813b1c288dc66272d74cf8a1821bf0eeac85f", + "id": "0xf127e783709b1fe01a35a7e8de81dea92d89fc1c73a0f53251b42b1ebd95e0aa", "size": "1" }, "pending_stake": "0", "pending_total_iota_withdraw": "0", "pending_pool_token_withdraw": "0", "extra_fields": { - "id": "0xcc8c44fff5e1f3fdc63bd2597685dba922cce4809e2f960c8128dcbcb76c3712", + "id": "0x2dcc0adf2a94ee04626fa50a4fce4cdea239c54a8527fe6d1252a6e573bea344", "size": "0" } }, @@ -923,35 +927,35 @@ Response: { "next_epoch_gas_price": "1000", "next_epoch_commission_rate": "200", "extra_fields": { - "id": "0x9a75ea182d4788588f2e81034a8a57034da6284a66159cd3289cb352e3a845aa", + "id": "0xd2cc363db7a87b6367c4eb32f43cd5fae0f1ef9f381133d1b5e7bd32d6853acb", "size": "0" } } ], "pending_active_validators": { "contents": { - "id": "0x31b89b7b349cf41a62274ebd1ef2c2789fa86b68270d9feefb7a62741d1f8e86", + "id": "0xb0e269fa1ff80a7f8c38533238c5f134c09f984562ee76b093c847728b22175d", "size": "0" } }, "pending_removals": [], "staking_pool_mappings": { - "id": "0x6025058d2b6287ffad433b714c9a573fe15ba477a4f47862b5088ca5938cded3", + "id": "0x4925774519ce560396690170c05dfb4ba99fa1da7bd20522fb6b452b9b8dcc57", "size": "1" }, "inactive_validators": { - "id": "0xaaf430f2910eb82232f946c1bda701ecb8f2c1f6928a9099ae80f5afc85fb69c", + "id": "0xa5e68b14b8badefc34fb95db4cff668c97de9f69351c0a57a314cb9eed9b2929", "size": "0" }, "validator_candidates": { - "id": "0xd2789ba6e8f5c3241a6d12bedc3055e57aeac6e92bf182ef7737c6533d7a22f9", + "id": "0x75338b4c8cdd41a01e949630ee85d24b6ed5140c77c8e03a549de638237be88a", "size": "0" }, "at_risk_validators": { "contents": [] }, "extra_fields": { - "id": "0x62d408b9b0b3c458c8424f68a6622c534d3023ce93368b5a412bd4dc665a8ebf", + "id": "0xe6dc889bdb7afbc322a978274d9d3dba599d45a348a1af81d8875f4d431bb8f8", "size": "0" } }, @@ -972,7 +976,7 @@ Response: { "validator_very_low_stake_threshold": "1000000000000000", "validator_low_stake_grace_period": "7", "extra_fields": { - "id": "0x61b4baf4a2f43504215e4131c43852e24775aa0afeef0628a113228ef41c7813", + "id": "0xb06a653caedc832a7cc46d6fab42d8798fd97afdc6863b0f1c22cb88f39611a4", "size": "0" } }, @@ -994,7 +998,7 @@ Response: { "safe_mode_non_refundable_storage_fee": "0", "epoch_start_timestamp_ms": "0", "extra_fields": { - "id": "0x5dc4c87d84a69a6b0f51a38b24cd4c9833b79c2a2e249dc1f24794961bfc76c1", + "id": "0xdca9555c76d3daa5746450c9d4def9d07fbba0a499600d1dc4d8b8261a473d1d", "size": "0" } } @@ -1007,14 +1011,14 @@ Response: { { "cursor": "eyJpIjoxMiwiYyI6MH0", "node": { - "address": "0xa0f947f895ffe5715ab529ed16659e9c099bee48524f56c8d5a2eab8e842bd99", + "address": "0x905219918de443bea9354cca0398473483a659cefe5697105fe0910855e2e532", "asMoveObject": { "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000003::validator_cap::UnverifiedValidatorOperationCap" }, "json": { - "id": "0xa0f947f895ffe5715ab529ed16659e9c099bee48524f56c8d5a2eab8e842bd99", + "id": "0x905219918de443bea9354cca0398473483a659cefe5697105fe0910855e2e532", "authorizer_validator_address": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80" } } @@ -1025,16 +1029,17 @@ Response: { { "cursor": "eyJpIjoxMywiYyI6MH0", "node": { - "address": "0xbb5caa62668e66be9dd0a5a74534814bf789fd6ab6335e08eff62a58ee1f287e", + "address": "0xa25001405d1e7f663228add25fde3915b90a2403978c2213039da62776d91c3a", "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<0x0000000000000000000000000000000000000000000000000000000000000002::object::ID,address>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0xbb5caa62668e66be9dd0a5a74534814bf789fd6ab6335e08eff62a58ee1f287e", - "name": "0x7aea65806e468642f39bb0a0f7a40a4b16afc9588d1980e8d9a9d20936541b7e", - "value": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80" + "id": "0xa25001405d1e7f663228add25fde3915b90a2403978c2213039da62776d91c3a", + "balance": { + "value": "30000000000000000" + } } } }, @@ -1044,14 +1049,36 @@ Response: { { "cursor": "eyJpIjoxNCwiYyI6MH0", "node": { - "address": "0xc28024efc650d31011065697e676b6738732dad9f709e54a13b116672c298f25", + "address": "0xbc421ae197581ec48f0f55a446dadb32b380d42498a45828082174e8f895d77d", + "asMoveObject": { + "contents": { + "type": { + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" + }, + "json": { + "id": "0xbc421ae197581ec48f0f55a446dadb32b380d42498a45828082174e8f895d77d", + "name": "0", + "value": { + "iota_amount": "0", + "pool_token_amount": "0" + } + } + } + }, + "asMovePackage": null + } + }, + { + "cursor": "eyJpIjoxNSwiYyI6MH0", + "node": { + "address": "0xc5788b6613609072343e1885a3d8cb1049aa1b17ec470a0e32aa87609039e8b8", "asMoveObject": { "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0xc28024efc650d31011065697e676b6738732dad9f709e54a13b116672c298f25", + "id": "0xc5788b6613609072343e1885a3d8cb1049aa1b17ec470a0e32aa87609039e8b8", "decimals": 9, "name": "IOTA", "symbol": "IOTA", @@ -1066,16 +1093,55 @@ Response: { } }, { - "cursor": "eyJpIjoxNSwiYyI6MH0", + "cursor": "eyJpIjoxNiwiYyI6MH0", + "node": { + "address": "0xc62e073102dcc99b5a1df4107b5cc3278e06ecf0c4e25cc4557094e71c9e33b5", + "asMoveObject": { + "contents": { + "type": { + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<0x0000000000000000000000000000000000000000000000000000000000000002::object::ID,address>" + }, + "json": { + "id": "0xc62e073102dcc99b5a1df4107b5cc3278e06ecf0c4e25cc4557094e71c9e33b5", + "name": "0x449d449710a053ea35448947ec1722c88b866b1c33ce721813e554f265631a85", + "value": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80" + } + } + }, + "asMovePackage": null + } + }, + { + "cursor": "eyJpIjoxNywiYyI6MH0", + "node": { + "address": "0xd2bdb9bd62d71a74938f8c2a7f139d22115834a15144abdf1c6567ce3a5f5d86", + "asMoveObject": { + "contents": { + "type": { + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + }, + "json": { + "id": "0xd2bdb9bd62d71a74938f8c2a7f139d22115834a15144abdf1c6567ce3a5f5d86", + "balance": { + "value": "300000000000000" + } + } + } + }, + "asMovePackage": null + } + }, + { + "cursor": "eyJpIjoxOCwiYyI6MH0", "node": { - "address": "0xc928f6f78781333f87efac974403df5a8565e3accb3c16a891a60a18dd2f2f42", + "address": "0xf7ac6c2ee5d92f53a3b87f10ff6b33f39ea9d642f99df06e4a0520a59343bf9c", "asMoveObject": { "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::display::Display<0x000000000000000000000000000000000000000000000000000000000000107a::nft::Nft>" }, "json": { - "id": "0xc928f6f78781333f87efac974403df5a8565e3accb3c16a891a60a18dd2f2f42", + "id": "0xf7ac6c2ee5d92f53a3b87f10ff6b33f39ea9d642f99df06e4a0520a59343bf9c", "fields": { "contents": [ { @@ -1118,72 +1184,6 @@ Response: { }, "asMovePackage": null } - }, - { - "cursor": "eyJpIjoxNiwiYyI6MH0", - "node": { - "address": "0xdd6b3a50df67a765e8c59bd37030224138f36bba296535846f490d8dede3c502", - "asMoveObject": { - "contents": { - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000003::staking_pool::StakedIota" - }, - "json": { - "id": "0xdd6b3a50df67a765e8c59bd37030224138f36bba296535846f490d8dede3c502", - "pool_id": "0x7aea65806e468642f39bb0a0f7a40a4b16afc9588d1980e8d9a9d20936541b7e", - "stake_activation_epoch": "0", - "principal": { - "value": "1500000000000000" - } - } - } - }, - "asMovePackage": null - } - }, - { - "cursor": "eyJpIjoxNywiYyI6MH0", - "node": { - "address": "0xe9ee601e69a2f4274ca5f23c16190823a7af496b5b9f2eac0d2c2645634b2737", - "asMoveObject": { - "contents": { - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" - }, - "json": { - "id": "0xe9ee601e69a2f4274ca5f23c16190823a7af496b5b9f2eac0d2c2645634b2737", - "name": "1", - "value": { - "version": "1", - "epoch": "0", - "randomness_round": "0", - "random_bytes": [] - } - } - } - }, - "asMovePackage": null - } - }, - { - "cursor": "eyJpIjoxOCwiYyI6MH0", - "node": { - "address": "0xf22e2f7e20b84f57fdcf1f44c79c321533b922fa9488c23556356ae3f906b0bb", - "asMoveObject": { - "contents": { - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" - }, - "json": { - "id": "0xf22e2f7e20b84f57fdcf1f44c79c321533b922fa9488c23556356ae3f906b0bb", - "balance": { - "value": "300000000000000" - } - } - } - }, - "asMovePackage": null - } } ] } @@ -1225,7 +1225,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000001", - "digest": "BWPzkyHoTWnZGNLBbza1xvEYP9hgm7dogXoi1DUjtpM7" + "digest": "Hf1uem1BBpFJWpGSGbgmcUfPpMyJZLs6u3bJyC6veojY" } }, { @@ -1234,7 +1234,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000002", - "digest": "63DagAxEDkLwscMq1tGaPAhLR9dCYKwMTRFZugpfDiMq" + "digest": "7ScU7qijtYCj9LrDZpKCNuK4LQmeyZ8Vj7nqXpXEbFSK" } }, { @@ -1243,7 +1243,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000003", - "digest": "3X6wUAwmH2pcVR5yHWcUMoJKs5gwhxfCRh42jq7xVZM3" + "digest": "9Foa9J71TyiiwQ4K5r2LL7D6maVvGA6xTFCcqxsu244g" } }, { @@ -1252,7 +1252,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000005", - "digest": "6XeCa8r3ai3FXCgp2kcz85fDjW4rJ5FZLeQJf2Nzwm75" + "digest": "BcLni3X1dYQcjjSrW5MMCvGVTy7UG6JwXn9iazHqzTj1" } }, { @@ -1261,7 +1261,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000006", - "digest": "gCx8m8h2RGFjajzMdfBdk4MyevRi34XxhWobMZVRyZV" + "digest": "CsX24oP1ge3qunH2ZcGLNbWnbo5kUC3jB4NGaPqDSmoT" } }, { @@ -1270,7 +1270,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000008", - "digest": "3oxqmiP9tw1RZ5idND2hZ6sQ7bCM8qU3MT7PYS8wWEuB" + "digest": "ARAEHibzGP7bMcAfaKucn97M1n5xwwHJuTfL3uKhDCfp" } }, { @@ -1279,7 +1279,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x000000000000000000000000000000000000000000000000000000000000000b", - "digest": "8m58ysCbvvBpAN54w4fww8Y6nXm4GAQfovuswD1vGFFP" + "digest": "Fh7k5f6gCofCaxX6F74J7sVsyVBECX3sWieXNG8hxq5k" } }, { @@ -1288,7 +1288,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000403", - "digest": "Eg1CzeQBR3AGwxnDq8TJo8A9gHSZjFpXNMk8zeMc5jXe" + "digest": "5uxJmx2nps5GgMEA4yVM6AMusvJuLwn5AgNXkxodj59g" } }, { @@ -1297,25 +1297,25 @@ Response: { "idDeleted": false, "outputState": { "address": "0x000000000000000000000000000000000000000000000000000000000000107a", - "digest": "Ds3kGXwgK3MWzFVW6wHPEDoPzLtU3mtRnvxF1PC7WTWp" + "digest": "DHfi13SuQgPyDUcbLcLtTfgscfXNuJkTPra3cEWC3WSy" } }, { - "address": "0x1b19651d3c2723e7f6c1eca23c13b72cd7f274524223391e75994dad311828df", + "address": "0x2ea13c0bbe0ba130f4e4ae61bf40f9fa31320be5f399cf949bdf04d5ff07ed61", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x1b19651d3c2723e7f6c1eca23c13b72cd7f274524223391e75994dad311828df", - "digest": "EPdNi4i16VS8Ji3xn4DAPVAJ5xi4pZHpCXGuKbqeNkzz" + "address": "0x2ea13c0bbe0ba130f4e4ae61bf40f9fa31320be5f399cf949bdf04d5ff07ed61", + "digest": "CuyDpjFn8nyP9rxdPqXVGW2NzzYVCK7a9XofECUwD2GS" } }, { - "address": "0x27982f48a697a9f61e3f738993c2d00e16b89938eedb74af1849ba6c6d82303b", + "address": "0x5a37bb4511d9f9ef9c8aa7b817765a898d7c38fe56f2b4f7bd5ceabeaa1382db", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x27982f48a697a9f61e3f738993c2d00e16b89938eedb74af1849ba6c6d82303b", - "digest": "GdkVYasCkoM1F9zBqytqzNtU5oKBsJnt7bvNeM7BQESg" + "address": "0x5a37bb4511d9f9ef9c8aa7b817765a898d7c38fe56f2b4f7bd5ceabeaa1382db", + "digest": "iEiqLQ8UgE58mnTGezS3U7oq9cYNKPJPTHiM6rLpoEn" } }, { @@ -1324,70 +1324,70 @@ Response: { "idDeleted": false, "outputState": { "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2", - "digest": "96gSoSvev5VaU8BfPEYSBpXkTfSLEhMjzcLtk3PAxBzn" + "digest": "EqpxyKecJMWi9qrRv7thi5pyU6juzNmpNvm2xUfkyR5r" } }, { - "address": "0xa0f947f895ffe5715ab529ed16659e9c099bee48524f56c8d5a2eab8e842bd99", + "address": "0x905219918de443bea9354cca0398473483a659cefe5697105fe0910855e2e532", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xa0f947f895ffe5715ab529ed16659e9c099bee48524f56c8d5a2eab8e842bd99", - "digest": "BNLVZMqwpvMRqGDAvLXND3zWvHJ3tcbfn5LgC1FvmNw7" + "address": "0x905219918de443bea9354cca0398473483a659cefe5697105fe0910855e2e532", + "digest": "UKscE978EndWjztxA8RnsUiGkVh8djT46bTNNTmYNWx" } }, { - "address": "0xbb5caa62668e66be9dd0a5a74534814bf789fd6ab6335e08eff62a58ee1f287e", + "address": "0xa25001405d1e7f663228add25fde3915b90a2403978c2213039da62776d91c3a", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xbb5caa62668e66be9dd0a5a74534814bf789fd6ab6335e08eff62a58ee1f287e", - "digest": "713ee9qPuf6j6nXZVs6jQNaURCHXprZfwwbFnmuVRBDu" + "address": "0xa25001405d1e7f663228add25fde3915b90a2403978c2213039da62776d91c3a", + "digest": "3d55nfHbCozQ9fTswboGToyZiWrKwtfrZMQJNQmP2guS" } }, { - "address": "0xc28024efc650d31011065697e676b6738732dad9f709e54a13b116672c298f25", + "address": "0xbc421ae197581ec48f0f55a446dadb32b380d42498a45828082174e8f895d77d", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xc28024efc650d31011065697e676b6738732dad9f709e54a13b116672c298f25", - "digest": "BEPbAyocJgB6QtEAKQQUgyfYFf8RkWPWUpvRpuwobNHC" + "address": "0xbc421ae197581ec48f0f55a446dadb32b380d42498a45828082174e8f895d77d", + "digest": "ER3SSV8XdfgsMMuHZqbML1tZausxjhgMahFbDEqneHtH" } }, { - "address": "0xc928f6f78781333f87efac974403df5a8565e3accb3c16a891a60a18dd2f2f42", + "address": "0xc5788b6613609072343e1885a3d8cb1049aa1b17ec470a0e32aa87609039e8b8", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xc928f6f78781333f87efac974403df5a8565e3accb3c16a891a60a18dd2f2f42", - "digest": "FzFjGUJ3FBJRZ4eVE7y9F3LRqxWyDY4JT1pmg7g1BU4X" + "address": "0xc5788b6613609072343e1885a3d8cb1049aa1b17ec470a0e32aa87609039e8b8", + "digest": "Ehg96UPFBWjTnK1DcDBDFtWewmfGhsbMweZXnLVp9Y9C" } }, { - "address": "0xdd6b3a50df67a765e8c59bd37030224138f36bba296535846f490d8dede3c502", + "address": "0xc62e073102dcc99b5a1df4107b5cc3278e06ecf0c4e25cc4557094e71c9e33b5", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xdd6b3a50df67a765e8c59bd37030224138f36bba296535846f490d8dede3c502", - "digest": "EJ4XFN8AQCbwg3rqF1uksR2gKLDyadnCN1dYvJ3Um713" + "address": "0xc62e073102dcc99b5a1df4107b5cc3278e06ecf0c4e25cc4557094e71c9e33b5", + "digest": "35Qdpzz8AowD3zsPhfogtd1juX6nKRA7nEagC9efyPrf" } }, { - "address": "0xe9ee601e69a2f4274ca5f23c16190823a7af496b5b9f2eac0d2c2645634b2737", + "address": "0xd2bdb9bd62d71a74938f8c2a7f139d22115834a15144abdf1c6567ce3a5f5d86", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xe9ee601e69a2f4274ca5f23c16190823a7af496b5b9f2eac0d2c2645634b2737", - "digest": "9oBq9oxHbMER3WeW5DudYyXecorCy5yjcaLJVBzrAJmw" + "address": "0xd2bdb9bd62d71a74938f8c2a7f139d22115834a15144abdf1c6567ce3a5f5d86", + "digest": "Hcm7iG6Mn2XatKUwX6Vcg3m7NjP7TnLMRpeD1arAFX73" } }, { - "address": "0xf22e2f7e20b84f57fdcf1f44c79c321533b922fa9488c23556356ae3f906b0bb", + "address": "0xf7ac6c2ee5d92f53a3b87f10ff6b33f39ea9d642f99df06e4a0520a59343bf9c", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xf22e2f7e20b84f57fdcf1f44c79c321533b922fa9488c23556356ae3f906b0bb", - "digest": "D6VFrTAqMGZjMktBnEhGkZ9MXyea8WisE4vdn8fBAjgV" + "address": "0xf7ac6c2ee5d92f53a3b87f10ff6b33f39ea9d642f99df06e4a0520a59343bf9c", + "digest": "EPJ4jthbbqfdbgWUxYN5fgjX9438Rv3q9AzKXdPGGpmh" } } ] @@ -1409,7 +1409,7 @@ Response: { "sequenceNumber": 0 }, "transactionBlock": { - "digest": "EjxArvXVR7U8yu5Yi2oDmELwV74gwJFinZKhnPuTKj83" + "digest": "4tReNGdXxGZo3su5zTWX47wjadMEreXffEzSbBsrutX1" } }, "expiration": null @@ -1461,7 +1461,7 @@ Response: { "dependencies": { "nodes": [ { - "digest": "EjxArvXVR7U8yu5Yi2oDmELwV74gwJFinZKhnPuTKj83" + "digest": "4tReNGdXxGZo3su5zTWX47wjadMEreXffEzSbBsrutX1" } ] }, @@ -1561,7 +1561,7 @@ Response: { "dependencies": { "nodes": [ { - "digest": "EjxArvXVR7U8yu5Yi2oDmELwV74gwJFinZKhnPuTKj83" + "digest": "4tReNGdXxGZo3su5zTWX47wjadMEreXffEzSbBsrutX1" } ] }, @@ -1580,12 +1580,12 @@ Response: { } }, { - "address": "0x0d8feaf1c714777ad5401781c55794e0b8f6dda166924176279914bed08951e0", + "address": "0x2a20cfa2a3d79b440d73722f8e77a287c0239151c2ef8c45b727bcf4876b15e9", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x0d8feaf1c714777ad5401781c55794e0b8f6dda166924176279914bed08951e0", - "digest": "92GwpFNwQDbmoJRDkH6crad72SMMubKs3HdpMhncAwbp" + "address": "0x2a20cfa2a3d79b440d73722f8e77a287c0239151c2ef8c45b727bcf4876b15e9", + "digest": "D6M3KSmV9ZD3nvLBd2gjAKWWUyqN3Nb5eLhDr3kmFkdd" } }, { @@ -1594,7 +1594,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x4509fa198370254af0418248c9718bb206e810e1bce9fc8ffd0c500aef972f4d", - "digest": "5wumBetyyshU5rCK2f6GUDCohAWpmVrus9D4QS5bambg" + "digest": "F7j6V3ML4pzLpjp71goheCiZ5oS4HL1hZy8EEAnZcLmf" } }, { @@ -1603,7 +1603,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2", - "digest": "CNxCh8MK8JrDGgHFwQyJ3oBV6njo5bRSWcEy8HPAakha" + "digest": "HitbtSedj8YKcmkG3nLAfcrgTRdJohZSFJrwP7Sw3diE" } } ] diff --git a/crates/iota-network-stack/src/multiaddr.rs b/crates/iota-network-stack/src/multiaddr.rs index 55207712eef..3d5ab1c4869 100644 --- a/crates/iota-network-stack/src/multiaddr.rs +++ b/crates/iota-network-stack/src/multiaddr.rs @@ -8,7 +8,7 @@ use std::{ }; pub use ::multiaddr::{Error, Protocol}; -use eyre::{Result, eyre}; +use eyre::{eyre, Result}; use tracing::error; #[derive(Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)] @@ -52,17 +52,20 @@ impl Multiaddr { } /// Attempts to convert a multiaddr of the form - /// `/[ip4,ip6,dns]/{}/udp/{port}` into an anemo address + /// `/[ip4,ip6,dns]/{}/[udp, tcp]/{port}` into an anemo address pub fn to_anemo_address(&self) -> Result { let mut iter = self.iter(); match (iter.next(), iter.next()) { - (Some(Protocol::Ip4(ipaddr)), Some(Protocol::Udp(port))) => Ok((ipaddr, port).into()), - (Some(Protocol::Ip6(ipaddr)), Some(Protocol::Udp(port))) => Ok((ipaddr, port).into()), - (Some(Protocol::Dns(hostname)), Some(Protocol::Udp(port))) => { + (Some(Protocol::Ip4(ipaddr)), Some(Protocol::Udp(port) | Protocol::Tcp(port))) => { + Ok((ipaddr, port).into()) + } + (Some(Protocol::Ip6(ipaddr)), Some(Protocol::Udp(port) | Protocol::Tcp(port))) => { + Ok((ipaddr, port).into()) + } + (Some(Protocol::Dns(hostname)), Some(Protocol::Udp(port) | Protocol::Tcp(port))) => { Ok((hostname.as_ref(), port).into()) } - _ => { tracing::warn!("unsupported p2p multiaddr: '{self}'"); Err("invalid address") diff --git a/crates/iota-swarm-config/src/genesis_config.rs b/crates/iota-swarm-config/src/genesis_config.rs index 35620d1911d..8bcf0652e30 100644 --- a/crates/iota-swarm-config/src/genesis_config.rs +++ b/crates/iota-swarm-config/src/genesis_config.rs @@ -169,14 +169,14 @@ impl ValidatorGenesisConfigBuilder { local_ip_utils::new_deterministic_udp_address_for_testing(&ip, offset + 1), local_ip_utils::new_deterministic_tcp_address_for_testing(&ip, offset + 2) .with_zero_ip(), - local_ip_utils::new_deterministic_udp_address_for_testing(&ip, offset + 3), + local_ip_utils::new_deterministic_tcp_address_for_testing(&ip, offset + 3), ) } else { ( local_ip_utils::new_tcp_address_for_testing(&ip), local_ip_utils::new_udp_address_for_testing(&ip), local_ip_utils::new_tcp_address_for_testing(&localhost), - local_ip_utils::new_udp_address_for_testing(&ip), + local_ip_utils::new_tcp_address_for_testing(&ip), ) };