Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Scope problem #1

Open
wants to merge 76 commits into
base: master
Choose a base branch
from
Open

Scope problem #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
ef1d72a
trying to get encryption working
ameba23 Apr 26, 2018
4590baf
finally works with private messages
ameba23 Apr 27, 2018
23df161
write locally to json file
ameba23 Apr 27, 2018
f06907e
electron hello world
ameba23 Apr 27, 2018
fdd37eb
readme
ameba23 Apr 27, 2018
1856f30
cant get electron and jquery to work together
ameba23 Apr 27, 2018
bd9e7e9
readme
ameba23 Apr 27, 2018
91e6c1c
whoami?
ameba23 Apr 27, 2018
5038427
who am i
ameba23 Apr 27, 2018
54c4e67
typo
ameba23 Apr 27, 2018
4fd76a2
Filter by type
nikolai-b Apr 27, 2018
0c250e8
Add electron to packages
nikolai-b Apr 28, 2018
a1aab6f
Add npm start
nikolai-b Apr 28, 2018
855b231
Fix: Show payment keys in electron
nikolai-b Apr 28, 2018
6f9a69a
try to make a table
ameba23 Apr 28, 2018
4fa6021
merge
ameba23 Apr 28, 2018
d8d382c
sorted readme, made a mess of everything else
ameba23 Apr 29, 2018
a64dc67
still lots to do
ameba23 Apr 29, 2018
55b99ce
slightly less worse
ameba23 Apr 30, 2018
5372a7d
type specification has changed
ameba23 Apr 30, 2018
f844760
fix problem with undefined variable
ameba23 Apr 30, 2018
a030186
output html
ameba23 Apr 30, 2018
c7d5232
cosigner array
ameba23 Apr 30, 2018
9bd86e8
more example types
ameba23 May 1, 2018
9f0dc0f
tidied message types
ameba23 May 1, 2018
874ebaa
began other message types
ameba23 May 1, 2018
8294ffb
dont add duplicates to arrays
ameba23 May 1, 2018
742ea25
small bugs fixed
ameba23 May 2, 2018
20510b0
support multiple wallets
ameba23 May 2, 2018
3ed73f0
readme
ameba23 May 2, 2018
9d2a1c9
write files (need to write only unique items)
ameba23 May 2, 2018
00102d0
only add unique items almost works
ameba23 May 2, 2018
2c5fe51
lots of small tweaks
ameba23 May 2, 2018
79cc4ed
fixed whoami
ameba23 May 3, 2018
19af3ab
readme
ameba23 May 4, 2018
5296411
display html table using clone
ameba23 May 7, 2018
5734a4e
add example localdb.json
ameba23 May 7, 2018
9f2f12f
begin making electrum-client
ameba23 May 8, 2018
0a030e0
comments...
ameba23 May 8, 2018
8d77ec4
deserialize a tx
ameba23 May 8, 2018
5086fdf
payto function
ameba23 May 8, 2018
8811520
readme, createmultisig
ameba23 May 8, 2018
3a5a0f6
more electrum functions
ameba23 May 9, 2018
3b9cef0
parse electrum history into our data structure
ameba23 May 10, 2018
c3e1b90
module exports
ameba23 May 10, 2018
486cdb2
reformat function names
ameba23 May 10, 2018
f3a06b7
separate file for front end
ameba23 May 10, 2018
09ccaa0
readme
ameba23 May 10, 2018
1378824
automate starting daemon and loading unencrypted wallet
ameba23 May 10, 2018
987023e
buttons, deepmerge and other bits
ameba23 May 11, 2018
fe13718
buttons that dont do anything
ameba23 May 11, 2018
eaa3aff
jquery UI tabs
ameba23 May 11, 2018
fe26485
keep css and js local
ameba23 May 11, 2018
def6130
more html
ameba23 May 11, 2018
80d2a29
display wallet info
ameba23 May 11, 2018
55aaf63
recieve addresses
ameba23 May 12, 2018
b2df314
minor changes from mixs refactoring
ameba23 May 14, 2018
5aa2831
send button
ameba23 May 14, 2018
edad576
verify bitcoin addresses
ameba23 May 14, 2018
e10712d
move files around
ameba23 May 15, 2018
682158f
payto function moved
ameba23 May 15, 2018
bf4df4e
Suggested updates to message
nikolai-b May 17, 2018
49d4929
add comments to recieve addresses
ameba23 May 25, 2018
26cf543
display recieve address memos
ameba23 May 25, 2018
eff6616
message type for recieve address memos
ameba23 May 26, 2018
27c4fed
password for payTo
ameba23 May 26, 2018
d9a2dd4
fixed bug with displaying transactions from electrum
ameba23 May 26, 2018
c817e9c
updated for electrum v3.1.3
ameba23 May 26, 2018
6bc543f
got a problem with scope for sbot methods
ameba23 May 27, 2018
a984a27
tidied readme
ameba23 May 27, 2018
3a9d73c
Merge branch 'readme'
ameba23 May 27, 2018
afa59d1
can publish ssb message in response to click event
ameba23 May 27, 2018
f2e094d
get hash of mpk to use as wallet identifier
ameba23 May 27, 2018
39a7b0a
rename ssb message type
ameba23 May 27, 2018
fea610d
send amount validation
ameba23 May 28, 2018
a18b87d
Merge branch 'master' into scope_problem
ameba23 May 28, 2018
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
node_modules/
localdb.json
7 changes: 7 additions & 0 deletions css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions css/jquery-ui.min.css
View file
Open in desktop

