forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-24 13:46:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ether to expanse

Browse source
This commit is contained in:
Christopher Franko 2015-08-13 09:03:28 -04:00 committed by Franko
parent 2c3541ea48
commit 1cfc9ec1e9
18 changed files with 280 additions and 331 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -10,7 +10,7 @@
*un~
.DS_Store
*/**/.DS_Store
.ethtest
.exptest
*/**/*tx_database*
*/**/*dapps*
Godeps/_workspace/pkg

4
.idea/misc.xml Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" />
</project>

330
.idea/workspace.xml
View file

@ -1,7 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="bcfd724f-6896-424a-9d98-673f9d913556" name="Default" comment="" />
<list default="true" id="bcfd724f-6896-424a-9d98-673f9d913556" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/files/ansible/test-files/docker-go/Dockerfile" afterPath="$PROJECT_DIR$/tests/files/ansible/test-files/docker-go/Dockerfile" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/bench_test.go" afterPath="$PROJECT_DIR$/core/bench_test.go" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/chain_makers_test.go" afterPath="$PROJECT_DIR$/core/chain_makers_test.go" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jsre/ethereum_js.go" afterPath="$PROJECT_DIR$/jsre/ethereum_js.go" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/trie/iterator_test.go" afterPath="$PROJECT_DIR$/trie/iterator_test.go" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/cmd/ethtest/main.go" afterPath="$PROJECT_DIR$/cmd/ethtest/main.go" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/cmd/gexp/main.go" afterPath="$PROJECT_DIR$/cmd/gexp/main.go" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/crypto/mnemonic_words.go" afterPath="$PROJECT_DIR$/crypto/mnemonic_words.go" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/cmd/gexp/monitorcmd.go" afterPath="$PROJECT_DIR$/cmd/gexp/monitorcmd.go" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/common/natspec/natspec_js.go" afterPath="$PROJECT_DIR$/common/natspec/natspec_js.go" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/common/size_test.go" afterPath="$PROJECT_DIR$/common/size_test.go" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/trie/trie_test.go" afterPath="$PROJECT_DIR$/trie/trie_test.go" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/files/TrieTests/trietest.json" afterPath="$PROJECT_DIR$/tests/files/TrieTests/trietest.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/files/TrieTests/trietest_secureTrie.json" afterPath="$PROJECT_DIR$/tests/files/TrieTests/trietest_secureTrie.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="go-expanse.iws" />
<ignored path=".idea/workspace.xml" />
<ignored path=".idea/dataSources.local.xml" />
@ -25,87 +43,37 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="README.md" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Godeps/_workspace/src/github.com/ethereum/ethash/README.md">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-4.08" vertical-offset="0" max-vertical-offset="476">
<caret line="6" column="45" selection-start-line="6" selection-start-column="45" selection-end-line="6" selection-end-column="45" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ethash.go" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go">
<provider editor-type-id="com.intellij.database.editor.CsvTableFileEditorProvider">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-5.90625" vertical-offset="5914" max-vertical-offset="6494">
<caret line="359" column="12" selection-start-line="359" selection-start-column="12" selection-end-line="359" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ethash_test.go" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Godeps/_workspace/src/github.com/ethereum/ethash/ethash_test.go">
<provider editor-type-id="com.intellij.database.editor.CsvTableFileEditorProvider">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-5.90625" vertical-offset="2514" max-vertical-offset="3570">
<caret line="159" column="9" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ethash.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Godeps/_workspace/src/github.com/ethereum/ethash/js/ethash.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2129" max-vertical-offset="3298">
<caret line="139" column="8" selection-start-line="139" selection-start-column="8" selection-end-line="139" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="test.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Godeps/_workspace/src/github.com/ethereum/ethash/js/test.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="366" max-vertical-offset="986">
<caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="io.h" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/io.h">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.33333334" vertical-offset="480" max-vertical-offset="3536">
<caret line="40" column="59" selection-start-line="40" selection-start-column="59" selection-end-line="40" selection-end-column="59" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="main.go" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cmd/ethtest/main.go">
<entry file="file://$PROJECT_DIR$/cmd/gexp/main.go">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="72" max-vertical-offset="3842">
<caret line="16" column="20" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
<state vertical-scroll-proportion="0.0" vertical-offset="3438" max-vertical-offset="12478">
<caret line="227" column="24" selection-start-line="227" selection-start-column="24" selection-end-line="227" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AUTHORS" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/AUTHORS">
<file leaf-file-name="ethereum_js.go" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/jsre/ethereum_js.go">
<provider editor-type-id="com.intellij.database.editor.CsvTableFileEditorProvider">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="510">
<caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
<state vertical-scroll-proportion="0.7650463" vertical-offset="13806" max-vertical-offset="106029">
<caret line="851" column="5" selection-start-line="851" selection-start-column="5" selection-end-line="851" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="natspec_js.go" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/common/natspec/natspec_js.go">
<provider editor-type-id="com.intellij.database.editor.CsvTableFileEditorProvider">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-5.78125" vertical-offset="121" max-vertical-offset="69122">
<caret line="18" column="3094" selection-start-line="18" selection-start-column="3094" selection-end-line="18" selection-end-column="3094" />
<folding />
</state>
</provider>
@ -119,12 +87,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/Godeps/_workspace/src/github.com/ethereum/ethash/setup.py" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/.gitmodules" />
<option value="$PROJECT_DIR$/Makefile" />
<option value="$PROJECT_DIR$/core/fees.go" />
<option value="$PROJECT_DIR$/p2p/discover/database_test.go" />
<option value="$PROJECT_DIR$/p2p/discover/node.go" />
<option value="$PROJECT_DIR$/p2p/discover/udp_test.go" />
<option value="$PROJECT_DIR$/tests/files/ansible/test-files/docker-python/Dockerfile" />
@ -161,15 +123,21 @@
<option value="$PROJECT_DIR$/miner/miner.go" />
<option value="$PROJECT_DIR$/miner/worker.go" />
<option value="$PROJECT_DIR$/eth/downloader/peer.go" />
<option value="$PROJECT_DIR$/jsre/ethereum_js.go" />
<option value="$PROJECT_DIR$/Godeps/_workspace/src/github.com/ethereum/ethash/README.md" />
<option value="$PROJECT_DIR$/Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go" />
<option value="$PROJECT_DIR$/README.md" />
<option value="$PROJECT_DIR$/accounts/abi/doc.go" />
<option value="$PROJECT_DIR$/cmd/bootnode/main.go" />
<option value="$PROJECT_DIR$/cmd/ethtest/main.go" />
<option value="$PROJECT_DIR$/cmd/geth/blocktestcmd.go" />
<option value="$PROJECT_DIR$/cmd/geth/js.go" />
<option value="$PROJECT_DIR$/cmd/gexp/main.go" />
<option value="$PROJECT_DIR$/cmd/gexp/monitorcmd.go" />
<option value="$PROJECT_DIR$/crypto/mnemonic_words.go" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/README.md" />
<option value="$PROJECT_DIR$/cmd/ethtest/main.go" />
<option value="$PROJECT_DIR$/tests/files/ansible/test-files/docker-go/Dockerfile" />
<option value="$PROJECT_DIR$/jsre/ethereum_js.go" />
<option value="$PROJECT_DIR$/common/natspec/natspec_js.go" />
</list>
</option>
</component>
@ -206,6 +174,7 @@
<sortByType />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@ -226,7 +195,6 @@
</PATH>
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@ -248,10 +216,16 @@
<BehatRunner />
<method />
</configuration>
<configuration default="true" type="PhpUnitRemoteRunConfigurationType" factoryName="PHPUnit on Server">
<configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
<node-options />
<gulpfile />
<tasks />
<arguments />
<pass-parent-envs>true</pass-parent-envs>
<envs />
<method />
</configuration>
<configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
<configuration default="true" type="PhpUnitRemoteRunConfigurationType" factoryName="PHPUnit on Server">
<method />
</configuration>
<list size="0" />
@ -270,28 +244,28 @@
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1053" extended-state="7" />
<frame x="-8" y="-8" width="1936" height="1053" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3290735" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32800853" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.12291667" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="Vcs.Log.UiProperties">
@ -315,11 +289,26 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/cmd/ethtest/main.go">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="100">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/AUTHORS">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="102" max-vertical-offset="510">
<caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tests/files/BlockchainTests/bcInvalidHeaderTest.json">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.5" vertical-offset="7897" max-vertical-offset="19176">
<caret line="476" column="1220" selection-start-line="476" selection-start-column="1220" selection-end-line="476" selection-end-column="1220" />
<folding />
</state>
</provider>
</entry>
@ -327,7 +316,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.1923075" vertical-offset="70448" max-vertical-offset="77384">
<caret line="4155" column="976" selection-start-line="4155" selection-start-column="976" selection-end-line="4155" selection-end-column="976" />
<folding />
</state>
</provider>
</entry>
@ -335,7 +323,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.1923075" vertical-offset="13566" max-vertical-offset="21012">
<caret line="809" column="63" selection-start-line="809" selection-start-column="63" selection-end-line="809" selection-end-column="63" />
<folding />
</state>
</provider>
</entry>
@ -343,7 +330,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.5" vertical-offset="67006" max-vertical-offset="185623">
<caret line="3953" column="1036" selection-start-line="3953" selection-start-column="1036" selection-end-line="3953" selection-end-column="1036" />
<folding />
</state>
</provider>
</entry>
@ -351,7 +337,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-11.115385" vertical-offset="765" max-vertical-offset="1326">
<caret line="62" column="429" selection-start-line="62" selection-start-column="429" selection-end-line="62" selection-end-column="429" />
<folding />
</state>
</provider>
</entry>
@ -359,7 +344,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.5" vertical-offset="298" max-vertical-offset="1309">
<caret line="29" column="40" selection-start-line="29" selection-start-column="40" selection-end-line="29" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
@ -367,7 +351,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.5" vertical-offset="2950" max-vertical-offset="47158">
<caret line="185" column="39" selection-start-line="185" selection-start-column="39" selection-end-line="185" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
@ -375,15 +358,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.1923075" vertical-offset="25670" max-vertical-offset="57256">
<caret line="1521" column="1539" selection-start-line="1521" selection-start-column="1539" selection-end-line="1521" selection-end-column="1539" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Godeps/_workspace/src/github.com/ethereum/ethash/test/c/test.cpp">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="451" max-vertical-offset="11475">
<caret line="38" column="29" selection-start-line="38" selection-start-column="29" selection-end-line="38" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
@ -391,7 +365,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="35568" max-vertical-offset="38403">
<caret line="2104" column="5" selection-start-line="2104" selection-start-column="5" selection-end-line="2104" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
@ -399,7 +372,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2052" max-vertical-offset="2652">
<caret line="144" column="34" selection-start-line="144" selection-start-column="34" selection-end-line="144" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
@ -407,7 +379,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1874" max-vertical-offset="4879">
<caret line="122" column="28" selection-start-line="122" selection-start-column="28" selection-end-line="122" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
@ -415,7 +386,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="8713" max-vertical-offset="9537">
<caret line="524" column="84" selection-start-line="524" selection-start-column="84" selection-end-line="524" selection-end-column="84" />
<folding />
</state>
</provider>
</entry>
@ -423,7 +393,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2185" max-vertical-offset="5882">
<caret line="140" column="30" selection-start-line="140" selection-start-column="30" selection-end-line="140" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
@ -431,7 +400,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1896" max-vertical-offset="4403">
<caret line="123" column="26" selection-start-line="123" selection-start-column="26" selection-end-line="123" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
@ -439,7 +407,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="386" max-vertical-offset="986">
<caret line="42" column="18" selection-start-line="42" selection-start-column="18" selection-end-line="42" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
@ -455,7 +422,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="774" max-vertical-offset="14008">
<caret line="57" column="6" selection-start-line="57" selection-start-column="6" selection-end-line="57" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
@ -463,7 +429,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1857" max-vertical-offset="3672">
<caret line="121" column="21" selection-start-line="121" selection-start-column="21" selection-end-line="121" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
@ -471,7 +436,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2214" max-vertical-offset="7378">
<caret line="142" column="39" selection-start-line="142" selection-start-column="39" selection-end-line="142" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
@ -479,7 +443,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="5979" max-vertical-offset="6579">
<caret line="379" column="12" selection-start-line="379" selection-start-column="12" selection-end-line="379" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
@ -487,7 +450,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="684" max-vertical-offset="2839">
<caret line="52" column="86" selection-start-line="52" selection-start-column="86" selection-end-line="52" selection-end-column="86" />
<folding />
</state>
</provider>
</entry>
@ -495,26 +457,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="7710" max-vertical-offset="11135">
<caret line="465" column="25" selection-start-line="465" selection-start-column="25" selection-end-line="465" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/jsre/ethereum_js.go">
<provider editor-type-id="com.intellij.database.editor.CsvTableFileEditorProvider">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-5.78125" vertical-offset="36535" max-vertical-offset="105961">
<caret line="2160" column="3" selection-start-line="2160" selection-start-column="3" selection-end-line="2160" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.48" vertical-offset="663" max-vertical-offset="1428">
<caret line="50" column="21" selection-start-line="50" selection-start-column="21" selection-end-line="50" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
@ -525,7 +467,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-10.09375" vertical-offset="0" max-vertical-offset="544">
<caret line="19" column="7" selection-start-line="19" selection-start-column="7" selection-end-line="19" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
@ -533,15 +474,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="72" max-vertical-offset="1666">
<caret line="16" column="42" selection-start-line="16" selection-start-column="42" selection-end-line="16" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cmd/ethtest/main.go">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="72" max-vertical-offset="3842">
<caret line="16" column="20" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
@ -553,56 +485,80 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Godeps/_workspace/src/github.com/ethereum/ethash/README.md">
<entry file="file://$PROJECT_DIR$/crypto/mnemonic_words.go">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-4.08" vertical-offset="0" max-vertical-offset="476">
<caret line="6" column="45" selection-start-line="6" selection-start-column="45" selection-end-line="6" selection-end-column="45" />
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="28152">
<caret line="19" column="10" selection-start-line="19" selection-start-column="10" selection-end-line="19" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go">
<entry file="file://$PROJECT_DIR$/cmd/gexp/monitorcmd.go">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="514" max-vertical-offset="6086">
<caret line="57" column="4" selection-start-line="57" selection-start-column="4" selection-end-line="57" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.48" vertical-offset="646" max-vertical-offset="1428">
<caret line="49" column="24" selection-start-line="49" selection-start-column="24" selection-end-line="49" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cmd/ethtest/main.go">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.92519253" vertical-offset="2576" max-vertical-offset="3842">
<caret line="201" column="16" selection-start-line="201" selection-start-column="16" selection-end-line="201" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tests/files/ansible/test-files/docker-go/Dockerfile">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.86028606" vertical-offset="0" max-vertical-offset="909">
<caret line="46" column="13" selection-start-line="46" selection-start-column="13" selection-end-line="46" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.23076923" vertical-offset="0" max-vertical-offset="884">
<caret line="12" column="1" selection-start-line="12" selection-start-column="1" selection-end-line="12" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cmd/gexp/main.go">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="3438" max-vertical-offset="12478">
<caret line="227" column="24" selection-start-line="227" selection-start-column="24" selection-end-line="227" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/common/natspec/natspec_js.go">
<provider editor-type-id="com.intellij.database.editor.CsvTableFileEditorProvider">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-5.90625" vertical-offset="5914" max-vertical-offset="6494">
<caret line="359" column="12" selection-start-line="359" selection-start-column="12" selection-end-line="359" selection-end-column="12" />
<state vertical-scroll-proportion="-5.78125" vertical-offset="121" max-vertical-offset="69122">
<caret line="18" column="3094" selection-start-line="18" selection-start-column="3094" selection-end-line="18" selection-end-column="3094" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Godeps/_workspace/src/github.com/ethereum/ethash/ethash_test.go">
<entry file="file://$PROJECT_DIR$/jsre/ethereum_js.go">
<provider editor-type-id="com.intellij.database.editor.CsvTableFileEditorProvider">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-5.90625" vertical-offset="2514" max-vertical-offset="3570">
<caret line="159" column="9" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Godeps/_workspace/src/github.com/ethereum/ethash/js/ethash.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2129" max-vertical-offset="3298">
<caret line="139" column="8" selection-start-line="139" selection-start-column="8" selection-end-line="139" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Godeps/_workspace/src/github.com/ethereum/ethash/js/test.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="366" max-vertical-offset="986">
<caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/io.h">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.33333334" vertical-offset="480" max-vertical-offset="3536">
<caret line="40" column="59" selection-start-line="40" selection-start-column="59" selection-end-line="40" selection-end-column="59" />
<state vertical-scroll-proportion="0.7650463" vertical-offset="13806" max-vertical-offset="106029">
<caret line="851" column="5" selection-start-line="851" selection-start-column="5" selection-end-line="851" selection-end-column="13" />
<folding />
</state>
</provider>

