Skip to content

Commit 6e46cfb

Browse files
committed
docs: some updates, config: update testnet and stagenet prefixes
1 parent e10df7e commit 6e46cfb

File tree

5 files changed

+31
-90
lines changed

5 files changed

+31
-90
lines changed

README.md

Lines changed: 19 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
# Scala
22

3-
Copyright (c) 2014-2023, The Monero Project
4-
53
Copyright (c) 2021-2023, Haku Labs MTÜ
64

5+
Copyright (c) 2014-2023, The Monero Project
6+
77
Portions Copyright (c) 2012-2013 The Cryptonote developers.
88

99
[<img src="https://scalaproject.io/img/card.jpg">](https://scalaproject.io)
1010

11-
1211
Scala is a privacy-focused cryptocurrency project linking distributed technologies to build a globally scalable and mobile-friendly ecosystem. We provide an opaque blockchain, untraceable payments, unlinkable transactions, and blockchain-analysis resistance.
1312

1413
Our vision is to distribute wealth for everyone and every device. We want to be the people’s coin. To achieve this goal, we focus on implementing solutions that are mobile-friendly and energy-efficient. There are about 4 billion mobile devices in the world, and we want to make sure that our ecosystem takes that into account. We also take a lot of time to improve the user experience so that our applications can be used easily by anyone.
@@ -21,10 +20,8 @@ Obviously, our goal is also to bring useful utilities and to solve real-world pr
2120
- [Table of Contents](#table-of-contents)
2221
- [Development resources](#development-resources)
2322
- [Vulnerability response](#vulnerability-response)
24-
- [Research](#research)
2523
- [Announcements](#announcements)
2624
- [Translations](#translations)
27-
- [Coverage](#coverage)
2825
- [Introduction](#introduction)
2926
- [About this project](#about-this-project)
3027
- [Supporting the project](#supporting-the-project)
@@ -68,42 +65,23 @@ Obviously, our goal is also to bring useful utilities and to solve real-world pr
6865
## Development resources
6966

7067
- Web: [scalaproject.io](https://scalaproject.io)
71-
- Mail: [dev@getscala.org](mailto:hello@scalaproject.io)
72-
- GitHub: [https://github.com/scala-network/scala](https://github.com/scala-network/scala)
68+
- Mail: [hello@scalaproject.io](mailto:hello@scalaproject.io)
69+
- GitHub: [https://github.com/scala-network/](https://github.com/scala-network/)
7370

7471
## Vulnerability response
7572

76-
- Our [Vulnerability Response Process](https://github.com/scala-project/meta/blob/master/VULNERABILITY_RESPONSE_PROCESS.md) encourages responsible disclosure
77-
- We are also available via [HackerOne](https://hackerone.com/scala)
78-
79-
## Research
80-
81-
The [scala Research Lab](https://src.getscala.org/resources/research-lab/) is an open forum where the community coordinates research into scala cryptography, protocols, fungibility, analysis, and more. We welcome collaboration and contributions from outside researchers! Because not all Lab work and publications are distributed as traditional preprints or articles, they may be easy to miss if you are conducting literature reviews for your own scala research. You are encouraged to get in touch with the scala research community if you have questions, wish to collaborate, or would like guidance to help avoid unnecessarily duplicating earlier or known work.
82-
83-
The scala research community is available on IRC in [#scala-research-lab on Libera](https://web.libera.chat/#scala-research-lab), which is also accessible via Matrix.
73+
Please contact us privately at [hello@scalaproject.io](mailto:hello@scalaproject.io) to report security issues.
8474

8575
## Announcements
8676

87-
- You can subscribe to an [announcement listserv](https://lists.getscala.org) to get critical announcements from the scala core team. The announcement list can be very helpful for knowing when software updates are needed.
88-
89-
## Translations
90-
The CLI wallet is available in different languages. If you want to help translate it, see our self-hosted localization platform, Weblate, on [translate.getscala.org]( https://translate.getscala.org/projects/scala/cli-wallet/). Every translation *must* be uploaded on the platform, pull requests directly editing the code in this repository will be closed. If you need help with Weblate, you can find a guide with screenshots [here](https://github.com/scala-ecosystem/scala-translations/blob/master/weblate.md).
91-
&nbsp;
77+
All critical announcements regarding the Scala project will be made on the following outlets:
9278

93-
If you need help/support/info about translations, contact the localization workgroup. You can find the complete list of contacts on the repository of the workgroup: [scala-translations](https://github.com/scala-ecosystem/scala-translations#contacts).
94-
95-
## Coverage
96-
97-
| Type | Status |
98-
|-----------|--------|
99-
| Coverity | [![Coverity Status](https://scan.coverity.com/projects/9657/badge.svg)](https://scan.coverity.com/projects/9657/)
100-
| OSS Fuzz | [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/scala.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:scala)
101-
| Coveralls | [![Coveralls Status](https://coveralls.io/repos/github/scala-project/scala/badge.svg?branch=master)](https://coveralls.io/github/scala-project/scala?branch=master)
102-
| License | [![License](https://img.shields.io/badge/license-BSD3-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
79+
- [Scala Discord](https://chat.scalaproject.io)
80+
- [Scala Telegram](https://t.me/scalaofficial)
10381

10482
## Introduction
10583

106-
scala is a private, secure, untraceable, decentralised digital currency. You are your bank, you control your funds, and nobody can trace your transfers unless you allow them to do so.
84+
Scala is a private, secure, untraceable, decentralised digital currency. You are your bank, you control your funds, and nobody can trace your transfers unless you allow them to do so.
10785

10886
**Privacy:** scala uses a cryptographically sound system to allow you to send and receive funds without your transactions being easily revealed on the blockchain (the ledger of transactions that everyone has). This ensures that your purchases, receipts, and all transfers remain private by default.
10987

@@ -123,27 +101,11 @@ As with many development projects, the repository on GitHub is considered to be
123101

124102
## Supporting the project
125103

126-
scala is a 100% community-sponsored endeavor. If you want to join our efforts, the easiest thing you can do is support the project financially. Both scala and Bitcoin donations can be made to **donate.getscala.org** if using a client that supports the [OpenAlias](https://openalias.org) standard. Alternatively, you can send XMR to the scala donation address via the `donate` command (type `help` in the command-line wallet for details).
127-
128-
The scala donation address is:
129-
`888tNkZrPN6JsEgekjMnABU4TBzc2Dt29EPAvkRxbANsAnjyPbb3iQ1YBRk1UXcdRsiKc9dhwMVgN5S9cQUiyoogDavup3H`
130-
Viewkey:
131-
`f359631075708155cc3d92a32b75a7d02a5dcf27756707b47a2b31b21c389501`
132-
Base address for restoring with address and viewkey:
133-
`44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft3XjrpDtQGv7SqSsaBYBb98uNbr2VBBEt7f2wfn3RVGQBEP3A`
134-
135-
The Bitcoin donation address is:
136-
`1KTexdemPdxSBcG55heUuTjDRYqbC5ZL8H`
104+
For information on how scala funds its development, please read [this](https://wiki.scalaproject.io/general/funding) on our wiki.
137105

138-
Core development funding and/or some supporting services are also graciously provided by [sponsors](https://www.getscala.org/community/sponsorships/):
106+
Core development funding and/or some supporting services are also graciously provided by sponsors:
139107

140-
[<img width="150" src="https://www.getscala.org/img/sponsors/tarilabs.png"/>](https://tarilabs.com/)
141-
[<img width="150" src="https://www.getscala.org/img/sponsors/globee.png"/>](https://globee.com/)
142-
[<img width="150" src="https://www.getscala.org/img/sponsors/symas.png"/>](https://symas.com/)
143-
[<img width="150" src="https://www.getscala.org/img/sponsors/forked_logo.png"/>](http://www.forked.net/)
144-
[<img width="150" src="https://www.getscala.org/img/sponsors/macstadium.png"/>](https://www.macstadium.com/)
145-
146-
There are also several mining pools that kindly donate a portion of their fees, [a list of them can be found on our Bitcointalk post](https://bitcointalk.org/index.php?topic=583449.0).
108+
[<img width="150" src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png"/>](https://www.jetbrains.com/)
147109

148110
## License
149111

@@ -157,27 +119,13 @@ If you want to help out, see [CONTRIBUTING](docs/CONTRIBUTING.md) for a set of g
157119

158120
scala uses a scheduled software/network upgrade (hard fork) mechanism to implement new features into the scala software and network. This means that users of scala (end users and service providers) should run current versions and upgrade their software when new releases are available. Software upgrades occur when new features are developed and implemented in the codebase. Network upgrades occur in tandem with software upgrades that modify the consensus rules of the scala network. The required software for network upgrades will be available prior to the scheduled network upgrade date. Please check the repository prior to this date for the proper scala software version. Below is the historical schedule and the projected schedule for the next upgrade.
159121

160-
Dates are provided in the format YYYY-MM-DD. The "Minimum" is the software version that follows the new consensus rules. The "Recommended" version may include bug fixes and other new features that do not affect the consensus rules.
161-
162-
163-
| Software upgrade block height | Date | Fork version | Minimum scala version | Recommended scala version | Details |
164-
| ------------------------------ | -----------| ----------------- | ---------------------- | -------------------------- | ---------------------------------------------------------------------------------- |
165-
| 1009827 | 2016-03-22 | v2 | v0.9.4 | v0.9.4 | Allow only >= ringsize 3, blocktime = 120 seconds, fee-free blocksize 60 kb |
166-
| 1141317 | 2016-09-21 | v3 | v0.9.4 | v0.10.0 | Splits coinbase into denominations |
167-
| 1220516 | 2017-01-05 | v4 | v0.10.1 | v0.10.2.1 | Allow normal and RingCT transactions |
168-
| 1288616 | 2017-04-15 | v5 | v0.10.3.0 | v0.10.3.1 | Adjusted minimum blocksize and fee algorithm |
169-
| 1400000 | 2017-09-16 | v6 | v0.11.0.0 | v0.11.0.0 | Allow only RingCT transactions, allow only >= ringsize 5 |
170-
| 1546000 | 2018-04-06 | v7 | v0.12.0.0 | v0.12.3.0 | Cryptonight variant 1, ringsize >= 7, sorted inputs
171-
| 1685555 | 2018-10-18 | v8 | v0.13.0.0 | v0.13.0.4 | max transaction size at half the penalty free block size, bulletproofs enabled, cryptonight variant 2, fixed ringsize [11](https://youtu.be/KOO5S4vxi0o)
172-
| 1686275 | 2018-10-19 | v9 | v0.13.0.0 | v0.13.0.4 | bulletproofs required
173-
| 1788000 | 2019-03-09 | v10 | v0.14.0.0 | v0.14.1.2 | New PoW based on Cryptonight-R, new block weight algorithm, slightly more efficient RingCT format
174-
| 1788720 | 2019-03-10 | v11 | v0.14.0.0 | v0.14.1.2 | forbid old RingCT transaction format
175-
| 1978433 | 2019-11-30 | v12 | v0.15.0.0 | v0.16.0.0 | New PoW based on RandomX, only allow >= 2 outputs, change to the block median used to calculate penalty, v1 coinbases are forbidden, rct sigs in coinbase forbidden, 10 block lock time for incoming outputs
176-
| 2210000 | 2020-10-17 | v13 | v0.17.0.0 | v0.17.3.2 | New CLSAG transaction format
177-
| 2210720 | 2020-10-18 | v14 | v0.17.1.1 | v0.17.3.2 | forbid old MLSAG transaction format
178-
| 2688888 | 2022-08-13 | v15 | v0.18.0.0 | v0.18.1.2 | ringsize = 16, bulletproofs+, view tags, adjusted dynamic block weight algorithm
179-
| 2689608 | 2022-08-14 | v16 | v0.18.0.0 | v0.18.1.2 | forbid old v14 transaction format
180-
| XXXXXXX | XXX-XX-XX | XXX | vX.XX.X.X | vX.XX.X.X | XXX |
122+
Dates are provided in the format DD-MM-YYYY. The "Minimum" is the software version that follows the new consensus rules. The "Recommended" version may include bug fixes and other new features that do not affect the consensus rules.
123+
124+
125+
| Software upgrade block height | Date | Fork version | Minimum scala version | Recommended scala version | Details |
126+
|-------------------------------|-----------|--------------|-----------------------|---------------------------|-----------------------------------------------------------------------|
127+
| 1 | 1-08-2020 | v4.1.0 | v4.1.0 | v7.9.0 | Genesis block |
128+
| X | X | v8.0.0 | v8.0.0 | v8.0.0 | Diardi V2, multiple proof of work, new bulletproofs, new reward curve |
181129

182130
X's indicate that these details have not been determined as of commit date.
183131

@@ -302,7 +250,6 @@ invokes cmake commands as needed.
302250

303251
```bash
304252
cd scala
305-
git checkout release-v0.18
306253
make
307254
```
308255

@@ -797,8 +744,6 @@ to prune an existing blockchain using the `scala-blockchain-prune` tool or using
797744
with an existing chain. If an existing chain exists, pruning will temporarily require disk space to store both the full
798745
and pruned blockchains.
799746
800-
For more detailed information see the ['Pruning' entry in the scalapedia](https://www.getscala.org/resources/scalapedia/pruning.html)
801-
802747
## Debugging
803748
804749
This section contains general instructions for debugging failed installs or problems encountered with scala. First, ensure you are running the latest version built from the GitHub repo.

docs/CONTRIBUTING.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ of software solid and usable.
1515
Patches are preferably to be sent via a GitHub pull request. If that
1616
can't be done, patches in "git format-patch" format can be sent
1717
(eg, posted to fpaste.org with a long enough timeout and a link
18-
posted to #scala-dev on irc.libera.chat).
18+
posted to discord).
1919

2020
Patches should be self contained. A good rule of thumb is to have
2121
one patch per separate issue, feature, or logical change. Also, no
@@ -56,7 +56,7 @@ the previous paragraph is here.
5656
## License
5757

5858
Copyright (c) 2009-2015 Pieter Hintjens.
59-
Copyright (c) 2017-2023, The scala Project
59+
Copyright (c) 2021-2023, Haku Labs MTÜ.
6060

6161
This Specification is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.
6262

@@ -68,10 +68,8 @@ You should have received a copy of the GNU General Public License along with thi
6868

6969
The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be interpreted as described in RFC 2119.
7070

71-
The "scala Maintainer Team" is defined in this document as the following users:
72-
- fluffypony
73-
- scalamooo
74-
- hyc
71+
The "Scala Maintainer Team" is defined in this document as the following users:
72+
- Hayzam
7573

7674
## Goals
7775

src/cryptonote_config.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,9 @@ namespace config
278278

279279
namespace testnet
280280
{
281-
uint64_t const CRYPTONOTE_PUBLIC_ADDRESS_BASE58_PREFIX = 53;
282-
uint64_t const CRYPTONOTE_PUBLIC_INTEGRATED_ADDRESS_BASE58_PREFIX = 54;
283-
uint64_t const CRYPTONOTE_PUBLIC_SUBADDRESS_BASE58_PREFIX = 63;
281+
uint64_t const CRYPTONOTE_PUBLIC_ADDRESS_BASE58_PREFIX = 0x59a0;
282+
uint64_t const CRYPTONOTE_PUBLIC_INTEGRATED_ADDRESS_BASE58_PREFIX = 0x5620;
283+
uint64_t const CRYPTONOTE_PUBLIC_SUBADDRESS_BASE58_PREFIX = 0x5820;
284284
uint16_t const P2P_DEFAULT_PORT = 28080;
285285
uint16_t const RPC_DEFAULT_PORT = 28081;
286286
uint16_t const ZMQ_RPC_DEFAULT_PORT = 28082;
@@ -293,9 +293,9 @@ namespace config
293293

294294
namespace stagenet
295295
{
296-
uint64_t const CRYPTONOTE_PUBLIC_ADDRESS_BASE58_PREFIX = 24;
297-
uint64_t const CRYPTONOTE_PUBLIC_INTEGRATED_ADDRESS_BASE58_PREFIX = 25;
298-
uint64_t const CRYPTONOTE_PUBLIC_SUBADDRESS_BASE58_PREFIX = 36;
296+
uint64_t const CRYPTONOTE_PUBLIC_ADDRESS_BASE58_PREFIX = 0x12221a;
297+
uint64_t const CRYPTONOTE_PUBLIC_INTEGRATED_ADDRESS_BASE58_PREFIX = 0x26e21a;
298+
uint64_t const CRYPTONOTE_PUBLIC_SUBADDRESS_BASE58_PREFIX = 0x2ba21a;
299299
uint16_t const P2P_DEFAULT_PORT = 38080;
300300
uint16_t const RPC_DEFAULT_PORT = 38081;
301301
uint16_t const ZMQ_RPC_DEFAULT_PORT = 38082;

src/cryptonote_core/cryptonote_tx_utils.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,7 @@ namespace cryptonote
224224
};
225225

226226
std::list <std::string> stagenet_addresses = {
227-
"StS1Bvcb33MQ9EpqUVzBwEfsU3523GfZr8Rwm2tA1KjbCs9p4L8xK3h5eJ3HEx3b9HEqYTceqB3r1Tw2u6EqmYSZ46kd5arWS4:046d45a0f08a5b72d754100ab9e863a130fe5647e12c6be6f20a6d10de46ef30",
228-
"StS1ef6jTsWDDZ7CDpAYVEFhEQNANgSX26bfscJUuUNSci4R9tchPwQeDTvXf1yY9ARddZiNXnXo2eck5XpxY3Hx7PkEfn8qnb:f15f3854f949098e48719fde5957d8f7ba398d2a1921778276b51fddd7d57bd1",
229-
"StS1X45Z1QEQGvY2EYz3BHHWkFyWiEKTu2ExjtdGe9CqFeRmMPDk2uhYukGUmYbHJeKzqEhD5msQqcxidHakujUc3EvPuZhrvq:adf9a925e38b263be592dd805462b953c46adf3f58076aeeaee06846c6578ef8"
227+
230228
};
231229

232230
switch (nettype)

src/version.cpp.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#define DEF_scala_VERSION_TAG "@VERSIONTAG@"
2-
#define DEF_scala_VERSION "7.9.5"
2+
#define DEF_scala_VERSION "8.0.0"
33
#define DEF_scala_RELEASE_NAME "Panthera Tigris"
44
#define DEF_scala_VERSION_FULL DEF_scala_VERSION "-" DEF_scala_VERSION_TAG
55
#define DEF_scala_VERSION_IS_RELEASE @VERSION_IS_RELEASE@

0 commit comments

Comments
 (0)