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.

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

Add Tor configuration #47

Merged
merged 24 commits into from
Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
7ac0e92
feat(adamant): add Tor nodes
bludnic Oct 11, 2023
0dabac2
feat(adamant): add infoService URLs
bludnic Oct 11, 2023
0bb5d71
feat(adamant): add `explorer`, `explorerTx` and `explorerAddress` in …
bludnic Oct 11, 2023
4c9451e
feat(adamant): add `nodeMinVersion`
bludnic Oct 12, 2023
e58bdba
feat(adamant): add adamant website for Tor configuration
bludnic Oct 13, 2023
db747f7
refactor(adamant): add "services" and include infoService
bludnic Oct 13, 2023
199c55d
fix(adamant): remove infoService from "links"
bludnic Oct 13, 2023
af3f708
feat(OpenAPI): add "services" and Tor configuration
bludnic Oct 13, 2023
927cc65
feat(OpenAPI): describe Tor links
bludnic Oct 13, 2023
7a3be4d
docs(README.md): document "tor" and "services"
bludnic Oct 13, 2023
ccf6e38
Merge branch 'dev' into feat/tor-configuration
bludnic Oct 13, 2023
7288826
refactor(adamant): rename nodeMinVersion -> minNodeVersion
bludnic Oct 13, 2023
4458d85
docs(README.md): fix comments
bludnic Oct 14, 2023
7b81069
feat: add Tor nodes for BTC, DASH, DOGE, ETH and LSK
bludnic Oct 14, 2023
d7afa19
feat(lisk): add Lisk services
bludnic Oct 15, 2023
a8add47
refactor(lisk): rename `liskService` -> `lskService`
bludnic Oct 15, 2023
a302900
refactor(lisk, Tor): rename `liskService` -> `lskService`
bludnic Oct 16, 2023
9e9f329
feat(adamant): update `minNodeVersion` 0.5.2 -> 0.7.0
bludnic Oct 17, 2023
449b282
feat(adamant): set infoService port to 80
bludnic Oct 17, 2023
a0269af
feat(bitcoin): add nodes `alt_ip`
bludnic Oct 18, 2023
1144688
feat(bitcoin): add `btcnode1` in Tor config
bludnic Oct 18, 2023
4dfaa6e
feat(doge): add `dogenode2` in Tor config
bludnic Oct 18, 2023
08abc2d
feat(doge): add dogenode2 `alt_ip`
bludnic Oct 18, 2023
44a33f3
feat(ethereum): add `ethnode2` in Tor config
bludnic Oct 18, 2023
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
26 changes: 26 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ Coin/token info stored in `\general\${token_name}` folders. Specific blockchain
"blockTimeFixed": 5000, // Optional. Fixed block time in ms
"blockTimeAvg": 600000, // Optional. Average block time in ms

"minNodeVersion": "0.8.0", // Optional. Minimal node API version used by the project
bludnic marked this conversation as resolved.
Show resolved Hide resolved

// Optional. Node links for API
"nodes": [
{ "url": "https://node.example.com" },
Expand All @@ -79,6 +81,17 @@ Coin/token info stored in `\general\${token_name}` folders. Specific blockchain
}
],

// Optional. Services used by the project
bludnic marked this conversation as resolved.
Show resolved Hide resolved
"services": {
"infoService": [
{ "url": "https://info.example.com" },
{
"url": "https://second-service.example.com",
"alt_ip": "0.0.0.1:80" // Alternative way to connect if the domain of a service is censored
}
],
},

// Optional. Additional project links
"links": [
{
Expand All @@ -90,6 +103,19 @@ Coin/token info stored in `\general\${token_name}` folders. Specific blockchain
"url": "https://example.com/whitepaper.pdf"
}
]

