Add initial gomobile support

Makefile

@@ -1,4 +1,4 @@
-.PHONY: statusgo statusd-prune all test xgo clean help
+.PHONY: statusgo statusd-prune all test xgo gomobile clean help
 .PHONY: statusgo-android statusgo-ios
 
 help: ##@other Show this help
@@ -101,24 +101,17 @@ statusgo-linux: xgo ##@cross-compile Build status-go for Linux
 	./_assets/patches/patcher -b . -p geth-xgo -r
 	@echo "Android cross compilation done."
 
-statusgo-android: xgo ##@cross-compile Build status-go for Android
-	./_assets/patches/patcher -b . -p geth-xgo
-	$(GOPATH)/bin/xgo --image $(XGOIMAGE) --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=android-16/aar -v -tags '$(BUILD_TAGS)' $(BUILD_FLAGS) ./lib
-	./_assets/patches/patcher -b . -p geth-xgo -r
-	@echo "Android cross compilation done."
+## TODO(divan): rename statusgo-android-16.aar to Statusgo.aar
+statusgo-android: gomobile ##@cross-compile Build status-go for Android
+	@echo "Building status-go for Android..."
+	@gomobile bind -target=android/arm -ldflags="-s -w" -o build/bin/statusgo-android-16.aar github.com/status-im/status-go/mobile
+	@echo "Android cross compilation done in build/bin/statusgo-android-16.aar"
 
-statusgo-ios: xgo	##@cross-compile Build status-go for iOS
-	./_assets/patches/patcher -b . -p geth-xgo
-	$(GOPATH)/bin/xgo --image $(XGOIMAGE) --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=ios-9.3/framework -v -tags '$(BUILD_TAGS)' $(BUILD_FLAGS) ./lib
-	./_assets/patches/patcher -b . -p geth-xgo -r
-	@echo "iOS framework cross compilation done."
-
-statusgo-ios-simulator: xgo	##@cross-compile Build status-go for iOS Simulator
-	@docker pull $(XGOIMAGEIOSSIM)
-	./_assets/patches/patcher -b . -p geth-xgo
-	$(GOPATH)/bin/xgo --image $(XGOIMAGEIOSSIM) --go=$(GO) -out statusgo --dest=$(GOBIN) --targets=ios-9.3/framework -v -tags '$(BUILD_TAGS)' $(BUILD_FLAGS) ./lib
-	./_assets/patches/patcher -b . -p geth-xgo -r
-	@echo "iOS framework cross compilation done."
+## TODO(divan): rename statusgo-ios-9.3-framework to Statusgo.framework/
+statusgo-ios: gomobile	##@cross-compile Build status-go for iOS
+	@echo "Building status-go for iOS..."
+	@gomobile bind -target=ios -ldflags="-s -w" -o build/bin/statusgo-ios-9.3-framework github.com/status-im/status-go/mobile
+	@echo "iOS framework cross compilation done in build/bin/statusgo-ios-9.3-framework"
 
 statusgo-library: ##@cross-compile Build status-go as static library for current platform
 	@echo "Building static library..."
@@ -171,7 +164,11 @@ xgo:
 	docker pull $(XGOIMAGE)
 	go get github.com/karalabe/xgo
 
-setup: dep-install lint-install mock-install ##@other Prepare project for first build
+gomobile:
+	@echo "Installing gomobile..."
+	@go get -u golang.org/x/mobile/cmd/gomobile
+
+setup: dep-install lint-install mock-install gomobile ##@other Prepare project for first build
 
 mock-install: ##@other Install mocking tools
 	go get -u github.com/golang/mock/mockgen

README.md

@@ -29,8 +29,8 @@ There are two main modes status-go can be built:
 Use following Makefile commands:
 
 - `make statusgo` (builds binary into `build/bin/statusd`)
