From b5219bc7238006c75bf5d79784d1786a4e677e8f Mon Sep 17 00:00:00 2001 From: Arkadiy Paronyan Date: Sun, 19 Feb 2017 20:55:52 +0100 Subject: [PATCH] Backporting to beta (#4602) * Static link for snappy * added 3 warpnodes for ropsten (#4289) * added 3 warpnodes for ropsten * Fixed indentation --- ethcore/res/ethereum/ropsten.json | 5 ++++- util/src/snappy.rs | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ethcore/res/ethereum/ropsten.json b/ethcore/res/ethereum/ropsten.json index ddd435fd2..04b3bdee0 100644 --- a/ethcore/res/ethereum/ropsten.json +++ b/ethcore/res/ethereum/ropsten.json @@ -44,7 +44,10 @@ }, "nodes": [ "enode://a22f0977ce02653bf95e38730106356342df48b5222e2c2a1a6f9ef34769bf593bae9ca0a888cf60839edd52efc1b6e393c63a57d76f4c4fe14e641f1f9e637e@128.199.55.137:30303", - "enode://012239fccf3ff1d92b036983a430cb6705c6528c96c0354413f8854802138e5135c084ab36e7c54efb621c46728df8c3a6f4c1db9bb48a1330efe3f82f2dd7a6@52.169.94.142:30303" + "enode://012239fccf3ff1d92b036983a430cb6705c6528c96c0354413f8854802138e5135c084ab36e7c54efb621c46728df8c3a6f4c1db9bb48a1330efe3f82f2dd7a6@52.169.94.142:30303", + "enode://1462682e4b7ba2258346d55e25e5b9d264b0db40cee12bdfba4e72b1d7050350ea954c006e9106dd96a128e6e0bd6dffb17eed51f9f99bf7f9cdadfeaf8da4ff@51.15.61.253:30303", + "enode://98fbb020c799ae39a828bd75dc2bd5d4721539faf317076b275f91182a5c8900b592e8abfdddceae674a7c3bb40ea00a6ca9ccb7805ab58c4b7b29c61c8f7239@51.15.62.44:30303", + "enode://d801dd4e3d15a8bf785931add164bd9c313e3f6b5749d9302b311f2b48064cba5c86c32b1302c27cd983fc89ae07d4d306dd1197610835b8782e95dfb1b3f9ea@51.15.43.255:30303" ], "accounts": { "0000000000000000000000000000000000000001": { "balance": "1", "nonce": "0", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } }, diff --git a/util/src/snappy.rs b/util/src/snappy.rs index 142dcadb0..8fb6fbd48 100644 --- a/util/src/snappy.rs +++ b/util/src/snappy.rs @@ -23,7 +23,7 @@ const SNAPPY_OK: c_int = 0; const SNAPPY_INVALID_INPUT: c_int = 1; const SNAPPY_BUFFER_TOO_SMALL: c_int = 2; -#[link(name = "snappy")] +#[link(name = "snappy", kind = "static")] extern { fn snappy_compress( input: *const c_char, @@ -154,4 +154,4 @@ pub fn decompress_into(input: &[u8], output: &mut Vec) -> Result bool { let status = unsafe { snappy_validate_compressed_buffer(input.as_ptr() as *const c_char, input.len() as size_t )}; status == SNAPPY_OK -} \ No newline at end of file +}