@multiplechain/bitcoin 0.1.8 → 0.1.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/bitcoin-provider.js +1 -1
  2. package/package.json +1 -1
  3. package/src/provider.js +72 -28
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "namespace": "multiplechain",
3
3
  "name": "@multiplechain/bitcoin",
4
- "version": "0.1.8",
4
+ "version": "0.1.9",
5
5
  "description": "Bitcoin JS provider",
6
6
  "scripts": {
7
7
  "serve": "parcel test.html --no-cache --dist-dir test",
package/src/provider.js CHANGED
@@ -56,14 +56,14 @@ class Provider {
56
56
  this.testnet = options.testnet;
57
57
  this.network = options.testnet ? 'testnet' : 'livenet';
58
58
 
59
- if (!this.testnet) {
60
- this.api = "https://blockstream.info/api/";
61
- this.explorer = "https://blockstream.info/";
62
- this.wsUrl = "wss://mempool.space/api/v1/ws";
63
- } else {
59
+ if (this.testnet) {
64
60
  this.api = "https://blockstream.info/testnet/api/";
65
61
  this.explorer = "https://blockstream.info/testnet/";
66
- this.wsUrl = "wss://mempool.space/testnet/api/v1/ws";
62
+ this.wsUrl = "wss://socket.blockcypher.com/v1/btc/test3?token=6d9cba333f234b9498473955497c40d9";
63
+ } else {
64
+ this.api = "https://blockstream.info/api/";
65
+ this.explorer = "https://blockstream.info/";
66
+ this.wsUrl = "wss://ws.blockchain.info/inv";
67
67
  }
68
68
 
69
69
  this.detectWallets();
@@ -76,33 +76,77 @@ class Provider {
76
76
  listenTransactions(options, callback) {
77
77
  let receiver = options.receiver;
78
78
  let ws = new WebSocket(this.wsUrl);
79
- let subscription = {
80
- unsubscribe: () => {
81
- ws.close();
79
+
80
+ if (this.testnet) {
81
+ let subscription = {
82
+ unsubscribe: () => {
83
+ ws.close();
84
+ }
82
85
  }
83
- }
84
86
 
85
- ws.addEventListener('open', () => {
86
- ws.send(JSON.stringify({ 'track-address': receiver }));
87
- });
88
-
89
- let startCallback = async (data) => {
90
- try {
91
- let tx = this.Transaction(data['address-transactions'][0].txid);
92
- await tx.getData();
93
- callback(subscription, tx);
94
- } catch (error) {
87
+ ws.addEventListener('open', () => {
88
+ ws.send(JSON.stringify({
89
+ event: "unconfirmed-tx",
90
+ address: receiver,
91
+ token: "6d9cba333f234b9498473955497c40d9"
92
+ }));
93
+ });
94
+
95
+ let startCallback = async (data) => {
96
+ try {
97
+ console.log(data);
98
+ let tx = this.Transaction(data.hash);
99
+ await tx.getData();
100
+ callback(subscription, tx);
101
+ } catch (error) {
102
+ setTimeout(() => {
103
+ startCallback(data);
104
+ }, 2500);
105
+ }
106
+ }
107
+
108
+ ws.addEventListener('message', (res) => {
109
+ console.log(res);
95
110
  setTimeout(() => {
96
- startCallback(data);
97
- }, 2500);
111
+ startCallback(JSON.parse(res.data));
112
+ }, 6000);
113
+ });
114
+ } else {
115
+ let subscription = {
116
+ unsubscribe: () => {
117
+ ws.send(JSON.stringify({
118
+ "op": "addr_unsub",
119
+ "addr": receiver
120
+ }));
121
+ ws.close();
122
+ }
123
+ }
124
+
125
+ ws.addEventListener('open', () => {
126
+ ws.send(JSON.stringify({
127
+ "op": "addr_sub",
128
+ "addr": receiver
129
+ }));
130
+ });
131
+
132
+ let startCallback = async (data) => {
133
+ try {
134
+ let tx = this.Transaction(data.x.hash);
135
+ await tx.getData();
136
+ callback(subscription, tx);
137
+ } catch (error) {
138
+ setTimeout(() => {
139
+ startCallback(data);
140
+ }, 2500);
141
+ }
98
142
  }
143
+
144
+ ws.addEventListener('message', (res) => {
145
+ setTimeout(() => {
146
+ startCallback(JSON.parse(res.data));
147
+ }, 6000);
148
+ });
99
149
  }
100
-
101
- ws.addEventListener('message', (res) => {
102
- setTimeout(() => {
103
- startCallback(JSON.parse(res.data));
104
- }, 6000);
105
- });
106
150
  }
107
151
 
108
152
  /**