6
README.md
View file

@ -21,7 +21,7 @@ The following builds are build automatically by our build servers after each pus
* Ubuntu
[trusty](https://build.ethdev.com/builds/Linux%20Go%20develop%20deb%20i386-trusty/latest/) |
[utopic](https://build.ethdev.com/builds/Linux%20Go%20develop%20deb%20i386-utopic/latest/)
* [Windows 64-bit](https://build.ethdev.com/builds/Windows%20Go%20develop%20branch/Geth-Win64-latest.zip)
* [Windows 64-bit](https://build.ethdev.com/builds/Windows%20Go%20develop%20branch/Gexp-Win64-latest.zip)
* [ARM](https://build.ethdev.com/builds/ARM%20Go%20develop%20branch/gexp-ARM-latest.tar.bz2)
## Building the source
@ -43,8 +43,8 @@ Go Expanse comes with several wrappers/executables found in
* `gexp` Expanse CLI (expanse command line interface client)
* `bootnode` runs a bootstrap node for the Discovery Protocol
* `ethtest` test tool which runs with the [tests](https://github.com/expanse-project/tests) suite:
`/path/to/test.json > ethtest --test BlockTests --stdin`.
* `exptest` test tool which runs with the [tests](https://github.com/expanse-project/tests) suite:
`/path/to/test.json > exptest --test BlockTests --stdin`.
* `evm` is a generic Expanse Virtual Machine: `evm -code 60ff60ff -gas
10000 -price 0 -dump`. See `-h` for a detailed description.
* `disasm` disassembles EVM code: `echo "6001" | disasm`

4
cmd/ethtest/main.go
View file

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with go-expanse. If not, see <http://www.gnu.org/licenses/>.
// ethtest executes Expanse JSON tests.
// exptest executes Expanse JSON tests.
package main
import (
@ -204,7 +204,7 @@ func main() {
glog.SetToStderr(true)
app := cli.NewApp()
app.Name = "ethtest"
app.Name = "exptest"
app.Usage = "go-expanse test interface"
app.Action = setupApp
app.Version = "0.2.0"

33
cmd/gexp/main.go
View file

@ -48,7 +48,7 @@ import (
)
const (
ClientIdentifier = "Geth"
ClientIdentifier = "Gexp"
Version = "1.1.0"
VersionMajor = 1
VersionMinor = 1
@ -125,7 +125,7 @@ The output of this command is supposed to be machine-readable.
get wallet import /path/to/my/presale.wallet
will prompt for your password and imports your ether presale account.
will prompt for your password and imports your expanse presale account.
It can be used non-interactively with the --password option taking a
passwordfile as argument containing the wallet password in plaintext.
@ -248,18 +248,18 @@ nodes.
{
Action: console,
Name: "console",
Usage: `Geth Console: interactive JavaScript environment`,
Usage: `Gexp Console: interactive JavaScript environment`,
Description: `
The Geth console is an interactive shell for the JavaScript runtime environment
The Gexp console is an interactive shell for the JavaScript runtime environment
which exposes a node admin interface as well as the Ðapp JavaScript API.
See https://github.com/expanse-project/go-expanse/wiki/Javascipt-Console
`},
{
Action: attach,
Name: "attach",
Usage: `Geth Console: interactive JavaScript environment (connect to node)`,
Usage: `Gexp Console: interactive JavaScript environment (connect to node)`,
Description: `
The Geth console is an interactive shell for the JavaScript runtime environment
The Gexp console is an interactive shell for the JavaScript runtime environment
which exposes a node admin interface as well as the Ðapp JavaScript API.
See https://github.com/expanse-project/go-expanse/wiki/Javascipt-Console.
This command allows to open a console on a running gexp node.
@ -268,7 +268,7 @@ This command allows to open a console on a running gexp node.
{
Action: execJSFiles,
Name: "js",
Usage: `executes the given JavaScript files in the Geth JavaScript VM`,
Usage: `executes the given JavaScript files in the Gexp JavaScript VM`,
Description: `
The JavaScript VM exposes a node admin interface as well as the Ðapp
JavaScript API. See https://github.com/expanse-project/go-expanse/wiki/Javascipt-Console
@ -395,19 +395,7 @@ func run(ctx *cli.Context) {
func attach(ctx *cli.Context) {
utils.CheckLegalese(ctx.GlobalString(utils.DataDirFlag.Name))
<<<<<<< HEAD
var client comms.EthereumClient
=======
// Wrap the standard output with a colorified stream (windows)
if isatty.IsTerminal(os.Stdout.Fd()) {
if pr, pw, err := os.Pipe(); err == nil {
go io.Copy(colorable.NewColorableStdout(), pr)
os.Stdout = pw
}
}
var client comms.ExpanseClient
>>>>>>> test change lol
var err error
if ctx.Args().Present() {
client, err = comms.ClientFromEndpoint(ctx.Args().First(), codec.JSON)
@ -558,14 +546,7 @@ func startEth(ctx *cli.Context, exp *exp.Expanse) {
// Start Expanse itself
utils.StartExpanse(exp)
<<<<<<< HEAD
am := eth.AccountManager()
=======
// Start logging file descriptor stats.
fdtrack.Start()
am := exp.AccountManager()
>>>>>>> test change lol
account := ctx.GlobalString(utils.UnlockedAccountFlag.Name)
accounts := strings.Split(account, " ")
for i, account := range accounts {

4
cmd/gexp/monitorcmd.go
View file

@ -53,9 +53,9 @@ var (
monitorCommand = cli.Command{
Action: monitor,
Name: "monitor",
Usage: `Geth Monitor: node metrics monitoring and visualization`,
Usage: `Gexp Monitor: node metrics monitoring and visualization`,
Description: `
The Geth monitor is a tool to collect and visualize various internal metrics
The Gexp monitor is a tool to collect and visualize various internal metrics
gathered by the node, supporting different chart types as well as the capacity
to display multiple metrics simultaneously.
`,

66
common/natspec/natspec_js.go
View file

File diff suppressed because one or more lines are too long

4
common/size_test.go
View file

@ -41,7 +41,7 @@ func (s *SizeSuite) TestStorageSizeString(c *checker.C) {
}
func (s *SizeSuite) TestCommon(c *checker.C) {
ether := CurrencyToString(BigPow(10, 19))
expanse := CurrencyToString(BigPow(10, 19))
finney := CurrencyToString(BigPow(10, 16))
szabo := CurrencyToString(BigPow(10, 13))
shannon := CurrencyToString(BigPow(10, 10))
@ -49,7 +49,7 @@ func (s *SizeSuite) TestCommon(c *checker.C) {
ada := CurrencyToString(BigPow(10, 4))
wei := CurrencyToString(big.NewInt(10))
c.Assert(ether, checker.Equals, "10 Ether")
c.Assert(expanse, checker.Equals, "10 Ether")
c.Assert(finney, checker.Equals, "10 Finney")
c.Assert(szabo, checker.Equals, "10 Szabo")
c.Assert(shannon, checker.Equals, "10 Shannon")

2
core/bench_test.go
View file

@ -102,7 +102,7 @@ func init() {
}
}
// genTxRing returns a block generator that sends ether in a ring
// genTxRing returns a block generator that sends expanse in a ring
// among n accounts. This is creates n entries in the state database
// and fills the blocks with many small transactions.
func genTxRing(naccounts int) func(int, *BlockGen) {

4
core/chain_makers_test.go
View file

@ -50,11 +50,11 @@ func ExampleGenerateChain() {
chain := GenerateChain(genesis, db, 5, func(i int, gen *BlockGen) {
switch i {
case 0:
// In block 1, addr1 sends addr2 some ether.
// In block 1, addr1 sends addr2 some expanse.
tx, _ := types.NewTransaction(gen.TxNonce(addr1), addr2, big.NewInt(10000), params.TxGas, nil, nil).SignECDSA(key1)
gen.AddTx(tx)
case 1:
// In block 2, addr1 sends some more ether to addr2.
// In block 2, addr1 sends some more expanse to addr2.
// addr2 passes it on to addr3.
tx1, _ := types.NewTransaction(gen.TxNonce(addr1), addr2, big.NewInt(1000), params.TxGas, nil, nil).SignECDSA(key1)
tx2, _ := types.NewTransaction(gen.TxNonce(addr2), addr3, big.NewInt(1000), params.TxGas, nil, nil).SignECDSA(key2)

4
crypto/mnemonic_words.go
View file

@ -17,6 +17,7 @@
package crypto
var MnemonicWords []string = []string{
"aiden",
"like",
"just",
"love",
@ -1494,6 +1495,7 @@ var MnemonicWords []string = []string{
"fur",
"giggle",
"glorious",
"heather",
"ignorance",
"law",
"lifeless",
@ -1541,10 +1543,12 @@ var MnemonicWords []string = []string{
"drama",
"drum",
"dude",
"elora",
"everybody",
"feast",
"forehead",
"former",
"franko",
"fright",
"fully",
"gas",

108
jsre/ethereum_js.go
View file

@ -1809,27 +1809,27 @@ var ETH_UNITS = [
'Gwei',
'szabo',
'finney',
'femtoether',
'picoether',
'nanoether',
'microether',
'milliether',
'femtoexpanse',
'picoexpanse',
'nanoexpanse',
'microexpanse',
'milliexpanse',
'nano',
'micro',
'milli',
'ether',
'expanse',
'grand',
'Mether',
'Gether',
'Tether',
'Pether',
'Eether',
'Zether',
'Yether',
'Nether',
'Dether',
'Vether',
'Uether'
'Mexpanse',
'Gexpanse',
'Texpanse',
'Pexpanse',
'Eexpanse',
'Zexpanse',
'Yexpanse',
'Nexpanse',
'Dexpanse',
'Vexpanse',
'Uexpanse'
];
module.exports = {
@ -1928,27 +1928,31 @@ var unitMap = {
'wei': '1',
'kwei': '1000',
'ada': '1000',
'femtoether': '1000',
'femtoexpanse': '1000',
'mwei': '1000000',
'babbage': '1000000',
'picoether': '1000000',
'picoexpanse': '1000000',
'gwei': '1000000000',
'shannon': '1000000000',
'nanoether': '1000000000',
'nanoexpanse': '1000000000',
'nano': '1000000000',
'szabo': '1000000000000',
'microether': '1000000000000',
'microexpanse': '1000000000000',
'micro': '1000000000000',
'finney': '1000000000000000',
'milliether': '1000000000000000',
'milliexpanse': '1000000000000000',
'milli': '1000000000000000',
'ether': '1000000000000000000',
'kether': '1000000000000000000000',
'expanse': '1000000000000000000',
'kexpanse': '1000000000000000000000',
'grand': '1000000000000000000000',
'einstein': '1000000000000000000000',
'mether': '1000000000000000000000000',
'gether': '1000000000000000000000000000',
'tether': '1000000000000000000000000000000'
'elora': '1000000000000000000000',
'mexpanse': '1000000000000000000000000',
'aiden': '1000000000000000000000000',
'gexpanse': '1000000000000000000000000000',
'heather': '1000000000000000000000000000',
'texpanse': '1000000000000000000000000000000',
'franko': '1000000000000000000000000000000'
};
/**
@ -2132,12 +2136,12 @@ var toHex = function (val) {
* Returns value of unit in Wei
*
* @method getValueOfUnit
* @param {String} unit the unit to convert to, default ether
* @param {String} unit the unit to convert to, default expanse
* @returns {BigNumber} value of the unit (in Wei)
* @throws error if the unit is not correct:w
*/
var getValueOfUnit = function (unit) {
unit = unit ? unit.toLowerCase() : 'ether';
unit = unit ? unit.toLowerCase() : 'expanse';
var unitValue = unitMap[unit];
if (unitValue === undefined) {
throw new Error('This unit doesn\'t exists, please use the one of the following units' + JSON.stringify(unitMap, null, 2));
@ -2146,24 +2150,24 @@ var getValueOfUnit = function (unit) {
};
/**
* Takes a number of wei and converts it to any other ether unit.
* Takes a number of wei and converts it to any other expanse unit.
*
* Possible units are:
* SI Short SI Full Effigy Other
* - kwei femtoether ada
* - mwei picoether babbage
* - gwei nanoether shannon nano
* - -- microether szabo micro
* - -- milliether finney milli
* - ether -- --
* - kether einstein grand
* - mether
* - gether
* - tether
* - kwei femtoexpanse ada
* - mwei picoexpanse babbage
* - gwei nanoexpanse shannon nano
* - -- microexpanse szabo micro
* - -- milliexpanse finney milli
* - expanse -- --
* - kexpanse einstein grand
* - mexpanse
* - gexpanse
* - texpanse
*
* @method fromWei
* @param {Number|String} number can be a number, number string or a HEX of a decimal
* @param {String} unit the unit to convert to, default ether
* @param {String} unit the unit to convert to, default expanse
* @return {String|Object} When given a BigNumber object it returns one as well, otherwise a number
*/
var fromWei = function(number, unit) {
@ -2177,20 +2181,20 @@ var fromWei = function(number, unit) {
*
* Possible units are:
* SI Short SI Full Effigy Other
* - kwei femtoether ada
* - mwei picoether babbage
* - gwei nanoether shannon nano
* - -- microether szabo micro
* - -- milliether finney milli
* - ether -- --
* - kether einstein grand
* - mether
* - gether
* - tether
* - kwei femtoexpanse ada
* - mwei picoexpanse babbage
* - gwei nanoexpanse shannon nano
* - -- microexpanse szabo micro
* - -- milliexpanse finney milli
* - expanse -- --
* - kexpanse einstein grand
* - mexpanse
* - gexpanse
* - texpanse
*
* @method toWei
* @param {Number|String|BigNumber} number can be a number, number string or a HEX of a decimal
* @param {String} unit the unit to convert from, default ether
* @param {String} unit the unit to convert from, default expanse
* @return {String|Object} When given a BigNumber object it returns one as well, otherwise a number
*/
var toWei = function(number, unit) {

4
tests/files/TrieTests/trietest.json
View file

@ -2,11 +2,11 @@
"emptyValues": {
"in": [
["do", "verb"],
["ether", "wookiedoo"],
["expanse", "wookiedoo"],
["horse", "stallion"],
["shaman", "horse"],
["doge", "coin"],
["ether", null],
["expanse", null],
["dog", "puppy"],
["shaman", null]
],

4
tests/files/TrieTests/trietest_secureTrie.json
View file

@ -2,11 +2,11 @@
"emptyValues": {
"in": [
["do", "verb"],
["ether", "wookiedoo"],
["expanse", "wookiedoo"],
["horse", "stallion"],
["shaman", "horse"],
["doge", "coin"],
["ether", null],
["expanse", null],
["dog", "puppy"],
["shaman", null]
],

4
tests/files/ansible/test-files/docker-go/Dockerfile
View file

@ -42,6 +42,6 @@ RUN git pull
RUN ETH_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/expanse-project/go-expanse/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$ETH_DEPS" ]; then go get $ETH_DEPS; fi
RUN go install -v ./cmd/ethtest
RUN go install -v ./cmd/exptest
ENTRYPOINT ["ethtest"]
ENTRYPOINT ["exptest"]

2
trie/iterator_test.go
View file

@ -22,7 +22,7 @@ func TestIterator(t *testing.T) {
trie := NewEmpty()
vals := []struct{ k, v string }{
{"do", "verb"},
{"ether", "wookiedoo"},
{"expanse", "wookiedoo"},
{"horse", "stallion"},
{"shaman", "horse"},
{"doge", "coin"},

26
trie/trie_test.go
View file

@ -103,11 +103,11 @@ func TestDelete(t *testing.T) {
vals := []struct{ k, v string }{
{"do", "verb"},
{"ether", "wookiedoo"},
{"expanse", "wookiedoo"},
{"horse", "stallion"},
{"shaman", "horse"},
{"doge", "coin"},
{"ether", ""},
{"expanse", ""},
{"dog", "puppy"},
{"shaman", ""},
}
@ -131,11 +131,11 @@ func TestEmptyValues(t *testing.T) {
vals := []struct{ k, v string }{
{"do", "verb"},
{"ether", "wookiedoo"},
{"expanse", "wookiedoo"},
{"horse", "stallion"},
{"shaman", "horse"},
{"doge", "coin"},
{"ether", ""},
{"expanse", ""},
{"dog", "puppy"},
{"shaman", ""},
}
@ -154,11 +154,11 @@ func TestReplication(t *testing.T) {
trie := NewEmpty()
vals := []struct{ k, v string }{
{"do", "verb"},
{"ether", "wookiedoo"},
{"expanse", "wookiedoo"},
{"horse", "stallion"},
{"shaman", "horse"},
{"doge", "coin"},
{"ether", ""},
{"expanse", ""},
{"dog", "puppy"},
{"shaman", ""},
{"somethingveryoddindeedthis is", "myothernodedata"},
@ -185,7 +185,7 @@ func TestReset(t *testing.T) {
trie := NewEmpty()
vals := []struct{ k, v string }{
{"do", "verb"},
{"ether", "wookiedoo"},
{"expanse", "wookiedoo"},
{"horse", "stallion"},
}
for _, val := range vals {
@ -215,11 +215,11 @@ func TestParanoia(t *testing.T) {
vals := []struct{ k, v string }{
{"do", "verb"},
{"ether", "wookiedoo"},
{"expanse", "wookiedoo"},
{"horse", "stallion"},
{"shaman", "horse"},
{"doge", "coin"},
{"ether", ""},
{"expanse", ""},
{"dog", "puppy"},
{"shaman", ""},
{"somethingveryoddindeedthis is", "myothernodedata"},
@ -258,11 +258,11 @@ func BenchmarkGets(b *testing.B) {
trie := NewEmpty()
vals := []struct{ k, v string }{
{"do", "verb"},
{"ether", "wookiedoo"},
{"expanse", "wookiedoo"},
{"horse", "stallion"},
{"shaman", "horse"},
{"doge", "coin"},
{"ether", ""},
{"expanse", ""},
{"dog", "puppy"},
{"shaman", ""},
{"somethingveryoddindeedthis is", "myothernodedata"},
@ -330,11 +330,11 @@ func TestSecureDelete(t *testing.T) {
vals := []struct{ k, v string }{
{"do", "verb"},
{"ether", "wookiedoo"},
{"expanse", "wookiedoo"},
{"horse", "stallion"},
{"shaman", "horse"},
{"doge", "coin"},
{"ether", ""},
{"expanse", ""},
{"dog", "puppy"},
{"shaman", ""},
}