Skip to content

Feat/bulk slp transactions #1

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

Open
crypto-blossom wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feat/bulk slp transactions #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68f8104
[feat] bulk slp transactions
lucasmgv Jan 25, 2020
321b7e6
Zclassic changes
cryptobubbles Feb 19, 2020
8bff7bd
Fix for mint
cryptobubbles Feb 20, 2020
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
4 changes: 2 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ program
)
.option(
"-r, --restURL <restURL>",
"The rest URL to use. default: https://trest.bitcoin.com/v2/"
"The rest URL to use. default: https://trest.zslp.org/v2/"
)
.option(
"-e, --environment <environment>",
Expand All @@ -39,7 +39,7 @@ program
let config
const environment = fetchOption("environment=development", config, options)
const restURL = fetchOption(
"restURL=https://trest.bitcoin.com/v2/",
"restURL=https://trest.zslp.org/v2/",
config,
options
)
Expand Down
39 changes: 20 additions & 19 deletions lib/Address.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,14 @@ var Address = /** @class */ (function (_super) {
if (prefix === void 0) { prefix = true; }
if (regtest === void 0) { regtest = false; }
this._ensureValidAddress(address);
var cashAddress = utils.toCashAddress(address);
var cashAddress = utils.toLegacyAddress(address);
if (prefix)
return cashAddress;
return cashAddress.split(":")[1];
};
Address.prototype.toLegacyAddress = function (address) {
this._ensureValidAddress(address);
var cashAddr = utils.toCashAddress(address);
var cashAddr = utils.toLegacyAddress(address);
return bitbox.Address.toLegacyAddress(cashAddr);
};
Address.prototype.isLegacyAddress = function (address) {
Expand All @@ -101,22 +101,22 @@ var Address = /** @class */ (function (_super) {
};
Address.prototype.isMainnetAddress = function (address) {
this._ensureValidAddress(address);
var cashaddr = utils.toCashAddress(address);
var cashaddr = utils.toLegacyAddress(address);
return bitbox.Address.isMainnetAddress(cashaddr);
};
Address.prototype.isTestnetAddress = function (address) {
this._ensureValidAddress(address);
var cashAddr = utils.toCashAddress(address);
var cashAddr = utils.toLegacyAddress(address);
return bitbox.Address.isTestnetAddress(cashAddr);
};
Address.prototype.isP2PKHAddress = function (address) {
this._ensureValidAddress(address);
var cashAddr = utils.toCashAddress(address);
var cashAddr = utils.toLegacyAddress(address);
return bitbox.Address.isP2PKHAddress(cashAddr);
};
Address.prototype.isP2SHAddress = function (address) {
this._ensureValidAddress(address);
var cashAddr = utils.toCashAddress(address);
var cashAddr = utils.toLegacyAddress(address);
return bitbox.Address.isP2SHAddress(cashAddr);
};
Address.prototype.detectAddressFormat = function (address) {
Expand All @@ -127,12 +127,12 @@ var Address = /** @class */ (function (_super) {
};
Address.prototype.detectAddressNetwork = function (address) {
this._ensureValidAddress(address);
var cashAddr = utils.toCashAddress(address);
var cashAddr = utils.toLegacyAddress(address);
return bitbox.Address.detectAddressNetwork(cashAddr);
};
Address.prototype.detectAddressType = function (address) {
this._ensureValidAddress(address);
var cashAddr = utils.toCashAddress(address);
var cashAddr = utils.toLegacyAddress(address);
return bitbox.Address.detectAddressType(cashAddr);
};
Address.prototype.details = function (address) {
Expand All @@ -145,10 +145,10 @@ var Address = /** @class */ (function (_super) {
else
network = this.detectAddressNetwork(address[0]);
if (typeof address === "string") {
cashAddr = utils.toCashAddress(address);
cashAddr = utils.toLegacyAddress(address);
return [2 /*return*/, tmpBITBOX.Address.details(cashAddr)];
}
address = address.map(function (address) { return utils.toCashAddress(address); });
address = address.map(function (address) { return utils.toLegacyAddress(address); });
return [2 /*return*/, tmpBITBOX.Address.details(address)];
});
});
Expand All @@ -163,10 +163,10 @@ var Address = /** @class */ (function (_super) {
else
network = this.detectAddressNetwork(address[0]);
if (typeof address === "string") {
cashAddr = utils.toCashAddress(address);
cashAddr = utils.toLegacyAddress(address);
return [2 /*return*/, tmpBITBOX.Address.utxo(cashAddr)];
}
address = address.map(function (address) { return utils.toCashAddress(address); });
address = address.map(function (address) { return utils.toLegacyAddress(address); });
return [2 /*return*/, tmpBITBOX.Address.utxo(address)];
});
});
Expand All @@ -181,15 +181,16 @@ var Address = /** @class */ (function (_super) {
else
network = this.detectAddressNetwork(address[0]);
if (typeof address === "string") {
cashAddr = utils.toCashAddress(address);
cashAddr = utils.toLegacyAddress(address);
return [2 /*return*/, tmpBITBOX.Address.unconfirmed(cashAddr)];
}
address = address.map(function (address) { return utils.toCashAddress(address); });
address = address.map(function (address) { return utils.toLegacyAddress(address); });
return [2 /*return*/, tmpBITBOX.Address.unconfirmed(address)];
});
});
};
Address.prototype.transactions = function (address) {
Address.prototype.transactions = function (address, page) {
if (page === void 0) { page = 0; }
return __awaiter(this, void 0, void 0, function () {
var tmpBITBOX, network, cashAddr;
return __generator(this, function (_a) {
Expand All @@ -199,17 +200,17 @@ var Address = /** @class */ (function (_super) {
else
network = this.detectAddressNetwork(address[0]);
if (typeof address === "string") {
cashAddr = utils.toCashAddress(address);
cashAddr = utils.toLegacyAddress(address);
return [2 /*return*/, tmpBITBOX.Address.transactions(cashAddr)];
}
address = address.map(function (address) { return utils.toCashAddress(address); });
return [2 /*return*/, tmpBITBOX.Address.transactions(address)];
address = address.map(function (address) { return utils.toLegacyAddress(address); });
return [2 /*return*/, tmpBITBOX.Address.transactions(address, page)];
});
});
};
Address.prototype._ensureValidAddress = function (address) {
try {
utils.toCashAddress(address);
utils.toLegacyAddress(address);
}
catch (err) {
throw new Error("Invalid BCH address. Double check your address is valid: " + address);
Expand Down
2 changes: 1 addition & 1 deletion lib/ECPair.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var ECPair = /** @class */ (function (_super) {
return _super !== null && _super.apply(this, arguments) || this;
}
ECPair.prototype.toSLPAddress = function (ecpair) {
var slpAddress = utils.toSlpAddress(bitbox.ECPair.toCashAddress(ecpair));
var slpAddress = utils.toSlpAddress(bitbox.ECPair.toLegacyAddress(ecpair));
return slpAddress;
};
return ECPair;
Expand Down
4 changes: 2 additions & 2 deletions lib/HDNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ var HDNode = /** @class */ (function (_super) {
};
HDNode.prototype.toCashAddress = function (hdNode, regtest) {
if (regtest === void 0) { regtest = false; }
return bitbox.HDNode.toCashAddress(hdNode, regtest);
return bitbox.HDNode.toLegacyAddress(hdNode);
};
HDNode.prototype.toSLPAddress = function (hdNode) {
var cashAddr = bitbox.HDNode.toCashAddress(hdNode);
var cashAddr = bitbox.HDNode.toLegacyAddress(hdNode);
return utils.toSlpAddress(cashAddr);
};
return HDNode;
Expand Down
21 changes: 12 additions & 9 deletions lib/SLP.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,23 @@ var __extends = (this && this.__extends) || (function () {
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
// imports
var bitbox_sdk_1 = require("bitbox-sdk");
var Address_1 = require("./Address");
var ECPair_1 = require("./ECPair");
var HDNode_1 = require("./HDNode");
var Address_1 = __importDefault(require("./Address"));
var ECPair_1 = __importDefault(require("./ECPair"));
var HDNode_1 = __importDefault(require("./HDNode"));
var SLPDB_1 = require("./SLPDB");
var Socket_1 = require("./Socket");
var TokenType1_1 = require("./TokenType1");
var Util_1 = require("./Util");
var TokenType1_1 = __importDefault(require("./TokenType1"));
var Util_1 = __importDefault(require("./Util"));
// exports
var REST_URL = "https://rest.bitcoin.com/v2/";
var TREST_URL = "https://trest.bitcoin.com/v2/";
var SLPDB_URL = "https://slpdb.bitcoin.com/";
var TSLPDB_URL = "https://tslpdb.bitcoin.com/";
var REST_URL = "https://rest.zslp.org/v2/";
var TREST_URL = "https://trest.zslp.org/v2/";
var SLPDB_URL = "https://zslpdb.zslp.org/";
var TSLPDB_URL = "https://tzslpdb.zslp.org/";
// consts
var slpjs = require("slpjs");
//const slpjs = require("/home/trout/work/bch/slpjs/lib/slp.js")
Expand Down
5 changes: 4 additions & 1 deletion lib/SLPDB.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
}
};
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
// imports
var axios_1 = require("axios");
var axios_1 = __importDefault(require("axios"));
var SLPDB_URL = "https://slpdb.bitcoin.com/";
// consts
var Buffer = require("safe-buffer").Buffer;
Expand Down
2 changes: 1 addition & 1 deletion lib/Socket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ var Socket = /** @class */ (function (_super) {
_this.slpsocketURL = config.slpsocketURL;
}
else {
_this.slpsocketURL = "https://slpsocket.bchdata.cash";
_this.slpsocketURL = "https://zslpsocket.zslp.org";
}
return _this;
}
Expand Down
Loading