diff --git a/about-the-oxen-blockchain/oxen-token-economics/README.md b/about-the-oxen-blockchain/oxen-token-economics/README.md index d03a262..2dc82ec 100644 --- a/about-the-oxen-blockchain/oxen-token-economics/README.md +++ b/about-the-oxen-blockchain/oxen-token-economics/README.md @@ -10,7 +10,7 @@ As the workhorses of the network, service nodes get the lion's share of the rewa This results in the creation of **11,880 $OXEN per day**. -Because of the nature of [Pulse](../pulse-pos-on-oxen/), a large proportion of $OXEN's total supply is locked in service nodes and unavailable on the market. On top of this, our research has shown that people earning rewards through staked nodes are **much** more likely to hold their tokens and continue participating in the network than those who earnt their tokens via mining. +Because of the nature of [Pulse](../pulse-pos-on-oxen/), a large proportion of $OXEN's total supply is locked in service nodes and unavailable on the market. On top of this, our research has shown that people earning rewards through staked nodes are **much** more likely to hold their tokens and continue participating in the network than those who earned their tokens via mining. These two qualities help increase buy pressure and decrease sell pressure in $OXEN markets, respectively. diff --git a/about-the-oxen-blockchain/pulse-pos-on-oxen/pulse-paper.md b/about-the-oxen-blockchain/pulse-pos-on-oxen/pulse-paper.md index 6fd743f..896ad4a 100644 --- a/about-the-oxen-blockchain/pulse-pos-on-oxen/pulse-paper.md +++ b/about-the-oxen-blockchain/pulse-pos-on-oxen/pulse-paper.md @@ -16,7 +16,7 @@ Pulse makes Oxen more secure, more sustainable, and more powerful. Every 120 seconds, an active [Oxen Service Node](../oxen-service-nodes.md) is chosen to create a new candidate block. This one true service node creates a candidate block and sends it to 11 randomly chosen _validators_. -Validators are service nodes tasked with independently assessing the candidate block and ensuring it does not contain any duplicate transactions \(or any other malicious activitiy\). If 7 of the 11 validators verify the block's legitimacy, it can be published to the network as a valid block. +Validators are service nodes tasked with independently assessing the candidate block and ensuring it does not contain any duplicate transactions \(or any other malicious activity\). If 7 of the 11 validators verify the block's legitimacy, it can be published to the network as a valid block. This process is then repeated to create the next block. @@ -60,7 +60,7 @@ Environmental and economic sustainability are becoming increasingly pertinent is PoW consensus, while serviceable for securing the blockchain, has an inescapable flaw — it is extremely inefficient, and this problem becomes worse as the network scales. -Bitcoin, which uses PoW, [consumes over 100 TWh](https://www.cbeci.org) per year, more than the consumption of entire countries like the Netherlands and the Phillipines — and that's just one blockchain! No one blockchain should have all that power. +Bitcoin, which uses PoW, [consumes over 100 TWh](https://www.cbeci.org) per year, more than the consumption of entire countries like the Netherlands and the Philippines — and that's just one blockchain! No one blockchain should have all that power. PoS means a sustainable future for blockchain technology. Instead of relying on power-intensive computation, the blockchain is secured through the cooperation of [service nodes](../oxen-service-nodes.md), which is much more energy efficient — say goodbye to the wasteful ways of PoW. @@ -68,7 +68,7 @@ PoS means a sustainable future for blockchain technology. Instead of relying on Lots of major players in the blockchain world have thrown their weight behind PoS — most notably, Ethereum. -This is largely because PoS is more scaleable, more flexible, and easier to participate in. PoS is what will finally bring blockchain to the masses. +This is largely because PoS is more scalable, more flexible, and easier to participate in. PoS is what will finally bring blockchain to the masses. Of course, the nodes that maintain the Oxen blockchain do a lot more than just create and validate blocks — they form the backbone range of services and applications, like [Session](../../products-built-on-oxen/session/) and [Lokinet](../../products-built-on-oxen/lokinet/). This is just the beginning of what Oxen can do with its powerful network of service nodes. diff --git a/products-built-on-oxen/lokinet/guides/lokinet-on-a-soho-router.md b/products-built-on-oxen/lokinet/guides/lokinet-on-a-soho-router.md index 846fec6..5fc0ff4 100644 --- a/products-built-on-oxen/lokinet/guides/lokinet-on-a-soho-router.md +++ b/products-built-on-oxen/lokinet/guides/lokinet-on-a-soho-router.md @@ -28,7 +28,7 @@ the layout of the system has the following components: * lokinet handles DNS for lokinet. * unbound provides encrypted dns tunnel for ICANN. * hostapd handles wifi access point. -* ifdown handles managing netowrk interfaces. +* ifdown handles managing network interfaces. ## setup @@ -78,7 +78,7 @@ we now need to install and configure lokinet. #### install lokinet -we add the apt repo for lokinet. follow instructions [here](https://deb.oxen.io/) to add the repo, dont install any packages from those instrctions. once you add the repos, update apt with: +we add the apt repo for lokinet. follow instructions [here](https://deb.oxen.io/) to add the repo, dont install any packages from those instructions. once you add the repos, update apt with: `# apt update` @@ -108,7 +108,7 @@ ifaddr=10.100.0.1/16 [dns] bind=127.0.42.1:5533 -# when this option is emtpy we only resolve .loki and .snode and will SERVFAIL any other queries. +# when this option is empty we only resolve .loki and .snode and will SERVFAIL any other queries. upstream= ``` @@ -125,7 +125,7 @@ exit-node=exit2.loki you can swap out exit.loki and exit2.loki with any other exit you know of, these are provided as functionging placeholder/default values for toy usage, the OPTF runs both of these exits at the moment. -you can add as many entries as you want and it will stripe traffic accross them per remote ip address. +you can add as many entries as you want and it will stripe traffic across them per remote ip address. then edit the systemd unit to add a post up command we'll need for the routing table: @@ -286,7 +286,7 @@ iface wifi0 inet static ``` then add a file for your upstream network in `/etc/network/interfaces.d/upstream`. -this exmaple will use dhcp in your upstream network to figure out how to get to the internet. +this example will use dhcp in your upstream network to figure out how to get to the internet. ```ini auto eth0 @@ -309,7 +309,7 @@ when it comes back up you can join devices to the wifi network called `lokinet` #### caveats -lokinet `0.9.11` has a wire protocol handshake state machine race condition, this is planned on being fixed by `0.10.1`. the work arround is as follows: +lokinet `0.9.11` has a wire protocol handshake state machine race condition, this is planned on being fixed by `0.10.1`. the work around is as follows: stop lokinet: diff --git a/using-the-oxen-blockchain/advanced/daemon-rpc-calls.md b/using-the-oxen-blockchain/advanced/daemon-rpc-calls.md index 007a749..99d1041 100644 --- a/using-the-oxen-blockchain/advanced/daemon-rpc-calls.md +++ b/using-the-oxen-blockchain/advanced/daemon-rpc-calls.md @@ -377,7 +377,7 @@ Outputs: * _status_ - string; General RPC error code. "OK" means everything looks good. * _untrusted_ - boolean; States if the result is obtained using the bootstrap mode, and is therefore not trusted \(`true`\), or when the daemon is fully synced \(`false`\). -In this example, blocks range from height 1545999 to 1546000 is looked up \(notice that the returned informations are ascending order and that it is at the April 2018 network upgrade time\): +In this example, blocks range from height 1545999 to 1546000 is looked up \(notice that the returned information are ascending order and that it is at the April 2018 network upgrade time\): ```text $ curl -X POST http://127.0.0.1:18081/json_rpc -d '{"jsonrpc":"2.0","id":"0","method":"get_block_headers_range","params":{"start_height":1545999,"end_height":1546000}}' -H 'Content-Type: application/json' @@ -890,7 +890,7 @@ $ curl -X POST http://127.0.0.1:18081/json_rpc -d '{"jsonrpc":"2.0","id":"0","me #### **get\_coinbase\_tx\_sum** -Get the coinbase ammount and the fees ammount for n last blocks starting at particular height +Get the coinbase amount and the fees amount for n last blocks starting at particular height Alias: _None_. @@ -1050,7 +1050,7 @@ $ curl -X POST http://127.0.0.1:18081/json_rpc -d '{"jsonrpc":"2.0","id":"0","me #### **sync\_info** -Get synchronisation informations +Get synchronisation information Alias: _None_. @@ -1499,7 +1499,7 @@ Alias: _/sendrawtransaction_. Inputs: -* _tx\_as\_hex_ - string; Full transaction information as hexidecimal string. +* _tx\_as\_hex_ - string; Full transaction information as hexadecimal string. * _do\_not\_relay_ - boolean; Stop relaying transaction to other nodes \(default is `false`\). Outputs: @@ -1525,7 +1525,7 @@ $ curl -X POST http://127.0.0.1:18081/send_raw_transaction -d '{"tx_as_hex":"de6 #### **/save\_bc** -Save the blockchain. The blockchain does not need saving and is always saved when modified, however it does a sync to flush the filesystem cache onto the disk for safety purposes against Operating System or Harware crashes. +Save the blockchain. The blockchain does not need saving and is always saved when modified, however it does a sync to flush the filesystem cache onto the disk for safety purposes against Operating System or Hardware crashes. Alias: _None_. @@ -1712,7 +1712,7 @@ Set the daemon log categories. Categories are represented as a comma separated l * _WARNING_ * _INFO_ * _DEBUG_ - * _TRACE_ - lower level A level automatically includes higher level. By default, categories are set to `*:WARNING,net:FATAL,net.p2p:FATAL,net.cn:FATAL,global:INFO,verify:FATAL,stacktrace:INFO,logging:INFO,msgwriter:INFO`. Setting the categories to "" prevent any logs to be outputed. + * _TRACE_ - lower level A level automatically includes higher level. By default, categories are set to `*:WARNING,net:FATAL,net.p2p:FATAL,net.cn:FATAL,global:INFO,verify:FATAL,stacktrace:INFO,logging:INFO,msgwriter:INFO`. Setting the categories to "" prevent any logs to be outputted. Alias: _None_. @@ -1768,7 +1768,7 @@ Outputs: * _fee_ - unsigned int; The amount of the mining fee included in the transaction, in atomic units. * _id\_hash_ - string; The transaction ID hash. * _kept\_by\_block_ - boolean; States if the tx was included in a block at least once \(`true`\) or not \(`false`\). - * _last\_failed\_height_ - unsigned int; If the transaction validation has previously failed, this tells at what height that occured. + * _last\_failed\_height_ - unsigned int; If the transaction validation has previously failed, this tells at what height that occurred. * _last\_failed\_id\_hash_ - string; Like the previous, this tells the previous transaction ID hash. * _last\_relayed\_time_ - unsigned int; Last unix time at which the transaction has been relayed. * _max\_used\_block\_height_ - unsigned int; Tells the height of the most recent block with an output used in this transaction. diff --git a/using-the-oxen-blockchain/advanced/wallet-rpc-calls.md b/using-the-oxen-blockchain/advanced/wallet-rpc-calls.md index 3b0a274..4ec5e32 100644 --- a/using-the-oxen-blockchain/advanced/wallet-rpc-calls.md +++ b/using-the-oxen-blockchain/advanced/wallet-rpc-calls.md @@ -179,7 +179,7 @@ Inputs: Outputs: * _address_ - string; The 95-character hex address string of the oxen-wallet-rpc in session. -* _addresses_ array of addresses informations +* _addresses_ array of addresses information * _address_ string; The 95-character hex \(sub\)address string. * _label_ string; Label of the \(sub\)address * _address\_index_ unsigned int; index of the subaddress @@ -226,7 +226,7 @@ Inputs: Outputs: -* _index_ - subaddress informations +* _index_ - subaddress information * _major_ unsigned int; Account index. * _minor_ unsigned int; Address index. @@ -573,7 +573,7 @@ Outputs: * _fee_ - Integer value of the fee charged for the txn. * _multisig\_txset_ - Set of multisig transactions in the process of being signed \(empty for non-multisig\). * _tx\_blob_ - Raw transaction represented as hex string, if get\_tx\_hex is true. -* _tx\_hash_ - String for the publically searchable transaction hash. +* _tx\_hash_ - String for the publicly searchable transaction hash. * _tx\_key_ - String for the transaction key if get\_tx\_key is true, otherwise, blank string. * _tx\_metadata_ - Set of transaction metadata needed to relay this transfer later, if get\_tx\_metadata is true. * _unsigned\_txset_ - String. Set of unsigned tx for cold-signing purposes. @@ -885,7 +885,7 @@ Inputs: Outputs: -* _tx\_hash_ - String for the publically searchable transaction hash. +* _tx\_hash_ - String for the publicly searchable transaction hash. Example: @@ -1446,7 +1446,7 @@ Inputs: * _txid_ - string; transaction id. * _address_ - string; destination public address of the transaction. -* _message_ - string; \(Optional\) add a message to the signature to further authenticate the prooving process. +* _message_ - string; \(Optional\) add a message to the signature to further authenticate the proving process. Outputs: @@ -1526,7 +1526,7 @@ Alias: _None_. Inputs: * _txid_ - string; transaction id. -* _message_ - string; \(Optional\) add a message to the signature to further authenticate the prooving process. +* _message_ - string; \(Optional\) add a message to the signature to further authenticate the proving process. Outputs: @@ -1598,7 +1598,7 @@ Inputs: * _all_ - boolean; Proves all wallet balance to be disposable. * _account\_index_ - unsigned int; Specify the account from witch to prove reserve. \(ignored if `all` is set to true\) * _amount_ - unsigned int; Amount \(in atomic units\) to prove the account has for reserve. \(ignored if `all` is set to true\) -* _message_ - string; \(Optional\) add a message to the signature to further authenticate the prooving process. +* _message_ - string; \(Optional\) add a message to the signature to further authenticate the proving process. Outputs: diff --git a/using-the-oxen-blockchain/oxen-service-node-guides/service-node-deregistration.md b/using-the-oxen-blockchain/oxen-service-node-guides/service-node-deregistration.md index 8166b8c..4d98cbc 100644 --- a/using-the-oxen-blockchain/oxen-service-node-guides/service-node-deregistration.md +++ b/using-the-oxen-blockchain/oxen-service-node-guides/service-node-deregistration.md @@ -16,7 +16,7 @@ Each Oxen Service Node can be in one of four states: awaiting, active, decommiss #### Decommission and credits -Active Oxen Service Nodes earn "credits" which are then used up during any periods where the service node goes offline (or otherwise stops meeting network requirements) to stop a deregistration from occuring. A new service node starts out with `INITIAL_CREDIT`, and then builds up `CREDIT_PER_DAY` for each day the service node remains active, up to a maximum of `DECOMMISSION_MAX_CREDIT`. +Active Oxen Service Nodes earn "credits" which are then used up during any periods where the service node goes offline (or otherwise stops meeting network requirements) to stop a deregistration from occurring. A new service node starts out with `INITIAL_CREDIT`, and then builds up `CREDIT_PER_DAY` for each day the service node remains active, up to a maximum of `DECOMMISSION_MAX_CREDIT`. | | | | ------------------------- | ---------------------------------------------- | diff --git a/using-the-oxen-blockchain/oxen-wallet-guides/cli-wallet-commands.md b/using-the-oxen-blockchain/oxen-wallet-guides/cli-wallet-commands.md index 33fc278..10ea919 100644 --- a/using-the-oxen-blockchain/oxen-wallet-guides/cli-wallet-commands.md +++ b/using-the-oxen-blockchain/oxen-wallet-guides/cli-wallet-commands.md @@ -342,7 +342,7 @@ check_reserve_proof
[] Where `
` is the address of the wallet where the command get\_reserve\_proof was ran. `` is the file that was received from the individual sending you the reserve proof, normally generated as `oxen_reserve_proof` and `` is the key set by the individual who sent you the reserve proof. -Therefor for the previous example where we created a reserve proof for 1000 $OXEN and signed with “car”, we would run the command: +Therefore for the previous example where we created a reserve proof for 1000 $OXEN and signed with “car”, we would run the command: ```text check_reserve_proof T6TmZX8EzZVjS9zNg7zAsrEQFDgcVC2qV2ZMyoWsbyK4SNB2SwMHZtMhPSsFyTmRBQUaGVF5k3qy5CMFM6Lvj7gi3AeszDag7 oxen_reserve_proof Car diff --git a/using-the-oxen-blockchain/oxen-wallet-guides/gui-wallet-setup.md b/using-the-oxen-blockchain/oxen-wallet-guides/gui-wallet-setup.md index 35bd512..403db8f 100644 --- a/using-the-oxen-blockchain/oxen-wallet-guides/gui-wallet-setup.md +++ b/using-the-oxen-blockchain/oxen-wallet-guides/gui-wallet-setup.md @@ -55,7 +55,7 @@ To import a wallet from seed click the `Restore wallet from seed` button. Next fill in the following input fields: * Wallet Name: `Enter a name for your wallet.` -* Mnemonic Seed: `Enter the seed phrase that was generated when intially creating your wallet.` +* Mnemonic Seed: `Enter the seed phrase that was generated when initially creating your wallet.` * Restore from Date: `Enter the date or blockheight in which you want to restore your wallet from.` > It is quicker to restore from the date in which you generated the wallet. diff --git a/using-the-oxen-blockchain/oxen-wallet-guides/oxen-ledger-wallet-setup-gui-wallet.md b/using-the-oxen-blockchain/oxen-wallet-guides/oxen-ledger-wallet-setup-gui-wallet.md index 8635c23..acb161c 100644 --- a/using-the-oxen-blockchain/oxen-wallet-guides/oxen-ledger-wallet-setup-gui-wallet.md +++ b/using-the-oxen-blockchain/oxen-wallet-guides/oxen-ledger-wallet-setup-gui-wallet.md @@ -80,7 +80,7 @@ Create a transaction by filling in the address and amount fields of this page an ![](https://lh3.googleusercontent.com/46czSXzuEtap4Bbqv6VmU8fljXI5NyzVvnmceE2A7458VRJG1HCtSOMNmQGFExMIdFyvcpx6ia3qZ3EP2uDG8jceXg2kZxDwu5D0zeuU5LESfVGhkTFikAkkFOj4-3U4NnCsO-1nvDt2TR9zEGq8LR4L25BiVbt8hyKYwjKHr4v3HiCdCjWaeVKUEQ) -The hardware wallet will then begin processing the transaction. At first you will see the “Processsing TX” screen. This page may take some time as the ledger has to do some heavy calculations. +The hardware wallet will then begin processing the transaction. At first you will see the “Processing TX” screen. This page may take some time as the ledger has to do some heavy calculations. ![](https://lh6.googleusercontent.com/qKkW3FtfD\_p9mcveaNkpGefEJRgnajlXzjBKwbU-3hFY1eNgRRozGpMnwmi2V\_VVAajDT1zcttPTrqVXybjiTIymlsmwwNeFic\_EUnn-w-eIUiMGWqXlA2a2rE-a0Qu5pxKqTld9M5J8Vv0U7KiBtrrWDS5GLJZImiHABbC7pKXAINzmcemO\_JpWGg)