Skip to content

Commit

Permalink
Add coordinator: Satstralia
Browse files Browse the repository at this point in the history
  • Loading branch information
Reckless-Satoshi committed Nov 3, 2023
1 parent 5363bfb commit 47731b6
Show file tree
Hide file tree
Showing 7 changed files with 134 additions and 5 deletions.
46 changes: 45 additions & 1 deletion frontend/static/federation.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"Evidence in Disputes": "In the event of a dispute, users will be asked to provide transaction-related evidence. This could include transaction IDs, screenshots of payment confirmations, or other pertinent transaction records. Personal information or unrelated transaction details should be redacted to maintain privacy.",
"Short-term Storage": "Sensitive information related to disputes will be stored only for the duration necessary to resolve the issue. Once resolved, the data will be permanently deleted. For ease of use e-mail communications are permitted, but E2EE and decentralized platforms such as NOSTR, SIMPLEX and MATRIX are advised.",
"No Third-Party Sharing": "Under no circumstances will user information be shared with third parties.",
"Short-term storage": " Any log needed to operate the coordinator will be cleared after 7 days, unless strictly needed to process disputes. To ensure utmost privacy, the coordinator will be accessible only through TOR.",
"Short-term storage": "Any log needed to operate the coordinator will be cleared after 7 days, unless strictly needed to process disputes. To ensure utmost privacy, the coordinator will be accessible only through TOR.",
"Rule 1:": "Do not share personal information through the chat, unless strictly needed for completing the trade.",
"Rule 2:": "Keep stacking Sats and Enjoy your journey in the Temple of Sats!"
},
Expand All @@ -82,6 +82,50 @@
"mainnetNodesPubkeys": ["030a425f5c69a29db30f6740d4e7df8f5612ef9955078ef4497490015464733dc8"],
"testnetNodesPubkeys": ["028e7a019180a664b84edf77ba656e96f2eb84f67f56d93020341caf4109e0dbc7"]
},
"satstralia": {
"longAlias": "Satstralia",
"shortAlias": "satstralia",
"description": "I'm happy to be part of Robosats in so many ways!",
"motto": "btc = ɔʇq",
"color": "#329239",
"contact": {
"email": "[email protected]",
"telegram": "@satstralia",
"simplex": "https://simplex.chat/contact/#/?v=1-4&smp=smp%3A%2F%2FZKe4uxF4Z_aLJJOEsC-Y6hSkXgQS5-oc442JQGkyP8M%3D%40smp17.simplex.im%2Fq0pIyShcBl0EP8le0D0xy2OfSrP1mQWg%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAcwmsC9GQwQEt40UNpYp4vKPhU_UnWXsXcVl-OJ57lC4%253D%26srv%3Dogtwfxyi3h2h5weftjjpjmxclhb5ugufa5rcyrmg7j4xlch7qsr5nuqd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22vNcyZH9C3eE6MHzRNpR3xA%3D%3D%22%7D",
"matrix": "#satstralia:matrix.org",
"pgp": "TODO",
"nostr": "npub1z94lxjf7m5snda0qc6s3kmpy6r4nfw74h78da9j6j4y8ym08zrrs459wpr",
"website": "https://satstralia.com",
"fingerprint": "TODO"
},
"badges": {
"isFounder": true,
"donatesToDevFund": 33,
"hasGoodOpSec": true,
"robotsLove": false,
"hasLargeLimits": false
},
"policies": {
"Privacy Policy 1": "Evidence in Disputes: In the event of a dispute, users will be asked to provide transaction-related evidence. This could include transaction IDs, screenshots of payment confirmations, or other pertinent transaction records. Personal information or unrelated transaction details should be redacted to maintain privacy.",
"Privacy Policy 2": "Short-term Storage: Sensitive information related to disputes will be stored only for the duration necessary to resolve the issue. Once resolved, the data will be permanently deleted. For ease of use e-mail communications are permitted, but E2EE and decentralized platforms such as NOSTR, SIMPLEX and MATRIX are advised.",
"Data Policy 1": "No Third-Party Sharing: Under no circumstances will user information be shared with third parties.",
"Data Policy 2": "Short-term Storage: Any log needed to operate the coordinator will be cleared after 7 days, unless strictly needed to process disputes. To ensure utmost privacy, the coordinator will be accessible only through TOR.",
"Rule 1:": "Do not share personal information through the chat, unless strictly needed for completing the trade.",
"Rule 2:": "Any dispute can be fist address through our public chats in the different social networks but never will be started using private chats."
},
"mainnet": {
"onion": "http://_TEMPORARY_SILENCED_MAINNET_satstraoq35jffvkgpfoqld32nzw2siuvowanruindbfojowpwsjdgad.onion",
"clearnet": "https://_TEMPORARY_SILENCED_MAINNET_unsafe.satstralia.com",
"i2p": ""
},
"testnet": {
"onion": "https://qu6xztmzhlve6nxbb77jldek53pvhkaltz6seni7wq6g6yyj233qp4yd.onion",
"clearnet": "https://test.unsafe.satstralia.com",
"i2p": ""
},
"mainnetNodesPubkeys": ["029c5b14214ca7c1f5334db539dbab266088ba43a40563551efb9458756a94cd94"],
"testnetNodesPubkeys": ["03607900c00c5fcc3f9d32da4ad687c73d95df4faa065e5320e77b41c5d76ef381"]
},
"local": {
"longAlias": "Local Dev",
"shortAlias": "local",
Expand Down
Binary file added frontend/static/federation/satstralia.small.webp
Binary file not shown.
Binary file added frontend/static/federation/satstralia.webp
Binary file not shown.
59 changes: 59 additions & 0 deletions nodeapp/coordinators/satstralia/locations.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# Satstralia Mainnet Locations
location /mainnet/satstralia/static/assets/avatars/ {
proxy_pass http://mainnet_satstralia/static/assets/avatars/;
}

location /mainnet/satstralia/api/ {
# if ($request_method = 'OPTIONS') {
# add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
# add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
# add_header 'Access-Control-Max-Age' 1728000;
# add_header 'Content-Type' 'text/plain; charset=utf-8';
# add_header 'Content-Length' 0;
# return 204;
# }
# if ($request_method = 'POST') {
# add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
# add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
# add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
# }
# if ($request_method = 'GET') {
# add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
# add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
# add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
# }
proxy_pass http://mainnet_satstralia/api/;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
proxy_set_header Host $host;
}

location /mainnet/satstralia/ws/ {
proxy_pass http://mainnet_satstralia/ws/;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
proxy_set_header Host $host;
}

# Satstralia Coordinator Testnet Locations
location /test/satstralia/static/assets/avatars/ {
proxy_pass http://testnet_satstralia/static/assets/avatars/;
}

location /testnet/satstralia/api/ {
proxy_pass http://testnet_satstralia/api/;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
proxy_set_header Host $host;
}

location /testnet/satstralia/ws/ {
proxy_pass http://testnet_satstralia/ws/;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
proxy_set_header Host $host;
}
9 changes: 9 additions & 0 deletions nodeapp/coordinators/satstralia/upstreams.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Satstralia Coordinator Mainnet
upstream mainnet_satstralia {
server localhost:103;
}

# Satstralia Coordinator Testnet
upstream testnet_satstralia {
server localhost:1003;
}
6 changes: 5 additions & 1 deletion nodeapp/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ http {
# Coordinators in the federation:
# Experimental
include /etc/nginx/conf.d/exp/upstreams.conf;
# Temple of Sats Coordinator
# Temple of Sats
include /etc/nginx/conf.d/temple/upstreams.conf;
# Satstralia
include /etc/nginx/conf.d/satstralia/upstreams.conf;

server {

Expand Down Expand Up @@ -68,6 +70,8 @@ http {
include /etc/nginx/conf.d/exp/locations.conf;
# Temple of Sats
include /etc/nginx/conf.d/temple/locations.conf;
# Satstralia
include /etc/nginx/conf.d/satstralia/locations.conf;

# do not log healtchecks made against "/selfhosted"
location /selfhosted {
Expand Down
19 changes: 16 additions & 3 deletions nodeapp/robosats-client.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# Every robosat coordinators needs a tor socat bridge.

###############################
# Experimental Coordinator
# Experimental
# Mainnet
mainnet_exp_onion=robosats6tkf3eva7x2voqso3a5wcorsnw34jveyxfqi2fu7oyheasid.onion
mainnet_exp_port=101
Expand All @@ -21,7 +21,7 @@ mainnet_exp_socat="socat tcp4-LISTEN:${mainnet_exp_port},reuseaddr,fork,keepaliv
testnet_exp_socat="socat tcp4-LISTEN:${testnet_exp_port},reuseaddr,fork,keepalive,bind=127.0.0.1 SOCKS4A:${TOR_PROXY_IP:-127.0.0.1}:${testnet_exp_onion}:80,socksport=${TOR_PROXY_PORT:-9050}"

################################
# Temple of Sats Coordinator
# Temple of Sats
# Mainnet
mainnet_temple_onion=zixoneehmz7z2ctsnpuubcni4kxw5gp6fkyzjd2spo5atie5awiuwmyd.onion
mainnet_temple_port=102
Expand All @@ -33,5 +33,18 @@ mainnet_temple_socat="socat tcp4-LISTEN:${mainnet_temple_port},reuseaddr,fork,ke
testnet_temple_socat="socat tcp4-LISTEN:${testnet_temple_port},reuseaddr,fork,keepalive,bind=127.0.0.1 SOCKS4A:${TOR_PROXY_IP:-127.0.0.1}:${testnet_temple_onion}:80,socksport=${TOR_PROXY_PORT:-9050}"


################################
# Satstralia
# Mainnet
mainnet_satstralia_onion=satstraoq35jffvkgpfoqld32nzw2siuvowanruindbfojowpwsjdgad.onion
mainnet_satstralia_port=103
# Testnet
testnet_satstralia_onion=qu6xztmzhlve6nxbb77jldek53pvhkaltz6seni7wq6g6yyj233qp4yd.onion
testnet_satstralia_port=1003
# socat cmd
mainnet_satstralia_socat="socat tcp4-LISTEN:${mainnet_satstralia_port},reuseaddr,fork,keepalive,bind=127.0.0.1 SOCKS4A:${TOR_PROXY_IP:-127.0.0.1}:${mainnet_satstralia_onion}:80,socksport=${TOR_PROXY_PORT:-9050}"
testnet_satstralia_socat="socat tcp4-LISTEN:${testnet_satstralia_port},reuseaddr,fork,keepalive,bind=127.0.0.1 SOCKS4A:${TOR_PROXY_IP:-127.0.0.1}:${testnet_satstralia_onion}:80,socksport=${TOR_PROXY_PORT:-9050}"


# RUN!
$mainnet_exp_socat & $testnet_exp_socat & $mainnet_temple_socat & $testnet_temple_socat & nginx
$mainnet_exp_socat & $testnet_exp_socat & $mainnet_temple_socat & $testnet_temple_socat & $mainnet_satstralia_socat & $testnet_satstralia_socat& nginx

0 comments on commit 47731b6

Please sign in to comment.