Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expose mobile http server #2

Merged
merged 19 commits into from
Jul 6, 2018
Merged

Expose mobile http server #2

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
554a6d2
Expose mobile http server
cmcewen May 16, 2018
d07dca0
Must set vhosts
cmcewen May 17, 2018
7ce06aa
Add package.json
cmcewen May 17, 2018
d7399e6
Try postinstall
cmcewen May 17, 2018
813542c
I am silly
cmcewen May 17, 2018
a51fc61
Add .aar to package
cmcewen May 21, 2018
22e7134
don't make on install
cmcewen May 21, 2018
011dd91
Switched to new mobile mining app.
May 24, 2018
d662b1d
Fixed a bug.
May 24, 2018
d2e6cfc
Cleaned up some code and added comments.
May 25, 2018
d8abb1d
Added todo and reformatted.
May 25, 2018
7bd573e
Small changes.
May 25, 2018
080b706
Expose personal
cmcewen May 25, 2018
3acd63a
add ipc
cmcewen Jun 7, 2018
85069d4
Merge branch 'switch-to-new-miner-app' into expose-server
cmcewen Jun 7, 2018
d82ec48
new version
cmcewen Jun 7, 2018
36f865f
Merge branch 'master' into expose-server
cmcewen Jul 6, 2018
9c0f09b
remove comments
cmcewen Jul 6, 2018
e2ded0c
new build
cmcewen Jul 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ build/_vendor/pkg

# used by the Makefile
/build/_workspace/
/build/bin/
/build/bin/*
!/build/bin/geth.aar
/geth*.zip

# travis
Expand All @@ -45,3 +46,5 @@ profile.cov
/dashboard/assets/package-lock.json

**/yarn-error.log


Binary file added build/bin/geth.aar
View file
Open in desktop
Binary file not shown.
Binary file added geth-sources.jar
View file
Open in desktop
Binary file not shown.
17 changes: 13 additions & 4 deletions mobile/geth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ type NodeConfig struct {

// Listening address of pprof server.
PprofAddress string

// Host of the http server
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delete before merging?

// HTTPHost string

// // Port the http server is listening on
// HTTPPort int
}

// defaultNodeConfig contains the default node configuration values to use if all
Expand Down Expand Up @@ -118,10 +124,13 @@ func NewNode(datadir string, config *NodeConfig) (stack *Node, _ error) {

// Create the empty networking stack
nodeConf := &node.Config{
Name: clientIdentifier,
Version: params.Version,
DataDir: datadir,
KeyStoreDir: filepath.Join(datadir, "keystore"), // Mobile should never use internal keystores!
Name: clientIdentifier,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm guessing this line is showing ups as different because of whitespaces changes. Consider running gofmt.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's also add a TODO here to revisit this to explore using IPC instead of a websocket.

Version: params.Version,
DataDir: datadir,
KeyStoreDir: filepath.Join(datadir, "keystore"), // Mobile should never use internal keystores!
HTTPHost: "localhost",
HTTPPort: 8545,
HTTPVirtualHosts: []string{"localhost"},
P2P: p2p.Config{
NoDiscovery: true,
DiscoveryV5: true,
Expand Down
5 changes: 5 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"name": "@celo/geth",
"version": "0.0.1",
"description": "celo geth"
}