chore: update narwhal pointer with rand upgrade (MystenLabs#3891)

* Bump Narwhal to 6a28e2. Bump rand to 0.8.5 * update open rpc samples * update move baseline * fix sdk * update cost Co-authored-by: Mingwei Tian <[email protected]>
blcozgn · Aug 16, 2022 · 4f3ec83 · 4f3ec83
1 parent 3f064dc
commit 4f3ec83
Show file tree

Hide file tree

Showing 37 changed files with 2,449 additions and 1,140 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/sui-adapter-transactional-tests/tests/child_count/count_decremented.exp b/crates/sui-adapter-transactional-tests/tests/child_count/count_decremented.exp
@@ -31,16 +31,17 @@ created: object(111), object(112)
 written: object(110)
 
 task 7 'view-object'. lines 78-78:
-Owner: Account Address ( A )
+Owner: Object ID: ( fake(111) )
 Version: 1
-Child Count: Some(1)
+Child Count: None
 Contents: test::m::S {id: sui::object::UID {id: sui::object::ID {bytes: fake(112)}}}
 
 task 8 'run'. lines 80-80:
-written: object(111), object(112), object(113)
+Error: Transaction Effects Status: Invalid Freezing of Parent Object with Children. Parent object fake(111) was made immutable before its children were deleted or transferred.
+Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: InvalidParentFreezing { parent: fake(111) }, source: None } }
 
 task 9 'view-object'. lines 82-86:
-Owner: Account Address ( A )
+Owner: Object ID: ( fake(111) )
 Version: 2
 Child Count: None
 Contents: test::m::S {id: sui::object::UID {id: sui::object::ID {bytes: fake(112)}}}
@@ -50,16 +51,16 @@ created: object(115), object(116)
 written: object(114)
 
 task 11 'view-object'. lines 90-90:
-Owner: Account Address ( A )
+Owner: Object ID: ( fake(116) )
 Version: 1
-Child Count: Some(1)
+Child Count: None
 Contents: test::m::S {id: sui::object::UID {id: sui::object::ID {bytes: fake(115)}}}
 
 task 12 'run'. lines 92-92:
 written: object(115), object(116), object(117)
 
 task 13 'view-object'. lines 94-98:
-Owner: Account Address ( A )
+Owner: Object ID: ( fake(116) )
 Version: 2
 Child Count: None
 Contents: test::m::S {id: sui::object::UID {id: sui::object::ID {bytes: fake(115)}}}
@@ -73,16 +74,17 @@ created: object(122), object(123)
 written: object(121)
 
 task 16 'view-object'. lines 104-104:
-Owner: Account Address ( A )
+Owner: Object ID: ( fake(119) )
 Version: 1
-Child Count: Some(1)
+Child Count: None
 Contents: test::m::S {id: sui::object::UID {id: sui::object::ID {bytes: fake(120)}}}
 
 task 17 'run'. lines 106-106:
-written: object(119), object(120), object(123), object(124)
+Error: Transaction Effects Status: Missing Object Owner. Missing object owner, the parent object fake(122) for child object fake(123).
+Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: MissingObjectOwner(MissingObjectOwner { child: fake(123), parent: fake(122) }), source: None } }
 
 task 18 'view-object'. lines 108-112:
-Owner: Account Address ( A )
+Owner: Object ID: ( fake(119) )
 Version: 2
 Child Count: None
 Contents: test::m::S {id: sui::object::UID {id: sui::object::ID {bytes: fake(120)}}}
@@ -96,16 +98,17 @@ created: object(129), object(130)
 written: object(128)
 
 task 21 'view-object'. lines 118-118:
-Owner: Account Address ( A )
+Owner: Object ID: ( fake(126) )
 Version: 1
-Child Count: Some(1)
+Child Count: None
 Contents: test::m::S {id: sui::object::UID {id: sui::object::ID {bytes: fake(127)}}}
 
 task 22 'run'. lines 120-120:
-written: object(126), object(127), object(130), object(131)
+Error: Transaction Effects Status: Missing Object Owner. Missing object owner, the parent object fake(129) for child object fake(130).
+Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: MissingObjectOwner(MissingObjectOwner { child: fake(130), parent: fake(129) }), source: None } }
 
 task 23 'view-object'. lines 122-126:
-Owner: Account Address ( A )
+Owner: Object ID: ( fake(126) )
 Version: 2
 Child Count: None
 Contents: test::m::S {id: sui::object::UID {id: sui::object::ID {bytes: fake(127)}}}
@@ -115,17 +118,17 @@ created: object(133), object(134)
 written: object(132)
 
 task 25 'view-object'. lines 130-130:
-Owner: Account Address ( A )
+Owner: Object ID: ( fake(133) )
 Version: 1
-Child Count: Some(1)
+Child Count: None
 Contents: test::m::S {id: sui::object::UID {id: sui::object::ID {bytes: fake(134)}}}
 
 task 26 'run'. lines 132-132:
-written: object(134), object(135)
-deleted: object(133)
+Error: Transaction Effects Status: Invalid Deletion of Parent Object with Children. Parent object fake(133) was deleted before its children were deleted or transferred.
+Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: InvalidParentDeletion { parent: fake(133), kind: Some(Normal) }, source: None } }
 
 task 27 'view-object'. lines 134-138:
-Owner: Account Address ( A )
+Owner: Object ID: ( fake(133) )
 Version: 2
 Child Count: None
 Contents: test::m::S {id: sui::object::UID {id: sui::object::ID {bytes: fake(134)}}}

diff --git a/crates/sui-benchmark/Cargo.toml b/crates/sui-benchmark/Cargo.toml
@@ -41,7 +41,7 @@ sui-node = { path = "../sui-node" }
 sui-json-rpc-types = { path = "../sui-json-rpc-types" }
 
 move-core-types = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a", features = ["address20"] }
-narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", package = "node" }
+narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "6a28e2ff64e4a567d7aee599c3774893598cb133", package = "node" }
 workspace-hack = { path = "../workspace-hack"}
 test-utils = { path = "../test-utils" }
 

diff --git a/crates/sui-config/Cargo.toml b/crates/sui-config/Cargo.toml
@@ -14,14 +14,14 @@ anyhow = { version = "1.0.58", features = ["backtrace"] }
 serde = { version = "1.0.141", features = ["derive", "rc"] }
 serde_with = "1.14.0"
 serde_yaml = "0.8.26"
-rand = "0.7.3"
+rand = "0.8.5"
 dirs = "4.0.0"
 multiaddr = "0.14.0"
 once_cell = "1.11.0"
 tracing = "0.1.36"
 
-narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", package = "config" }
-narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", package = "crypto" }
+narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "6a28e2ff64e4a567d7aee599c3774893598cb133", package = "config" }
+narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "6a28e2ff64e4a567d7aee599c3774893598cb133", package = "crypto" }
 
 move-binary-format = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" }
 move-package = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" }

diff --git a/crates/sui-config/tests/snapshots/snapshot_tests__genesis_config_snapshot_matches.snap b/crates/sui-config/tests/snapshots/snapshot_tests__genesis_config_snapshot_matches.snap
@@ -5,69 +5,69 @@ expression: genesis_config
 validator_genesis_info: ~
 committee_size: 4
 accounts:
-  - address: 89dca66cd6a15bc3ebaa44ceecfb58c70a032485
+  - address: 375741c9373ae27bde5e6b5f5cc79f074cd84587
     gas_objects:
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
     gas_object_ranges: []
-  - address: 89dca66cd6a15bc3ebaa44ceecfb58c70a032485
+  - address: 375741c9373ae27bde5e6b5f5cc79f074cd84587
     gas_objects:
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
     gas_object_ranges: []
-  - address: 89dca66cd6a15bc3ebaa44ceecfb58c70a032485
+  - address: 375741c9373ae27bde5e6b5f5cc79f074cd84587
     gas_objects:
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
     gas_object_ranges: []
-  - address: 89dca66cd6a15bc3ebaa44ceecfb58c70a032485
+  - address: 375741c9373ae27bde5e6b5f5cc79f074cd84587
     gas_objects:
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
     gas_object_ranges: []
