add convert sha256 to string functions and update docs#22

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

Closed
bitkevin wants to merge 6 commits into from
Closed

add convert sha256 to string functions and update docs #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
981f4f1
fix "missing braces around initializer"
Mar 31, 2016
5316e79
Merge branch 'hotfix/fix_compile_iss'
Mar 31, 2016
69a9ed0
Merge branch 'master' of https://github.com/ElementsProject/lightning
Apr 7, 2016
d989053
bitcoind: add convert sha256 to string
Apr 7, 2016
a4409e7
docs: add install libsodium
Apr 7, 2016
3bd90a4
add tal allocated object to be parent
Apr 13, 2016
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
14 changes: 14 additions & 0 deletions INSTALL.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ You will need several development libraries:
To Build on Ubuntu 15.10
------------------------
Build protobuf-c dependency (>= 1.1.0):

```
sudo apt-get install libprotoc-dev
git clone https://github.com/protobuf-c/protobuf-c.git
Expand All@@ -21,7 +22,20 @@ make install
cd ../
```

Build libsodium:

```
wget https://download.libsodium.org/libsodium/releases/LATEST.tar.gz
tar zxvf LATEST.tar.gz
cd libsodium-1.0.10
./configure
make && make check
make install
cd ../
```

Clone lightning and initialize submodules:

```
git clone https://github.com/ElementsProject/lightning.git
cd lighting
Expand Down
18 changes: 18 additions & 0 deletions bitcoin/shadouble.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
#include "shadouble.h"
#include <ccan/mem/mem.h>
#include <stdio.h>

void sha256_double(struct sha256_double *shadouble, const void *p, size_t len)
{
Expand All@@ -12,3 +13,20 @@ void sha256_double_done(struct sha256_ctx *shactx, struct sha256_double *res)
sha256_done(shactx, &res->sha);
sha256(&res->sha, &res->sha, sizeof(res->sha));
}

char *sha256_str(const tal_t *ctx, struct sha256 *sha)
{
const size_t size = sizeof(struct sha256);
char *hex = tal_arr(ctx, char, size * 2 + 1);
size_t i = 0;
for (; i < size; i++) {
sprintf(hex + i*2, "%02x", sha->u.u8[size - i - 1]);
}
*(hex + size*2) = '\0';
return hex;
}

char *sha256_double_str(const tal_t *ctx, struct sha256_double *shadouble)
{
return sha256_str(ctx, &shadouble->sha);
}
5 changes: 5 additions & 0 deletions bitcoin/shadouble.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
#define LIGHTNING_BITCOIN_SHADOUBLE_H
#include "config.h"
#include <ccan/crypto/sha256/sha256.h>
#include <ccan/tal/tal.h>

/* To explicitly distinguish between single sha and bitcoin's standard double */
struct sha256_double {
Expand All@@ -11,4 +12,8 @@ struct sha256_double {
void sha256_double(struct sha256_double *shadouble, const void *p, size_t len);

void sha256_double_done(struct sha256_ctx *sha256, struct sha256_double *res);

char *sha256_str(const tal_t *ctx, struct sha256 *sha);
char *sha256_double_str(const tal_t *ctx, struct sha256_double *shadouble);

#endif /* LIGHTNING_BITCOIN_SHADOUBLE_H */
9 changes: 4 additions & 5 deletions daemon/bitcoind.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -251,12 +251,11 @@ static void process_transactions(struct bitcoin_cli *bcli)
bcli->output + blktok->start);
}
}
/* FIXME: log txid, blkid */

log_debug(bcli->dstate->base_log,
"txid %02x%02x%02x%02x..., conf %u, coinbase %u",
txid.sha.u.u8[0], txid.sha.u.u8[1],
txid.sha.u.u8[2], txid.sha.u.u8[3],
conf, is_coinbase);
"txid %s, conf %u, coinbase %u, blkhash %s",
sha256_double_str(bcli, &txid), conf, is_coinbase,
conf ? sha256_double_str(bcli, &blkhash) : "null");

@rustyrussellrustyrussellApr 12, 2016

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you allocate the strings off "bcli" (which will be freed when the command is done), you don't need to free the strings! In fact, you can just do:

log_debug(bcli->dstate->base_log,
"txid %s, conf %u, coinbase %u, blkhash %s",
sha256_double_str(bcli, &txid),
conf, is_coinbase, conf ? sha256_double_str(bcli, &blkhash) : "null");

Thanks!

cb(bcli->dstate, &txid, conf, is_coinbase,
conf ? &blkhash : NULL);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
add convert sha256 to string functions and update docs#22

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

 Closed

bitkevin
wants to merge
6
commits into

from

 Closed


add convert sha256 to string functions and update docs
#22
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
981f4f1

fix "missing braces around initializer"

Mar 31, 2016
5316e79

Merge branch 'hotfix/fix_compile_iss'

Mar 31, 2016
69a9ed0

Merge branch 'master' of https://github.com/ElementsProject/lightning

Apr 7, 2016
d989053

bitcoind: add convert sha256 to string

Apr 7, 2016
a4409e7

docs: add install libsodium

Apr 7, 2016
3bd90a4

add tal allocated object to be parent

Apr 13, 2016

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


14 changes: 14 additions & 0 deletions
INSTALL.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ You will need several development libraries:
To Build on Ubuntu 15.10
------------------------
Build protobuf-c dependency (>= 1.1.0):

```
sudo apt-get install libprotoc-dev
git clone https://github.com/protobuf-c/protobuf-c.git
Expand All@@ -21,7 +22,20 @@ make install
cd ../
```

Build libsodium:

```
wget https://download.libsodium.org/libsodium/releases/LATEST.tar.gz
tar zxvf LATEST.tar.gz
cd libsodium-1.0.10
./configure
make && make check
make install
cd ../
```

Clone lightning and initialize submodules:

```
git clone https://github.com/ElementsProject/lightning.git
cd lighting
Expand Down

