Skip to content

Commit 7a083b0

Browse files
AnynomoussAnynomouss
authored
Merge branch 'master' into master
2 parents 31b9749 + 9e62d0a commit 7a083b0

File tree

4 files changed

+159
-43
lines changed

4 files changed

+159
-43
lines changed

‎docs/wiki/blocks/block-body.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Block Body
2+
3+
The block body contains transactions. They are aggregated into one single transaction and follow the description of a [transaction body](../transactions/transaction-body.md).

‎docs/wiki/extra-documents/google-cloud-node.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ Install rust:
6060
curl https://sh.rustup.rs -sSf | sh; source $HOME/.cargo/env
6161
```
6262

63-
Clone grin and build a release version
63+
Clone grin and build a release version using the commands below. First check for the latest release version [here](https://github.com/mimblewimble/grin/releases). If v5.2.1 is not the latest release, replace the version number below ("v5.2.1") with the latest release version before entering the command.
6464

6565
```bash
6666
git clone https://github.com/mimblewimble/grin.git
6767
cd grin
68-
git checkout v4.0.2
68+
git checkout v5.2.1
6969
cargo build --release
7070
```
7171

‎docs/wiki/resources.md‎

Lines changed: 69 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## More Documents
44

5-
: [Build and run automation](extra-documents/build-run-automation.md) </br>
5+
[Build and run automation](extra-documents/build-run-automation.md) </br>
66
[Run a node on google cloud for free](extra-documents/google-cloud-node.md) </br>
77
[How to mine with grin-miner](extra-documents/how-to-mine.md) </br>
88
[Monetary policy](extra-documents/monetary-policy.md) </br>
@@ -12,7 +12,7 @@
1212

1313
#### Playlists
1414

15-
: [grincon0](https://www.youtube.com/playlist?list=PLvgCPbagiHgqYdVUj-ylqhsXOifWrExiq) </br>
15+
[grincon0](https://www.youtube.com/playlist?list=PLvgCPbagiHgqYdVUj-ylqhsXOifWrExiq) </br>
1616
[grinconUS(0)](https://www.youtube.com/playlist?list=PLvgCPbagiHgqOe0z_xgrIsGq-ayVZcNjy) </br>
1717
[grinAmsterdam](https://www.youtube.com/playlist?list=PLvgCPbagiHgpJXhrKAJu0Q-mbCVhpqgu7) </br>
1818
[grincon1](https://www.youtube.com/playlist?list=PLvgCPbagiHgrQa5KVt4XixK9t_NbfpkuP) </br>
@@ -27,57 +27,84 @@
2727

2828
## Forum
2929

30-
: [How to store Grin in cold storage?](https://forum.grin.mw/t/how-to-store-grin-in-cold-storage/5375) </br>
30+
### Announcements
31+
[Hardforks on Grin v5.0.0 and beyond](https://forum.grin.mw/t/network-upgrades-hard-forks-on-grin-v5-0-0-and-beyond/7231) </br>
32+
[Dismantling the core team and governance structure](https://forum.grin.mw/t/dismantling-the-core-team-and-governance-structure/7801)</br>
33+
34+
### Development and Technical Discussions
35+
36+
: [How to store Grin in cold storage?](https://forum.grin.mw/t/how-to-store-grin-in-cold-storage/5375)</br>
3137
[Raspberry Pi 4 - Standalone Grin-Node PoC by Grinnode.live](https://forum.grin.mw/t/raspberry-pi-4-standalone-grin-node-poc-by-grinnode-live/7796) </br>
32-
[How to open port 3414 (and why)](https://forum.grin.mw/t/how-to-open-port-3414-and-why/7825) </br>
33-
[PoW specification](https://forum.grin.mw/t/pow-specification/7963) </br>
34-
[Coinbase outputs as regular outputs](https://forum.grin.mw/t/coinbase-outputs-as-transaction-outputs/7441) </br>
35-
[Use of NRD kernels in payment channels](https://forum.grin.mw/t/use-of-nrd-kernels-in-grin-payment-channels/7298) </br>
36-
[Emission Rate Thread](https://forum.grin.mw/t/emission-rate-of-grin/171), [#2](https://forum.grin.mw/t/questioning-core-assumptions-on-our-emissions-model/1414), [#3](https://forum.grin.mw/t/question-for-statement-linear-emission-is-fair-for-late-adopters/6285) </br>
37-
[Transaction Aggregation](https://forum.grin.mw/t/grin-transaction-aggregation/418) </br>
38-
[TX Graph Confidentality](https://forum.grin.mw/t/tx-graph-confidentiality/1260) </br>
39-
[Response to Reavealing TX Graph](https://forum.grin.mw/t/my-full-response-to-the-blocks-questions/6566) </br>
40-
[Some Thoughts on Privacy](https://forum.grin.mw/t/some-thoughts-on-privacy/6581) </br>
41-
[How to open port 3414 (and why)](https://forum.grin.mw/t/how-to-open-port-3414-and-why/7825) </br>
42-
[Scheduled PoW upgrades proposal](https://forum.grin.mw/t/scheduled-pow-upgrades-proposal/820) </br>
43-
[Choice of ASIC Resistant PoW for GPU miners](https://forum.grin.mw/t/choice-of-asic-resistant-pow-for-gpu-miners/1017) </br>
44-
[Put later phase-outs on hold proposal](https://forum.grin.mw/t/grin-improvement-proposal-1-put-later-phase-outs-on-hold-and-rephrase-primary-pow-commitment/4653) </br>
45-
[All about C31 fade out, the C29 scale and C32](https://forum.grin.mw/t/all-about-c31-fade-out-the-c29-scale-and-c32/6914) </br>
46-
[Genesis block message](https://forum.grin.mw/t/genesis-block-message/250) </br>
47-
[Queries about transaction aggregation](https://forum.grin.mw/t/some-queries-about-transaction-aggregation/1753 </br>)
48-
[Aggregate merkle proofs](https://forum.grin.mw/t/aggregate-merkle-proofs/4948) </br>
49-
[Unique kernels thread #73](https://forum.grin.mw/t/unique-kernel-thread-73/7688/14) </br>
50-
[Sending a transaction to more parties than originally intended](https://forum.grin.mw/t/sending-a-transaction-to-more-different-parties-than-originally-intended/4985) </br>
38+
[How to open port 3414 (and why)](https://forum.grin.mw/t/how-to-open-port-3414-and-why/7825)</br>
39+
[Use of NRD kernels in payment channels](https://forum.grin.mw/t/use-of-nrd-kernels-in-grin-payment-channels/7298)</br>
40+
[Transaction Aggregation](https://forum.grin.mw/t/grin-transaction-aggregation/418)</br>
41+
[TX Graph Confidentality](https://forum.grin.mw/t/tx-graph-confidentiality/1260)</br>
42+
[Queries about transaction aggregation](https://forum.grin.mw/t/some-queries-about-transaction-aggregation/1753)</br>
43+
[Aggregate merkle proofs](https://forum.grin.mw/t/aggregate-merkle-proofs/4948)</br>
44+
[Unique kernels thread #73](https://forum.grin.mw/t/unique-kernel-thread-73/7688/14)</br>
45+
[Sending a transaction to more parties than originally intended](https://forum.grin.mw/t/sending-a-transaction-to-more-different-parties-than-originally-intended/4985)</br>
5146
[Reasoning behind block weight limit](https://forum.grin.mw/t/reasoning-behind-block-weight-limit/6310) </br>
52-
[Hardforks on Grin v5.0.0 and beyond](https://forum.grin.mw/t/network-upgrades-hard-forks-on-grin-v5-0-0-and-beyond/7231) </br>
5347
[Play attacks and possible mitigations](https://forum.grin.mw/t/play-attacks-and-possible-mitigations/7527) </br>
54-
[Replay attacks and possible mitigations](https://forum.grin.mw/t/replay-attacks-and-possible-mitigations/7415) </br>
55-
[Grin transactions user interactivity](https://forum.grin.mw/t/grin-transactions-user-interactivity/7738) </br>
56-
[Eliminate finalize step](https://forum.grin.mw/t/eliminating-finalize-step/7621) </br>
48+
[Replay attacks and possible mitigations](https://forum.grin.mw/t/replay-attacks-and-possible-mitigations/7415)</br>
49+
[Grin transactions user interactivity](https://forum.grin.mw/t/grin-transactions-user-interactivity/7738)</br>
50+
[Eliminate finalize step](https://forum.grin.mw/t/eliminating-finalize-step/7621)</br>
51+
[Integrated payment proofs and round minimization](https://forum.grin.mw/t/integrated-payment-proofs-and-round-minimization/7745)</br>
52+
[Pep talk for one sided transactions](https://forum.grin.mw/t/pep-talk-for-one-sided-transactions/7361)</br>
53+
[Communicating with grin-wallet API (Tutorial)](https://forum.grin.mw/t/communicating-with-grin-wallet-api-tutorial/9925/4)
54+
55+
### Emmission Model
56+
57+
[Emission Rate of GRIN](https://forum.grin.mw/t/emission-rate-of-grin/171)</br>
58+
[Questioning core assumptions on emmission model](https://forum.grin.mw/t/questioning-core-assumptions-on-our-emissions-model/1414)</br>
59+
[Linear emmission is fair to late adopters](https://forum.grin.mw/t/question-for-statement-linear-emission-is-fair-for-late-adopters/6285)</br>
60+
61+
62+
#### Mining
63+
64+
[PoW specification](https://forum.grin.mw/t/pow-specification/7963)</br>
65+
[Scheduled PoW upgrades proposal](https://forum.grin.mw/t/scheduled-pow-upgrades-proposal/820)</br>
66+
[Choice of ASIC Resistant PoW for GPU miners](https://forum.grin.mw/t/choice-of-asic-resistant-pow-for-gpu-miners/1017)</br>
67+
[Put later phase-outs on hold proposal](https://forum.grin.mw/t/grin-improvement-proposal-1-put-later-phase-outs-on-hold-and-rephrase-primary-pow-commitment/4653)</br>
68+
[All about C31 fade out, the C29 scale and C32](https://forum.grin.mw/t/all-about-c31-fade-out-the-c29-scale-and-c32/6914)</br>
69+
[Being ASIC resistant or not](https://forum.grin.mw/t/being-asic-resistant-or-not/372)</br>
70+
[Grin ASIC iPOLLO-G1 Mining Tutorial](https://forum.grin.mw/t/how-to-mine-grin-with-g1-mini-steps/9796)
71+
72+
### Miscellaneous
73+
74+
[Response to Reavealing TX Graph](https://forum.grin.mw/t/my-full-response-to-the-blocks-questions/6566)</br>
75+
[Some toughts on Privacy](https://forum.grin.mw/t/some-thoughts-on-privacy/6581)</br>
5776
[On Igno's absence](https://forum.grin.mw/t/on-ignos-absence/5301) </br>
58-
[Being ASIC resistant or not](https://forum.grin.mw/t/being-asic-resistant-or-not/372) </br>
77+
[Genesis block message](https://forum.grin.mw/t/genesis-block-message/250)</br>
78+
79+
80+
### Research
81+
82+
[Coinbase outputs as regular outputs](https://forum.grin.mw/t/coinbase-outputs-as-transaction-outputs/7441) </br>
5983
[Is there a potential hidden inflation problem](https://forum.grin.mw/t/is-there-a-potential-hidden-inflation-problem-with-all-mw-coins/6400) </br>
60-
[Eliminating finalize step](https://forum.grin.mw/t/eliminating-finalize-step/7621) </br>
61-
[Integrated payment proofs and round minimization](Wallet APIs are split into two seperate blocks of functionality called the 'Owner' and 'Foreign' APIs) </br>
62-
[Pep talk for one sided transactions](https://forum.grin.mw/t/pep-talk-for-one-sided-transactions/7361) </br>
63-
[Dismantling the core team and governance structure](https://forum.grin.mw/t/dismantling-the-core-team-and-governance-structure/7801) </br>
84+
[Confidential Assets](https://forum.grin.mw/t/confidential-assets/1217) </br>
85+
[Bidirectional Payment Proofs](https://forum.grin.mw/t/bidirectional-payment-proofs/9175) </br>
86+
[Grin AUDIT 4.0.0 Release]( https://forum.grin.mw/t/grin-audit-for-4-0-0-release/7473/3) </br>
87+
[Grinvestigation](https://phyro.github.io/grinvestigation/)</br>
88+
[Coinswap Proposal](https://forum.grin.mw/t/mimblewimble-coinswap-proposal/8322)
6489

90+
6591
## Medium
6692

67-
: [Grin's Mythical Fair Launch](https://www.coindesk.com/coders-harry-potter-bitcoin-mimblewimble) </br>
93+
[Grin's Mythical Fair Launch](https://www.coindesk.com/coders-harry-potter-bitcoin-mimblewimble) </br>
6894
[Grin Money Explained](https://medium.com/@CryptoProfG/grin-money-explained-4-exploring-grins-monetary-model-e48b1761653) </br>
6995
[Grin Transactions Explained, Step-by-Step](https://medium.com/@brandonarvanaghi/grin-transactions-explained-step-by-step-fdceb905a853) </br>
70-
[What’s inside a Grin Transaction File?](https://medium.com/@brandonarvanaghi/whats-inside-a-grin-transaction-file-f062a0dcbf99) </br>
71-
[Breaking Mimblewimble’s Privacy Model](https://medium.com/dragonfly-research/breaking-mimblewimble-privacy-model-84bcd67bfe52) </br>
72-
[Factual inaccuracies of “Breaking Mimblewimble’s Privacy Model”](https://medium.com/grin-mimblewimble/factual-inaccuracies-of-breaking-mimblewimbles-privacy-model-8063371839b9) </br>
96+
[What’s inside a Grin Transaction File?](https://medium.com/@brandonarvanaghi/whats-inside-a-grin-transaction-file-f062a0dcbf99)</br>
97+
[Breaking Mimblewimble’s Privacy Model](https://medium.com/dragonfly-research/breaking-mimblewimble-privacy-model-84bcd67bfe52)</br>
98+
[Factual inaccuracies of “Breaking Mimblewimble’s Privacy Model”](https://medium.com/grin-mimblewimble/factual-inaccuracies-of-breaking-mimblewimbles-privacy-model-8063371839b9)</br>
7399
[Mimblewimble Without the Scary Math](https://blog.qtum.org/mimblewimble-without-scary-math-e894cb841b98) </br>
74100
[Behind Mimblewimble](https://medium.com/scalar-capital/behind-mimblewimble-cd9da78a00e9) </br>
75101
[An Introduction to Grin Proof-of-Work](https://medium.com/blockcypher-blog/an-introduction-to-grin-proof-of-work-103aaa9f66ce) </br>
76-
102+
[A Case for using soft total supply](https://john-tromp.medium.com/a-case-for-using-soft-total-supply-1169a188d153)
103+
77104

78105
## Podcasts
79106

80-
: [[Bitcoin Wednesday] Introducing Mimblewimble and Grin @jaspervdm](https://www.youtube.com/watch?v=mzHswLujMYc) </br>
107+
[[Bitcoin Wednesday] Introducing Mimblewimble and Grin @jaspervdm](https://www.youtube.com/watch?v=mzHswLujMYc) </br>
81108
[[Unchained] Grin: A More Private, Lighter Bitcoin @lehnberg @yeastplume](https://unchainedpodcast.com/grin-a-more-private-lighter-bitcoin/) </br>
82109
[[The Crypto Show] Mimblewimble with Andrew Poelstra and Peter Wuillie](https://soundcloud.com/heryptohow/mimblewimble-andrew-poelstra-peter-wuille-brian-deery-and-chris-odom) </br>
83110
[[What Bitcoin Did] Grin's Mimblewimble Implementation @yeastplume](https://www.whatbitcoindid.com/podcast/grins-michael-cordner-aka-yeastplume-on-implementing-mimblewimble) </br>
@@ -87,7 +114,7 @@
87114

88115
## Miscellaneous
89116

90-
: [[Launchpad] Mimblewimble Mailing List Archive](https://lists.launchpad.net/mimblewimble/) </br>
117+
[[Launchpad] Mimblewimble Mailing List Archive](https://lists.launchpad.net/mimblewimble/) </br>
91118
[[Reddit] Mimblewimble introduced to r/bitcoin](https://www.reddit.com/r/Bitcoin/comments/4vub3y/mimblewimble_noninteractive_coinjoin_and_better/) </br>
92119
[[Youtube] Aantonop Bitcoin Q&A: Mimblewimble and Dandelion](https://www.youtube.com/watch?v=LjDJGTpK_lE) </br>
93120
[[Coindesk] Harry Potter Characters Join Mimblewimble 2016](https://www.coindesk.com/coders-harry-potter-bitcoin-mimblewimble) </br>
@@ -97,16 +124,17 @@
97124
[[GitHub] Grin difficulty, C29, C31 fade out and C32](https://github.com/Lolliedieb/lolMiner-releases/wiki/All-you-need-to-know-about-Grin-difficulty,-C29,-C31-fade-out-and-C32) </br>
98125
[[GitHub] Fees in Mining](https://github.com/mimblewimble/grin/wiki/fees-mining) </br>
99126
[[Google] Replay Attacks Summary](https://docs.google.com/document/d/1BbXhgFd3byP_gfvnteRq4BmfXjtv5PJtJwI13CJsZT8/edit#) </br>
100-
[[Blog] A Relatively Easy to Understand Primer on ECC](https://blog.cloudflare.com/a-relatively-easy-to-understand-primer-on-elliptic-curve-cryptography/) </br>
127+
[[Blog] A Relatively Easy to Understand Primer on ECC](https://blog.cloudflare.com/a-relatively-easy-to-understand-primer-on-elliptic-curve-cryptography/)</br>
128+
101129

102130
#### RFCs
103131

104-
: [[Github] All Accepted RFCs](https://github.com/mimblewimble/grin-rfcs#list-of-accepted-rfcs) </br>
132+
[[Github] All Accepted RFCs](https://github.com/mimblewimble/grin-rfcs#list-of-accepted-rfcs) </br>
105133
[[Github] All Pending RFCs](https://github.com/mimblewimble/grin-rfcs/pulls) </br>
106134

107135
## Papers
108136

109-
: [Confidential Assets](https://blockstream.com/bitcoin17-final41.pdf) </br>
137+
[Confidential Assets](https://blockstream.com/bitcoin17-final41.pdf) </br>
110138
[OWAS](https://download.wpsoftware.net/bitcoin/wizardry/horasyuanmouton-owas.pdf) </br>
111139
[Bulletproofs](https://eprint.iacr.org/2017/1066.pdf) </br>
112140
[Cuckoo Cycle](https://github.com/tromp/cuckoo/blob/master/doc/cuckoo.pdf) </br>

0 commit comments

Comments
 (0)