API tools faq
paste
Advertisement
Guest User

diff_go-expanse_go-ethereum

a guest
Oct 19th, 2016
918
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 29.72 KB | None | 0 0
raw download clone embed print report
  1. Common subdirectories: go-expanse/.git and go-ethereum/.git
  2. Common subdirectories: go-expanse/.github and go-ethereum/.github
  3. diff go-expanse/.gitignore go-ethereum/.gitignore
  4. 6c6
  5. < tests/files/VMTests/RandomTests/*
  6. ---
  7. >
  8. 13c13
  9. < .exptest
  10. ---
  11. > .ethtest
  12. 34,39d33
  13. <
  14. < .idea/workspace.xml
  15. < *.idea/
  16. <
  17. < # vagrant
  18. < .vagrant
  19. Only in go-expanse: .gitmodules
  20. diff go-expanse/.mailmap go-ethereum/.mailmap
  21. 1,3c1,65
  22. < Christopher Franko <chrisjfranko@gmail.com>
  23. < Dan Conway <dan@expanse.tech>
  24. < James Clayton <james@expanse.tech>
  25. ---
  26. > Jeffrey Wilcke <jeffrey@ethereum.org>
  27. > Jeffrey Wilcke <jeffrey@ethereum.org> <geffobscura@gmail.com>
  28. > Jeffrey Wilcke <jeffrey@ethereum.org> <obscuren@obscura.com>
  29. > Jeffrey Wilcke <jeffrey@ethereum.org> <obscuren@users.noreply.github.com>
  30. >
  31. > Viktor Trón <viktor.tron@gmail.com>
  32. >
  33. > Joseph Goulden <joegoulden@gmail.com>
  34. >
  35. > Nick Savers <nicksavers@gmail.com>
  36. >
  37. > Maran Hidskes <maran.hidskes@gmail.com>
  38. >
  39. > Taylor Gerring <taylor.gerring@gmail.com>
  40. > Taylor Gerring <taylor.gerring@gmail.com> <taylor.gerring@ethereum.org>
  41. >
  42. > Bas van Kervel <bas@ethdev.com>
  43. > Bas van Kervel <bas@ethdev.com> <basvankervel@ziggo.nl>
  44. > Bas van Kervel <bas@ethdev.com> <basvankervel@gmail.com>
  45. >
  46. > Sven Ehlert <sven@ethdev.com>
  47. >
  48. > Vitalik Buterin <v@buterin.com>
  49. >
  50. > Marian Oancea <contact@siteshop.ro>
  51. >
  52. > Christoph Jentzsch <jentzsch.software@gmail.com>
  53. >
  54. > Heiko Hees <heiko@heiko.org>
  55. >
  56. > Alex Leverington <alex@ethdev.com>
  57. > Alex Leverington <alex@ethdev.com> <subtly@users.noreply.github.com>
  58. >
  59. > Zsolt Felföldi <zsfelfoldi@gmail.com>
  60. >
  61. > Gavin Wood <i@gavwood.com>
  62. >
  63. > Martin Becze <mjbecze@gmail.com>
  64. > Martin Becze <mjbecze@gmail.com> <wanderer@users.noreply.github.com>
  65. >
  66. > Dimitry Khokhlov <winsvega@mail.ru>
  67. >
  68. > Roman Mandeleil <roman.mandeleil@gmail.com>
  69. >
  70. > Alec Perseghin <aperseghin@gmail.com>
  71. >
  72. > Alon Muroch <alonmuroch@gmail.com>
  73. >
  74. > Arkadiy Paronyan <arkadiy@ethdev.com>
  75. >
  76. > Jae Kwon <jkwon.work@gmail.com>
  77. >
  78. > Aaron Kumavis <kumavis@users.noreply.github.com>
  79. >
  80. > Nick Dodson <silentcicero@outlook.com>
  81. >
  82. > Jason Carver <jacarver@linkedin.com>
  83. > Jason Carver <jacarver@linkedin.com> <ut96caarrs@snkmail.com>
  84. >
  85. > Joseph Chow <ethereum@outlook.com>
  86. > Joseph Chow <ethereum@outlook.com> ethers <TODO>
  87. >
  88. > Enrique Fynn <enriquefynn@gmail.com>
  89. >
  90. > Vincent G <caktux@gmail.com>
  91. \ No newline at end of file
  92. diff go-expanse/.travis.yml go-ethereum/.travis.yml
  93. 2,5c2,31
  94. < go:
  95. <   - 1.4.2
  96. <   - 1.5.4
  97. <   - 1.6.2
  98. ---
  99. > go_import_path: github.com/ethereum/go-ethereum
  100. > sudo: false
  101. > matrix:
  102. >   include:
  103. >     - os: linux
  104. >       dist: trusty
  105. >       go: 1.4.2
  106. >     - os: linux
  107. >       dist: trusty
  108. >       go: 1.5.4
  109. >     - os: linux
  110. >       dist: trusty
  111. >       go: 1.6.2
  112. >     - os: osx
  113. >       go: 1.6.2
  114. >
  115. >     # This builder does the PPA upload (and nothing else).
  116. >     - os: linux
  117. >       dist: trusty
  118. >       go: 1.6.2
  119. >       env: PPA
  120. >       addons:
  121. >         apt:
  122. >           packages:
  123. >             - devscripts
  124. >             - debhelper
  125. >             - dput
  126. >       script:
  127. >         - go run build/ci.go debsrc -signer "Felix Lange (Geth CI Testing Key) <fjl@twurst.com>" -upload ppa:lp-fjl/geth-ci-testing
  128. >
  129. 7,9d32
  130. <   # - go get code.google.com/p/go.tools/cmd/goimports
  131. <   # - go get github.com/golang/lint/golint
  132. <   # - go get golang.org/x/tools/cmd/vet
  133. 11,16d33
  134. < before_script:
  135. <   # - gofmt -l -w .
  136. <   # - goimports -l -w .
  137. <   # - golint .
  138. <   # - go vet ./...
  139. <   # - go test -race ./...
  140. 18c35,36
  141. <   - make gexp
  142. ---
  143. >   - go run build/ci.go install
  144. >   - go run build/ci.go test -coverage -vet
  145. 20,24c38,39
  146. <   - bash <(curl -s https://codecov.io/bash)
  147. < env:
  148. <   global:
  149. <     - secure: "U2U1AmkU4NJBgKR/uUAebQY87cNL0+1JHjnLOmmXwxYYyj5ralWb1aSuSH3qSXiT93qLBmtaUkuv9fberHVqrbAeVlztVdUsKAq7JMQH+M99iFkC9UiRMqHmtjWJ0ok4COD1sRYixxi21wb/JrMe3M1iL4QJVS61iltjHhVdM64="
  150. < sudo: false
  151. ---
  152. >   # - go run build/ci.go archive -type tar
  153. >
  154. 25a41,45
  155. >   webhooks:
  156. >     urls:
  157. >       - https://webhooks.gitter.im/e/e09ccdce1048c5e03445
  158. >     on_success: change
  159. >     on_failure: always
  160. diff go-expanse/AUTHORS go-ethereum/AUTHORS
  161. 1c1
  162. < # This is the official list of go-expanse authors for copyright purposes.
  163. ---
  164. > # This is the official list of go-ethereum authors for copyright purposes.
  165. 7d6
  166. < Christopher Franko <chrisjfranko@gmail.com>
  167. diff go-expanse/COPYING go-ethereum/COPYING
  168. 4c4
  169. <  Copyright (C) 2015 The go-expanse Authors.
  170. ---
  171. >  Copyright (C) 2014 The go-ethereum Authors.
  172. diff go-expanse/COPYING.LESSER go-ethereum/COPYING.LESSER
  173. 82c82
  174. < taken togexper, effectively do not restrict modification of the
  175. ---
  176. > taken together, effectively do not restrict modification of the
  177. 131c131
  178. < Library side by side in a single library togexper with other library
  179. ---
  180. > Library side by side in a single library together with other library
  181. Common subdirectories: go-expanse/Godeps and go-ethereum/Godeps
  182. diff go-expanse/Makefile go-ethereum/Makefile
  183. 5,10c5,10
  184. < .PHONY: gexp gexp-cross evm all test clean
  185. < .PHONY: gexp-linux gexp-linux-386 gexp-linux-amd64 gexp-linux-mips64 gexp-linux-mips64le
  186. < .PHONY: gexp-linux-arm gexp-linux-arm-5 gexp-linux-arm-6 gexp-linux-arm-7 gexp-linux-arm64
  187. < .PHONY: gexp-darwin gexp-darwin-386 gexp-darwin-amd64
  188. < .PHONY: gexp-windows gexp-windows-386 gexp-windows-amd64
  189. < .PHONY: gexp-android gexp-ios
  190. ---
  191. > .PHONY: geth geth-cross evm all test clean
  192. > .PHONY: geth-linux geth-linux-386 geth-linux-amd64 geth-linux-mips64 geth-linux-mips64le
  193. > .PHONY: geth-linux-arm geth-linux-arm-5 geth-linux-arm-6 geth-linux-arm-7 geth-linux-arm64
  194. > .PHONY: geth-darwin geth-darwin-386 geth-darwin-amd64
  195. > .PHONY: geth-windows geth-windows-386 geth-windows-amd64
  196. > .PHONY: geth-android geth-ios
  197. 15,16c15,16
  198. < gexp:
  199. <   build/env.sh go run build/ci.go install ./cmd/gexp
  200. ---
  201. > geth:
  202. >   build/env.sh go run build/ci.go install ./cmd/geth
  203. 18c18
  204. <   @echo "Run \"$(GOBIN)/gexp\" to launch gexp."
  205. ---
  206. >   @echo "Run \"$(GOBIN)/geth\" to launch geth."
  207. 36c36
  208. < gexp-cross: gexp-linux gexp-darwin gexp-windows gexp-android gexp-ios
  209. ---
  210. > geth-cross: geth-linux geth-darwin geth-windows geth-android geth-ios
  211. 38c38
  212. <   @ls -ld $(GOBIN)/gexp-*
  213. ---
  214. >   @ls -ld $(GOBIN)/geth-*
  215. 40c40
  216. < gexp-linux: gexp-linux-386 gexp-linux-amd64 gexp-linux-arm gexp-linux-mips64 gexp-linux-mips64le
  217. ---
  218. > geth-linux: geth-linux-386 geth-linux-amd64 geth-linux-arm geth-linux-mips64 geth-linux-mips64le
  219. 42c42
  220. <   @ls -ld $(GOBIN)/gexp-linux-*
  221. ---
  222. >   @ls -ld $(GOBIN)/geth-linux-*
  223. 44,45c44,45
  224. < gexp-linux-386:
  225. <   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/386 -v ./cmd/gexp
  226. ---
  227. > geth-linux-386:
  228. >   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/386 -v ./cmd/geth
  229. 47c47
  230. <   @ls -ld $(GOBIN)/gexp-linux-* | grep 386
  231. ---
  232. >   @ls -ld $(GOBIN)/geth-linux-* | grep 386
  233. 49,50c49,50
  234. < gexp-linux-amd64:
  235. <   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/amd64 -v ./cmd/gexp
  236. ---
  237. > geth-linux-amd64:
  238. >   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/amd64 -v ./cmd/geth
  239. 52c52
  240. <   @ls -ld $(GOBIN)/gexp-linux-* | grep amd64
  241. ---
  242. >   @ls -ld $(GOBIN)/geth-linux-* | grep amd64
  243. 54c54
  244. < gexp-linux-arm: gexp-linux-arm-5 gexp-linux-arm-6 gexp-linux-arm-7 gexp-linux-arm64
  245. ---
  246. > geth-linux-arm: geth-linux-arm-5 geth-linux-arm-6 geth-linux-arm-7 geth-linux-arm64
  247. 56c56
  248. <   @ls -ld $(GOBIN)/gexp-linux-* | grep arm
  249. ---
  250. >   @ls -ld $(GOBIN)/geth-linux-* | grep arm
  251. 58,59c58,59
  252. < gexp-linux-arm-5:
  253. <   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/arm-5 -v ./cmd/gexp
  254. ---
  255. > geth-linux-arm-5:
  256. >   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/arm-5 -v ./cmd/geth
  257. 61c61
  258. <   @ls -ld $(GOBIN)/gexp-linux-* | grep arm-5
  259. ---
  260. >   @ls -ld $(GOBIN)/geth-linux-* | grep arm-5
  261. 63,64c63,64
  262. < gexp-linux-arm-6:
  263. <   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/arm-6 -v ./cmd/gexp
  264. ---
  265. > geth-linux-arm-6:
  266. >   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/arm-6 -v ./cmd/geth
  267. 66c66
  268. <   @ls -ld $(GOBIN)/gexp-linux-* | grep arm-6
  269. ---
  270. >   @ls -ld $(GOBIN)/geth-linux-* | grep arm-6
  271. 68,69c68,69
  272. < gexp-linux-arm-7:
  273. <   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/arm-7 -v ./cmd/gexp
  274. ---
  275. > geth-linux-arm-7:
  276. >   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/arm-7 -v ./cmd/geth
  277. 71c71
  278. <   @ls -ld $(GOBIN)/gexp-linux-* | grep arm-7
  279. ---
  280. >   @ls -ld $(GOBIN)/geth-linux-* | grep arm-7
  281. 73,74c73,74
  282. < gexp-linux-arm64:
  283. <   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/arm64 -v ./cmd/gexp
  284. ---
  285. > geth-linux-arm64:
  286. >   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/arm64 -v ./cmd/geth
  287. 76c76
  288. <   @ls -ld $(GOBIN)/gexp-linux-* | grep arm64
  289. ---
  290. >   @ls -ld $(GOBIN)/geth-linux-* | grep arm64
  291. 78,79c78,79
  292. < gexp-linux-mips64:
  293. <   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/mips64 -v ./cmd/gexp
  294. ---
  295. > geth-linux-mips64:
  296. >   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/mips64 -v ./cmd/geth
  297. 81c81
  298. <   @ls -ld $(GOBIN)/gexp-linux-* | grep mips64
  299. ---
  300. >   @ls -ld $(GOBIN)/geth-linux-* | grep mips64
  301. 83,84c83,84
  302. < gexp-linux-mips64le:
  303. <   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/mips64le -v ./cmd/gexp
  304. ---
  305. > geth-linux-mips64le:
  306. >   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/mips64le -v ./cmd/geth
  307. 86c86
  308. <   @ls -ld $(GOBIN)/gexp-linux-* | grep mips64le
  309. ---
  310. >   @ls -ld $(GOBIN)/geth-linux-* | grep mips64le
  311. 88c88
  312. < gexp-darwin: gexp-darwin-386 gexp-darwin-amd64
  313. ---
  314. > geth-darwin: geth-darwin-386 geth-darwin-amd64
  315. 90c90
  316. <   @ls -ld $(GOBIN)/gexp-darwin-*
  317. ---
  318. >   @ls -ld $(GOBIN)/geth-darwin-*
  319. 92,93c92,93
  320. < gexp-darwin-386:
  321. <   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=darwin/386 -v ./cmd/gexp
  322. ---
  323. > geth-darwin-386:
  324. >   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=darwin/386 -v ./cmd/geth
  325. 95c95
  326. <   @ls -ld $(GOBIN)/gexp-darwin-* | grep 386
  327. ---
  328. >   @ls -ld $(GOBIN)/geth-darwin-* | grep 386
  329. 97,98c97,98
  330. < gexp-darwin-amd64:
  331. <   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=darwin/amd64 -v ./cmd/gexp
  332. ---
  333. > geth-darwin-amd64:
  334. >   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=darwin/amd64 -v ./cmd/geth
  335. 100c100
  336. <   @ls -ld $(GOBIN)/gexp-darwin-* | grep amd64
  337. ---
  338. >   @ls -ld $(GOBIN)/geth-darwin-* | grep amd64
  339. 102c102
  340. < gexp-windows: gexp-windows-386 gexp-windows-amd64
  341. ---
  342. > geth-windows: geth-windows-386 geth-windows-amd64
  343. 104c104
  344. <   @ls -ld $(GOBIN)/gexp-windows-*
  345. ---
  346. >   @ls -ld $(GOBIN)/geth-windows-*
  347. 106,107c106,107
  348. < gexp-windows-386:
  349. <   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=windows/386 -v ./cmd/gexp
  350. ---
  351. > geth-windows-386:
  352. >   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=windows/386 -v ./cmd/geth
  353. 109c109
  354. <   @ls -ld $(GOBIN)/gexp-windows-* | grep 386
  355. ---
  356. >   @ls -ld $(GOBIN)/geth-windows-* | grep 386
  357. 111,112c111,112
  358. < gexp-windows-amd64:
  359. <   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=windows/amd64 -v ./cmd/gexp
  360. ---
  361. > geth-windows-amd64:
  362. >   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=windows/amd64 -v ./cmd/geth
  363. 114c114
  364. <   @ls -ld $(GOBIN)/gexp-windows-* | grep amd64
  365. ---
  366. >   @ls -ld $(GOBIN)/geth-windows-* | grep amd64
  367. 116,117c116,117
  368. < gexp-android:
  369. <   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=android-21/aar -v ./cmd/gexp
  370. ---
  371. > geth-android:
  372. >   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=android-21/aar -v ./cmd/geth
  373. 119c119
  374. <   @ls -ld $(GOBIN)/gexp-android-*
  375. ---
  376. >   @ls -ld $(GOBIN)/geth-android-*
  377. 121,122c121,122
  378. < gexp-ios:
  379. <   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=ios-7.0/framework -v ./cmd/gexp
  380. ---
  381. > geth-ios:
  382. >   build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=ios-7.0/framework -v ./cmd/geth
  383. 124c124
  384. <   @ls -ld $(GOBIN)/gexp-ios-*
  385. ---
  386. >   @ls -ld $(GOBIN)/geth-ios-*
  387. diff go-expanse/README.md go-ethereum/README.md
  388. 1c1
  389. < ## Expanse Go
  390. ---
  391. > ## Ethereum Go
  392. 3c3
  393. < Expanse Go Client, by Christopher Franko (forked from Jeffrey Wilcke (and some other people)'s Expanse Go client).
  394. ---
  395. > Official golang implementation of the Ethereum protocol
  396. 7,8c7,13
  397. < develop   | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=Linux%20Go%20develop%20branch)](https://build.ethdev.com/builders/Linux%20Go%20develop%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=Linux%20Go%20develop%20branch)](https://build.ethdev.com/builders/OSX%20Go%20develop%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=ARM%20Go%20develop%20branch)](https://build.ethdev.com/builders/ARM%20Go%20develop%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=Windows%20Go%20develop%20branch)](https://build.ethdev.com/builders/Windows%20Go%20develop%20branch/builds/-1) | [![Buildr+Status](https://travis-ci.org/expanse-project/go-expanse.svg?branch=develop)](https://travis-ci.org/expanse/go-expanse) [![Coverage Status](https://coveralls.io/repos/expanse-project/go-expanse/badge.svg?branch=develop)](https://coveralls.io/r/expanse/go-expanse?branch=develop)
  398. < master    | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=Linux%20Go%20master%20branch)](https://build.ethdev.com/builders/Linux%20Go%20master%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=OSX%20Go%20master%20branch)](https://build.ethdev.com/builders/OSX%20Go%20master%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=ARM%20Go%20master%20branch)](https://build.ethdev.com/builders/ARM%20Go%20master%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=Windows%20Go%20master%20branch)](https://build.ethdev.com/builders/Windows%20Go%20master%20branch/builds/-1) | [![Buildr+Status](https://travis-ci.org/expanse-project/go-expanse.svg?branch=master)](https://travis-ci.org/expanse-project/go-expanse) [![Coverage Status](https://coveralls.io/repos/expanse-project/go-expanse/badge.svg?branch=master)](https://coveralls.io/r/expanse-project/go-expanse?branch=master)
  399. ---
  400. > develop   | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=Linux%20Go%20develop%20branch)](https://build.ethdev.com/builders/Linux%20Go%20develop%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=Linux%20Go%20develop%20branch)](https://build.ethdev.com/builders/OSX%20Go%20develop%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=ARM%20Go%20develop%20branch)](https://build.ethdev.com/builders/ARM%20Go%20develop%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=Windows%20Go%20develop%20branch)](https://build.ethdev.com/builders/Windows%20Go%20develop%20branch/builds/-1) | [![Buildr+Status](https://travis-ci.org/ethereum/go-ethereum.svg?branch=develop)](https://travis-ci.org/ethereum/go-ethereum) [![codecov.io](http://codecov.io/github/ethereum/go-ethereum/coverage.svg?branch=develop)](http://codecov.io/github/ethereum/go-ethereum?branch=develop)
  401. > master    | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=Linux%20Go%20master%20branch)](https://build.ethdev.com/builders/Linux%20Go%20master%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=OSX%20Go%20master%20branch)](https://build.ethdev.com/builders/OSX%20Go%20master%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=ARM%20Go%20master%20branch)](https://build.ethdev.com/builders/ARM%20Go%20master%20branch/builds/-1) | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=Windows%20Go%20master%20branch)](https://build.ethdev.com/builders/Windows%20Go%20master%20branch/builds/-1) | [![Buildr+Status](https://travis-ci.org/ethereum/go-ethereum.svg?branch=master)](https://travis-ci.org/ethereum/go-ethereum) [![codecov.io](http://codecov.io/github/ethereum/go-ethereum/coverage.svg?branch=master)](http://codecov.io/github/ethereum/go-ethereum?branch=master)
  402. >
  403. > [![API Reference](
  404. > https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/68747470733a2f2f676f646f632e6f72672f6769746875622e636f6d2f676f6c616e672f6764646f3f7374617475732e737667
  405. > )](https://godoc.org/github.com/ethereum/go-ethereum)
  406. > [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ethereum/go-ethereum?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
  407. 10,13d14
  408. < [![Bugs](https://badge.waffle.io/expanse-project/go-expanse.png?label=bug&title=Bugs)](https://waffle.io/expanse/go-expanse)
  409. < [![Stories in Ready](https://badge.waffle.io/expanse-project/go-expanse.png?label=ready&title=Ready)](https://waffle.io/expanse/go-expanse)
  410. < [![Stories in Progress](https://badge.waffle.io/expanse-project/go-expanse.svg?label=in%20progress&title=In Progress)](http://waffle.io/expanse/go-expanse)
  411. < [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/expanse/go-expanse?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
  412. 16c17
  413. < The following builds are build automatically by our build servers after each push to the [develop](https://github.com/expanse-project/go-expanse/tree/develop) branch.
  414. ---
  415. > The following builds are build automatically by our build servers after each push to the [develop](https://github.com/ethereum/go-ethereum/tree/develop) branch.
  416. 18c19
  417. < * [Docker](https://registry.hub.docker.com/u/expanse/go-expanse/)
  418. ---
  419. > * [Docker](https://registry.hub.docker.com/u/ethereum/client-go/)
  420. 23,24c24,25
  421. < * [Windows 64-bit](https://build.ethdev.com/builds/Windows%20Go%20develop%20branch/Gexp-Win64-latest.zip)
  422. < * [ARM](https://build.ethdev.com/builds/ARM%20Go%20develop%20branch/gexp-ARM-latest.tar.bz2)
  423. ---
  424. > * [Windows 64-bit](https://build.ethdev.com/builds/Windows%20Go%20develop%20branch/Geth-Win64-latest.zip)
  425. > * [ARM](https://build.ethdev.com/builds/ARM%20Go%20develop%20branch/geth-ARM-latest.tar.bz2)
  426. 29c30
  427. < [Installation Instructions](https://github.com/expanse-project/go-expanse/wiki/Building-Expanse)
  428. ---
  429. > [Installation Instructions](https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum)
  430. 32c33
  431. < Building gexp requires both a Go and a C compiler.
  432. ---
  433. > Building geth requires both a Go and a C compiler.
  434. 36c37
  435. <     make gexp
  436. ---
  437. >     make geth
  438. 44,45c45
  439. < Go Expanse comes with several wrappers/executables found in
  440. < [the `cmd` directory](https://github.com/expanse-project/go-expanse/tree/develop/cmd):
  441. ---
  442. > The go-ethereum project comes with several wrappers/executables found in the `cmd` directory.
  443. 47,54c47,55
  444. < * `gexp` Expanse CLI (expanse command line interface client)
  445. < * `bootnode` runs a bootstrap node for the Discovery Protocol
  446. < * `exptest` test tool which runs with the [tests](https://github.com/expanse-project/tests) suite:
  447. <   `/path/to/test.json > exptest --test BlockTests --stdin`.
  448. < * `evm` is a generic Expanse Virtual Machine: `evm -code 60ff60ff -gas
  449. <   10000 -price 0 -dump`. See `-h` for a detailed description.
  450. < * `disasm` disassembles EVM code: `echo "6001" | disasm`
  451. < * `rlpdump` prints RLP structures
  452. ---
  453. > | Command    | Description |
  454. > |:----------:|-------------|
  455. > | **`geth`** | Our main Ethereum CLI client. It is the entry point into the Ethereum network (main-, test- or private net), capable of running as a full node (default) archive node (retaining all historical state) or a light node (retrieving data live). It can be used by other processes as an gateway into the Ethereum network via JSON RPC endpoints exposed on top of HTTP, WebSocket and/or IPC transports. Please see our [Command Line Options](https://github.com/ethereum/go-ethereum/wiki/Command-Line-Options) wiki page for details. |
  456. > | `abigen` | Source code generator to convert Ethereum contract definitions into easy to use, compile-time type-safe Go packages. It operates on plain [Ethereum contract ABIs](https://github.com/ethereum/wiki/wiki/Ethereum-Contract-ABI) with expanded functionality if the contract bytecode is also available. However it also accepts Solidity source files, making development much more streamlined. Please see our [Native DApps](https://github.com/ethereum/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts) wiki page for details. |
  457. > | `bootnode` | Stripped down version of our Ethereum client implementation that only takes part in the network node discovery protocol, but does not run any of the higher level application protocols. It can be used as a lightweight bootstrap node to aid in finding peers in private networks. |
  458. > | `disasm` | Bytecode disassembler to convert EVM (Ethereum Virtual Machine) bytecode into more user friendly assembly-like opcodes (e.g. `echo "6001" | disasm`). For details on the individual opcodes, please see pages 22-30 of the [Ethereum Yellow Paper](http://gavwood.com/paper.pdf). |
  459. > | `evm` | Developer utility version of the EVM (Ethereum Virtual Machine) that is capable of running bytecode snippets within a configurable environment and execution mode. Its purpose is to allow insolated, fine graned debugging of EVM opcodes (e.g. `evm --code 60ff60ff --debug`). |
  460. > | `gethrpctest` | Developer utility tool to support our [ethereum/rpc-test](https://github.com/ethereum/rpc-tests) test suite which validates baseline conformity to the [Ethereum JSON RPC](https://github.com/ethereum/wiki/wiki/JSON-RPC) specs. Please see the [test suite's readme](https://github.com/ethereum/rpc-tests/blob/master/README.md) for details. |
  461. > | `rlpdump` | Developer utility tool to convert binary RLP ([Recursive Length Prefix](https://github.com/ethereum/wiki/wiki/RLP)) dumps (data encoding used by the Ethereum protocol both network as well as consensus wise) to user friendlier hierarchical representation (e.g. `rlpdump --hex CE0183FFFFFFC4C304050583616263`). |
  462. 59c60
  463. < [CLI Wiki page](https://github.com/expanse-project/go-expanse/wiki/Command-Line-Options)), but we've
  464. ---
  465. > [CLI Wiki page](https://github.com/ethereum/go-ethereum/wiki/Command-Line-Options)), but we've
  466. 61c62
  467. < own  instance.
  468. ---
  469. > own Geth instance.
  470. 81c82
  471. <  * Start up 's built-in interactive [JavaScript console](https://github.com/expanse-project/go-expanse/wiki/JavaScript-Console),
  472. ---
  473. >  * Start up Geth's built-in interactive [JavaScript console](https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console),
  474. 83,84c84,85
  475. <    as well as 's own [management APIs](https://github.com/expanse-project/go-expanse/wiki/Management-APIs).
  476. <    This too is optional and if you leave it out you can always attach to an already running  instance
  477. ---
  478. >    as well as Geth's own [management APIs](https://github.com/ethereum/go-ethereum/wiki/Management-APIs).
  479. >    This too is optional and if you leave it out you can always attach to an already running Geth instance
  480. 102c103
  481. < Specifying the `--testnet` flag however will reconfigure your  instance a bit:
  482. ---
  483. > Specifying the `--testnet` flag however will reconfigure your Geth instance a bit:
  484. 104c105
  485. <  * Instead of using the default data directory (`~/.ethereum` on Linux for example),  will nest
  486. ---
  487. >  * Instead of using the default data directory (`~/.ethereum` on Linux for example), Geth will nest
  488. 111c112
  489. < always use separate accounts for play-money and real-money. Unless you manually move accounts,
  490. ---
  491. > always use separate accounts for play-money and real-money. Unless you manually move accounts, Geth
  492. 115c116
  493. < ### Programatically interfacing  nodes
  494. ---
  495. > ### Programatically interfacing Geth nodes
  496. 117,118c118,119
  497. < As a developer, sooner rather than later you'll want to start interacting with  and the Ethereum
  498. < network via your own programs and not manually through the console. To aid this,  has built in
  499. ---
  500. > As a developer, sooner rather than later you'll want to start interacting with Geth and the Ethereum
  501. > network via your own programs and not manually through the console. To aid this, Geth has built in
  502. 120c121
  503. < [ specific APIs](https://github.com/expanse-project/go-expanse/wiki/Management-APIs)). These can be
  504. ---
  505. > [Geth specific APIs](https://github.com/ethereum/go-ethereum/wiki/Management-APIs)). These can be
  506. 123c124
  507. < The IPC interface is enabled by default and exposes all the APIs supported by , whereas the HTTP
  508. ---
  509. > The IPC interface is enabled by default and exposes all the APIs supported by Geth, whereas the HTTP
  510. 144c145
  511. < via HTTP, WS or IPC to a  node configured with the above flags and you'll need to speak [JSON-RPC](http://www.jsonrpc.org/specification)
  512. ---
  513. > via HTTP, WS or IPC to a Geth node configured with the above flags and you'll need to speak [JSON-RPC](http://www.jsonrpc.org/specification)
  514. 188c189
  515. < With the genesis state defined in the above JSON file, you'll need to initialize **every**  node
  516. ---
  517. > With the genesis state defined in the above JSON file, you'll need to initialize **every** Geth node
  518. 211c212
  519. < *Note: You could also use a full fledged  node as a bootnode, but it's the less recommended way.*
  520. ---
  521. > *Note: You could also use a full fledged Geth node as a bootnode, but it's the less recommended way.*
  522. 216c217
  523. < it's indeed reachable), start every subsequent  node pointed to the bootnode for peer discovery
  524. ---
  525. > it's indeed reachable), start every subsequent Geth node pointed to the bootnode for peer discovery
  526. 236c237
  527. < resources (consider running on a single thread, no need for multiple ones either). To start a
  528. ---
  529. > resources (consider running on a single thread, no need for multiple ones either). To start a Geth
  530. 249c250,251
  531. < `gexp` can be configured via command line options, environment variables and config files.
  532. ---
  533. > Thank you for considering to help out with the source code! We welcome contributions from
  534. > anyone on the internet, and are grateful for even the smallest of fixes!
  535. 251c253
  536. < If you'd like to contribute to go-expanse, please fork, fix, commit and send a pull request
  537. ---
  538. > If you'd like to contribute to go-ethereum, please fork, fix, commit and send a pull request
  539. 253c255
  540. < complex changes though, please check up with the core devs first on [our gitter channel](https://gitter.im/expanse-project/go-expanse)
  541. ---
  542. > complex changes though, please check up with the core devs first on [our gitter channel](https://gitter.im/ethereum/go-ethereum)
  543. 264,265c266
  544. <    * E.g. "exp, rpc: make trace configs optional"
  545. <
  546. ---
  547. >    * E.g. "eth, rpc: make trace configs optional"
  548. 267c268
  549. < Please see the [Developers' Guide](https://github.com/expanse-project/go-expanse/wiki/Developers'-Guide)
  550. ---
  551. > Please see the [Developers' Guide](https://github.com/ethereum/go-ethereum/wiki/Developers'-Guide)
  552. 272c273
  553. < The go-expanse library (i.e. all code outside of the `cmd` directory) is licensed under the
  554. ---
  555. > The go-ethereum library (i.e. all code outside of the `cmd` directory) is licensed under the
  556. 276c277
  557. < The go-expanse binaries (i.e. all code inside of the `cmd` directory) is licensed under the
  558. ---
  559. > The go-ethereum binaries (i.e. all code inside of the `cmd` directory) is licensed under the
  560. diff go-expanse/VERSION go-ethereum/VERSION
  561. 1c1
  562. < 1.4.17
  563. ---
  564. > 1.4.18
  565. Common subdirectories: go-expanse/_data and go-ethereum/_data
  566. Common subdirectories: go-expanse/accounts and go-ethereum/accounts
  567. Common subdirectories: go-expanse/build and go-ethereum/build
  568. diff go-expanse/circle.yml go-ethereum/circle.yml
  569. 26c26
  570. <     # Build  and move into a known folder
  571. ---
  572. >     # Build Geth and move into a known folder
  573. Common subdirectories: go-expanse/cmd and go-ethereum/cmd
  574. Common subdirectories: go-expanse/common and go-ethereum/common
  575. Common subdirectories: go-expanse/compression and go-ethereum/compression
  576. Common subdirectories: go-expanse/console and go-ethereum/console
  577. Common subdirectories: go-expanse/containers and go-ethereum/containers
  578. Common subdirectories: go-expanse/core and go-ethereum/core
  579. Common subdirectories: go-expanse/crypto and go-ethereum/crypto
  580. Only in go-expanse: docker
  581. Common subdirectories: go-expanse/errs and go-ethereum/errs
  582. Only in go-ethereum: eth
  583. Common subdirectories: go-expanse/ethdb and go-ethereum/ethdb
  584. Common subdirectories: go-expanse/event and go-ethereum/event
  585. Only in go-expanse: exp
  586. Only in go-expanse: exp.log
  587. Only in go-expanse: fdtrack
  588. Common subdirectories: go-expanse/generators and go-ethereum/generators
  589. Only in go-expanse: genesis.json
  590. Only in go-expanse: genesis.json.gz
  591. Common subdirectories: go-expanse/internal and go-ethereum/internal
  592. Only in go-expanse: jsre
  593. Common subdirectories: go-expanse/light and go-ethereum/light
  594. Common subdirectories: go-expanse/logger and go-ethereum/logger
  595. Common subdirectories: go-expanse/metrics and go-ethereum/metrics
  596. Common subdirectories: go-expanse/miner and go-ethereum/miner
  597. Common subdirectories: go-expanse/node and go-ethereum/node
  598. Common subdirectories: go-expanse/p2p and go-ethereum/p2p
  599. Common subdirectories: go-expanse/params and go-ethereum/params
  600. Common subdirectories: go-expanse/pow and go-ethereum/pow
  601. Common subdirectories: go-expanse/release and go-ethereum/release
  602. Common subdirectories: go-expanse/rlp and go-ethereum/rlp
  603. Common subdirectories: go-expanse/rpc and go-ethereum/rpc
  604. Only in go-expanse: test_genesis.json
  605. Common subdirectories: go-expanse/tests and go-ethereum/tests
  606. Common subdirectories: go-expanse/trie and go-ethereum/trie
  607. Common subdirectories: go-expanse/whisper and go-ethereum/whisper
  608. Only in go-expanse: xeth
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!