Skip to content

Upgrade to OpenEthereum 2.6.2 #3542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evgenykuzyakov merged 1 commit into from
Oct 30, 2020
Merged

Upgrade to OpenEthereum 2.6.2 #3542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ATTRIBUTIONS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# NEAR Client Attributions

We have taken inspiration and few pieces of code from:
* [Parity Ethereum](https://github.com/paritytech/parity-ethereum)
* [OpenEthereum](https://github.com/openethereum/openethereum)
* [Parity Substrate](https://github.com/paritytech/substrate)
* [Parity Trie](https://github.com/paritytech/trie)
* [Grin](https://github.com/mimblewimble/grin/)

## Licenses

### Parity {Ethereum, Substrate}
### OpenEthereum, Parity Substrate

GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Expand Down
60 changes: 45 additions & 15 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/crypto/src/signature.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ impl Signature {
.unwrap();
let sig = rsig.to_standard(&SECP256K1);
let pdata: [u8; 65] = {
// code borrowed from https://github.com/paritytech/parity-ethereum/blob/98b7c07171cd320f32877dfa5aa528f585dc9a72/ethkey/src/signature.rs#L210
// code borrowed from https://github.com/openethereum/openethereum/blob/98b7c07171cd320f32877dfa5aa528f585dc9a72/ethkey/src/signature.rs#L210
let mut temp = [4u8; 65];
temp[1..65].copy_from_slice(&public_key.0);
temp
Expand Down
4 changes: 2 additions & 2 deletions runtime/near-evm-runner/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ keccak-hash = "0.2.0"
ripemd160 = "0.9.0"
libsecp256k1 = "0.3.5"

evm = { git = "https://github.com/paritytech/parity-ethereum", rev = "eed630a002bbebed3a3097127f2483213ff52079" }
vm = { git = "https://github.com/paritytech/parity-ethereum", rev = "eed630a002bbebed3a3097127f2483213ff52079" }
evm = { git = "https://github.com/openethereum/openethereum", rev = "v2.6.2" }
vm = { git = "https://github.com/openethereum/openethereum", rev = "v2.6.2" }
Comment thread
artob marked this conversation as resolved.
bn = { git = "https://github.com/paritytech/bn", default-features = false }
parity-bytes = "0.1.0"
ethereum-types = "0.6.0"
Expand Down
2 changes: 1 addition & 1 deletion runtime/near-evm-runner/src/near_ext.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use crate::evm_state::{EvmState, SubState};
use crate::interpreter;
use crate::utils::format_log;

// https://github.com/paritytech/parity-ethereum/blob/77643c13e80ca09d9a6b10631034f5a1568ba6d3/ethcore/machine/src/externalities.rs
// https://github.com/openethereum/openethereum/blob/77643c13e80ca09d9a6b10631034f5a1568ba6d3/ethcore/machine/src/externalities.rs
pub struct NearExt<'a> {
pub info: EnvInfo,
pub origin: Address,
Expand Down