18 changes: 18 additions & 0 deletions
bitcoin/shadouble.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
#include "shadouble.h"
#include <ccan/mem/mem.h>
#include <stdio.h>

void sha256_double(struct sha256_double *shadouble, const void *p, size_t len)
{
Expand All@@ -12,3 +13,20 @@ void sha256_double_done(struct sha256_ctx *shactx, struct sha256_double *res)
	sha256_done(shactx, &res->sha);
	sha256(&res->sha, &res->sha, sizeof(res->sha));
}

char *sha256_str(const tal_t *ctx, struct sha256 *sha)
{
	const size_t size = sizeof(struct sha256);
	char *hex = tal_arr(ctx, char, size * 2 + 1);
	size_t i = 0;
	for (; i < size; i++) {
 sprintf(hex + i*2, "%02x", sha->u.u8[size - i - 1]);
	}
	*(hex + size*2) = '\0';
	return hex;
}

char *sha256_double_str(const tal_t *ctx, struct sha256_double *shadouble)
{
	return sha256_str(ctx, &shadouble->sha);
}

5 changes: 5 additions & 0 deletions
bitcoin/shadouble.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
#define LIGHTNING_BITCOIN_SHADOUBLE_H
#include "config.h"
#include <ccan/crypto/sha256/sha256.h>
#include <ccan/tal/tal.h>

/* To explicitly distinguish between single sha and bitcoin's standard double */
struct sha256_double {
Expand All@@ -11,4 +12,8 @@ struct sha256_double {
void sha256_double(struct sha256_double *shadouble, const void *p, size_t len);

void sha256_double_done(struct sha256_ctx *sha256, struct sha256_double *res);

char *sha256_str(const tal_t *ctx, struct sha256 *sha);
char *sha256_double_str(const tal_t *ctx, struct sha256_double *shadouble);

#endif /* LIGHTNING_BITCOIN_SHADOUBLE_H */

9 changes: 4 additions & 5 deletions
daemon/bitcoind.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,12 +251,11 @@ static void process_transactions(struct bitcoin_cli *bcli)
 bcli->output + blktok->start);
 }
 }
 /* FIXME: log txid, blkid */

 log_debug(bcli->dstate->base_log,
 "txid %02x%02x%02x%02x..., conf %u, coinbase %u",
 txid.sha.u.u8[0], txid.sha.u.u8[1],
 txid.sha.u.u8[2], txid.sha.u.u8[3],
 conf, is_coinbase);
 "txid %s, conf %u, coinbase %u, blkhash %s",
 sha256_double_str(bcli, &txid), conf, is_coinbase,
 conf ? sha256_double_str(bcli, &blkhash) : "null");

@rustyrussellrustyrussellApr 12, 2016

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you allocate the strings off "bcli" (which will be freed when the command is done), you don't need to free the strings! In fact, you can just do:
log_debug(bcli->dstate->base_log,
"txid %s, conf %u, coinbase %u, blkhash %s",
sha256_double_str(bcli, &txid),
conf, is_coinbase, conf ? sha256_double_str(bcli, &blkhash) : "null");

Thanks!
 cb(bcli->dstate, &txid, conf, is_coinbase,
 conf ? &blkhash : NULL);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
add convert sha256 to string functions and update docs#22

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

 Closed