-- `make statusgo-android` (builds .aar file `build/android-16/aar`)
-- `make statusgo-ios` and `make statusgo-ios-simulator` (builds iOS related artifacts in `build/os-9.3/framework`)
+- `make statusgo-android` (builds .aar file `build/bin/statusgo-android-16.aar`)
+- `make statusgo-ios` (builds iOS framework in `build/bin/statusgo-ios-9.3-framework`)
 
 In order to build and use `status-go` directly from `status-react`, follow the instructions in https://wiki.status.im/Building_Status, under the '**Building Status with the checked-out version of status-go**' section.
 

mobile/README.md

@@ -0,0 +1,27 @@
+# Mobile
+
+Package mobile implements [gomobile](https://github.com/golang/mobile) bindings for status-go. Current implementation servers as a drop-in replacement for `lib` package.
+
+# Usage
+
+For properly using this package, please refer to Makefile in the root of `status-go` directory.
+
+To manually build library, run following commands:
+
+### iOS
+
+```
+gomobile bind -v -target=ios -ldflags="-s -w" github.com/status-im/status-go/mobile
+```
+This will produce `Status.framework` file in the current directory, which can be used in iOS project.
+
+### Android
+
+```
+gomobile bind -v -target=android -ldflags="-s -w" github.com/status-im/status-go/mobile
+```
+This will generate `Status.aar` file in the current dir.
+
+# Notes
+
+See [https://github.com/golang/go/wiki/Mobile](https://github.com/golang/go/wiki/Mobile) for more information on `gomobile` usage.

mobile/response.go

@@ -0,0 +1,64 @@
+package status
+
+import (
+	"encoding/json"
+
+	"github.com/ethereum/go-ethereum/accounts/keystore"
+	"github.com/status-im/status-go/account"
+	"github.com/status-im/status-go/transactions"
+)
+
+const (
+	codeUnknown int = iota
+	// special codes
+	codeFailedParseResponse
+	codeFailedParseParams
+	// account related codes
+	codeErrNoAccountSelected
+	codeErrInvalidTxSender
+	codeErrDecrypt
+)
+
+var errToCodeMap = map[error]int{
+	account.ErrNoAccountSelected:    codeErrNoAccountSelected,
+	transactions.ErrInvalidTxSender: codeErrInvalidTxSender,
+	keystore.ErrDecrypt:             codeErrDecrypt,
+}
+
+type jsonrpcSuccessfulResponse struct {
+	Result interface{} `json:"result"`
+}
+
+type jsonrpcErrorResponse struct {
+	Error jsonError `json:"error"`
+}
+
+type jsonError struct {
+	Code    int    `json:"code,omitempty"`
+	Message string `json:"message"`
+}
+
+func prepareJSONResponse(result interface{}, err error) string {
+	code := codeUnknown
+	if c, ok := errToCodeMap[err]; ok {
+		code = c
+	}
+
+	return prepareJSONResponseWithCode(result, err, code)
+}
+
+func prepareJSONResponseWithCode(result interface{}, err error, code int) string {
+	if err != nil {
+		errResponse := jsonrpcErrorResponse{
+			Error: jsonError{Code: code, Message: err.Error()},
+		}
+		response, _ := json.Marshal(&errResponse)
+		return string(response)
+	}
+
+	data, err := json.Marshal(jsonrpcSuccessfulResponse{result})
+	if err != nil {
+		return prepareJSONResponseWithCode(nil, err, codeFailedParseResponse)
+	}
+	return string(data)
+}

mobile/response_test.go

@@ -0,0 +1,27 @@
+package status
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+type nonJSON struct{}
+
+func (*nonJSON) MarshalJSON() ([]byte, error) {
+	return nil, errors.New("invalid JSON")
+}
+
+func TestPrepareJSONResponseErrorWithResult(t *testing.T) {
+	data := prepareJSONResponse("0x123", nil)
+	require.Equal(t, `{"result":"0x123"}`, data)
+
+	data = prepareJSONResponse(&nonJSON{}, nil)
+	require.Contains(t, data, `{"error":{"code":1,"message":`)
+}
+
+func TestPrepareJSONResponseErrorWithError(t *testing.T) {
+	data := prepareJSONResponse("0x123", errors.New("some error"))
+	require.Contains(t, data, `{"error":{"message":"some error"}}`)
+}