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

resolve conflicts

Browse Source
This commit is contained in:
Justin Starry
2021-09-25 09:40:18 -04:00
committed by Justin Starry
parent 66a9e6bcb4
commit 1a88a9eb0e
6 changed files with 48 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

193
Cargo.lock generated
View File

@@ -664,15 +664,6 @@ dependencies = [
"bitflags",
]
[[package]]
name = "cloudabi"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467"
dependencies = [
"bitflags",
]
[[package]]
name = "combine"
version = "3.8.1"
@@ -877,13 +868,8 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
dependencies = [
<<<<<<< HEAD
"generic-array 0.14.3",
"subtle 2.2.2",
=======
"generic-array 0.14.4",
"subtle",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
]
[[package]]
@@ -892,13 +878,8 @@ version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58bcd97a54c7ca5ce2f6eb16f6bede5b0ab5f0055fedc17d2f0b4466e21671ca"
dependencies = [
<<<<<<< HEAD
"generic-array 0.14.3",
"subtle 2.2.2",
=======
"generic-array 0.14.4",
"subtle",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
]
[[package]]
@@ -907,13 +888,8 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6"
dependencies = [
<<<<<<< HEAD
"generic-array 0.14.3",
"subtle 2.2.2",
=======
"generic-array 0.14.4",
"subtle",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
]
[[package]]
@@ -1143,11 +1119,7 @@ dependencies = [
"rand 0.7.3",
"serde",
"serde_bytes",
<<<<<<< HEAD
"sha2 0.9.2",
=======
"sha2",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
"zeroize",
]
@@ -1161,11 +1133,7 @@ dependencies = [
"ed25519-dalek",
"failure",
"hmac 0.9.0",
<<<<<<< HEAD
"sha2 0.9.2",
=======
"sha2",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
]
[[package]]
@@ -1308,7 +1276,7 @@ checksum = "affc17579b132fc2461adf7c575cc6e8b134ebca52c51f5411388965227dc695"
dependencies = [
"cfg-if 0.1.10",
"libc",
"redox_syscall",
"redox_syscall 0.1.56",
"winapi 0.3.9",
]
@@ -1926,21 +1894,20 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754"
dependencies = [
<<<<<<< HEAD
"bytes 0.5.4",
=======
"cfg-if 1.0.0",
"js-sys",
"wasm-bindgen",
"web-sys",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
]
[[package]]
name = "instant"
version = "0.1.6"
version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b141fdc7836c525d4d594027d318c84161ca17aaf8113ab1f81ab93ae897485"
checksum = "716d3d89f35ac6a34fd0eed635395f4c3b76fa889338a4632e5231a8684216bd"
dependencies = [
"cfg-if 1.0.0",
"js-sys",
"wasm-bindgen",
"web-sys",
]
[[package]]
name = "iovec"
@@ -2100,7 +2067,7 @@ dependencies = [
"jsonrpc-server-utils",
"log 0.4.11",
"net2",
"parking_lot 0.11.0",
"parking_lot 0.11.2",
"unicase 2.6.0",
]
@@ -2115,7 +2082,7 @@ dependencies = [
"jsonrpc-server-utils",
"log 0.4.11",
"parity-tokio-ipc",
"parking_lot 0.11.0",
"parking_lot 0.11.2",
"tower-service",
]
@@ -2129,7 +2096,7 @@ dependencies = [
"jsonrpc-core",
"lazy_static",
"log 0.4.11",
"parking_lot 0.11.0",
"parking_lot 0.11.2",
"rand 0.7.3",
"serde",
]
@@ -2163,7 +2130,7 @@ dependencies = [
"jsonrpc-server-utils",
"log 0.4.11",
"parity-ws",
"parking_lot 0.11.0",
"parking_lot 0.11.2",
"slab",
]
@@ -2256,33 +2223,10 @@ dependencies = [
"libsecp256k1-gen-genmult",
"rand 0.7.3",
"serde",
<<<<<<< HEAD
"sha2 0.9.2",
=======
"sha2",
"typenum",
]
[[package]]
name = "libsecp256k1"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9d220bc1feda2ac231cb78c3d26f27676b8cf82c96971f7aeef3d0cf2797c73"
dependencies = [
"arrayref",
"base64 0.12.3",
"digest 0.9.0",
"hmac-drbg",
"libsecp256k1-core",
"libsecp256k1-gen-ecmult",
"libsecp256k1-gen-genmult",
"rand 0.7.3",
"serde",
"sha2",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
"typenum",
]
[[package]]
name = "libsecp256k1-core"
version = "0.2.1"
@@ -2329,9 +2273,9 @@ dependencies = [
[[package]]
name = "lock_api"
version = "0.4.1"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c"
checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"
dependencies = [
"scopeguard",
]
@@ -2677,7 +2621,7 @@ version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
dependencies = [
"parking_lot 0.11.0",
"parking_lot 0.11.2",
]
[[package]]
@@ -2804,13 +2748,13 @@ dependencies = [
[[package]]
name = "parking_lot"
version = "0.11.0"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733"
checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
dependencies = [
"instant",
"lock_api 0.4.1",
"parking_lot_core 0.8.0",
"lock_api 0.4.5",
"parking_lot_core 0.8.5",
]
[[package]]
@@ -2820,9 +2764,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
dependencies = [
"cfg-if 0.1.10",
"cloudabi 0.0.3",
"cloudabi",
"libc",
"redox_syscall",
"redox_syscall 0.1.56",
"rustc_version",
"smallvec 0.6.14",
"winapi 0.3.9",
@@ -2835,24 +2779,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
dependencies = [
"cfg-if 0.1.10",
"cloudabi 0.0.3",
"cloudabi",
"libc",
"redox_syscall",
"redox_syscall 0.1.56",
"smallvec 1.6.1",
"winapi 0.3.9",
]
[[package]]
name = "parking_lot_core"
version = "0.8.0"
version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"
checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
dependencies = [
"cfg-if 0.1.10",
"cloudabi 0.1.0",
"cfg-if 1.0.0",
"instant",
"libc",
"redox_syscall",
"redox_syscall 0.2.10",
"smallvec 1.6.1",
"winapi 0.3.9",
]
@@ -3365,7 +3308,7 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
dependencies = [
"cloudabi 0.0.3",
"cloudabi",
"fuchsia-cprng",
"libc",
"rand_core 0.4.2",
@@ -3450,6 +3393,15 @@ version = "0.1.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
[[package]]
name = "redox_syscall"
version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
dependencies = [
"bitflags",
]
[[package]]
name = "redox_users"
version = "0.3.4"
@@ -3457,7 +3409,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431"
dependencies = [
"getrandom 0.1.14",
"redox_syscall",
"redox_syscall 0.1.56",
"rust-argon2",
]
@@ -3891,25 +3843,9 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
[[package]]
name = "sha2"
<<<<<<< HEAD
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69"
dependencies = [
"block-buffer 0.7.3",
"digest 0.8.1",
"fake-simd",
"opaque-debug 0.2.3",
]
[[package]]
name = "sha2"
version = "0.9.2"
=======
version = "0.9.8"
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8"
dependencies = [
@@ -4015,7 +3951,7 @@ checksum = "2c29947abdee2a218277abeca306f25789c938e500ea5a9d4b12a5a504466902"
dependencies = [
"cfg-if 1.0.0",
"libc",
"redox_syscall",
"redox_syscall 0.1.56",
"winapi 0.3.9",
]
@@ -4357,12 +4293,8 @@ dependencies = [
"spl-memo",
"tempfile",
"thiserror",
<<<<<<< HEAD
"tiny-bip39 0.7.3",
"url 2.2.0",
=======
"tiny-bip39",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
"url 2.2.0",
]
[[package]]
@@ -4647,15 +4579,9 @@ dependencies = [
"rustc_version",
"serde",
"serde_derive",
<<<<<<< HEAD
"sha2 0.9.2",
"sha2",
"solana-frozen-abi-macro 1.6.27",
"solana-logger 1.6.27",
=======
"sha2",
"solana-frozen-abi-macro 1.7.6",
"solana-logger 1.7.6",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
"thiserror",
]
@@ -4673,15 +4599,9 @@ dependencies = [
"rustc_version",
"serde",
"serde_derive",
<<<<<<< HEAD
"sha2 0.9.2",
"sha2",
"solana-frozen-abi-macro 1.7.1",
"solana-logger 1.7.1",
=======
"sha2",
"solana-frozen-abi-macro 1.8.0",
"solana-logger 1.8.0",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
"thiserror",
]
@@ -4826,11 +4746,7 @@ dependencies = [
"rustc_version",
"serde",
"serde_bytes",
<<<<<<< HEAD
"sha2 0.9.2",
=======
"sha2",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
"solana-account-decoder",
"solana-bpf-loader-program",
"solana-budget-program",
@@ -5127,12 +5043,8 @@ dependencies = [
"serde",
"serde_bytes",
"serde_derive",
<<<<<<< HEAD
"serde_json",
"sha2 0.9.2",
=======
"sha2",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
"sha3",
"solana-frozen-abi 1.6.27",
"solana-frozen-abi-macro 1.6.27",
@@ -5166,12 +5078,7 @@ dependencies = [
"serde",
"serde_bytes",
"serde_derive",
<<<<<<< HEAD
"sha2 0.9.2",
=======
"serde_json",
"sha2",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
"sha3",
"solana-frozen-abi 1.7.1",
"solana-frozen-abi-macro 1.7.1",
@@ -5350,11 +5257,7 @@ dependencies = [
"serde_bytes",
"serde_derive",
"serde_json",
<<<<<<< HEAD
"sha2 0.9.2",
=======
"sha2",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
"sha3",
"solana-crate-features",
"solana-frozen-abi 1.6.27",
@@ -5948,7 +5851,7 @@ checksum = "5c058ad0bd6ccb84faa24cc44d4fc99bee8a5d7ba9ff33aa4d993122d1aeeac2"
dependencies = [
"filetime",
"libc",
"redox_syscall",
"redox_syscall 0.1.56",
"xattr",
]
@@ -5993,7 +5896,7 @@ dependencies = [
"cfg-if 0.1.10",
"libc",
"rand 0.7.3",
"redox_syscall",
"redox_syscall 0.1.56",
"remove_dir_all",
"winapi 0.3.9",
]
@@ -6131,11 +6034,7 @@ dependencies = [
"pbkdf2 0.4.0",
"rand 0.7.3",
"rustc-hash",
<<<<<<< HEAD
"sha2 0.9.2",
=======
"sha2",
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
"thiserror",
"unicode-normalization",
"zeroize",
@@ -6169,7 +6068,7 @@ dependencies = [
"mio 0.7.6",
"num_cpus",
"once_cell",
"parking_lot 0.11.0",
"parking_lot 0.11.2",
"pin-project-lite",
"signal-hook-registry",
"tokio-macros",

8
clap-utils/Cargo.toml
View File

@@ -11,19 +11,11 @@ edition = "2018"
[dependencies]
clap = "2.33.0"
<<<<<<< HEAD
rpassword = "4.0"
solana-remote-wallet = { path = "../remote-wallet", version = "=1.6.27" }
solana-sdk = { path = "../sdk", version = "=1.6.27" }
thiserror = "1.0.21"
tiny-bip39 = "0.8.0"
=======
rpassword = "5.0"
solana-remote-wallet = { path = "../remote-wallet", version = "=1.8.0" }
solana-sdk = { path = "../sdk", version = "=1.8.0" }
thiserror = "1.0.29"
tiny-bip39 = "0.8.1"
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
uriparse = "0.6.3"
url = "2.1.0"
chrono = "0.4"

7
cli/Cargo.toml
View File

@@ -47,14 +47,9 @@ solana-transaction-status = { path = "../transaction-status", version = "=1.6.27
solana-version = { path = "../version", version = "=1.6.27" }
solana-vote-program = { path = "../programs/vote", version = "=1.6.27" }
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
<<<<<<< HEAD
thiserror = "1.0.21"
tiny-bip39 = "0.7.0"
url = "2.1.1"
=======
thiserror = "1.0.29"
tiny-bip39 = "0.8.1"
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
url = "2.1.1"
[dev-dependencies]
solana-core = { path = "../core", version = "=1.6.27" }

9
keygen/Cargo.toml
View File

@@ -14,21 +14,12 @@ bs58 = "0.3.1"
clap = "2.33"
dirs-next = "2.0.0"
num_cpus = "1.13.0"
<<<<<<< HEAD
solana-clap-utils = { path = "../clap-utils", version = "=1.6.27" }
solana-cli-config = { path = "../cli-config", version = "=1.6.27" }
solana-remote-wallet = { path = "../remote-wallet", version = "=1.6.27" }
solana-sdk = { path = "../sdk", version = "=1.6.27" }
solana-version = { path = "../version", version = "=1.6.27" }
tiny-bip39 = "0.7.0"
=======
solana-clap-utils = { path = "../clap-utils", version = "=1.8.0" }
solana-cli-config = { path = "../cli-config", version = "=1.8.0" }
solana-remote-wallet = { path = "../remote-wallet", version = "=1.8.0" }
solana-sdk = { path = "../sdk", version = "=1.8.0" }
solana-version = { path = "../version", version = "=1.8.0" }
tiny-bip39 = "0.8.1"
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
[[bin]]
name = "solana-keygen"

2
programs/bpf/Cargo.lock generated
View File

@@ -3901,7 +3901,7 @@ dependencies = [
"anyhow",
"hmac 0.8.1",
"once_cell",
"parking_lot",
"parking_lot 0.11.1",
"pbkdf2 0.4.0",
"rand 0.7.3",
"rustc-hash",

5
sdk/Cargo.toml
View File

@@ -80,13 +80,8 @@ thiserror = "1.0"
uriparse = "0.6.3"
[dev-dependencies]
<<<<<<< HEAD
curve25519-dalek = "2.1.0"
tiny-bip39 = "0.7.0"
=======
curve25519-dalek = "3.2.0"
tiny-bip39 = "0.8.1"
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
[build-dependencies]
rustc_version = "0.2"