-  - address: 89dca66cd6a15bc3ebaa44ceecfb58c70a032485
+  - address: 375741c9373ae27bde5e6b5f5cc79f074cd84587
     gas_objects:
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
-      - object_id: "0x89dca66cd6a15bc3ebaa44ceecfb58c70a032485"
+      - object_id: "0x375741c9373ae27bde5e6b5f5cc79f074cd84587"
         gas_value: 100000000
     gas_object_ranges: []
 
diff --git a/crates/sui-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap b/crates/sui-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap
@@ -3,7 +3,7 @@ source: crates/sui-config/tests/snapshot_tests.rs
 expression: network_config
 ---
 validator_configs:
-  - key-pair: drjgraDxPZBAXWrlU4a9KL3SGbigje0aqDbvzIt3Dccg/brJsQt1h7untbwWO85p55bXHk7UTBD8tEiGifehRA==
+  - key-pair: m/SaagdV+VOBH84SXyaD1QQpw7tJ4HQUfgCJpS6uFV+5xu4WMO8+cRFEpkjbBruyKE9ydM++5T/87lA8waSSAA==
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
@@ -38,7 +38,7 @@ validator_configs:
     enable-reconfig: false
     genesis:
       genesis: "[fake genesis]"
-  - key-pair: 2kFZfFFXSI13JOA/uNhKN2pDuPQVGKEcw4e2abLuZYZ15BdN1YgiVICG8XsDfOyw7oZRa30TQAqAyFa0va9/4Q==
+  - key-pair: BWT4edJ648As6Cg0rPqMeTpinyyg3mkZYQvoL0ETJr6u8/SkuOyh38NDNhv45Da9Qt6SWcBLgxTrjiBU3W6Cqw==
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
@@ -73,7 +73,7 @@ validator_configs:
     enable-reconfig: false
     genesis:
       genesis: "[fake genesis]"
-  - key-pair: nwfnvlVROHqYupd8cy0IDcsPKaBI42VpEsZTPjLueu1jHBVB86S/RNTYlwYVZKqElddm9hkaP/YVYgA/GEuMZQ==
+  - key-pair: C9WIQSA+dP6G/HEzjOAXPcYo67cZvcvMFRWFIUzAibSKV2LiGsHNs4cEQsd7TDr1jHztuHedAnDm1PHi9zZ9dA==
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
@@ -108,7 +108,7 @@ validator_configs:
     enable-reconfig: false
     genesis:
       genesis: "[fake genesis]"
-  - key-pair: KbchdpzmTkPVcTOwdNg51THtHyhRCvtFrOEKH0t5TW++raBhJseNmLShpp9u5hiWlPD0dRU42oJPGtyLFKG1Yg==
+  - key-pair: QiWNzaFM8RHGAriXG4zIQ+keRsqQUVHAJ0SmsBfmkxbMYjMuNLstXNafYO+7KjbLkWx+tFgwHqNmNsTbsBK9iA==
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
@@ -143,7 +143,7 @@ validator_configs:
     enable-reconfig: false
     genesis:
       genesis: "[fake genesis]"
-  - key-pair: LQmg5mMmbOGuftEIGWigdY5xjpl702LGsMNGNKmgs10ccMiRpjRoGJDfb8SqO5TSEAuhWgfHiheQi24y3xkNSw==
+  - key-pair: sgzWfEvezFOOi+mQwbZCXWi/06b+l2k+SEY1FZbMqKsjjttu6akf3I5xvlDAo/s88pLZAk3brAKqpwkJawqp2g==
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
@@ -178,7 +178,7 @@ validator_configs:
     enable-reconfig: false
     genesis:
       genesis: "[fake genesis]"
-  - key-pair: ASc3aB97XQ8oHjr95Fi8HnPS0xPJz5TAX/NxYkCiSPIfevXxsJEf9GgdcOIY8NqzmaqCNm1l12Xy+2rPYQEvSA==
+  - key-pair: 9Z/d0Lf1LcwMYKRIy/lRFhCwp0Lx5NI4p6RcrgVOwhydR2FqGN8gOTB/BkIiYCWItSpqrqp7b+jGtNnrqKeHsQ==
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
@@ -213,7 +213,7 @@ validator_configs:
     enable-reconfig: false
     genesis:
       genesis: "[fake genesis]"
