diff --git a/geth/api/api_test.go b/geth/api/api_test.go index d64f15976..7ed753336 100644 --- a/geth/api/api_test.go +++ b/geth/api/api_test.go @@ -40,16 +40,12 @@ func (s *APITestSuite) TestCHTUpdate() { require.NoError(err) defer os.RemoveAll(tmpDir) - url := "https://gist.githubusercontent.com/tiabc/83ed515fbb0c0e9d39700a6279072b6a/raw/a8c7b08488fab3c1d9139b18af33da3df823e3ff/cht.json?u=" + strconv.Itoa(int(time.Now().Unix())) configJSON := `{ "NetworkId": ` + strconv.Itoa(params.RopstenNetworkID) + `, "DataDir": "` + tmpDir + `", "LogEnabled": true, "LogLevel": "INFO", - "RPCEnabled": true, - "LightEthConfig": { - "CHTRootConfigURL": "` + url + `" - } + "RPCEnabled": true }` //nodeConfig, err := params.LoadNodeConfig(configJSON) _, err = params.LoadNodeConfig(configJSON) diff --git a/geth/params/config.go b/geth/params/config.go index d414c1940..4c082eeaf 100644 --- a/geth/params/config.go +++ b/geth/params/config.go @@ -7,16 +7,14 @@ import ( "errors" "fmt" "io/ioutil" - "net/http" "os" "path/filepath" - "strconv" "strings" - "time" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" "github.com/status-im/status-go/geth/log" + "github.com/status-im/status-go/static" ) // default node configuration options @@ -561,17 +559,15 @@ func (c *NodeConfig) updateBootClusterConfig() error { Dev subClusterConfig `json:"dev"` } - client := &http.Client{Timeout: 5 * time.Second} - r, err := client.Get(BootClusterConfigURL + "?u=" + strconv.Itoa(int(time.Now().Unix()))) + chtFile, err := static.Asset("config/cht.json") if err != nil { - return err + return fmt.Errorf("cht.json could not be loaded: %s", err) } - defer r.Body.Close() var clusters []clusterConfig - err = json.NewDecoder(r.Body).Decode(&clusters) + err = json.Unmarshal(chtFile, &clusters) if err != nil { - return err + return fmt.Errorf("failed to unmarshal cht.json: %s", err) } for _, cluster := range clusters { diff --git a/geth/params/defaults.go b/geth/params/defaults.go index 85b9e31da..1ecc1a982 100644 --- a/geth/params/defaults.go +++ b/geth/params/defaults.go @@ -51,14 +51,6 @@ const ( // DatabaseCache is memory (in MBs) allocated to internal caching (min 16MB / database forced) DatabaseCache = 16 - // CHTRootConfigURL defines URL to file containing hard-coded CHT roots - // TODO remove this hack, once CHT sync is implemented on LES side - CHTRootConfigURL = "https://gist.githubusercontent.com/tiabc/83ed515fbb0c0e9d39700a6279072b6a/raw/a8c7b08488fab3c1d9139b18af33da3df823e3ff/cht.json" - - // BootClusterConfigURL defines URL to file containing hard-coded CHT roots and boot nodes - // TODO remove this hack, once CHT sync is implemented on LES side - BootClusterConfigURL = "https://gist.githubusercontent.com/tiabc/83ed515fbb0c0e9d39700a6279072b6a/raw/a8c7b08488fab3c1d9139b18af33da3df823e3ff/cht.json" - // LogFile defines where to write logs to LogFile = "geth.log" diff --git a/package.json b/package.json index a59333d94..12db8abac 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,7 @@ "version": "0.9.6", "description": "JavaScript tests for RPC API (Whisper/5, Swarm)", "main": "index.js", - "dependencies": { - }, + "dependencies": {}, "devDependencies": { "chai": "^3.5.0", "mocha": "^3.3.0", diff --git a/static/bindata.go b/static/bindata.go index c020f2ab2..307f34665 100644 --- a/static/bindata.go +++ b/static/bindata.go @@ -2,6 +2,7 @@ // sources: // scripts/README.md // scripts/web3.js +// config/cht.json // config/linter_exclude_list.txt // config/test-data.json // keys/firebaseauthkey @@ -98,7 +99,7 @@ func scriptsReadmeMd() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "scripts/README.md", size: 133, mode: os.FileMode(420), modTime: time.Unix(1498222808, 0)} + info := bindataFileInfo{name: "scripts/README.md", size: 133, mode: os.FileMode(420), modTime: time.Unix(1500971474, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -118,7 +119,27 @@ func scriptsWeb3Js() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "scripts/web3.js", size: 496165, mode: os.FileMode(420), modTime: time.Unix(1501859373, 0)} + info := bindataFileInfo{name: "scripts/web3.js", size: 496165, mode: os.FileMode(420), modTime: time.Unix(1503587751, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil +} + +var _configChtJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x98\xc9\x8e\x66\xc7\x71\x85\xf7\x7c\x8a\x42\xaf\xe5\x52\xcc\x43\xaf\xb4\xf0\xc2\x7e\x06\x41\x8b\x8c\x21\x2d\x41\x30\x69\x90\xf2\x04\xc3\xef\x6e\xdc\x76\x17\x49\x40\xea\x12\x6d\x18\xf0\xa6\x57\x55\xc8\xaa\xff\xcf\x73\x33\x4f\x9c\xf8\xe2\xfe\xf6\x9b\x97\x97\xff\xf8\xe6\xe5\xe5\xe5\xe5\xc3\xb7\xfb\xa7\x7f\xfd\xee\xfb\x3f\xfe\xfd\xdf\x7e\xf8\xf8\xc2\xbf\xfa\xef\xb5\x7f\xd8\x6f\xf7\x87\x3f\xfc\xf0\x77\xe7\x87\xdf\x7f\xf8\xf8\xf2\x01\xfe\x4d\x30\x05\x81\xd8\x02\x92\x78\xe1\xae\x8c\xcb\x61\xa9\x39\x1d\x28\x78\x49\x05\x96\xcf\x26\x18\xb1\x63\xac\xf8\x98\x0d\xf6\x91\x43\xf3\xe1\xf3\x17\xff\xd3\xf7\xdf\xcd\x87\x8f\x9f\xb7\x7e\x36\xff\xe7\x7f\xac\xfd\xfe\xc3\xc7\x17\xd2\xfc\xd5\xdb\xe2\xef\x3f\x6f\x9b\x18\xa4\xf7\xde\xed\x52\xf3\x40\x73\x72\x4e\xd5\xd9\x33\x53\x17\xb8\xc9\xce\x82\x50\x78\xdf\x39\x86\x02\xdc\x50\x67\xb4\xf7\x54\xbc\x6d\xfa\xf2\xf2\xa1\xbe\xfb\xee\x4f\xdf\x7e\x37\xfb\xc3\x87\x8f\x2f\xbf\xfd\xbc\xf8\xf2\xf2\x61\x9f\xb5\x8f\xbf\xfe\xb5\x9f\xa2\x8c\xde\x69\xc1\xd0\x13\x29\x43\x38\x71\xc4\x50\xc9\x68\xdb\x6a\x7a\xcd\x3a\xcb\x3c\x38\x3c\x48\x63\x61\xb4\x18\x01\x79\x18\x3a\x81\x23\x99\x84\xe9\x3a\xac\x16\x95\x1d\xed\x61\xe2\xba\x41\xa0\x2a\xb7\x8b\xe8\x56\x7b\x89\xb2\x79\x44\x2a\xd1\x66\x8b\xe4\x6f\x14\x5f\x51\x5f\x8d\x5f\x93\x3f\x32\x30\xf0\x8f\xd2\x7f\xa6\xf2\x6a\x6e\x38\xe0\xc5\x68\xcf\xd6\xae\x76\xc3\x98\xf6\xaa\xa4\x18\x91\x69\xba\x2a\xa0\xed\x63\xc9\x73\x26\x7d\x0e\x4d\x68\x68\xba\xa6\x3c\x4f\x72\x87\x6d\xf8\xae\x41\xd4\x9d\x76\x72\x38\x2c\x47\x66\x00\x2e\x47\xdf\x4d\x2b\xaa\x73\x48\xae\xf7\xc0\x69\x8a\xe1\xa0\x83\x9f\x55\x7a\xbe\x46\x7c\x59\xe5\xd2\x61\x0d\x2f\x2f\xc1\xd3\xb7\x25\x77\x66\x4f\x12\x25\x05\x26\xe8\x90\xd2\xde\x3a\x50\xe7\xaa\x69\x5f\x23\xb7\xb9\xe8\xf7\x5c\x90\x00\x2c\x0f\xcf\xdd\x33\xae\x3e\x27\x4a\x6b\x91\x0b\xf4\x92\xae\xbb\x9e\xb2\x09\xf5\x7b\xc9\xa4\x5a\xf9\x44\x36\x90\x1f\x53\x9f\x41\xf8\xac\x52\xf4\x15\x51\xde\x39\xcc\xcd\x44\x57\x6a\xf9\xe4\x95\x4a\x30\x88\x5b\x17\x6d\x22\x8f\x5e\x1f\x9b\xc7\x7e\x26\x3e\x92\x81\x6a\xb9\xd5\xdb\x8b\x45\xc2\x45\x00\x20\x04\x47\xa7\x9c\x70\x09\x85\x18\xdb\x8f\xcd\x61\x15\xbe\x27\x08\x31\xb4\x1d\xac\x6b\xb2\xb2\xd6\x14\x25\x65\x3b\xfd\xaa\x9d\xb7\x2b\xf7\x57\xc4\xfc\xb2\x4c\x09\x92\x90\x4a\xcc\x50\x86\x5d\x5a\x80\xa9\x48\x7f\x6a\x83\x49\xa4\x8f\xe0\xf4\xb0\x13\x09\x2d\x2d\x52\xfa\x0c\xd8\xb5\x89\x19\x56\x37\xe0\x34\x68\x3d\x93\xdd\x31\x8d\x7a\x7b\x2e\xac\xec\xf3\x6f\xe5\x67\x7c\x4a\x13\xd6\xfc\x40\xa9\x5c\xcf\x68\x32\x0d\xdc\x1a\x7f\xbb\x73\x7d\x45\x7e\xe7\xd2\x73\x33\x17\x83\x4b\xdb\x71\x14\x67\x0b\x6d\xad\x84\x4e\x67\x93\xb5\x6b\xdf\xce\xa7\x98\x73\xee\xd9\xa0\xa8\x70\x2c\x96\x60\x95\xae\xed\x8b\x69\x73\xaf\xcc\x08\xab\x79\x91\x75\x90\x60\x51\xa5\x67\x97\xec\xc9\x1b\x73\x96\x26\xcf\xe9\x1b\x66\x92\x73\xee\x62\x1e\xce\xf3\x93\x35\xd1\xed\xcb\x32\x91\x46\xa9\xd9\xd3\x1c\xe0\x96\x9e\xbe\x97\xda\xe7\xd9\xda\xab\xca\xc6\x11\x9e\x1a\xbf\x2c\x42\xbb\x3c\x99\xa7\xb1\x31\x1d\xd0\x7a\xa6\xa4\x59\x2d\xaa\xb6\x0e\xe8\x70\xa2\x68\x6b\x76\x26\xf4\x98\x5c\xb7\xea\x2c\x80\x91\x42\xbe\x08\x90\xda\x92\x0a\x3e\x23\x7d\x7f\x56\xe7\x88\xf0\x65\x99\x70\xbd\x4d\xc9\xfd\x26\xda\xbd\xc2\x9e\x77\x95\xa0\xc2\x15\x82\x8e\xda\x6a\xf8\x16\xf7\x62\xa3\x9a\x4f\xde\x9b\x42\x60\x35\x05\x5a\x07\xcd\x5b\x89\x9c\x2e\xc1\x35\x96\x9e\xe7\x32\xb7\x75\x72\xee\x16\x27\x03\x3e\xd5\xbf\xa8\xa9\x13\x6b\x72\x1c\xbd\xa3\xc4\x2c\xe9\x7e\x96\xa9\xf2\x8a\xfa\x8e\xcc\x05\xb0\x0b\x45\xd3\x19\xeb\xea\x62\x51\xe6\xe8\x4c\xa9\x8a\xb9\x59\x36\x7a\xaf\x84\x90\x3b\x9d\x2e\x8c\x3b\xa0\xda\x46\xe0\xf4\x64\x2e\xfb\x93\xa9\x5a\xb1\x8b\x00\xf1\xc4\xc4\xc6\x5e\xc3\x0d\x2e\x54\xd4\x99\xe2\x5b\x6a\x53\xb7\x72\xea\xe2\x15\x63\x55\x3a\xde\x79\x7f\x43\x48\xaf\xe2\xaf\xc4\xfe\x8a\xe4\x5f\x16\x3a\x02\xe1\x78\x9b\x17\xb1\xc8\x24\x1d\x20\x3d\x16\xec\xf4\x58\x1c\x92\x73\x55\xd6\x80\x47\x98\xf9\x9e\xed\x72\x48\xb2\x3e\x3e\x37\xb9\xce\x81\xf2\xba\xb2\x49\x7e\xfb\x4c\x1e\x6f\x6c\xf0\x9b\xc5\xa4\x4f\xac\xdb\xa0\x33\xac\x53\x30\xca\x3c\xd5\x65\x4a\xbc\xda\x5b\x4d\x9f\xcf\x13\x99\x5e\x89\xf5\x9d\x03\x3d\xec\x9d\x4e\xe2\x46\xb5\x7e\xcd\x62\x51\x87\xa7\x53\x55\x8d\x94\xf2\x94\x5c\xc0\x1a\x4f\xc5\x0b\xc5\x8d\x69\x50\xae\xdb\x75\x44\x37\x9a\xab\xb8\x63\x6b\xed\xb8\x82\x4c\x1e\x81\x79\x6c\xac\x46\x85\x6c\xf4\xa4\xc0\xea\x22\xa1\xb2\x28\xba\xe9\xcd\x83\x74\x0c\xe7\x37\xf8\x38\xd3\xe9\x15\x23\x5f\x09\xde\x51\x1a\xd1\x54\x24\x42\x79\xec\xba\x05\xdf\xba\x03\x16\x2e\x67\xf9\xe2\x7e\xf2\xd2\xd1\x7b\x2b\xc4\xd6\xbd\xfd\xb1\x25\xd0\x92\x0a\x7b\xe4\x98\xdd\x06\xa6\x32\x03\x3b\x31\x11\x11\x5b\x46\x9c\x87\x4e\xad\x46\x7a\x6f\xf0\xf5\x98\x9e\xbe\x5d\x40\x3e\xb6\xc7\xf2\x1c\xbb\x9b\x3f\x29\x55\x7f\x35\xfc\xb2\xd0\x5e\x0b\x95\xa6\x76\x3f\x11\x00\xb7\x1b\xc9\x00\x08\xac\x59\xa4\x02\x94\xab\x12\x76\xb9\x0e\x05\xac\xb5\x5c\x8c\xcb\x28\xd8\xd3\xba\x1b\x50\xdd\x5c\x53\x24\x5d\x0d\xfb\x29\xa6\x46\x8a\x63\xbc\xd4\x55\x6c\x47\x29\x1a\xe0\x5c\xeb\x31\x90\x53\xa6\x2d\xcf\xe2\xb5\x9f\x09\xe5\x57\xa4\x77\x1a\x12\xc0\x59\x03\x77\x9c\xa7\xdb\xcc\xa9\xf3\x84\xb7\x8d\x18\x9f\xa0\xe3\xc5\x06\xc5\x27\x60\x59\x4f\xd1\xc2\x9c\x43\x5a\xd3\xd6\xc7\x08\xf9\x5e\xe9\x60\x09\x78\xba\xe4\xe2\x49\x88\x13\x57\x43\x10\x0f\x9b\xdc\x05\x3a\x70\x8b\x9b\xce\x61\x02\x08\x06\xb9\x60\x3c\x71\xce\xc5\x43\x3f\x29\x65\x7a\x8d\xf7\xee\xde\xb6\x3a\x84\xcf\x51\x34\xcb\x85\x58\x72\x01\x58\x61\xbd\xa9\x4f\x67\x5a\xce\x69\x15\x28\x20\x3c\x74\x99\x12\x4f\xb9\x5b\x47\x54\xcd\xe1\x49\x37\x46\xe3\x24\xcc\x7a\xfc\xb1\xfc\xf4\x75\x4f\x11\x22\x6a\x71\x47\xae\xd9\xa7\xb8\xb0\x48\xdd\xb3\xd7\x85\x0f\xe7\x38\xfc\x58\xf6\x9f\xf2\xe9\x4d\xe8\x67\x9d\xbf\xfb\xf4\xf3\x3f\x3f\xd3\xe6\xec\xbf\x7c\x85\xcd\xaf\xb0\xf9\x15\x36\xbf\xc2\xe6\x57\xd8\xfc\x0a\x9b\x5f\x61\xf3\x2b\x6c\x7e\x85\xcd\xaf\xb0\xf9\x7f\x0c\x9b\xdf\x7c\x06\xce\xbf\xf0\x3e\x55\xbe\xf4\x3e\xd5\x58\xf0\x0e\xcf\xb9\x29\xe5\x12\xed\xd4\x3b\x7a\xb4\xc8\x80\xe2\x92\xb8\x5c\xbd\x00\x13\x24\x0a\xb2\x72\x0f\xfb\x71\x75\xf3\x45\xf7\xbf\xfa\x3e\xd5\xec\xcf\x08\xf7\xfb\x3f\x7c\xfb\xc7\xad\x7f\xff\x9b\x4f\x9f\xf9\xa5\xb4\x7a\xe7\xf0\x03\x4d\x7c\xe0\xd2\x1c\x39\xad\xa1\x31\x78\x95\x56\xcf\x3d\x37\x67\x2f\x05\x22\x61\x2d\x0f\xbb\x6a\xb4\xf9\xc8\x64\x1f\xb2\xb6\x33\x7e\xe0\xe9\x27\xd4\xe3\xa2\x82\x04\xb7\xdc\x61\xc3\xe6\x01\x06\x09\xef\x4c\x92\x22\x34\x5b\x53\x09\xbd\x06\xb6\x6a\x63\x70\xfb\xad\x8b\xe5\x2b\xca\x3b\x86\xae\x23\x78\x4e\x3c\xd8\xe7\x07\x4e\x82\xdb\x64\xdd\xbb\x93\xde\xd1\x4b\x2b\x89\x95\x19\xce\x14\xd1\xb9\x11\x76\xd1\xee\xa8\x2b\x3f\xd1\x6c\x6d\x4f\xf2\xcb\xad\x1b\x28\x57\x4f\x3e\x76\xda\x06\x90\x7b\x4f\x36\x9c\x0d\x53\xb8\x49\x77\x10\x1a\x69\xb7\xbc\xd9\x44\x93\xb7\xf8\xe7\x32\xdf\x69\x0e\x14\xdb\x57\xc9\xa9\xd4\xa0\xcf\x93\xab\xd2\xe3\x17\xb7\xa2\xc6\x68\x8e\x86\x72\x01\x59\xc9\xa3\x86\xa9\xa5\x00\xfd\xc1\xb8\x02\x44\x09\xcc\x03\x09\xe7\x69\x71\xe3\x97\xc9\x42\xd9\x74\x7b\x62\x01\x44\x01\x5c\xee\x01\x73\x06\xce\xb3\x77\x11\x2e\xdf\x32\xb3\x7d\x7e\x79\x43\x17\x7b\x25\xc9\xff\xcd\xe4\xf4\x8e\xad\x9e\x8f\xfc\xe2\x19\x48\x91\x3a\xae\xad\xdf\x3b\xdd\x4e\xdc\xd7\x7d\x0d\xe8\xe0\x6c\x4e\x74\xd3\xc6\x19\xd6\x29\x86\x14\x7b\x1e\x1c\xe9\xb1\x90\x73\xa8\x23\xe3\xd9\xe5\x84\xbb\xcd\xfc\x8c\x50\x85\x3c\xc7\x19\x9e\xb0\xa0\x2a\x92\xd8\x1d\x13\xe0\x5c\x0e\x84\x45\xb5\x4d\xcf\xa2\x10\xef\x7a\x3b\x87\x78\x25\x79\x67\x08\xc2\x6e\xf2\xa3\x47\x10\x19\x8e\xf6\x43\xee\x53\x4f\x0f\x76\x9e\xa6\xb8\x5e\x6a\x97\x77\x6e\xc3\x74\xab\x97\x99\x8e\x28\x92\x4b\x91\xa9\xe0\xc6\xac\xe4\x1e\x3f\xe0\xf2\x69\x24\xb1\x13\x44\x90\x95\x4f\x63\xe0\xec\x0c\x44\xe3\xb2\x7b\x43\x9b\x81\xe3\xc4\x52\xb5\x4e\x54\xbc\xb9\x2a\xde\x1d\xd5\x3c\x63\xd0\xc1\x04\x05\x2b\x6e\xc4\x5c\xc7\x00\x8a\x13\x8f\xd3\x52\x78\xb0\x2b\xd6\xd2\x8a\xe7\x94\x9a\x62\xb6\x43\xb9\x17\x0e\x8b\x65\xa9\x95\x5d\xe9\x65\x8f\x10\x75\x13\x0b\x88\xab\xed\x94\xb9\x89\x68\x46\x76\x89\x02\x2f\x43\xa5\xa6\x92\x57\x5a\x1e\xc7\x95\xfb\x13\xb6\xd3\x8f\x25\xfa\x8b\x13\x12\xbf\x94\x90\x23\xab\xe6\x02\x37\xdc\xce\xde\x68\x40\xa8\xb0\x87\x30\xf4\x3e\x7f\xd1\x83\x18\x03\xcf\x89\xb2\xac\xe5\xd9\x8e\x86\xa9\xe7\x59\xef\xe1\xbf\x9a\x90\x01\xfa\x67\x5e\x0e\x5d\xa1\xb0\xbb\x70\x3e\x55\x10\x90\x3c\x4c\x3d\x1b\xe2\x96\xee\xe7\xce\x59\xd8\x52\x65\xa8\x87\x99\x8d\x8e\x52\x21\x31\xf2\x28\xdc\x5f\x1e\xab\x5c\xb0\x3a\xfd\x6c\x93\x46\x75\xf6\x49\x1d\x16\xa0\xe7\x06\x0f\xa5\x99\x48\x33\x6f\x8c\x9f\xd4\x1a\x3c\xc5\xc8\x28\x7c\x9e\x39\xd2\x1d\xdc\x0e\x70\x75\xb9\x91\xb1\x3a\x5c\xba\x2c\x23\x5b\xca\x70\x71\xce\x55\x50\x69\xc8\x84\x24\x3c\xe1\xf4\x9c\x52\x29\xe8\xf4\xce\x8f\x77\xf6\x70\xc2\x3b\x13\xe1\xed\x85\xc1\xfe\x34\x4e\x53\x16\x6c\x77\xaf\x88\xdc\x48\xe1\x1b\x01\xe1\xbd\x00\x47\x37\x11\x0a\xd5\xd3\x69\x17\x4d\xe3\xa4\xc4\x10\xb7\x1f\x10\xbb\x64\x6a\x7e\x9d\x8b\x0a\x63\x90\x2c\x10\x15\x72\x7c\x2f\xce\x6a\x6d\x16\xce\x3e\xec\x55\x28\xce\x71\x34\xe1\xe9\xcc\x3f\x9b\x08\xe3\x9d\x58\xe5\x92\xca\x7b\x80\xce\xc6\x3c\x04\x36\xa5\x78\xcc\xa5\x3a\x79\x42\x4d\xb2\xc4\x5d\x2f\x91\x00\xdc\x07\x1c\x49\x37\x2f\xb6\x99\xd6\x39\x5c\x3d\xc3\xdc\x67\x86\x1a\x4f\x72\x0f\xc4\xb1\x73\x33\xa4\xcb\x40\x6f\x95\xe1\x36\x8c\x2b\x1c\xc4\x91\x78\x30\x1f\x28\xe3\x5c\x80\xb7\x3a\x75\x7f\xc5\x1f\x0b\xf5\x7f\x14\xab\xff\xaf\x5e\x4c\x0e\xe6\xda\xc0\xe6\xc1\x87\x3d\xcf\x6a\xcf\x92\x46\xc7\x0d\x3a\x83\x80\x78\xb0\xf6\xc4\x96\x3c\xd3\x21\x14\x9c\xcb\x29\x23\xd7\xaf\xaf\x68\xfa\x33\x48\x87\x83\x2a\x5d\x36\x17\xd9\x3b\xce\x64\x49\xc7\x24\x4c\x07\x37\xca\x04\x51\xf6\xdc\xc8\x83\x75\x06\x0e\x26\xf0\x79\x9b\x58\x4c\x5e\xdf\xb3\xe2\xf8\x03\xd7\xd5\x2a\x28\x52\x44\x96\xad\x8c\xcf\xd0\x07\x70\x9f\xaf\x92\xbd\xbb\x74\x2b\x86\x71\xbd\x30\x39\xf7\xde\x79\x70\xe9\x3e\x58\xc7\x37\xa6\xfd\xce\x89\x96\x2d\xb1\x14\x05\xcf\x9c\xe3\x97\xb3\x64\xd9\x64\xe9\x90\xc7\x24\x96\xb2\x3e\x58\x59\xf5\xd8\x9a\xd3\x58\x7f\xaa\x18\x7e\xc7\x89\xea\xe1\x42\xa0\xc9\x38\x37\xdd\xc0\x73\xe5\xde\xd8\x7a\xf0\xdd\xc4\x10\x18\x6e\x3d\x26\x64\x09\xab\xd1\x6d\x39\x6b\x3b\x56\x27\x1f\xb8\x1d\xc8\xab\xb1\x9a\x35\xa1\x14\x38\x24\x10\x72\x0c\x8c\xaa\xe3\x94\xa2\x4c\xf5\x9c\x93\xe6\x71\x9b\x01\x70\xc4\xdd\x69\x8d\x6c\x7f\x96\xc5\xf8\x97\x9d\xf8\x64\xf1\x37\xbf\xfb\xaf\x00\x00\x00\xff\xff\x44\x7c\xec\x2c\x00\x20\x00\x00") + +func configChtJsonBytes() ([]byte, error) { + return bindataRead( + _configChtJson, + "config/cht.json", + ) +} + +func configChtJson() (*asset, error) { + bytes, err := configChtJsonBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "config/cht.json", size: 8192, mode: os.FileMode(420), modTime: time.Unix(1503586129, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -138,7 +159,7 @@ func configLinter_exclude_listTxt() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "config/linter_exclude_list.txt", size: 2258, mode: os.FileMode(420), modTime: time.Unix(1498222808, 0)} + info := bindataFileInfo{name: "config/linter_exclude_list.txt", size: 2258, mode: os.FileMode(420), modTime: time.Unix(1500971474, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -158,7 +179,7 @@ func configTestDataJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "config/test-data.json", size: 301, mode: os.FileMode(420), modTime: time.Unix(1501859367, 0)} + info := bindataFileInfo{name: "config/test-data.json", size: 301, mode: os.FileMode(420), modTime: time.Unix(1502102342, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -178,7 +199,7 @@ func keysFirebaseauthkey() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "keys/firebaseauthkey", size: 153, mode: os.FileMode(420), modTime: time.Unix(1498222808, 0)} + info := bindataFileInfo{name: "keys/firebaseauthkey", size: 153, mode: os.FileMode(420), modTime: time.Unix(1500971474, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -198,7 +219,7 @@ func keysTestAccount1Pk() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "keys/test-account1.pk", size: 637, mode: os.FileMode(420), modTime: time.Unix(1498222808, 0)} + info := bindataFileInfo{name: "keys/test-account1.pk", size: 637, mode: os.FileMode(420), modTime: time.Unix(1500971474, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -218,7 +239,7 @@ func keysTestAccount2Pk() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "keys/test-account2.pk", size: 1073, mode: os.FileMode(420), modTime: time.Unix(1498222808, 0)} + info := bindataFileInfo{name: "keys/test-account2.pk", size: 1073, mode: os.FileMode(420), modTime: time.Unix(1500971474, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -238,7 +259,7 @@ func keysWnodekey() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "keys/wnodekey", size: 65, mode: os.FileMode(420), modTime: time.Unix(1498222808, 0)} + info := bindataFileInfo{name: "keys/wnodekey", size: 65, mode: os.FileMode(420), modTime: time.Unix(1500971474, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -258,7 +279,7 @@ func keysWnodepassword() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "keys/wnodepassword", size: 9, mode: os.FileMode(420), modTime: time.Unix(1498222808, 0)} + info := bindataFileInfo{name: "keys/wnodepassword", size: 9, mode: os.FileMode(420), modTime: time.Unix(1500971474, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -278,7 +299,7 @@ func testdataJailCommandsJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "testdata/jail/commands.js", size: 7677, mode: os.FileMode(420), modTime: time.Unix(1500264813, 0)} + info := bindataFileInfo{name: "testdata/jail/commands.js", size: 7677, mode: os.FileMode(420), modTime: time.Unix(1500971474, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -298,7 +319,7 @@ func testdataJailStatusJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "testdata/jail/status.js", size: 3402, mode: os.FileMode(420), modTime: time.Unix(1500264813, 0)} + info := bindataFileInfo{name: "testdata/jail/status.js", size: 3402, mode: os.FileMode(420), modTime: time.Unix(1500971474, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -318,7 +339,7 @@ func testdataJailTxSendContextNoMessageIdJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "testdata/jail/tx-send/context-no-message-id.js", size: 1793, mode: os.FileMode(420), modTime: time.Unix(1500821837, 0)} + info := bindataFileInfo{name: "testdata/jail/tx-send/context-no-message-id.js", size: 1793, mode: os.FileMode(420), modTime: time.Unix(1500971474, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -338,7 +359,7 @@ func testdataJailTxSendMessageIdNoContextJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "testdata/jail/tx-send/message-id-no-context.js", size: 1875, mode: os.FileMode(420), modTime: time.Unix(1500264813, 0)} + info := bindataFileInfo{name: "testdata/jail/tx-send/message-id-no-context.js", size: 1875, mode: os.FileMode(420), modTime: time.Unix(1500971474, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -358,7 +379,7 @@ func testdataJailTxSendNoMessageIdOrContextJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "testdata/jail/tx-send/no-message-id-or-context.js", size: 1354, mode: os.FileMode(420), modTime: time.Unix(1500264813, 0)} + info := bindataFileInfo{name: "testdata/jail/tx-send/no-message-id-or-context.js", size: 1354, mode: os.FileMode(420), modTime: time.Unix(1500971474, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -378,7 +399,7 @@ func testdataJailTxSendTxSendJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "testdata/jail/tx-send/tx-send.js", size: 2987, mode: os.FileMode(420), modTime: time.Unix(1500264813, 0)} + info := bindataFileInfo{name: "testdata/jail/tx-send/tx-send.js", size: 2987, mode: os.FileMode(420), modTime: time.Unix(1500971474, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -398,7 +419,7 @@ func testdataNodeTestSol() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "testdata/node/test.sol", size: 119, mode: os.FileMode(420), modTime: time.Unix(1500264813, 0)} + info := bindataFileInfo{name: "testdata/node/test.sol", size: 119, mode: os.FileMode(420), modTime: time.Unix(1500971474, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -457,6 +478,7 @@ func AssetNames() []string { var _bindata = map[string]func() (*asset, error){ "scripts/README.md": scriptsReadmeMd, "scripts/web3.js": scriptsWeb3Js, + "config/cht.json": configChtJson, "config/linter_exclude_list.txt": configLinter_exclude_listTxt, "config/test-data.json": configTestDataJson, "keys/firebaseauthkey": keysFirebaseauthkey, @@ -514,6 +536,7 @@ type bintree struct { } var _bintree = &bintree{nil, map[string]*bintree{ "config": &bintree{nil, map[string]*bintree{ + "cht.json": &bintree{configChtJson, map[string]*bintree{}}, "linter_exclude_list.txt": &bintree{configLinter_exclude_listTxt, map[string]*bintree{}}, "test-data.json": &bintree{configTestDataJson, map[string]*bintree{}}, }}, diff --git a/static/config/cht.json b/static/config/cht.json new file mode 100644 index 000000000..baf1c4b75 --- /dev/null +++ b/static/config/cht.json @@ -0,0 +1,92 @@ +[ + { + "networkID": 3, + "genesisHash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d", + "prod": { + "number": 259, + "hash": "91825fffecb5678167273955deaddbf03c26ae04287cfda61403c0bad5ceab8d", + "bootnodes": [ + "enode://7ab298cedc4185a894d21d8a4615262ec6bdce66c9b6783878258e0d5b31013d30c9038932432f70e5b2b6a5cd323bf820554fcb22fbc7b45367889522e9c449@51.15.63.93:30303", + "enode://f59e8701f18c79c5cbc7618dc7bb928d44dc2f5405c7d693dad97da2d8585975942ec6fd36d3fe608bfdc7270a34a4dd00f38cfe96b2baa24f7cd0ac28d382a1@51.15.79.88:30303", + "enode://e2a3587b7b41acfc49eddea9229281905d252efba0baf565cf6276df17faf04801b7879eead757da8b5be13b05f25e775ab6d857ff264bc53a89c027a657dd10@51.15.45.114:30303", + "enode://fe991752c4ceab8b90608fbf16d89a5f7d6d1825647d4981569ebcece1b243b2000420a5db721e214231c7a6da3543fa821185c706cbd9b9be651494ec97f56a@51.15.67.119:30303", + "enode://482484b9198530ee2e00db89791823244ca41dcd372242e2e1297dd06f6d8dd357603960c5ad9cc8dc15fcdf0e4edd06b7ad7db590e67a0b54f798c26581ebd7@51.15.75.138:30303", + "enode://9e99e183b5c71d51deb16e6b42ac9c26c75cfc95fff9dfae828b871b348354cbecf196dff4dd43567b26c8241b2b979cb4ea9f8dae2d9aacf86649dafe19a39a@51.15.79.176:30303", + "enode://12d52c3796700fb5acff2c7d96df7bbb6d7109b67f3442ee3d99ac1c197016cddb4c3568bbeba05d39145c59c990cd64f76bc9b00d4b13f10095c49507dd4cf9@51.15.63.110:30303", + "enode://0f7c65277f916ff4379fe520b875082a56e587eb3ce1c1567d9ff94206bdb05ba167c52272f20f634cd1ebdec5d9dfeb393018bfde1595d8e64a717c8b46692f@51.15.54.150:30303", + "enode://e006f0b2dc98e757468b67173295519e9b6d5ff4842772acb18fd055c620727ab23766c95b8ee1008dea9e8ef61e83b1515ddb3fb56dbfb9dbf1f463552a7c9f@212.47.237.127:30303", + "enode://d40871fc3e11b2649700978e06acd68a24af54e603d4333faecb70926ca7df93baa0b7bf4e927fcad9a7c1c07f9b325b22f6d1730e728314d0e4e6523e5cebc2@51.15.132.235:30303", + "enode://ea37c9724762be7f668e15d3dc955562529ab4f01bd7951f0b3c1960b75ecba45e8c3bb3c8ebe6a7504d9a40dd99a562b13629cc8e5e12153451765f9a12a61d@163.172.189.205:30303", + "enode://88c2b24429a6f7683fbfd06874ae3f1e7c8b4a5ffb846e77c705ba02e2543789d66fc032b6606a8d8888eb6239a2abe5897ce83f78dcdcfcb027d6ea69aa6fe9@163.172.157.61:30303", + "enode://ce6854c2c77a8800fcc12600206c344b8053bb90ee3ba280e6c4f18f3141cdc5ee80bcc3bdb24cbc0e96dffd4b38d7b57546ed528c00af6cd604ab65c4d528f6@163.172.153.124:30303", + "enode://00ae60771d9815daba35766d463a82a7b360b3a80e35ab2e0daa25bdc6ca6213ff4c8348025e7e1a908a8f58411a364fe02a0fb3c2aa32008304f063d8aaf1a2@163.172.132.85:30303", + "enode://86ebc843aa51669e08e27400e435f957918e39dc540b021a2f3291ab776c88bbda3d97631639219b6e77e375ab7944222c47713bdeb3251b25779ce743a39d70@212.47.254.155:30303" + ] + }, + "dev": { + "number": 259, + "hash": "91825fffecb5678167273955deaddbf03c26ae04287cfda61403c0bad5ceab8d", + "bootnodes": [ + "enode://7ab298cedc4185a894d21d8a4615262ec6bdce66c9b6783878258e0d5b31013d30c9038932432f70e5b2b6a5cd323bf820554fcb22fbc7b45367889522e9c449@51.15.63.93:30303", + "enode://f59e8701f18c79c5cbc7618dc7bb928d44dc2f5405c7d693dad97da2d8585975942ec6fd36d3fe608bfdc7270a34a4dd00f38cfe96b2baa24f7cd0ac28d382a1@51.15.79.88:30303", + "enode://e2a3587b7b41acfc49eddea9229281905d252efba0baf565cf6276df17faf04801b7879eead757da8b5be13b05f25e775ab6d857ff264bc53a89c027a657dd10@51.15.45.114:30303", + "enode://fe991752c4ceab8b90608fbf16d89a5f7d6d1825647d4981569ebcece1b243b2000420a5db721e214231c7a6da3543fa821185c706cbd9b9be651494ec97f56a@51.15.67.119:30303", + "enode://482484b9198530ee2e00db89791823244ca41dcd372242e2e1297dd06f6d8dd357603960c5ad9cc8dc15fcdf0e4edd06b7ad7db590e67a0b54f798c26581ebd7@51.15.75.138:30303", + "enode://9e99e183b5c71d51deb16e6b42ac9c26c75cfc95fff9dfae828b871b348354cbecf196dff4dd43567b26c8241b2b979cb4ea9f8dae2d9aacf86649dafe19a39a@51.15.79.176:30303", + "enode://12d52c3796700fb5acff2c7d96df7bbb6d7109b67f3442ee3d99ac1c197016cddb4c3568bbeba05d39145c59c990cd64f76bc9b00d4b13f10095c49507dd4cf9@51.15.63.110:30303", + "enode://0f7c65277f916ff4379fe520b875082a56e587eb3ce1c1567d9ff94206bdb05ba167c52272f20f634cd1ebdec5d9dfeb393018bfde1595d8e64a717c8b46692f@51.15.54.150:30303", + "enode://e006f0b2dc98e757468b67173295519e9b6d5ff4842772acb18fd055c620727ab23766c95b8ee1008dea9e8ef61e83b1515ddb3fb56dbfb9dbf1f463552a7c9f@212.47.237.127:30303", + "enode://d40871fc3e11b2649700978e06acd68a24af54e603d4333faecb70926ca7df93baa0b7bf4e927fcad9a7c1c07f9b325b22f6d1730e728314d0e4e6523e5cebc2@51.15.132.235:30303", + "enode://ea37c9724762be7f668e15d3dc955562529ab4f01bd7951f0b3c1960b75ecba45e8c3bb3c8ebe6a7504d9a40dd99a562b13629cc8e5e12153451765f9a12a61d@163.172.189.205:30303", + "enode://88c2b24429a6f7683fbfd06874ae3f1e7c8b4a5ffb846e77c705ba02e2543789d66fc032b6606a8d8888eb6239a2abe5897ce83f78dcdcfcb027d6ea69aa6fe9@163.172.157.61:30303", + "enode://ce6854c2c77a8800fcc12600206c344b8053bb90ee3ba280e6c4f18f3141cdc5ee80bcc3bdb24cbc0e96dffd4b38d7b57546ed528c00af6cd604ab65c4d528f6@163.172.153.124:30303", + "enode://00ae60771d9815daba35766d463a82a7b360b3a80e35ab2e0daa25bdc6ca6213ff4c8348025e7e1a908a8f58411a364fe02a0fb3c2aa32008304f063d8aaf1a2@163.172.132.85:30303", + "enode://86ebc843aa51669e08e27400e435f957918e39dc540b021a2f3291ab776c88bbda3d97631639219b6e77e375ab7944222c47713bdeb3251b25779ce743a39d70@212.47.254.155:30303" + ] + } + }, + { + "networkID": 4, + "genesisHash": "0x6341fd3daf94b748c72ced5a5b26028f2474f5f00d824504e4fa37a75767e177", + "prod": { + "number": 66, + "hash": "rinkeby-prod", + "bootnodes": [ + "enode://fda3f6273a0f2da4ac5858d1f52e5afaf9def281121be3d37558c67d4d9ca26c6ad7a0520b2cd7454120fb770e86d5760487c9924b2166e65485f606e56d60fc@51.15.69.144:30303", + "enode://ba41aa829287a0a9076d9bffed97c8ce2e491b99873288c9e886f16fd575306ac6c656db4fbf814f5a9021aec004ffa9c0ae8650f92fd10c12eeb7c364593eb3@51.15.69.147:30303", + "enode://28ecf5272b560ca951f4cd7f1eb8bd62da5853b026b46db432c4b01797f5b0114819a090a72acd7f32685365ecd8e00450074fa0673039aefe10f3fb666e0f3f@51.15.76.249:30303" + ] + }, + "dev": { + "number": 66, + "hash": "rinkeby-dev", + "bootnodes": [ + "enode://7512c8f6e7ffdcc723cf77e602a1de9d8cc2e8ad35db309464819122cd773857131aee390fec33894db13da730c8432bb248eed64039e3810e156e979b2847cb@51.15.78.243:30303", + "enode://1cc27a5a41130a5c8b90db5b2273dc28f7b56f3edfc0dcc57b665d451274b26541e8de49ea7a074281906a82209b9600239c981163b6ff85c3038a8e2bc5d8b8@51.15.68.93:30303", + "enode://798d17064141b8f88df718028a8272b943d1cb8e696b3dab56519c70b77b1d3469b56b6f4ce3788457646808f5c7299e9116626f2281f30b959527b969a71e4f@51.15.75.244:30303" + ] + } + }, + { + "networkID": 1, + "genesisHash": "0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3", + "prod": { + "number": 805, + "hash": "85e4286fe0a730390245c49de8476977afdae0eb5530b277f62a52b12313d50f", + "bootnodes": [ + "enode://f3b0e5dca730962bae814f3402b8f8a296644c33e8d7a95bd1ab313143a752c77076a03bcb76263570f2f34d4eb530f1daf5054c0990921a872a34eb505dcedf@51.15.73.129:30303", + "enode://fce0d1c2292829b0eccce444f8943f88087ce00a5e910b157972ee1658a948d23c7a046f26567f73b2b18d126811509d7ef1de5be9b1decfcbb14738a590c477@51.15.75.187:30303", + "enode://3b4b9fa02ae8d54c2db51a674bc93d85649b4775f22400f74ae25e9f1c665baa3bcdd33cadd2c1a93cd08a6af984cb605fbb61ec0d750a11d48d4080298af008@51.15.77.193:30303" + ] + }, + "dev": { + "number": 805, + "hash": "85e4286fe0a730390245c49de8476977afdae0eb5530b277f62a52b12313d50f", + "bootnodes": [ + "enode://93833be81c3d1bdb2ae5cde258c8f82ad1011a1bea8eb49fe50b0af394d4f7f7e45974356870552f36744efd732692a64865d1e8b64114eaf89a1bad0a1903a2@51.15.64.29:30303", + "enode://d76854bc54144b2269c5316d5f00f0a194efee2fb8d31e7b1939effd7e17f25773f8dc7fda8c4eb469450799da7f39b4e364e2a278d91b53539dcbb10b139635@51.15.73.37:30303", + "enode://57874205931df976079e4ff8ebb5756461030fb00f73486bd5ec4ae6ed6ba98e27d09f58e59bd85281d24084a6062bc8ab514dbcdaa9678fc3001d47772e626e@51.15.75.213:30303" + ] + } + } +] \ No newline at end of file