// Optional. Tor configuration if the project uses Tor
bludnic marked this conversation as resolved.
Show resolved Hide resolved
// It follows the same structure as the root properties
// Currently supported props are described below:
"tor": {
"website": "http://abc.onion",
"explorer": "http://xyz.onion",
"explorerTx": "http://xyz.onion/tx/${ID}",
"explorerAddress": "http://xyz.onion/address/${ID}",
"nodes": [/*...*/],
"services": {/*...*/},
"links": [/*...*/]
}
}
```

Expand Down
41 changes: 40 additions & 1 deletion assets/general/adamant/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"oldPendingInterval": 4000,
"registeredInterval": 4000
},
"minNodeVersion": "0.5.2",
"nodes": [
{ "url": "https://clown.adamant.im" },
{ "url": "https://lake.adamant.im" },
Expand All @@ -43,6 +44,14 @@
{ "url": "https://node1.adamant.business" },
{ "url": "https://node2.blockchain2fa.io" }
],
"services": {
"infoService": [
{
"url": "https://info.adamant.im",
"alt_ip": "http://88.198.156.44"
}
]
},
"links": [
{
"name": "github",
Expand All @@ -56,5 +65,35 @@
"name": "whitepaper",
"url": "https://adamant.im/whitepaper/adamant-whitepaper-en.pdf"
}
]
],
"tor": {
"website": "http://adamantim24okpwfr4wxjgsh6vtw4odoiabhsfaqaktnfqzrjrspjuid.onion",
"explorer": "http://srovpmanmrbmbqe63vp5nycsa3j3g6be3bz46ksmo35u5pw7jjtjamid.onion",
"explorerTx": "http://srovpmanmrbmbqe63vp5nycsa3j3g6be3bz46ksmo35u5pw7jjtjamid.onion/tx/${ID}",
"explorerAddress": "http://srovpmanmrbmbqe63vp5nycsa3j3g6be3bz46ksmo35u5pw7jjtjamid.onion/address/${ID}",
"nodes": [
{
"url": "http://37g5to2z6bdoeegun4hms2hvkfbdxh4rcon4e3p267wtfkh4ji2ns6id.onion"
},
{
"url": "http://fqjcvsibnbwhlwxndzqzziapiwoidgn24avfiauu4wo2fc3yyiy2qcid.onion"
},
{
"url": "http://omhrhpc45njpgzp4fggtndazaodwuwvb5in6hsn3k7tvaqennmfaa2qd.onion"
},
{
"url": "http://uxu6vnnrrnl7tmo7i657yvs4jbgdz734xvufryoi326az5dzufuwboad.onion"
},
{
"url": "http://rukehjd2yalzgny7mdjqtzown2mazsaeh4zr7zjdg4l5afkgc3z2kgqd.onion"
}
],
"services": {
"infoService": [
{
"url": "http://czjsawp2crjmnkliw2h2kpk7wwd3a36zvvnvqgvzmi4t4vc2yzm7j2qd.onion"
}
]
}
}
}
114 changes: 92 additions & 22 deletions specification/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,45 @@
"paths": {},
"components": {
"schemas": {
"NodeInfo": {
"type": "object",
"required": ["url"],
"properties": {
"url": {
"type": "string"
},
"alt_ip": {
"type": "string"
},
"hasIndex": {
"type": "boolean"
}
}
},
"ProjectLink": {
"type": "object",
"required": ["name", "url"],
"properties": {
"name": {
"type": "string"
},
"url": {
"type": "string"
}
}
},
"Service": {
"type": "object",
"required": ["url"],
"properties": {
"url": {
"type": "string"
},
"alt_ip": {
"type": "string"
}
}
},
"TokenGeneral": {
"type": "object",
"required": [
Expand Down Expand Up @@ -156,40 +195,71 @@
"type": "integer",
"description": "Time in ms when difference between in-chat transfer and Tx timestamp considered as acceptable"
},
"minNodeVersion": {
"type": "string",
"description": "Minimal node API version",
"example": "0.8.0"
},
"nodes": {
"type": "array",
"items": {
"type": "object",
"required": ["url"],
"properties": {
"url": {
"type": "string"
},
"alt_ip": {
"type": "string"
},
"hasIndex": {
"type": "boolean"
}
}
"$ref": "#/components/schemas/NodeInfo"
},
"description": "Node links for API"
},
"services": {
"type": "object",
"additionalProperties": {
"$ref": "#/components/schemas/Service"
}
},
"links": {
"type": "array",
"items": {
"type": "object",
"required": ["name", "url"],
"properties": {
"name": {
"type": "string"
"$ref": "#/components/schemas/ProjectLink"
},
"description": "Additional project links"
},
"tor": {
"type": "object",
"properties": {
"website": {
"type": "string",
"description": "Project website URL (Tor)"
},
"explorer": {
"type": "string",
"description": "Explorer URL (Tor)"
},
"explorerTx": {
"type": "string",
"description": "URL to get tx info (Tor)"
},
"explorerAddress": {
"type": "string",
"description": "URL to get address info (Tor)"
},
"nodes": {
"type": "array",
"items": {
"$ref": "#/components/schemas/NodeInfo"
},
"url": {
"type": "string"
"description": "Node links for API (Tor)"
},
"services": {
"type": "object",
"additionalProperties": {
"$ref": "#/components/schemas/Service"
}
},
"links": {
"type": "array",
"items": {
"$ref": "#/components/schemas/ProjectLink"
},
"description": "Additional project links (Tor)"
}
},
"description": "Additional project links"
}
}
}
},
Expand Down