Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

[PAN-2936] Add section on EEA compliant privacy #1769

Merged
merged 34 commits into from
Jul 29, 2019
Merged
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
0ed474b
WIP
MadelineMurray Jun 13, 2019
0cd240a
WIP
MadelineMurray Jun 15, 2019
0bb7329
WIP:
MadelineMurray Jun 16, 2019
8e1cc0e
WIP
MadelineMurray Jun 29, 2019
3329412
Merge branch 'master' of https://github.com/PegaSysEng/pantheon into …
MadelineMurray Jun 29, 2019
d9d7716
Ready for review
MadelineMurray Jun 29, 2019
4edbf16
WIP
MadelineMurray Jul 12, 2019
3bd6f8d
WIP
MadelineMurray Jul 13, 2019
236afe8
Merge branch 'master' of https://github.com/PegaSysEng/pantheon into …
MadelineMurray Jul 15, 2019
7f58702
Merge branch 'master' of https://github.com/PegaSysEng/pantheon into …
MadelineMurray Jul 21, 2019
0787fe8
Added overview of privacy methods
MadelineMurray Jul 21, 2019
e99111d
Added method overviews
MadelineMurray Jul 21, 2019
c46761a
Reorganised privacy section
MadelineMurray Jul 21, 2019
e261569
Moved files
MadelineMurray Jul 22, 2019
12c3568
Rework
MadelineMurray Jul 22, 2019
a5ffe15
Merge branch 'privacyReorg' of https://github.com/MadelineMurray/pant…
MadelineMurray Jul 22, 2019
9834dde
Merge branch 'MadelineMurray-privacyReorg'
MadelineMurray Jul 22, 2019
f55ff08
Merge branch 'master' of https://github.com/PegaSysEng/pantheon into …
MadelineMurray Jul 22, 2019
da054a5
Merge branch 'MadelineMurray-privacyReorg'
MadelineMurray Jul 22, 2019
1ca598f
Merge branch 'managingPrivateTransactions' of https://github.com/Made…
MadelineMurray Jul 22, 2019
7e1f705
rework
MadelineMurray Jul 22, 2019
4acf168
Merge branch 'MadelineMurray-managingPrivateTransactions'
MadelineMurray Jul 22, 2019
2058cbd
Merge branch 'master' of https://github.com/PegaSysEng/pantheon
MadelineMurray Jul 23, 2019
1a86c07
Merge branch 'eeajsMethods' of https://github.com/MadelineMurray/pant…
MadelineMurray Jul 24, 2019
9319b04
Merge branch 'MadelineMurray-eeajsMethods'
MadelineMurray Jul 24, 2019
fcd5f38
fix conflict
MadelineMurray Jul 24, 2019
6d4f152
Merge branch 'master' of https://github.com/PegaSysEng/pantheon
MadelineMurray Jul 25, 2019
ba57ea5
Merge branch 'master' of https://github.com/PegaSysEng/pantheon
MadelineMurray Jul 26, 2019
149d814
WIP
MadelineMurray Jul 26, 2019
cc4fc6d
Added section on EEA compliant privacy
MadelineMurray Jul 26, 2019
6bb85cf
Added legacy type
MadelineMurray Jul 26, 2019
0968b35
Added link
MadelineMurray Jul 26, 2019
6d5226d
Merge branch 'master' into eeaCompliantPrivacy
MadelineMurray Jul 29, 2019
bc01365
Merge branch 'master' into eeaCompliantPrivacy
MadelineMurray Jul 29, 2019
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
Next Next commit
WIP
  • Loading branch information
MadelineMurray committed Jun 13, 2019
commit 0ed474b1867414ff6e502b44fa739d00384fd6cc
34 changes: 34 additions & 0 deletions docs/Reference/web3js-eea-Methods.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
web3.eea.getMakerTransaction

web3.eea.generatePrivacyGroup

web3.eea.sendRawTransaction

web3.eea.getTransactionCount

web3.eea.getTransactionReceipt



### eea.getMakerTransaction

Gets the [privacy marker transaction](../Privacy/Private-Transaction-Processing.md) transaction receipt.

**Parameters**

`txHash` - `string` : Transaction hash of the private transaction
`retries` - `int` : Number of attempts to make to get the private marker transaction receipts
`delay` - `int` : Delay between retries (in seconds?)

**Returns**

`result` : Privacy marker transaction receipt

!!! example
```bash tab="JS request"
eea.getMakerTransaction("tx hash -add", 5, 2)
```

```bash tab="Result"
Add this
```