Use web3code from separate repo and remove static

Gopkg.lock

@@ -320,6 +320,12 @@
   packages = ["."]
   revision = "ed27b6fd65218132ee50cd95f38474a3d8a2cd12"
 
+[[projects]]
+  name = "github.com/status-im/go-web3js"
+  packages = ["."]
+  revision = "a136c82b1e1f30b5b24118eeff1caa71924e4e3a"
+  version = "0.20.1"
+
 [[projects]]
   name = "github.com/stretchr/testify"
   packages = [
@@ -483,6 +489,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "fd11e2094673d9a89cee7b47b626c2c18c7dd80b6e86835d88a2d8d28e5e9fa7"
+  inputs-digest = "c3c6facfce434b6e6c2c5b676526dcfb0c6bde11fffb616b18c90d16fbfb2e73"
   solver-name = "gps-cdcl"
   solver-version = 1

Gopkg.toml

@@ -25,6 +25,10 @@
   name = "github.com/ethereum/go-ethereum"
   version = "1.8.1"
 
+[[constraint]]
+  name = "github.com/status-im/go-web3js"
+  version = "0.20.1"
+
 [[constraint]]
   name = "github.com/prometheus/client_golang"
   version = "0.8.0"

_assets/static/package-lock.json

@@ -1,53 +0,0 @@
-{
-  "name": "status-js",
-  "version": "0.0.1",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "bignumber.js": {
-      "version": "github:status-im/bignumber.js#cc066a0a3d6bfe0c436c9957f4ea8344bf963c89",
-      "dev": true
-    },
-    "crypto-js": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.8.tgz",
-      "integrity": "sha1-cV8HC/YBTyrpkqmLOSkli3E/CNU=",
-      "dev": true
-    },
-    "requirejs": {
-      "version": "2.3.5",
-      "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.5.tgz",
-      "integrity": "sha512-svnO+aNcR/an9Dpi44C7KSAy5fFGLtmPbaaCeQaklUz8BQhS64tWWIIlvEA5jrWICzlO/X9KSzSeXFnZdBu8nw==",
-      "dev": true
-    },
-    "utf8": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz",
-      "integrity": "sha1-H6DZJw6b6FDZsFAn9jUZv0ZFfZY=",
-      "dev": true
-    },
-    "web3": {
-      "version": "git+https://github.com/status-im/web3.js.git#aca66029d7ffac8ed2803b2fc7f0fec01e335ca3",
-      "dev": true,
-      "requires": {
-        "bignumber.js": "github:status-im/bignumber.js#cc066a0a3d6bfe0c436c9957f4ea8344bf963c89",
-        "crypto-js": "3.1.8",
-        "utf8": "2.1.2",
-        "xhr2": "0.1.4",
-        "xmlhttprequest": "1.8.0"
-      }
-    },
-    "xhr2": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.1.4.tgz",
-      "integrity": "sha1-f4dliEdxbbUCYyOBL4GMras4el8=",
-      "dev": true
-    },
-    "xmlhttprequest": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
-      "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=",
-      "dev": true
-    }
-  }
-}

_assets/static/package.json

@@ -1,23 +0,0 @@
-{
-  "name": "status-js",
-  "version": "0.0.1",
-  "description": "Package file for NPM packages required by make generate, to be included in Go static assets",
-  "engines": {
-    "node": ">=8.9.0"
-  },
-  "dependencies": {},
-  "devDependencies": {
-    "requirejs": "^2.3.4",
-    "web3": "https://github.com/status-im/web3.js#status-develop"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/status-im/status-go.git"
-  },
-  "author": "Pedro Pombeiro",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/status-im/status-go/issues"
-  },
-  "homepage": "https://github.com/status-im/status-go#readme"
-}

geth/jail/jail.go

@@ -8,8 +8,8 @@ import (
 	"sync"
 
 	"github.com/robertkrimen/otto"
+	web3js "github.com/status-im/go-web3js"
 	"github.com/status-im/status-go/geth/rpc"
-	"github.com/status-im/status-go/static"
 )
 
 const (
@@ -27,7 +27,6 @@ const (
 )
 
 var (
-	web3Code = string(static.MustAsset("scripts/web3.js"))
 	// ErrNoRPCClient is returned when an RPC client is required but it's nil.
 	ErrNoRPCClient = errors.New("RPC client is not available")
 )
@@ -130,7 +129,7 @@ func (j *Jail) initCell(cell *Cell) error {
 	// Run some initial JS code to provide some global objects.
 	c := []string{
 		j.baseJS,
-		web3Code,
+		string(web3js.Web3CODE),
 		web3InstanceCode,
 	}