bitkevin
wants to merge
6
commits into

from

 Closed


add convert sha256 to string functions and update docs
#22
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
981f4f1

fix "missing braces around initializer"

Mar 31, 2016
5316e79

Merge branch 'hotfix/fix_compile_iss'

Mar 31, 2016
69a9ed0

Merge branch 'master' of https://github.com/ElementsProject/lightning

Apr 7, 2016
d989053

bitcoind: add convert sha256 to string

Apr 7, 2016
a4409e7

docs: add install libsodium

Apr 7, 2016
3bd90a4

add tal allocated object to be parent

Apr 13, 2016

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


14 changes: 14 additions & 0 deletions
INSTALL.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ You will need several development libraries:
To Build on Ubuntu 15.10
------------------------
Build protobuf-c dependency (>= 1.1.0):

```
sudo apt-get install libprotoc-dev
git clone https://github.com/protobuf-c/protobuf-c.git
Expand All@@ -21,7 +22,20 @@ make install
cd ../
```

Build libsodium:

```
wget https://download.libsodium.org/libsodium/releases/LATEST.tar.gz
tar zxvf LATEST.tar.gz
cd libsodium-1.0.10
./configure
make && make check
make install
cd ../
```

Clone lightning and initialize submodules:

```
git clone https://github.com/ElementsProject/lightning.git
cd lighting
Expand Down

18 changes: 18 additions & 0 deletions
bitcoin/shadouble.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
#include "shadouble.h"
#include <ccan/mem/mem.h>
#include <stdio.h>

void sha256_double(struct sha256_double *shadouble, const void *p, size_t len)
{
Expand All@@ -12,3 +13,20 @@ void sha256_double_done(struct sha256_ctx *shactx, struct sha256_double *res)
	sha256_done(shactx, &res->sha);
	sha256(&res->sha, &res->sha, sizeof(res->sha));
}

char *sha256_str(const tal_t *ctx, struct sha256 *sha)
{
	const size_t size = sizeof(struct sha256);
	char *hex = tal_arr(ctx, char, size * 2 + 1);
	size_t i = 0;
	for (; i < size; i++) {
 sprintf(hex + i*2, "%02x", sha->u.u8[size - i - 1]);
	}
	*(hex + size*2) = '\0';
	return hex;
}

char *sha256_double_str(const tal_t *ctx, struct sha256_double *shadouble)
{
	return sha256_str(ctx, &shadouble->sha);
}

5 changes: 5 additions & 0 deletions
bitcoin/shadouble.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
#define LIGHTNING_BITCOIN_SHADOUBLE_H
#include "config.h"
#include <ccan/crypto/sha256/sha256.h>
#include <ccan/tal/tal.h>

/* To explicitly distinguish between single sha and bitcoin's standard double */
struct sha256_double {
Expand All@@ -11,4 +12,8 @@ struct sha256_double {
void sha256_double(struct sha256_double *shadouble, const void *p, size_t len);

void sha256_double_done(struct sha256_ctx *sha256, struct sha256_double *res);

char *sha256_str(const tal_t *ctx, struct sha256 *sha);
char *sha256_double_str(const tal_t *ctx, struct sha256_double *shadouble);

#endif /* LIGHTNING_BITCOIN_SHADOUBLE_H */

9 changes: 4 additions & 5 deletions
daemon/bitcoind.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,12 +251,11 @@ static void process_transactions(struct bitcoin_cli *bcli)
 bcli->output + blktok->start);
 }
 }
 /* FIXME: log txid, blkid */

 log_debug(bcli->dstate->base_log,
 "txid %02x%02x%02x%02x..., conf %u, coinbase %u",
 txid.sha.u.u8[0], txid.sha.u.u8[1],
 txid.sha.u.u8[2], txid.sha.u.u8[3],
 conf, is_coinbase);
 "txid %s, conf %u, coinbase %u, blkhash %s",
 sha256_double_str(bcli, &txid), conf, is_coinbase,
 conf ? sha256_double_str(bcli, &blkhash) : "null");

@rustyrussellrustyrussellApr 12, 2016

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you allocate the strings off "bcli" (which will be freed when the command is done), you don't need to free the strings! In fact, you can just do:
log_debug(bcli->dstate->base_log,
"txid %s, conf %u, coinbase %u, blkhash %s",
sha256_double_str(bcli, &txid),
conf, is_coinbase, conf ? sha256_double_str(bcli, &blkhash) : "null");

Thanks!
 cb(bcli->dstate, &txid, conf, is_coinbase,
 conf ? &blkhash : NULL);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
add convert sha256 to string functions and update docs#22

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

 Closed

bitkevin
wants to merge
6
commits into

from

 Closed


add convert sha256 to string functions and update docs
#22
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
981f4f1

fix "missing braces around initializer"

Mar 31, 2016
5316e79

Merge branch 'hotfix/fix_compile_iss'

Mar 31, 2016
69a9ed0

Merge branch 'master' of https://github.com/ElementsProject/lightning

Apr 7, 2016
d989053

bitcoind: add convert sha256 to string

Apr 7, 2016
a4409e7

docs: add install libsodium

Apr 7, 2016
3bd90a4

add tal allocated object to be parent

Apr 13, 2016

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


14 changes: 14 additions & 0 deletions
INSTALL.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ You will need several development libraries:
To Build on Ubuntu 15.10
------------------------
Build protobuf-c dependency (>= 1.1.0):

```
sudo apt-get install libprotoc-dev
git clone https://github.com/protobuf-c/protobuf-c.git
Expand All@@ -21,7 +22,20 @@ make install
cd ../
```

Build libsodium:

```
wget https://download.libsodium.org/libsodium/releases/LATEST.tar.gz
tar zxvf LATEST.tar.gz
cd libsodium-1.0.10
./configure
make && make check
make install
cd ../
```

Clone lightning and initialize submodules:

```
git clone https://github.com/ElementsProject/lightning.git
cd lighting
Expand Down

