Use late definition to resolve circular dependency.
This commit is contained in:
parent
4e212e846d
commit
ef26931645
|
@ -7,7 +7,6 @@ var Base58Check = require('./encoding/base58check');
|
||||||
var Networks = require('./networks');
|
var Networks = require('./networks');
|
||||||
var Hash = require('./crypto/hash');
|
var Hash = require('./crypto/hash');
|
||||||
var JSUtil = require('./util/js');
|
var JSUtil = require('./util/js');
|
||||||
var Script = require('./script');
|
|
||||||
var PublicKey = require('./publickey');
|
var PublicKey = require('./publickey');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -505,3 +504,5 @@ Address.prototype.inspect = function() {
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports = Address;
|
module.exports = Address;
|
||||||
|
|
||||||
|
var Script = require('./script');
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
var Address = require('../address');
|
||||||
var BufferReader = require('../encoding/bufferreader');
|
var BufferReader = require('../encoding/bufferreader');
|
||||||
var BufferWriter = require('../encoding/bufferwriter');
|
var BufferWriter = require('../encoding/bufferwriter');
|
||||||
var Hash = require('../crypto/hash');
|
var Hash = require('../crypto/hash');
|
||||||
|
@ -8,7 +8,6 @@ var Opcode = require('../opcode');
|
||||||
var PublicKey = require('../publickey');
|
var PublicKey = require('../publickey');
|
||||||
var Signature = require('../crypto/signature');
|
var Signature = require('../crypto/signature');
|
||||||
var Networks = require('../networks');
|
var Networks = require('../networks');
|
||||||
|
|
||||||
var $ = require('../util/preconditions');
|
var $ = require('../util/preconditions');
|
||||||
var _ = require('lodash');
|
var _ = require('lodash');
|
||||||
var errors = require('../errors');
|
var errors = require('../errors');
|
||||||
|
@ -29,8 +28,6 @@ var Script = function Script(from) {
|
||||||
if (!(this instanceof Script)) {
|
if (!(this instanceof Script)) {
|
||||||
return new Script(from);
|
return new Script(from);
|
||||||
}
|
}
|
||||||
var Address = require('../address');
|
|
||||||
|
|
||||||
this.chunks = [];
|
this.chunks = [];
|
||||||
|
|
||||||
if (BufferUtil.isBuffer(from)) {
|
if (BufferUtil.isBuffer(from)) {
|
||||||
|
@ -639,7 +636,6 @@ Script.buildP2SHMultisigIn = function(pubkeys, threshold, signatures, opts) {
|
||||||
* @param {(Address|PublicKey)} to - destination address or public key
|
* @param {(Address|PublicKey)} to - destination address or public key
|
||||||
*/
|
*/
|
||||||
Script.buildPublicKeyHashOut = function(to) {
|
Script.buildPublicKeyHashOut = function(to) {
|
||||||
var Address = require('../address');
|
|
||||||
$.checkArgument(!_.isUndefined(to));
|
$.checkArgument(!_.isUndefined(to));
|
||||||
$.checkArgument(to instanceof PublicKey || to instanceof Address || _.isString(to));
|
$.checkArgument(to instanceof PublicKey || to instanceof Address || _.isString(to));
|
||||||
if (to instanceof PublicKey) {
|
if (to instanceof PublicKey) {
|
||||||
|
@ -692,7 +688,6 @@ Script.buildDataOut = function(data) {
|
||||||
* @returns {Script} new pay to script hash script for given script
|
* @returns {Script} new pay to script hash script for given script
|
||||||
*/
|
*/
|
||||||
Script.buildScriptHashOut = function(script) {
|
Script.buildScriptHashOut = function(script) {
|
||||||
var Address = require('../address');
|
|
||||||
$.checkArgument(script instanceof Script ||
|
$.checkArgument(script instanceof Script ||
|
||||||
(script instanceof Address && script.isPayToScriptHash()));
|
(script instanceof Address && script.isPayToScriptHash()));
|
||||||
var s = new Script();
|
var s = new Script();
|
||||||
|
@ -745,7 +740,6 @@ Script.prototype.toScriptHashOut = function() {
|
||||||
* @return {Script} an output script built from the address
|
* @return {Script} an output script built from the address
|
||||||
*/
|
*/
|
||||||
Script.fromAddress = function(address) {
|
Script.fromAddress = function(address) {
|
||||||
var Address = require('../address');
|
|
||||||
address = Address(address);
|
address = Address(address);
|
||||||
if (address.isPayToScriptHash()) {
|
if (address.isPayToScriptHash()) {
|
||||||
return Script.buildScriptHashOut(address);
|
return Script.buildScriptHashOut(address);
|
||||||
|
@ -761,7 +755,6 @@ Script.fromAddress = function(address) {
|
||||||
* for this script if any, or false
|
* for this script if any, or false
|
||||||
*/
|
*/
|
||||||
Script.prototype.getAddressInfo = function() {
|
Script.prototype.getAddressInfo = function() {
|
||||||
var Address = require('../address');
|
|
||||||
var info = {};
|
var info = {};
|
||||||
if (this.isScriptHashOut()) {
|
if (this.isScriptHashOut()) {
|
||||||
info.hashBuffer = this.getData();
|
info.hashBuffer = this.getData();
|
||||||
|
@ -787,7 +780,6 @@ Script.prototype.getAddressInfo = function() {
|
||||||
* @return {Address|boolean} the associated address for this script if possible, or false
|
* @return {Address|boolean} the associated address for this script if possible, or false
|
||||||
*/
|
*/
|
||||||
Script.prototype.toAddress = function(network) {
|
Script.prototype.toAddress = function(network) {
|
||||||
var Address = require('../address');
|
|
||||||
network = Networks.get(network) || this._network || Networks.defaultNetwork;
|
network = Networks.get(network) || this._network || Networks.defaultNetwork;
|
||||||
var info = this.getAddressInfo();
|
var info = this.getAddressInfo();
|
||||||
if (!info) {
|
if (!info) {
|
||||||
|
|
Loading…
Reference in New Issue