@teleportdao/bitcoin 1.1.3-alpha.0 → 1.1.3-alpha.1

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 (8) hide show
  1. package/dist/bitcoin-interface.d.ts +6 -0
  2. package/dist/bitcoin-interface.d.ts.map +1 -1
  3. package/dist/helper/teleport-request-helper.d.ts +2 -0
  4. package/dist/helper/teleport-request-helper.d.ts.map +1 -1
  5. package/dist/helper/teleport-request-helper.js +9 -5
  6. package/dist/helper/teleport-request-helper.js.map +1 -1
  7. package/package.json +2 -2
  8. package/src/helper/teleport-request-helper.js +21 -5
package/dist/bitcoin-interface.d.ts CHANGED
@@ -84,7 +84,9 @@ declare class BitcoinInterface extends BitcoinInterfaceUtils {
84
84
  } | {
85
85
  status: boolean;
86
86
  data: any;
87
+ requestOutputIndex: any;
87
88
  value: any;
89
+ valueOutputIndex: any;
88
90
  message?: undefined;
89
91
  code?: undefined;
90
92
  };
@@ -131,7 +133,9 @@ declare class BitcoinInterface extends BitcoinInterfaceUtils {
131
133
  } | {
132
134
  status: boolean;
133
135
  data: any;
136
+ requestOutputIndex: any;
134
137
  value: any;
138
+ valueOutputIndex: any;
135
139
  message?: undefined;
136
140
  code?: undefined;
137
141
  };
@@ -178,7 +182,9 @@ declare class BitcoinInterface extends BitcoinInterfaceUtils {
178
182
  } | {
179
183
  status: boolean;
180
184
  data: any;
185
+ requestOutputIndex: any;
181
186
  value: any;
187
+ valueOutputIndex: any;
182
188
  message?: undefined;
183
189
  code?: undefined;
184
190
  };
package/dist/bitcoin-interface.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"bitcoin-interface.d.ts","sourceRoot":"","sources":["../src/bitcoin-interface.js"],"names":[],"mappings":";AAYA;IACE;;OAeC;IAZG,2EAAqD;IAMrD,qBAAkD;IAClD,iBAAkE;IAGpE,+BAA2D;IAC3D,cAAoD;IAMtD,qCAGC;IAED,6CAGC;IAED,kDAGC;IAED,wCAEC;IAGD,yCAMC;IAKD;;;;;SAkCC;IAED;;;;;;;;;;;;OAoBC;IAED;;;OAMC;IAKD,kDA0BC;IAED,8DAqCC;IAED,uCAMC;IAID,2FAUC;IAGD,4HAiBC;IAGD,gGAcC;IAGD,2DAMC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAsBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAcC;IAED;;;;;;;;;;SAsBC;IAED;;;;;;;;;cAYC;CACF"}
1
+ {"version":3,"file":"bitcoin-interface.d.ts","sourceRoot":"","sources":["../src/bitcoin-interface.js"],"names":[],"mappings":";AAYA;IACE;;OAeC;IAZG,2EAAqD;IAMrD,qBAAkD;IAClD,iBAAkE;IAGpE,+BAA2D;IAC3D,cAAoD;IAMtD,qCAGC;IAED,6CAGC;IAED,kDAGC;IAED,wCAEC;IAGD,yCAMC;IAKD;;;;;SAkCC;IAED;;;;;;;;;;;;OAoBC;IAED;;;OAMC;IAKD,kDA0BC;IAED,8DAqCC;IAED,uCAMC;IAID,2FAUC;IAGD,4HAiBC;IAGD,gGAcC;IAGD,2DAMC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAsBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAcC;IAED;;;;;;;;;;SAsBC;IAED;;;;;;;;;cAYC;CACF"}
package/dist/helper/teleport-request-helper.d.ts CHANGED
@@ -38,7 +38,9 @@ export function checkAndParseProtocolRequest(vouts: any, address: any, config?:
38
38
  } | {
39
39
  status: boolean;
40
40
  data: any;
41
+ requestOutputIndex: any;
41
42
  value: any;
43
+ valueOutputIndex: any;
42
44
  message?: undefined;
43
45
  code?: undefined;
44
46
  };
package/dist/helper/teleport-request-helper.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"teleport-request-helper.d.ts","sourceRoot":"","sources":["../../src/helper/teleport-request-helper.js"],"names":[],"mappings":"AA8IA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAeC"}
1
+ {"version":3,"file":"teleport-request-helper.d.ts","sourceRoot":"","sources":["../../src/helper/teleport-request-helper.js"],"names":[],"mappings":"AAsJA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuBC"}
package/dist/helper/teleport-request-helper.js CHANGED
@@ -90,7 +90,7 @@ function parseRawRequest(opReturnData) {
90
90
  };
91
91
  }
92
92
  }
