Commit Graph

10 Commits

Author SHA1 Message Date
Raul Jordan
b9cb8a8194 sharding: fetch from upstream but keep travis the same
Former-commit-id: 75db983a69c7061e250b2756e5917ac5dd1ff7d2 [formerly 6e8e11322b931a70b5f2db8b5413c945834143fe]
Former-commit-id: 8de7b4c58f421e45bff2f0af167e2f2a27ddac49
2018-05-16 16:44:56 -04:00
Eli
89f0a45668 trie: golint iterator fixes (#16639)
Former-commit-id: fe3d7c1e0956ba6ce2dc5b2e4a8142e3753c9b7c [formerly cbd57f04bdfc7105341b7c0286a0d2f432373fc1]
Former-commit-id: e2c38a0175a5f52a75e44b373a6d35de6cc3f58f
2018-05-02 11:24:34 +03:00
Eli
1cf6747d06 whisper: Golint fixes in whisper packages (#16637)
Former-commit-id: 6a2a7c34e451465eae5d78f76e310e36a412d848 [formerly 6294fcfb3a206061cc8f9309f945f9b0c5a332a2]
Former-commit-id: e2d352442cc4b45620454ac6ece0f8d3d564ed11
2018-05-02 08:17:17 +02:00
Fynn
eb70fc73cd Merge branch 'master' of https://github.com/ethereum/go-ethereum into geth-sharding
Former-commit-id: 25dc367490dd16ef4fa1d462118aa438df1b319a [formerly 6fab78aeb8b9f54fddbad1406f97392b753a830a]
Former-commit-id: 0de0bb3ef9af1735ac8ecd1aefe2d57c0f76c62d
2018-03-23 19:10:53 +01:00
Preston Van Loon
0cc6a006c1 merge upstream
Former-commit-id: b1699eddfbe71837d0703c6c998624bdcffeee55 [formerly 324fd14865ea1bddc19d776718d1d8e1cf3ee210]
Former-commit-id: 2523cca14cf81b44d7fe05a121524e38f9ecc77d
2018-02-18 21:03:41 -05:00
Fynn
5b5cae693f accounts/abi: use unpackTuple to unpack event arguments
Events with just 1 argument fail before this change


Former-commit-id: 69cbb51c56054208417e464dc6e46a94ccb3bbeb [formerly fbb03244929beb0ce8f9c607ce33d107e8319b89]
Former-commit-id: 984154c1ba79f1fe8bf0106a604b2765ea312079
2018-02-16 11:46:25 +01:00
Preston Van Loon
84ff4c5b14 Merge pull request #23 from ethereum/master
Upstream changes from ethereum/go-ethereum

Former-commit-id: b40212f60d4e0a11e783a362886c7db8fb9c54f9 [formerly a2112a830d4047afa18c31243c2a506f80d4de12]
Former-commit-id: 4c9a4d5662038dd26bda5d3343f231795c702b02
2018-02-07 10:27:01 -05:00
Raul Jordan
31d4fd0678 fix
Former-commit-id: 46792bf21cbfd109e0a912577c47e7c68c1fe09b [formerly 14503cf42f8cb0d70f7b09c9fdefd15a3deefaf7]
Former-commit-id: 72a23597a36b67bd2babb278132fc64807e86ea0
2018-01-15 11:56:50 -06:00
Raul Jordan
da20785685 Merge branch 'master' into gitter-badge-1
Former-commit-id: 23f542f43b4b493e38f5aa4c29788ed93a63b43b [formerly 71b23a6a28eb045fcfeab6329de69f1e5455486b]
Former-commit-id: d12b3a6decc876f010a71f98e11df7387c1aaf2a
2018-01-13 17:31:28 -05:00
Fynn
8bf9cd853f FreeBSD support
Former-commit-id: ff5dba816571945e8c0837f3ef52485da5fd7314 [formerly 2f23f618fd8f01331b593ab4e064138047fe7c77]
Former-commit-id: 1ec5e7440481e307be5e131ac0a416fd7d2fea9f
2015-07-28 19:16:16 -03:00