18 changes: 18 additions & 0 deletions
bitcoin/shadouble.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
#include "shadouble.h"
#include <ccan/mem/mem.h>
#include <stdio.h>

void sha256_double(struct sha256_double *shadouble, const void *p, size_t len)
{
Expand All@@ -12,3 +13,20 @@ void sha256_double_done(struct sha256_ctx *shactx, struct sha256_double *res)
	sha256_done(shactx, &res->sha);
	sha256(&res->sha, &res->sha, sizeof(res->sha));
}

char *sha256_str(const tal_t *ctx, struct sha256 *sha)
{
	const size_t size = sizeof(struct sha256);
	char *hex = tal_arr(ctx, char, size * 2 + 1);
	size_t i = 0;
	for (; i < size; i++) {
 sprintf(hex + i*2, "%02x", sha->u.u8[size - i - 1]);
	}
	*(hex + size*2) = '\0';
	return hex;
}

char *sha256_double_str(const tal_t *ctx, struct sha256_double *shadouble)
{
	return sha256_str(ctx, &shadouble->sha);
}

5 changes: 5 additions & 0 deletions
bitcoin/shadouble.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
#define LIGHTNING_BITCOIN_SHADOUBLE_H
#include "config.h"
#include <ccan/crypto/sha256/sha256.h>
#include <ccan/tal/tal.h>

/* To explicitly distinguish between single sha and bitcoin's standard double */
struct sha256_double {
Expand All@@ -11,4 +12,8 @@ struct sha256_double {
void sha256_double(struct sha256_double *shadouble, const void *p, size_t len);

void sha256_double_done(struct sha256_ctx *sha256, struct sha256_double *res);

char *sha256_str(const tal_t *ctx, struct sha256 *sha);
char *sha256_double_str(const tal_t *ctx, struct sha256_double *shadouble);

#endif /* LIGHTNING_BITCOIN_SHADOUBLE_H */

9 changes: 4 additions & 5 deletions
daemon/bitcoind.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,12 +251,11 @@ static void process_transactions(struct bitcoin_cli *bcli)
 bcli->output + blktok->start);
 }
 }
 /* FIXME: log txid, blkid */

 log_debug(bcli->dstate->base_log,
 "txid %02x%02x%02x%02x..., conf %u, coinbase %u",
 txid.sha.u.u8[0], txid.sha.u.u8[1],
 txid.sha.u.u8[2], txid.sha.u.u8[3],
 conf, is_coinbase);
 "txid %s, conf %u, coinbase %u, blkhash %s",
 sha256_double_str(bcli, &txid), conf, is_coinbase,
 conf ? sha256_double_str(bcli, &blkhash) : "null");

@rustyrussellrustyrussellApr 12, 2016

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you allocate the strings off "bcli" (which will be freed when the command is done), you don't need to free the strings! In fact, you can just do:
log_debug(bcli->dstate->base_log,
"txid %s, conf %u, coinbase %u, blkhash %s",
sha256_double_str(bcli, &txid),
conf, is_coinbase, conf ? sha256_double_str(bcli, &blkhash) : "null");

Thanks!
 cb(bcli->dstate, &txid, conf, is_coinbase,
 conf ? &blkhash : NULL);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
add convert sha256 to string functions and update docs#22

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

 Closed

