Page MenuHomePhabricator
Files F14864665

D13584.id39295.diff
No OneTemporary
Actions

D13584.id39295.diff
View Options

diff --git a/apps/ecash-herald/package-lock.json b/apps/ecash-herald/package-lock.json
--- a/apps/ecash-herald/package-lock.json
+++ b/apps/ecash-herald/package-lock.json
@@ -10,7 +10,6 @@
"license": "MIT",
"dependencies": {
"chronik-client": "^0.8.2",
- "ecashaddrjs": "^1.0.7",
"node-telegram-bot-api": "^0.61.0"
},
"devDependencies": {
@@ -1088,14 +1087,6 @@
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
"integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="
},
- "node_modules/axios": {
- "version": "0.21.4",
- "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
- "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
- "dependencies": {
- "follow-redirects": "^1.14.0"
- }
- },
"node_modules/balanced-match": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -1110,14 +1101,6 @@
"tweetnacl": "^0.14.3"
}
},
- "node_modules/big-integer": {
- "version": "1.6.36",
- "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.36.tgz",
- "integrity": "sha512-t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg==",
- "engines": {
- "node": ">=0.6"
- }
- },
"node_modules/binary-extensions": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -1345,6 +1328,14 @@
"ws": "^8.3.0"
}
},
+ "node_modules/chronik-client/node_modules/axios": {
+ "version": "0.21.4",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
+ "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+ "dependencies": {
+ "follow-redirects": "^1.14.0"
+ }
+ },
"node_modules/clean-stack": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
@@ -1536,14 +1527,6 @@
"node": ">=6.0.0"
}
},
- "node_modules/ecashaddrjs": {
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/ecashaddrjs/-/ecashaddrjs-1.0.7.tgz",
- "integrity": "sha512-KsvHYLlYtLr/GBkEPiwwQDIDBzqRx61qC34n1puHKOjVE4Uwg3syHccjFCqNynLa6T6xI0Rd7ByCRUJcuJcoIw==",
- "dependencies": {
- "big-integer": "1.6.36"
- }
- },
"node_modules/ecc-jsbn": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -5674,14 +5657,6 @@
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
"integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="
},
- "axios": {
- "version": "0.21.4",
- "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
- "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
- "requires": {
- "follow-redirects": "^1.14.0"
- }
- },
"balanced-match": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -5696,11 +5671,6 @@
"tweetnacl": "^0.14.3"
}
},
- "big-integer": {
- "version": "1.6.36",
- "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.36.tgz",
- "integrity": "sha512-t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg=="
- },
"binary-extensions": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -5854,6 +5824,16 @@
"isomorphic-ws": "^4.0.1",
"protobufjs": "^6.8.8",
"ws": "^8.3.0"
+ },
+ "dependencies": {
+ "axios": {
+ "version": "0.21.4",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
+ "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+ "requires": {
+ "follow-redirects": "^1.14.0"
+ }
+ }
}
},
"clean-stack": {
@@ -6002,14 +5982,6 @@
"esutils": "^2.0.2"
}
},
- "ecashaddrjs": {
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/ecashaddrjs/-/ecashaddrjs-1.0.7.tgz",
- "integrity": "sha512-KsvHYLlYtLr/GBkEPiwwQDIDBzqRx61qC34n1puHKOjVE4Uwg3syHccjFCqNynLa6T6xI0Rd7ByCRUJcuJcoIw==",
- "requires": {
- "big-integer": "1.6.36"
- }
- },
"ecc-jsbn": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
diff --git a/apps/ecash-herald/package.json b/apps/ecash-herald/package.json
--- a/apps/ecash-herald/package.json
+++ b/apps/ecash-herald/package.json
@@ -22,7 +22,6 @@
"license": "MIT",
"dependencies": {
"chronik-client": "^0.8.2",
- "ecashaddrjs": "^1.0.7",
"node-telegram-bot-api": "^0.61.0"
},
"devDependencies": {
diff --git a/apps/ecash-herald/src/utils.js b/apps/ecash-herald/src/utils.js
--- a/apps/ecash-herald/src/utils.js
+++ b/apps/ecash-herald/src/utils.js
@@ -1,5 +1,4 @@
'use strict'
-const cashaddr = require('ecashaddrjs');
module.exports = {
returnLabeledChronikBlockPromise: async function (
@@ -21,58 +20,7 @@
},
);
});
- },
- // This function is lifted directly from alias-server
- outputScriptToAddress: function (outputScript) {
- // returns P2SH or P2PKH address
- // P2PKH addresses are in outputScript of type 76a914...88ac
- // P2SH addresses are in outputScript of type a914...87
- // Return false if cannot determine P2PKH or P2SH address
-
- const typeTestSlice = outputScript.slice(0, 4);
- let addressType;
- let hash160;
- switch (typeTestSlice) {
- case '76a9':
- addressType = 'P2PKH';
- hash160 = outputScript.substring(
- outputScript.indexOf('76a914') + '76a914'.length,
- outputScript.lastIndexOf('88ac'),
- );
- break;
- case 'a914':
- addressType = 'P2SH';
- hash160 = outputScript.substring(
- outputScript.indexOf('a914') + 'a914'.length,
- outputScript.lastIndexOf('87'),
- );
- break;
- default:
- return false;
- }
- // Test hash160 for correct length
- if (hash160.length !== 40) {
- return false;
- }
-
- const buffer = Buffer.from(hash160, 'hex');
-
- // Because ecashaddrjs only accepts Uint8Array as input type, convert
- const hash160ArrayBuffer = new ArrayBuffer(buffer.length);
- const hash160Uint8Array = new Uint8Array(hash160ArrayBuffer);
- for (let i = 0; i < hash160Uint8Array.length; i += 1) {
- hash160Uint8Array[i] = buffer[i];
- }
-
- // Encode ecash: address
- const ecashAddress = cashaddr.encode(
- 'ecash',
- addressType,
- hash160Uint8Array,
- );
-
- return ecashAddress;
- },
+ },
returnAddressPreview: function (cashAddress, sliceSize = 3) {
const addressParts = cashAddress.split(':');
const unprefixedAddress = addressParts[addressParts.length - 1];

File Metadata

Mime Type
text/plain
Expires
Tue, May 20, 21:31 (17 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5862414
Default Alt Text
D13584.id39295.diff (8 KB)

Event Timeline