Large diffs are not rendered by default.

193 changes: 193 additions & 0 deletions html/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>mmt payment metadata app</title>


<link rel="stylesheet" href="../css/bootstrap.min.css">
<link rel="stylesheet" href="../css/jquery-ui.min.css">
<style>
/* TODO: put this somewhere else */
.incompleteUnfilled {
display: none;
}
.paymentsUnfilled {
display: none;
}
.addressesUnfilled {
display: none;
}
.requestsUnfilled {
display: none;
}
#payTo {
width: 400px;
}
</style>

<!-- Insert this line above script imports -->
<script>
delete module.exports
</script>

<script src="../scripts/jquery-3.3.1.min.js"></script>
<script src="../scripts/jquery-ui.min.js"></script>

<!-- normal script imports etc -->

<script src="../src/mmt-metadata.js"></script>

<script>
// TODO: put this somewhere else
$( function() {
$( "#tabs" ).tabs();
} );
</script>

</head>
<body>
<div class = "container">
<h1>mmt payment metadata app</h1>
<div id="walletInfo">
<b><span id="walletName"></span></b> -
<span id="requiredCosigners"></span> of <span id="numberCosigners"></span> multisig. -
Confirmed balance: <span class="balance"></span> BTC
</div>
<div id="tabs">
<ul>
<li><a href="#history">Transactions</a></li>
<li><a href="#send">Send</a></li>
<li><a href="#recieve">Recieve</a></li>
<li><a href="#addresses">Addresses</a></li>
<li><a href="#coins">Coins</a></li>
<li><a href="#contacts">Contacts</a></li>
</ul>

<div id="history">
<h3> Incomplete transactions </h3>
<table class = "table">
<thead>
<tr>
<th> Date </th>
<th> Cosigners </th>
<th> Description and comments </th>
<th> Rate </th>
<th> Amount </th>
<th> Confirmations </th>
<th> Recipient(s) </th>
<th> Options </th>
</tr>
</thead>
<tbody id="incompleteTbody">
<tr class="incompleteUnfilled">
<td class="date"></td>
<td class="Initiated by"></td>
<td class="cosigners"></td>
<td class="comment"></td>
<td class="rate"></td>
<td class="amount"></td>
<td class="recipients"></td>
<td class="options">
<button class="details">Sign</button>
<button class="details">Details</button>
<button class="addComment">Add comment</button>
</td>
</tr>
</tbody>
</table>
<h3> Broadcast transactions </h3>
<table class = "table">
<thead>
<tr>
<th> Date </th>
<th> Cosigners </th>
<th> Description and comments </th>
<th> Rate </th>
<th> Amount </th>
<th> Confirmations </th>
<th> Recipient(s) </th>
<th> Options </th>
</tr>
</thead>
<tbody id="paymentsTbody">
<tr class="paymentsUnfilled">
<td class="date"></td>
<td class="cosigners"></td>
<td class="comment"></td>
<td class="rate"></td>
<td class="amount"></td>
<td class="confirmations"></td>
<td class="recipients"></td>
<td class="options">
<button class="details">Details</button>
<button class="addComment">Add comment</button>
</td>
</tr>
</tbody>
</table>
</div>