bitkevin
wants to merge
6
commits into

from

 Closed


add convert sha256 to string functions and update docs
#22
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
981f4f1

fix "missing braces around initializer"

Mar 31, 2016
5316e79

Merge branch 'hotfix/fix_compile_iss'

Mar 31, 2016
69a9ed0

Merge branch 'master' of https://github.com/ElementsProject/lightning

Apr 7, 2016
d989053

bitcoind: add convert sha256 to string

Apr 7, 2016
a4409e7

docs: add install libsodium

Apr 7, 2016
3bd90a4

add tal allocated object to be parent

Apr 13, 2016

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


14 changes: 14 additions & 0 deletions
INSTALL.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ You will need several development libraries:
To Build on Ubuntu 15.10
------------------------
Build protobuf-c dependency (>= 1.1.0):

```
sudo apt-get install libprotoc-dev
git clone https://github.com/protobuf-c/protobuf-c.git
Expand All@@ -21,7 +22,20 @@ make install
cd ../
```

Build libsodium:

```
wget https://download.libsodium.org/libsodium/releases/LATEST.tar.gz
tar zxvf LATEST.tar.gz
cd libsodium-1.0.10
./configure
make && make check
make install
cd ../
```

Clone lightning and initialize submodules:

```
git clone https://github.com/ElementsProject/lightning.git
cd lighting
Expand Down

18 changes: 18 additions & 0 deletions
bitcoin/shadouble.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
#include "shadouble.h"
#include <ccan/mem/mem.h>
#include <stdio.h>

void sha256_double(struct sha256_double *shadouble, const void *p, size_t len)
{
Expand All@@ -12,3 +13,20 @@ void sha256_double_done(struct sha256_ctx *shactx, struct sha256_double *res)
	sha256_done(shactx, &res->sha);
	sha256(&res->sha, &res->sha, sizeof(res->sha));
}

char *sha256_str(const tal_t *ctx, struct sha256 *sha)
{
	const size_t size = sizeof(struct sha256);
	char *hex = tal_arr(ctx, char, size * 2 + 1);
	size_t i = 0;
	for (; i < size; i++) {
 sprintf(hex + i*2, "%02x", sha->u.u8[size - i - 1]);
	}
	*(hex + size*2) = '\0';
	return hex;
}

char *sha256_double_str(const tal_t *ctx, struct sha256_double *shadouble)
{
	return sha256_str(ctx, &shadouble->sha);
}

5 changes: 5 additions & 0 deletions
bitcoin/shadouble.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
#define LIGHTNING_BITCOIN_SHADOUBLE_H
#include "config.h"
#include <ccan/crypto/sha256/sha256.h>
#include <ccan/tal/tal.h>

/* To explicitly distinguish between single sha and bitcoin's standard double */
struct sha256_double {
Expand All@@ -11,4 +12,8 @@ struct sha256_double {
void sha256_double(struct sha256_double *shadouble, const void *p, size_t len);

void sha256_double_done(struct sha256_ctx *sha256, struct sha256_double *res);

char *sha256_str(const tal_t *ctx, struct sha256 *sha);
char *sha256_double_str(const tal_t *ctx, struct sha256_double *shadouble);

#endif /* LIGHTNING_BITCOIN_SHADOUBLE_H */

9 changes: 4 additions & 5 deletions
daemon/bitcoind.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,12 +251,11 @@ static void process_transactions(struct bitcoin_cli *bcli)
 bcli->output + blktok->start);
 }
 }
 /* FIXME: log txid, blkid */

 log_debug(bcli->dstate->base_log,
 "txid %02x%02x%02x%02x..., conf %u, coinbase %u",
 txid.sha.u.u8[0], txid.sha.u.u8[1],
 txid.sha.u.u8[2], txid.sha.u.u8[3],
 conf, is_coinbase);
 "txid %s, conf %u, coinbase %u, blkhash %s",
 sha256_double_str(bcli, &txid), conf, is_coinbase,
 conf ? sha256_double_str(bcli, &blkhash) : "null");

@rustyrussellrustyrussellApr 12, 2016

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you allocate the strings off "bcli" (which will be freed when the command is done), you don't need to free the strings! In fact, you can just do:
log_debug(bcli->dstate->base_log,
"txid %s, conf %u, coinbase %u, blkhash %s",
sha256_double_str(bcli, &txid),
conf, is_coinbase, conf ? sha256_double_str(bcli, &blkhash) : "null");

Thanks!
 cb(bcli->dstate, &txid, conf, is_coinbase,
 conf ? &blkhash : NULL);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
add convert sha256 to string functions and update docs#22

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

 Closed

bitkevin
wants to merge
6
commits into

from

 Closed


add convert sha256 to string functions and update docs
#22
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
981f4f1

fix "missing braces around initializer"

Mar 31, 2016
5316e79

Merge branch 'hotfix/fix_compile_iss'

Mar 31, 2016
69a9ed0

Merge branch 'master' of https://github.com/ElementsProject/lightning

Apr 7, 2016
d989053

bitcoind: add convert sha256 to string

Apr 7, 2016
a4409e7

docs: add install libsodium

Apr 7, 2016
3bd90a4

add tal allocated object to be parent

Apr 13, 2016

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


14 changes: 14 additions & 0 deletions
INSTALL.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ You will need several development libraries:
To Build on Ubuntu 15.10
------------------------
Build protobuf-c dependency (>= 1.1.0):

```
sudo apt-get install libprotoc-dev
git clone https://github.com/protobuf-c/protobuf-c.git
Expand All@@ -21,7 +22,20 @@ make install
cd ../
```

Build libsodium:

```
wget https://download.libsodium.org/libsodium/releases/LATEST.tar.gz
tar zxvf LATEST.tar.gz
cd libsodium-1.0.10
./configure
make && make check
make install
cd ../
```

Clone lightning and initialize submodules:

```
git clone https://github.com/ElementsProject/lightning.git
cd lighting
Expand Down

