-
Notifications
You must be signed in to change notification settings - Fork 45
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'mainnet' into feature/rename-visor
# Conflicts: # cmd/hypervisor/hypervisor.postman_collection.json # integration/generic/nodeA.json # integration/generic/nodeC.json # integration/intermediary-nodeB.json # integration/messaging/nodeA.json # integration/messaging/nodeC.json # integration/proxy/nodeA.json # integration/proxy/nodeC.json # integration/ssh/nodeA.json # integration/ssh/nodeC.json
- Loading branch information
Showing
12 changed files
with
1,284 additions
and
1,262 deletions.
There are no files selected for viewing
1,572 changes: 786 additions & 786 deletions
1,572
cmd/hypervisor/hypervisor.postman_collection.json
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| { | ||
| "public_key": "024ec47420176680816e0406250e7156465e4531f5b26057c9f6297bb0303558c7", | ||
| "secret_key": "42bca4df2f3189b28872d40e6c61aacd5e85b8e91f8fea65780af27c142419e5", | ||
| "messaging": { | ||
| "discovery": "http://skywire.skycoin.net:8001", | ||
| "server_count": 1 | ||
| }, | ||
| "transport_discovery": "http://skywire.skycoin.net:8003", | ||
| "log_level": "info" | ||
| "public_key": "024ec47420176680816e0406250e7156465e4531f5b26057c9f6297bb0303558c7", | ||
| "secret_key": "42bca4df2f3189b28872d40e6c61aacd5e85b8e91f8fea65780af27c142419e5", | ||
| "messaging": { | ||
| "discovery": "http://skywire.skycoin.net:8001", | ||
| "server_count": 1 | ||
| }, | ||
| "transport_discovery": "http://skywire.skycoin.net:8003", | ||
| "log_level": "info" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,44 @@ | ||
| { | ||
| "version": "1.0", | ||
| "node": { | ||
| "static_public_key": "024ec47420176680816e0406250e7156465e4531f5b26057c9f6297bb0303558c7", | ||
| "static_secret_key": "42bca4df2f3189b28872d40e6c61aacd5e85b8e91f8fea65780af27c142419e5" | ||
| }, | ||
| "messaging": { | ||
| "server": false, | ||
| "public": true, | ||
| "discovery": "http://skywire.skycoin.net:8001", | ||
| "delegated_servers": [ | ||
| "03a714db33a696a1202de568485234d5035935040bd85a87925568e3ddd100f1e3", | ||
| "02709cebf98a35431407068ee0740233224795315e3b218054431da80d9c827f07", | ||
| "03cf6b2ab045aa96d39a58cc087177d1d94944f61a131ec4a69327d5007a8e9953" | ||
| ], | ||
| "server_count": 5 | ||
| }, | ||
| "apps": [ | ||
| { | ||
| "app": "skychat", | ||
| "version": "1.0", | ||
| "auto_start": true, | ||
| "ports": [1] | ||
| }, | ||
| { | ||
| "app": "SSH-server", | ||
| "auto_start": true, | ||
| "ports": [2] | ||
| } | ||
| "version": "1.0", | ||
| "node": { | ||
| "static_public_key": "024ec47420176680816e0406250e7156465e4531f5b26057c9f6297bb0303558c7", | ||
| "static_secret_key": "42bca4df2f3189b28872d40e6c61aacd5e85b8e91f8fea65780af27c142419e5" | ||
| }, | ||
| "messaging": { | ||
| "server": false, | ||
| "public": true, | ||
| "discovery": "http://skywire.skycoin.net:8001", | ||
| "delegated_servers": [ | ||
| "03a714db33a696a1202de568485234d5035935040bd85a87925568e3ddd100f1e3", | ||
| "02709cebf98a35431407068ee0740233224795315e3b218054431da80d9c827f07", | ||
| "03cf6b2ab045aa96d39a58cc087177d1d94944f61a131ec4a69327d5007a8e9953" | ||
| ], | ||
| "messaging_path": "./messaging", | ||
| "apps_path": "./apps", | ||
| "local_path": "./local", | ||
| "interfaces": { | ||
| "messaging": ":3434", | ||
| "http": ":80", | ||
| "https": false, | ||
| "rpc": ":3435" | ||
| "server_count": 5 | ||
| }, | ||
| "apps": [ | ||
| { | ||
| "app": "skychat", | ||
| "version": "1.0", | ||
| "auto_start": true, | ||
| "ports": [ | ||
| 1 | ||
| ] | ||
| }, | ||
| { | ||
| "app": "SSH-server", | ||
| "auto_start": true, | ||
| "ports": [ | ||
| 2 | ||
| ] | ||
| } | ||
| ], | ||
| "messaging_path": "./messaging", | ||
| "apps_path": "./apps", | ||
| "local_path": "./local", | ||
| "interfaces": { | ||
| "messaging": ":3434", | ||
| "http": ":80", | ||
| "https": false, | ||
| "rpc": ":3435" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,59 +1,59 @@ | ||
| { | ||
| "version": "1.0", | ||
| "node": { | ||
| "static_public_key": "02072dd1e2ccd761e717096e1a264de1d8917e78e3176ca99dbf7ccf7292969845", | ||
| "static_secret_key": "7073e557aa2308b448525397ea2f45d56c9962c4dcdf82c5fdb5cc02fca0481c" | ||
| }, | ||
| "messaging": { | ||
| "discovery": "https://messaging.discovery.skywire.skycoin.net", | ||
| "server_count": 1 | ||
| }, | ||
| "transport": { | ||
| "discovery": "https://transport.discovery.skywire.skycoin.net", | ||
| "log_store": { | ||
| "type": "file", | ||
| "location": "./local/nodeA/transport_logs" | ||
| } | ||
| "version": "1.0", | ||
| "node": { | ||
| "static_public_key": "02072dd1e2ccd761e717096e1a264de1d8917e78e3176ca99dbf7ccf7292969845", | ||
| "static_secret_key": "7073e557aa2308b448525397ea2f45d56c9962c4dcdf82c5fdb5cc02fca0481c" | ||
| }, | ||
| "messaging": { | ||
| "discovery": "https://messaging.discovery.skywire.skycoin.net", | ||
| "server_count": 1 | ||
| }, | ||
| "transport": { | ||
| "discovery": "https://transport.discovery.skywire.skycoin.net", | ||
| "log_store": { | ||
| "type": "file", | ||
| "location": "./local/nodeA/transport_logs" | ||
| } | ||
| }, | ||
| "routing": { | ||
| "setup_nodes": [ | ||
| "0324579f003e6b4048bae2def4365e634d8e0e3054a20fc7af49daf2a179658557" | ||
| ], | ||
| "route_finder": "https://routefinder.skywire.skycoin.net/", | ||
| "table": { | ||
| "type": "boltdb", | ||
| "location": "./local/nodeA/routing.db" | ||
| } | ||
| }, | ||
| "apps": [ | ||
| { | ||
| "app": "skychat", | ||
| "version": "1.0", | ||
| "auto_start": true, | ||
| "port": 1, | ||
| "args": [] | ||
| }, | ||
| "routing": { | ||
| "setup_nodes": [ | ||
| "0324579f003e6b4048bae2def4365e634d8e0e3054a20fc7af49daf2a179658557" | ||
| ], | ||
| "route_finder": "https://routefinder.skywire.skycoin.net/", | ||
| "table": { | ||
| "type": "boltdb", | ||
| "location": "./local/nodeA/routing.db" | ||
| } | ||
| { | ||
| "app": "SSH", | ||
| "version": "1.0", | ||
| "auto_start": true, | ||
| "port": 2, | ||
| "args": [] | ||
| }, | ||
| "apps": [ | ||
| { | ||
| "app": "skychat", | ||
| "version": "1.0", | ||
| "auto_start": true, | ||
| "port": 1, | ||
| "args": [] | ||
| }, | ||
| { | ||
| "app": "SSH", | ||
| "version": "1.0", | ||
| "auto_start": true, | ||
| "port": 2, | ||
| "args": [] | ||
| }, | ||
| { | ||
| "app": "socksproxy", | ||
| "version": "1.0", | ||
| "auto_start": true, | ||
| "port": 3, | ||
| "args": [] | ||
| } | ||
| ], | ||
| "trusted_nodes": [], | ||
| "hypervisors": [], | ||
| "apps_path": "./apps", | ||
| "local_path": "./local/nodeA", | ||
| "log_level": "info", | ||
| "interfaces": { | ||
| "rpc": "localhost:3436" | ||
| { | ||
| "app": "socksproxy", | ||
| "version": "1.0", | ||
| "auto_start": true, | ||
| "port": 3, | ||
| "args": [] | ||
| } | ||
| ], | ||
| "trusted_nodes": [], | ||
| "hypervisors": [], | ||
| "apps_path": "./apps", | ||
| "local_path": "./local/nodeA", | ||
| "log_level": "info", | ||
| "interfaces": { | ||
| "rpc": "localhost:3436" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,59 +1,65 @@ | ||
| { | ||
| "version": "1.0", | ||
| "node": { | ||
| "static_public_key": "02c9ddf5c2ae6a5a2166028dafbc814eff3ec2352f429fb0aa37d96e1aa668f332", | ||
| "static_secret_key": "5ab3744ab56e4d0b82f9a915e07b8f05d51ec0f16ff8496bd92f4e378ca6c1fc" | ||
| }, | ||
| "messaging": { | ||
| "discovery": "https://messaging.discovery.skywire.skycoin.net", | ||
| "server_count": 1 | ||
| }, | ||
| "transport": { | ||
| "discovery": "https://transport.discovery.skywire.skycoin.net", | ||
| "log_store": { | ||
| "type": "file", | ||
| "location": "./local/nodeC/transport_logs" | ||
| } | ||
| }, | ||
| "routing": { | ||
| "setup_nodes": [ | ||
| "0324579f003e6b4048bae2def4365e634d8e0e3054a20fc7af49daf2a179658557" | ||
| ], | ||
| "route_finder": "https://routefinder.skywire.skycoin.net/", | ||
| "table": { | ||
| "type": "boltdb", | ||
| "location": "./local/nodeC/routing.db" | ||
| } | ||
| }, | ||
| "apps": [ | ||
| { | ||
| "app": "skychat", | ||
| "version": "1.0", | ||
| "auto_start": true, | ||
| "port": 1, | ||
| "args": ["-addr", ":8001"] | ||
| }, | ||
| { | ||
| "app": "SSH-client", | ||
| "version": "1.0", | ||
| "auto_start": true, | ||
| "port": 12, | ||
| "args": [] | ||
| }, | ||
| { | ||
| "app": "socksproxy-client", | ||
| "version": "1.0", | ||
| "auto_start": true, | ||
| "port": 13, | ||
| "args": ["-srv", "024ec47420176680816e0406250e7156465e4531f5b26057c9f6297bb0303558c7"] | ||
| } | ||
| ], | ||
| "trusted_nodes": [], | ||
| "hypervisors": [], | ||
| "apps_path": "./apps", | ||
| "local_path": "./local/nodeC", | ||
| "log_level": "info", | ||
| "interfaces": { | ||
| "rpc": "localhost:3438" | ||
| } | ||
| "version": "1.0", | ||
| "node": { | ||
| "static_public_key": "02c9ddf5c2ae6a5a2166028dafbc814eff3ec2352f429fb0aa37d96e1aa668f332", | ||
| "static_secret_key": "5ab3744ab56e4d0b82f9a915e07b8f05d51ec0f16ff8496bd92f4e378ca6c1fc" | ||
| }, | ||
| "messaging": { | ||
| "discovery": "https://messaging.discovery.skywire.skycoin.net", | ||
| "server_count": 1 | ||
| }, | ||
| "transport": { | ||
| "discovery": "https://transport.discovery.skywire.skycoin.net", | ||
| "log_store": { | ||
| "type": "file", | ||
| "location": "./local/nodeC/transport_logs" | ||
| } | ||
| }, | ||
| "routing": { | ||
| "setup_nodes": [ | ||
| "0324579f003e6b4048bae2def4365e634d8e0e3054a20fc7af49daf2a179658557" | ||
| ], | ||
| "route_finder": "https://routefinder.skywire.skycoin.net/", | ||
| "table": { | ||
| "type": "boltdb", | ||
| "location": "./local/nodeC/routing.db" | ||
| } | ||
| }, | ||
| "apps": [ | ||
| { | ||
| "app": "skychat", | ||
| "version": "1.0", | ||
| "auto_start": true, | ||
| "port": 1, | ||
| "args": [ | ||
| "-addr", | ||
| ":8001" | ||
| ] | ||
| }, | ||
| { | ||
| "app": "SSH-client", | ||
| "version": "1.0", | ||
| "auto_start": true, | ||
| "port": 12, | ||
| "args": [] | ||
| }, | ||
| { | ||
| "app": "socksproxy-client", | ||
| "version": "1.0", | ||
| "auto_start": true, | ||
| "port": 13, | ||
| "args": [ | ||
| "-srv", | ||
| "024ec47420176680816e0406250e7156465e4531f5b26057c9f6297bb0303558c7" | ||
| ] | ||
| } | ||
| ], | ||
| "trusted_nodes": [], | ||
| "hypervisors": [], | ||
| "apps_path": "./apps", | ||
| "local_path": "./local/nodeC", | ||
| "log_level": "info", | ||
| "interfaces": { | ||
| "rpc": "localhost:3438" | ||
| } | ||
| } |
Oops, something went wrong.