Conflicts:
Script.js
ScriptInterpreter.js
Transaction.js
test/testdata.js
...conflicts resolved by taking Manuel's changes, and then manually including
Matias's changes on those same files. The conflicts resulted from differences
in indentation, which is because Matias' changes unindendented all the code
that had been but is not now inside a function.
@ -17,9 +17,9 @@ Bitcore runs on [node](http://nodejs.org/), and can be installed via [npm](https
npm install bitcore
npm install bitcore
```
```
It is a collection of objects useful to bitcoin applications; class-like idioms are enabled via [Classtool](https://github.com/gasteve/classtool). In most cases, a developer will require the object's class directly:
It is a collection of objects useful to bitcoin applications; class-like idioms are enabled via [Soop](https://github.com/gasteve/soop). In most cases, a developer will require the object's class directly:
```
```
var Address = require('bitcore/Address').class();
var Address = require('bitcore/Address');
```
```
#Examples
#Examples
@ -29,7 +29,7 @@ Some examples are provided at the [examples](/examples) path. Here are some snip
## Validating an address
## Validating an address
Validating a Bitcoin address:
Validating a Bitcoin address:
```js
```js
var Address = require('bitcore/Address').class();
var Address = require('bitcore/Address');
var addrStrings = [
var addrStrings = [
"1A1zP1eP5QGefi2DMPTfTL5SLmv7DivfNa",
"1A1zP1eP5QGefi2DMPTfTL5SLmv7DivfNa",
@ -57,10 +57,9 @@ For this example you need a running bitcoind instance with RPC enabled.
```js
```js
var util = require('util');
var util = require('util');
var networks = require('bitcore/networks');
var networks = require('bitcore/networks');
var Peer = require('bitcore/Peer').class();
var Peer = require('bitcore/Peer');
var PeerManager = require('bitcore/PeerManager').createClass({
var PeerManager = require('soop').load('bitcore/PeerManager',
network: networks.testnet
{network: networks.testnet});
});
var handleBlock = function(info) {
var handleBlock = function(info) {
@ -109,14 +108,13 @@ PeerManager will emit the following events: 'version', 'verack', 'addr', 'getadd
For this example you need a running bitcoind instance with RPC enabled.
For this example you need a running bitcoind instance with RPC enabled.
```js
```js
var networks = require('bitcore/networks');
var networks = require('bitcore/networks');
var Peer = require('bitcore/Peer').class();
var Peer = require('bitcore/Peer');
var Transaction = require('bitcore/Transaction').class();
var Transaction = require('bitcore/Transaction');
var Address = require('bitcore/Address').class();
var Address = require('bitcore/Address');
var Script = require('bitcore/Script').class();
var Script = require('bitcore/Script');
var coinUtil = require('bitcore/util/util');
var coinUtil = require('bitcore/util/util');
var PeerManager = require('bitcore/PeerManager').createClass({
var PeerManager = require('soop').load('bitcore/PeerManager',
network: networks.testnet
{network: networks.testnet});
});
var createTx = function() {
var createTx = function() {
@ -185,7 +183,7 @@ peerman.start();
For this example you need a running bitcoind instance with RPC enabled.
For this example you need a running bitcoind instance with RPC enabled.
```js
```js
var util = require('util');
var util = require('util');
var RpcClient = require('bitcore/RpcClient').class();
var RpcClient = require('bitcore/RpcClient');
var hash = process.argv[2] || '0000000000b6288775bbd326bedf324ca8717a15191da58391535408205aada4';
var hash = process.argv[2] || '0000000000b6288775bbd326bedf324ca8717a15191da58391535408205aada4';
var config = {
var config = {
@ -217,7 +215,7 @@ Check the list of all supported RPC call at [RpcClient.js](RpcClient.js)
Gets an address strings from a ScriptPubKey Buffer
Gets an address strings from a ScriptPubKey Buffer
Ryan X. Charles
11 years ago