18 changes: 18 additions & 0 deletions
bitcoin/shadouble.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
#include "shadouble.h"
#include <ccan/mem/mem.h>
#include <stdio.h>

void sha256_double(struct sha256_double *shadouble, const void *p, size_t len)
{
Expand All@@ -12,3 +13,20 @@ void sha256_double_done(struct sha256_ctx *shactx, struct sha256_double *res)
	sha256_done(shactx, &res->sha);
	sha256(&res->sha, &res->sha, sizeof(res->sha));
}

char *sha256_str(const tal_t *ctx, struct sha256 *sha)
{
	const size_t size = sizeof(struct sha256);
	char *hex = tal_arr(ctx, char, size * 2 + 1);
	size_t i = 0;
	for (; i < size; i++) {
 sprintf(hex + i*2, "%02x", sha->u.u8[size - i - 1]);
	}
	*(hex + size*2) = '\0';
	return hex;
}

char *sha256_double_str(const tal_t *ctx, struct sha256_double *shadouble)
{
	return sha256_str(ctx, &shadouble->sha);
}

5 changes: 5 additions & 0 deletions
bitcoin/shadouble.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
#define LIGHTNING_BITCOIN_SHADOUBLE_H
#include "config.h"
#include <ccan/crypto/sha256/sha256.h>
#include <ccan/tal/tal.h>

/* To explicitly distinguish between single sha and bitcoin's standard double */
struct sha256_double {
Expand All@@ -11,4 +12,8 @@ struct sha256_double {
void sha256_double(struct sha256_double *shadouble, const void *p, size_t len);

void sha256_double_done(struct sha256_ctx *sha256, struct sha256_double *res);

char *sha256_str(const tal_t *ctx, struct sha256 *sha);
char *sha256_double_str(const tal_t *ctx, struct sha256_double *shadouble);

#endif /* LIGHTNING_BITCOIN_SHADOUBLE_H */

9 changes: 4 additions & 5 deletions
daemon/bitcoind.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,12 +251,11 @@ static void process_transactions(struct bitcoin_cli *bcli)
 bcli->output + blktok->start);
 }
 }
 /* FIXME: log txid, blkid */

 log_debug(bcli->dstate->base_log,
 "txid %02x%02x%02x%02x..., conf %u, coinbase %u",
 txid.sha.u.u8[0], txid.sha.u.u8[1],
 txid.sha.u.u8[2], txid.sha.u.u8[3],
 conf, is_coinbase);
 "txid %s, conf %u, coinbase %u, blkhash %s",
 sha256_double_str(bcli, &txid), conf, is_coinbase,
 conf ? sha256_double_str(bcli, &blkhash) : "null");

@rustyrussellrustyrussellApr 12, 2016

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you allocate the strings off "bcli" (which will be freed when the command is done), you don't need to free the strings! In fact, you can just do:
log_debug(bcli->dstate->base_log,
"txid %s, conf %u, coinbase %u, blkhash %s",
sha256_double_str(bcli, &txid),
conf, is_coinbase, conf ? sha256_double_str(bcli, &blkhash) : "null");

Thanks!
 cb(bcli->dstate, &txid, conf, is_coinbase,
 conf ? &blkhash : NULL);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
