gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rebase

Browse Source
This commit is contained in:
Michael Vines
2021-10-06 23:13:08 -07:00
parent 81d2c3261c
commit ef55045724
3 changed files with 42 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Cargo.lock generated
View File

@ -485,6 +485,26 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0017894339f586ccb943b01b9555de56770c11cda818e7e3d8bd93f4ed7f46e" checksum = "b0017894339f586ccb943b01b9555de56770c11cda818e7e3d8bd93f4ed7f46e"
[[package]]
name = "bytemuck"
version = "1.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72957246c41db82b8ef88a5486143830adeb8227ef9837740bdec67724cf2c5b"
dependencies = [
"bytemuck_derive",
]
[[package]]
name = "bytemuck_derive"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e215f8c2f9f79cb53c8335e687ffd07d5bfcb6fe5fc80723762d0be46e7cc54"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.9",
"syn 1.0.60",
]
[[package]] [[package]]
name = "byteorder" name = "byteorder"
version = "1.3.4" version = "1.3.4"
@ -5130,12 +5150,8 @@ dependencies = [
"borsh-derive", "borsh-derive",
"bs58 0.3.1", "bs58 0.3.1",
"bv", "bv",
<<<<<<< HEAD
"curve25519-dalek 2.1.0",
=======
"bytemuck", "bytemuck",
"curve25519-dalek 3.2.0", "curve25519-dalek 2.1.0",
>>>>>>> f96685982 (Derive Pod/Zeroable for Pubkey)
"hex", "hex",
"itertools 0.9.0", "itertools 0.9.0",
"lazy_static", "lazy_static",

26
programs/bpf/Cargo.lock generated
View File

@ -299,6 +299,26 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
[[package]]
name = "bytemuck"
version = "1.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72957246c41db82b8ef88a5486143830adeb8227ef9837740bdec67724cf2c5b"
dependencies = [
"bytemuck_derive",
]
[[package]]
name = "bytemuck_derive"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e215f8c2f9f79cb53c8335e687ffd07d5bfcb6fe5fc80723762d0be46e7cc54"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.6",
"syn 1.0.67",
]
[[package]] [[package]]
name = "byteorder" name = "byteorder"
version = "0.5.3" version = "0.5.3"
@ -3295,12 +3315,8 @@ dependencies = [
"borsh-derive", "borsh-derive",
"bs58 0.3.1", "bs58 0.3.1",
"bv", "bv",
<<<<<<< HEAD
"curve25519-dalek 2.1.0",
=======
"bytemuck", "bytemuck",
"curve25519-dalek 3.2.0", "curve25519-dalek 2.1.0",
>>>>>>> f96685982 (Derive Pod/Zeroable for Pubkey)
"hex", "hex",
"itertools 0.9.0", "itertools 0.9.0",
"lazy_static", "lazy_static",

7
sdk/program/Cargo.toml
View File

@ -12,17 +12,10 @@ edition = "2018"
[dependencies] [dependencies]
bincode = "1.3.1" bincode = "1.3.1"
<<<<<<< HEAD
borsh = "0.9.0" borsh = "0.9.0"
borsh-derive = "0.9.0" borsh-derive = "0.9.0"
bs58 = "0.3.1" bs58 = "0.3.1"
=======
blake3 = { version = "1.0.0", features = ["traits-preview"] }
borsh = "0.9.1"
borsh-derive = "0.9.1"
bs58 = "0.4.0"
bytemuck = { version = "1.7.2", features = ["derive"] } bytemuck = { version = "1.7.2", features = ["derive"] }
>>>>>>> f96685982 (Derive Pod/Zeroable for Pubkey)
bv = { version = "0.11.1", features = ["serde"] } bv = { version = "0.11.1", features = ["serde"] }
hex = "0.4.2" hex = "0.4.2"
itertools = "0.9.0" itertools = "0.9.0"