<div id="send">
<p>Balance available: <span class="balance"></span> BTC</p>
<p>Pay to: <input type="text" name="payTo" id="payTo" ></p>
<p>Amount: <input type="text" name="sendAmount" id="sendAmount" ></p>
<p>Description: <input type="text" name="sendComment" id="sendComment" ></p>
<button id="createTransaction">Create transaction</button>
<p><span id="sendVerifyErrors"></span></p>
</div>

<div id="recieve">
<p> Recieve address: <span id="recieveAddress"></span><button id="addressToClipboard" onclick="">Copy to clipboard</button></p>
<p> Memo <input type="text" name="memo" id="memo" oninput='' ></p>
<p> Requested Amount (optional) <input type="text" name="requestedAmount" id="requestedAmount" oninput=''></p>
<p> Expires: (drop down box?) </p>
<button id="recieveMemo">Save memo to recieve address</button>
<br><br>
<h4> Existing requests: </h4>
<table class = "table">
<thead>
<tr>
<th> Address </th>
<th> Memo </th>
</tr>
</thead>
<tbody id="requestsTbody">
<tr class="requestsUnfilled">
<td class="address"></td>
<td class="memo"></td>
</tr>
</tbody>
</table>
</div>

<div id="addresses">

<table class = "table">
<thead>
<tr>
<th> Address </th>
<th> Amount </th>
</tr>
</thead>
<tbody id="addressesTbody">
<tr class="addressesUnfilled">
<td class="address"></td>
<td class="amount"></td>
</tr>
</tbody>
</table>
</div>

<div id="coins">
<p>coming soon</p>
</div>

<div id="contacts">
<p>coming soon</p>
</div>

</div>
</div>
</body>
</html>
51 changes: 51 additions & 0 deletions localdb.json.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"%2idi0F1cCzjhHKSh8gymzvP+LDiXbB/dv2x7mt47n5Q=.sha256": {
"name": "the groovy gang wallet",
"requiredCosigners": 2,
"publicKeys": [
{
"owner": "@vEJe4hdnbHJl549200IytOeA3THbnP0oM+JQtS1u+8o=.ed25519",
"xpub": "xpubblahblah...."
}
],
"payments": {
"d5f2a6a8cd1e8c35466cfec16551": {
"comments": [
{
"author": "@vEJe4hdnbHJl549200IytOeA3THbnP0oM+JQtS1u+8o=.ed25519",
"comment": "bought a new pencil sharpener"
},
{
"author": "@vEJe4hdnbHJl549200IytOeA3THbnP0oM+JQtS1u+8o=.ed25519",
"comment": "this payment was a mistake"
}
],
"rate": 5000,
"amount": 59300,
"confirmations": 5443,
"timestamp": "unknown"
},
"d5fsdffd1e8c35466cfe45dg": {
"comments": [
{
"author": "@vEJe4hdnbHJl549200IytOeA3THbnP0oM+JQtS1u+8o=.ed25519",
"comment": "bought a cheese grater"
}
],
"rate": 5560,
"amount": 500,
"confirmations": 4,
"timestamp": "unknown"
},
"dc4c9bf17b2dff0fff82e2b7cc98b343c14479586a4b8099dc0c52c825176647": {
"amount": 88000,
"confirmations": 3500,
"timestamp": 1524336989000,
"comments": []
}
},
"cosigners": [
"@vEJe4hdnbHJl549200IytOeA3THbnP0oM+JQtS1u+8o=.ed25519"
]
}
}
135 changes: 0 additions & 135 deletions mmt-metadata.js
View file
Open in desktop

This file was deleted.

Loading