Skip to content

Commit

Permalink
[crypto] add blst dependency
Browse files Browse the repository at this point in the history
blst has a conflict with ed25519-dalek with zeroize version, this commit changes ed25519-dalek
to 1.0.1 and downgrade rand to 0.7.3 as well as x25519-dalek to 1.2.0.
  • Loading branch information
zekun000 authored and aptos-bot committed Jun 10, 2022
1 parent 2666e86 commit d9c76af
Show file tree
Hide file tree
Showing 105 changed files with 414 additions and 376 deletions.
145 changes: 90 additions & 55 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ storage-interface = { path = "../storage/storage-interface" }

[dev-dependencies]
goldenfile = "1.1.0"
rand = "0.8.5"
rand = "0.7.3"
regex = "1.5.5"
reqwest = { version = "0.11.10", features = ["blocking", "json"], default_features = false }

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"sequence_number": "0",
"authentication_key": "0x7deeccb1080854f499ec8b4c1b213b82c5e34b925cf6875fec02d4b77adbd2d6"
"authentication_key": "0x8e0d19280063fa870fe4dbb85cc724091a398451c5c11e1e76e64cdc7b588510"
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
}
}
],
"id": "0xf44b581f23222c10916b17a369b4da039d075952b58036f2a7b561446592403c",
"id": "0xe52bfb76e51cca8b4e9016838657edfae09cb9a71eb219025c4c87a67c4aaa86",
"epoch": "0",
"round": "1",
"previous_block_votes": [
Expand All @@ -73,7 +73,7 @@
"data": {
"type": "0x1::Account::Account",
"data": {
"authentication_key": "0x7deeccb1080854f499ec8b4c1b213b82c5e34b925cf6875fec02d4b77adbd2d6",
"authentication_key": "0x8e0d19280063fa870fe4dbb85cc724091a398451c5c11e1e76e64cdc7b588510",
"self_address": "0xa550c18",
"sequence_number": "1"
}
Expand Down Expand Up @@ -118,20 +118,20 @@
},
{
"type": "write_resource",
"address": "0xe60912ecb0a8c365d163d258f3b9f1b62f8f9148c207643864d7ed4a2b23159",
"address": "0xd30c067c5c317672314ed69ebe81008891c7aca019294ce52d2524891b8026ea",
"state_key_hash": "",
"data": {
"type": "0x1::Account::Account",
"data": {
"authentication_key": "0x0e60912ecb0a8c365d163d258f3b9f1b62f8f9148c207643864d7ed4a2b23159",
"self_address": "0xe60912ecb0a8c365d163d258f3b9f1b62f8f9148c207643864d7ed4a2b23159",
"authentication_key": "0xd30c067c5c317672314ed69ebe81008891c7aca019294ce52d2524891b8026ea",
"self_address": "0xd30c067c5c317672314ed69ebe81008891c7aca019294ce52d2524891b8026ea",
"sequence_number": "0"
}
}
},
{
"type": "write_resource",
"address": "0xe60912ecb0a8c365d163d258f3b9f1b62f8f9148c207643864d7ed4a2b23159",
"address": "0xd30c067c5c317672314ed69ebe81008891c7aca019294ce52d2524891b8026ea",
"state_key_hash": "",
"data": {
"type": "0x1::Coin::CoinEvents",
Expand All @@ -141,7 +141,7 @@
"guid": {
"guid": {
"id": {
"addr": "0xe60912ecb0a8c365d163d258f3b9f1b62f8f9148c207643864d7ed4a2b23159",
"addr": "0xd30c067c5c317672314ed69ebe81008891c7aca019294ce52d2524891b8026ea",
"creation_num": "0"
}
},
Expand All @@ -153,7 +153,7 @@
},
{
"type": "write_resource",
"address": "0xe60912ecb0a8c365d163d258f3b9f1b62f8f9148c207643864d7ed4a2b23159",
"address": "0xd30c067c5c317672314ed69ebe81008891c7aca019294ce52d2524891b8026ea",
"state_key_hash": "",
"data": {
"type": "0x1::Coin::CoinStore<0x1::TestCoin::TestCoin>",
Expand All @@ -166,7 +166,7 @@
"guid": {
"guid": {
"id": {
"addr": "0xe60912ecb0a8c365d163d258f3b9f1b62f8f9148c207643864d7ed4a2b23159",
"addr": "0xd30c067c5c317672314ed69ebe81008891c7aca019294ce52d2524891b8026ea",
"creation_num": "1"
}
},
Expand All @@ -178,7 +178,7 @@
"guid": {
"guid": {
"id": {
"addr": "0xe60912ecb0a8c365d163d258f3b9f1b62f8f9148c207643864d7ed4a2b23159",
"addr": "0xd30c067c5c317672314ed69ebe81008891c7aca019294ce52d2524891b8026ea",
"creation_num": "2"
}
},
Expand All @@ -190,7 +190,7 @@
},
{
"type": "write_resource",
"address": "0xe60912ecb0a8c365d163d258f3b9f1b62f8f9148c207643864d7ed4a2b23159",
"address": "0xd30c067c5c317672314ed69ebe81008891c7aca019294ce52d2524891b8026ea",
"state_key_hash": "",
"data": {
"type": "0x1::GUID::Generator",
Expand All @@ -210,17 +210,17 @@
"function": "0x1::Account::create_account",
"type_arguments": [],
"arguments": [
"0xe60912ecb0a8c365d163d258f3b9f1b62f8f9148c207643864d7ed4a2b23159"
"0xd30c067c5c317672314ed69ebe81008891c7aca019294ce52d2524891b8026ea"
]
},
"signature": {
"type": "ed25519_signature",
"public_key": "0xb9c6ee1630ef3e711144a648db06bbb2284f7274cfbee53ffcee503cc1a49200",
"signature": "0x368cd71ddb9e8710823f1fb4feeaa2fe3cf814e56c1b151161157ce8090822809344962b8f10ae141387484aca5c5ffd32a6ddb18973b37c7c847ebdf7493504"
"public_key": "0x20fdbac9b10b7587bba7b5bc163bce69e796d71e4ed44c10fcb4488689f7a144",
"signature": "0x2496d9a46e38adcadfb09e2aa27882f3f1bbe52b1087ce75ae3bae2b4bad1f4ca8a40fed59608be896e6d56b83f1b0a76aade5b352b4f081ad3d914cb8436205"
},
"events": [
{
"key": "0x00000000000000000e60912ecb0a8c365d163d258f3b9f1b62f8f9148c207643864d7ed4a2b23159",
"key": "0x0000000000000000d30c067c5c317672314ed69ebe81008891c7aca019294ce52d2524891b8026ea",
"sequence_number": "0",
"type": "0x1::Coin::RegisterEvent",
"data": {
Expand Down
Loading

0 comments on commit d9c76af

Please sign in to comment.