From 7d8bd8ec887712095b67968201133fb1fb5b6ce3 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Mon, 20 Jul 2015 17:52:19 +0200 Subject: [PATCH] Credits. Catch exceptions again. --- README.md | 19 +++++++++++++++++-- libethereum/BlockChain.cpp | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2bb57566c..5b56dbc11 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Join the chat at https://gitter.im/ethereum/cpp-ethereum](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ethereum/cpp-ethereum?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -By Gav Wood et al, 2013, 2014, 2015. +By Gav Wood et al*, 2013, 2014, 2015. | Linux | OSX | Windows ----------|---------|-----|-------- @@ -12,7 +12,22 @@ evmjit | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=L [![Stories in Ready](https://badge.waffle.io/ethereum/cpp-ethereum.png?label=ready&title=Ready)](http://waffle.io/ethereum/cpp-ethereum) -Ethereum is based on a design in an original whitepaper by Vitalik Buterin. This implementation is based on the formal specification of a refinement of that idea detailed in the 'yellow paper' by Gavin Wood. Contributors, builders and testers include Alex Leverington (Clang & Mac building, client multiplexing), Tim Hughes (MSVC compilation & Dagger testing), Caktux (ongoing CI), Christoph Jentzsch (tests), Christian Reissweiner (Solidity), Marek Kotewicz (external JS & JSON-RPC), Eric Lombrozo (MinGW32 cross-compilation), Marko Simovic (original CI), and several others. +Ethereum is based on a design in an original whitepaper by Vitalik Buterin. This implementation is based on the formal specification of a refinement of that idea detailed in the 'yellow paper' by Gavin Wood. Contributors, builders and testers include: + +- *arkpar* (**Arkadiy Paronyan**) Mix, PV61/BlockQueue +- *debris* (**Marek Kotewicz**) JSONRPC, web3.js +- *CJentzsch* (**Christoph Jentzsch**) tests, lots of tests +- *LefterisJP* (**Lefteris Karapetsas**) Solidity, libethash +- *chriseth* (**Christian Reitwiessner**) Solidity +- *subtly* (**Alex Leverington**) libp2p, rlpx +- *yann300* (**Yann Levreau**) Mix +- *LianaHus* (**Liana Husikyan**) Solidity +- *chfast* (**Paweł Bylica**) EVMJIT +- *cubedro* (**Marian Oancea**) web3.js +- *gluk250* (**Vlad Gluhovsky**) Whisper +- *programmerTim* (**Tim Hughes**) libethash-cl + +And let's not forget: Caktux (neth, ongoing CI), Eric Lombrozo (original MinGW32 cross-compilation), Marko Simovic (original CI). ### Building diff --git a/libethereum/BlockChain.cpp b/libethereum/BlockChain.cpp index 320797ef3..d4fc1ce1b 100644 --- a/libethereum/BlockChain.cpp +++ b/libethereum/BlockChain.cpp @@ -48,7 +48,7 @@ using namespace dev; using namespace dev::eth; namespace js = json_spirit; -#define ETH_CATCH 0 +#define ETH_CATCH 1 #define ETH_TIMED_IMPORTS 1 #ifdef _WIN32