add convert sha256 to string functions and update docs#22

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

 Closed

bitkevin
wants to merge
6
commits into

from

 Closed


add convert sha256 to string functions and update docs
#22
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
981f4f1

fix "missing braces around initializer"

Mar 31, 2016
5316e79

Merge branch 'hotfix/fix_compile_iss'

Mar 31, 2016
69a9ed0

Merge branch 'master' of https://github.com/ElementsProject/lightning

Apr 7, 2016
d989053

bitcoind: add convert sha256 to string

Apr 7, 2016
a4409e7

docs: add install libsodium

Apr 7, 2016
3bd90a4

add tal allocated object to be parent

Apr 13, 2016

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


14 changes: 14 additions & 0 deletions
INSTALL.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ You will need several development libraries:
To Build on Ubuntu 15.10
------------------------
Build protobuf-c dependency (>= 1.1.0):

```
sudo apt-get install libprotoc-dev
git clone https://github.com/protobuf-c/protobuf-c.git
Expand All@@ -21,7 +22,20 @@ make install
cd ../
```

Build libsodium:

```
wget https://download.libsodium.org/libsodium/releases/LATEST.tar.gz
tar zxvf LATEST.tar.gz
cd libsodium-1.0.10
./configure
make && make check
make install
cd ../
```

Clone lightning and initialize submodules:

```
git clone https://github.com/ElementsProject/lightning.git
cd lighting
Expand Down

18 changes: 18 additions & 0 deletions
bitcoin/shadouble.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
#include "shadouble.h"
#include <ccan/mem/mem.h>
#include <stdio.h>

void sha256_double(struct sha256_double *shadouble, const void *p, size_t len)
{
Expand All@@ -12,3 +13,20 @@ void sha256_double_done(struct sha256_ctx *shactx, struct sha256_double *res)
	sha256_done(shactx, &res->sha);
	sha256(&res->sha, &res->sha, sizeof(res->sha));
}

char *sha256_str(const tal_t *ctx, struct sha256 *sha)
{
	const size_t size = sizeof(struct sha256);
	char *hex = tal_arr(ctx, char, size * 2 + 1);
	size_t i = 0;
	for (; i < size; i++) {
 sprintf(hex + i*2, "%02x", sha->u.u8[size - i - 1]);
	}
	*(hex + size*2) = '\0';
	return hex;
}

char *sha256_double_str(const tal_t *ctx, struct sha256_double *shadouble)
{
	return sha256_str(ctx, &shadouble->sha);
}

5 changes: 5 additions & 0 deletions
bitcoin/shadouble.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
#define LIGHTNING_BITCOIN_SHADOUBLE_H
#include "config.h"
#include <ccan/crypto/sha256/sha256.h>
#include <ccan/tal/tal.h>

/* To explicitly distinguish between single sha and bitcoin's standard double */
struct sha256_double {
Expand All@@ -11,4 +12,8 @@ struct sha256_double {
void sha256_double(struct sha256_double *shadouble, const void *p, size_t len);

void sha256_double_done(struct sha256_ctx *sha256, struct sha256_double *res);

char *sha256_str(const tal_t *ctx, struct sha256 *sha);
char *sha256_double_str(const tal_t *ctx, struct sha256_double *shadouble);

#endif /* LIGHTNING_BITCOIN_SHADOUBLE_H */

9 changes: 4 additions & 5 deletions
daemon/bitcoind.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,12 +251,11 @@ static void process_transactions(struct bitcoin_cli *bcli)
 bcli->output + blktok->start);
 }
 }
 /* FIXME: log txid, blkid */

 log_debug(bcli->dstate->base_log,
 "txid %02x%02x%02x%02x..., conf %u, coinbase %u",
 txid.sha.u.u8[0], txid.sha.u.u8[1],
 txid.sha.u.u8[2], txid.sha.u.u8[3],
 conf, is_coinbase);
 "txid %s, conf %u, coinbase %u, blkhash %s",
 sha256_double_str(bcli, &txid), conf, is_coinbase,
 conf ? sha256_double_str(bcli, &blkhash) : "null");

@rustyrussellrustyrussellApr 12, 2016

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you allocate the strings off "bcli" (which will be freed when the command is done), you don't need to free the strings! In fact, you can just do:
log_debug(bcli->dstate->base_log,
"txid %s, conf %u, coinbase %u, blkhash %s",
sha256_double_str(bcli, &txid),
conf, is_coinbase, conf ? sha256_double_str(bcli, &blkhash) : "null");

Thanks!
 cb(bcli->dstate, &txid, conf, is_coinbase,
 conf ? &blkhash : NULL);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
add convert sha256 to string functions and update docs#22

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

 Closed

bitkevin
wants to merge
6
commits into

from

 Closed


add convert sha256 to string functions and update docs
#22
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
981f4f1

fix "missing braces around initializer"

Mar 31, 2016
5316e79

Merge branch 'hotfix/fix_compile_iss'

Mar 31, 2016
69a9ed0

Merge branch 'master' of https://github.com/ElementsProject/lightning

Apr 7, 2016
d989053

bitcoind: add convert sha256 to string

Apr 7, 2016
a4409e7

docs: add install libsodium

Apr 7, 2016
3bd90a4

add tal allocated object to be parent

Apr 13, 2016

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


14 changes: 14 additions & 0 deletions
INSTALL.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ You will need several development libraries:
To Build on Ubuntu 15.10
------------------------
Build protobuf-c dependency (>= 1.1.0):

```
sudo apt-get install libprotoc-dev
git clone https://github.com/protobuf-c/protobuf-c.git
Expand All@@ -21,7 +22,20 @@ make install
cd ../
```

Build libsodium:

```
wget https://download.libsodium.org/libsodium/releases/LATEST.tar.gz
tar zxvf LATEST.tar.gz
cd libsodium-1.0.10
./configure
make && make check
make install
cd ../
```

Clone lightning and initialize submodules:

```
git clone https://github.com/ElementsProject/lightning.git
cd lighting
Expand Down