-  - key-pair: EyCgWNezVmvVINqqPtK/CsW4sSD7hSdzw2OXNLRckaRA9LsfqzzA5P2RKivmFTX5XcMFaP6QRsKuxgtVFJIytg==
+  - key-pair: 4BB+FmG6xjjQpGNs/bv21foY4nMY2jMCltCjhxgNbIzqP8527hCzpkX7MEBRHfq0yc1gWPQZKQFNFkZvXjssKg==
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
@@ -249,10 +249,10 @@ validator_configs:
     genesis:
       genesis: "[fake genesis]"
 account_keys:
-  - LdTLg/iEDS7tsVgTEGKsPx8s+P9tzRhW6GoebDFnFn7LLuH905q3rXBH/S7bfDf4/W6mpai4AJ0nEANmJMCTfw==
-  - 5aaIdCtHxa37WdTfdv0dseUe4Dscqfgqyhc+24tyk0fVp4FJTSvxoXTd/94eAsuIgc/22rcOYcve85PerAzmOQ==
-  - Tr6YD5BNEMkWRCtHg6DphIYMtslXs5w47Y9Rz/qmik0Jl3FIJlyVJyaFSf4VO4E9w7PbWOKcq7heaKRU9zRoYw==
-  - 4BAlo5xQRUa53BQGp+soFR5RUNeyBLqnGdTwkQISF9vjK71JOpv+Enog2V6Yq1WT0V9eFFLM68bFKafgXsR4xA==
-  - XPG1yExPpxqHlhChppWsUnxbVndKa4ohquiGhYaOCUykZAZuYXvNpGb8sJtOd9+Gho23M7jxFptmOxS+FsIulQ==
+  - 0gL1Yotsq+ENWrgyROSyMO/U3MzvxGNYktNenctyJd+vtJBelVDPRiqCAHgkoFXZda6TRHDEd9ndu20rJkw2+g==
+  - 9Lcs30s8QZpYQnBLH+55QCOl6uAiOVb7LEcBbhB7hE6X5+2EP6saQs6cISlDUh7CKgJWh0fMADuIH70n9wvf4A==
+  - kYP0d2s+pZoXgeVko+rpZ2k5e4q0NbJd2kGJ4QPQMc9cR/734xE9wBxW701He/5RV6/DOWmgFPi7VTfhjM7GTA==
+  - nZTXHAccZRpZcVXhUvvQe7WAB32Ak1vyNmNCX/Kl8amDOdmcMzuzonf+t4C41GysMM3NkFDb4jX7jMZ7kcGwag==
+  - pzzqy7X725Nhn+RxRHmPNmU97IGS14ftQFbEczxPAHaGQZf0zFyrbI7dS3nEhe+5pVVxi3W2A+LouY9V7A3iZw==
 genesis: "[fake genesis]"
 
diff --git a/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap b/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap
@@ -4,7 +4,7 @@ expression: genesis.committee().unwrap()
 ---
 epoch: 0
 voting_rights:
-  - - IP26ybELdYe7p7W8FjvOaeeW1x5O1EwQ/LRIhon3oUQ=
+  - - ucbuFjDvPnERRKZI2wa7sihPcnTPvuU//O5QPMGkkgA=
     - 1
 total_votes: 1
 
diff --git a/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-3.snap b/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-3.snap
@@ -3,7 +3,7 @@ source: crates/sui-config/tests/snapshot_tests.rs
 expression: genesis.narwhal_committee()
 ---
 authorities:
-  IP26ybELdYe7p7W8FjvOaeeW1x5O1EwQ/LRIhon3oUQ=:
+  ucbuFjDvPnERRKZI2wa7sihPcnTPvuU//O5QPMGkkgA=:
     stake: 1
     primary:
       primary_to_primary: ""