93
- function validateRequestAndValue(data, value, { minTeleporterFeeAmount = 0 }) {
93
+ function validateRequestAndValue(data, requestOutputIndex, value, valueOutputIndex, { minTeleporterFeeAmount = 0 }) {
94
94
  if (!data) {
95
95
  return {
96
96
  status: false,
@@ -115,17 +115,21 @@ function validateRequestAndValue(data, value, { minTeleporterFeeAmount = 0 }) {
115
115
  return {
116
116
  status: true,
117
117
  data,
118
+ requestOutputIndex,
118
119
  value,
120
+ valueOutputIndex,
119
121
  };
120
122
  }
121
123
  function checkAndParseProtocolRequest(vouts, address, config = { minTeleporterFeeAmount: 0 }) {
122
124
  var _a, _b;
123
- let opReturnData = ((_a = vouts.find((vout_) => vout_.script.startsWith("6a"))) === null || _a === void 0 ? void 0 : _a.script) || null;
124
- if (opReturnData) {
125
- let value = ((_b = vouts.find((vout_) => vout_.address === address)) === null || _b === void 0 ? void 0 : _b.value) || 0;
125
+ let requestOutputIndex = vouts.findIndex((vout_) => vout_.script.startsWith("6a"));
126
+ if (requestOutputIndex >= 0) {
127
+ let opReturnData = ((_a = vouts[requestOutputIndex]) === null || _a === void 0 ? void 0 : _a.script) || null;
128
+ let valueOutputIndex = ((_b = vouts.findIndex((vout_) => vout_.address === address)) === null || _b === void 0 ? void 0 : _b.value) || 0;
129
+ let value = valueOutputIndex >= 0 ? vouts[valueOutputIndex].value || 0 : 0;
126
130
  let dataResponse = parseRawRequest(opReturnData);
127
131
  if (dataResponse.status) {
128
- return validateRequestAndValue(dataResponse.data, value, config);
132
+ return validateRequestAndValue(dataResponse.data, requestOutputIndex, value, valueOutputIndex, config);
129
133
  }
130
134
  return dataResponse;
131
135
  }
package/dist/helper/teleport-request-helper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"teleport-request-helper.js","sourceRoot":"","sources":["../../src/helper/teleport-request-helper.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"teleport-request-helper.js","sourceRoot":"","sources":["../../src/helper/teleport-request-helper.js"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@teleportdao/bitcoin",
3
- "version": "1.1.3-alpha.0",
3
+ "version": "1.1.3-alpha.1",
4
4
  "description": "provider for different networks",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -30,5 +30,5 @@
30
30
  "publishConfig": {
31
31
  "access": "public"
32
32
  },
33
- "gitHead": "5c861fdb381f6a5c9228c276aae524c984f21ad7"
33
+ "gitHead": "1eb891fb8dd5e7b878574edaaa05288f64d8783b"
34
34
  }
package/src/helper/teleport-request-helper.js CHANGED
@@ -104,7 +104,13 @@ function parseRawRequest(opReturnData) {
104
104
  }
105
105
  }
106
106
 
107
- function validateRequestAndValue(data, value, { minTeleporterFeeAmount = 0 }) {
107
+ function validateRequestAndValue(
108
+ data,
109
+ requestOutputIndex,
110
+ value,
111
+ valueOutputIndex,
112
+ { minTeleporterFeeAmount = 0 },
113
+ ) {
108
114
  if (!data) {
109
115
  return {
110
116
  status: false,
@@ -136,17 +142,27 @@ function validateRequestAndValue(data, value, { minTeleporterFeeAmount = 0 }) {
136
142
  return {
137
143
  status: true,
138
144
  data,
145
+ requestOutputIndex,
139
146
  value,
147
+ valueOutputIndex,
140
148
  }
141
149
  }
142
150
 
143
151
  function checkAndParseProtocolRequest(vouts, address, config = { minTeleporterFeeAmount: 0 }) {
144
- let opReturnData = vouts.find((vout_) => vout_.script.startsWith("6a"))?.script || null
145
- if (opReturnData) {
146
- let value = vouts.find((vout_) => vout_.address === address)?.value || 0
152
+ let requestOutputIndex = vouts.findIndex((vout_) => vout_.script.startsWith("6a"))
153
+ if (requestOutputIndex >= 0) {
154
+ let opReturnData = vouts[requestOutputIndex]?.script || null
155
+ let valueOutputIndex = vouts.findIndex((vout_) => vout_.address === address)?.value || 0
156
+ let value = valueOutputIndex >= 0 ? vouts[valueOutputIndex].value || 0 : 0
147
157
  let dataResponse = parseRawRequest(opReturnData)
148
158
  if (dataResponse.status) {
149
- return validateRequestAndValue(dataResponse.data, value, config)
159
+ return validateRequestAndValue(
160
+ dataResponse.data,
161
+ requestOutputIndex,
162
+ value,
163
+ valueOutputIndex,
164
+ config,
165
+ )
150
166
  }
151
167
  return dataResponse
152
168
  }