18 changes: 18 additions & 0 deletions
bitcoin/shadouble.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
#include "shadouble.h"
#include <ccan/mem/mem.h>
#include <stdio.h>

void sha256_double(struct sha256_double *shadouble, const void *p, size_t len)
{
Expand All@@ -12,3 +13,20 @@ void sha256_double_done(struct sha256_ctx *shactx, struct sha256_double *res)
	sha256_done(shactx, &res->sha);
	sha256(&res->sha, &res->sha, sizeof(res->sha));
}

char *sha256_str(const tal_t *ctx, struct sha256 *sha)
{
	const size_t size = sizeof(struct sha256);
	char *hex = tal_arr(ctx, char, size * 2 + 1);
	size_t i = 0;
	for (; i < size; i++) {
 sprintf(hex + i*2, "%02x", sha->u.u8[size - i - 1]);
	}
	*(hex + size*2) = '\0';
	return hex;
}

char *sha256_double_str(const tal_t *ctx, struct sha256_double *shadouble)
{
	return sha256_str(ctx, &shadouble->sha);
}

5 changes: 5 additions & 0 deletions
bitcoin/shadouble.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
#define LIGHTNING_BITCOIN_SHADOUBLE_H
#include "config.h"
#include <ccan/crypto/sha256/sha256.h>
#include <ccan/tal/tal.h>

/* To explicitly distinguish between single sha and bitcoin's standard double */
struct sha256_double {
Expand All@@ -11,4 +12,8 @@ struct sha256_double {
void sha256_double(struct sha256_double *shadouble, const void *p, size_t len);

void sha256_double_done(struct sha256_ctx *sha256, struct sha256_double *res);

char *sha256_str(const tal_t *ctx, struct sha256 *sha);
char *sha256_double_str(const tal_t *ctx, struct sha256_double *shadouble);

#endif /* LIGHTNING_BITCOIN_SHADOUBLE_H */

9 changes: 4 additions & 5 deletions
daemon/bitcoind.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,12 +251,11 @@ static void process_transactions(struct bitcoin_cli *bcli)
 bcli->output + blktok->start);
 }
 }
 /* FIXME: log txid, blkid */

 log_debug(bcli->dstate->base_log,
 "txid %02x%02x%02x%02x..., conf %u, coinbase %u",
 txid.sha.u.u8[0], txid.sha.u.u8[1],
 txid.sha.u.u8[2], txid.sha.u.u8[3],
 conf, is_coinbase);
 "txid %s, conf %u, coinbase %u, blkhash %s",
 sha256_double_str(bcli, &txid), conf, is_coinbase,
 conf ? sha256_double_str(bcli, &blkhash) : "null");

@rustyrussellrustyrussellApr 12, 2016

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you allocate the strings off "bcli" (which will be freed when the command is done), you don't need to free the strings! In fact, you can just do:
log_debug(bcli->dstate->base_log,
"txid %s, conf %u, coinbase %u, blkhash %s",
sha256_double_str(bcli, &txid),
conf, is_coinbase, conf ? sha256_double_str(bcli, &blkhash) : "null");

Thanks!
 cb(bcli->dstate, &txid, conf, is_coinbase,
 conf ? &blkhash : NULL);
Expand Down