@com-chain/jsc3l 2.0.1-rc.0 → 2.0.1-rc.10
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.
- package/build/bcRead.d.ts +8 -9
- package/build/bcRead.js +93 -35
- package/build/bcRead.js.map +1 -1
- package/build/bcTransaction.d.ts +2 -1
- package/build/bcTransaction.js +55 -76
- package/build/bcTransaction.js.map +1 -1
- package/build/config/transactions.d.ts +44 -0
- package/build/config/transactions.js +29 -0
- package/build/config/transactions.js.map +1 -0
- package/build/connection.js +14 -8
- package/build/connection.js.map +1 -1
- package/build/customization.js +11 -2
- package/build/customization.js.map +1 -1
- package/build/ethereum/ethFuncs.js +1 -1
- package/build/ethereum/ethFuncs.js.map +1 -1
- package/build/ethereum/etherUnits.js +5 -5
- package/build/ethereum/etherUnits.js.map +1 -1
- package/build/ethereum/uiFuncs.d.ts +1 -3
- package/build/ethereum/uiFuncs.js +13 -23
- package/build/ethereum/uiFuncs.js.map +1 -1
- package/build/index.d.ts +10 -6
- package/build/index.js +35 -21
- package/build/index.js.map +1 -1
- package/build/qr.d.ts +31 -6
- package/build/qr.js +32 -12
- package/build/qr.js.map +1 -1
- package/build/rest/ajaxReq.d.ts +2 -10
- package/build/rest/ajaxReq.js +10 -32
- package/build/rest/ajaxReq.js.map +1 -1
- package/build/type.d.ts +4 -4
- package/build/wallet.d.ts +7 -9
- package/build/wallet.js +31 -39
- package/build/wallet.js.map +1 -1
- package/package.json +3 -1
- package/src/bcRead.ts +108 -49
- package/src/bcTransaction.ts +58 -77
- package/src/config/transactions.ts +30 -0
- package/src/connection.ts +15 -7
- package/src/customization.ts +17 -2
- package/src/ethereum/ethFuncs.ts +1 -1
- package/src/ethereum/etherUnits.ts +5 -5
- package/src/ethereum/uiFuncs.ts +16 -25
- package/src/index.ts +50 -28
- package/src/qr.ts +86 -12
- package/src/rest/ajaxReq.ts +10 -39
- package/src/wallet.ts +40 -50
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ethFuncs.js","sourceRoot":"","sources":["../../src/ethereum/ethFuncs.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAA;AACpC,OAAO,OAAO,MAAM,iBAAiB,CAAA;AAErC,OAAO,KAAK,UAAU,MAAM,cAAc,CAAA;AAE1C,SAAS,iBAAiB,CAAE,OAAO;IACjC,OAAO,OAAO,KAAK,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAA;AACvD,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAE,OAAO;IAC3C,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI;QAAE,OAAO,KAAK,CAAA;SAC7C,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,KAAK,CAAA;SACvD,IAAI,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC;QACnC,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAA;SACpD;QAAE,OAAO,iBAAiB,CAAC,OAAO,CAAC,CAAA;KAAE;AAC5C,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAE,GAAG;IACpC,IAAI,GAAG,KAAK,EAAE;QAAE,OAAO,IAAI,CAAA;IAC3B,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI;QAChC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE;QAChC,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,CAAA;IACrB,MAAM,EAAE,GAAG,cAAc,CAAA;IACzB,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACrB,CAAC;AAED,MAAM,UAAU,WAAW,CAAE,GAAG;IAC9B,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;IAC3D,IAAI,GAAG,KAAK,EAAE;QAAE,OAAO,EAAE,CAAA;IACzB,OAAO,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,CAAA;AAChC,CAAC;AAED,SAAS,WAAW,CAAE,GAAG;IACvB,GAAG,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAA;IAC5C,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAE,GAAG;IACnC,GAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"ethFuncs.js","sourceRoot":"","sources":["../../src/ethereum/ethFuncs.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,24 +37,24 @@ export function getValueOfUnit(unit) {
|
|
|
37
37
|
export function fiatToWei(number, pricePerEther) {
|
|
38
38
|
return new BigNumber(String(number))
|
|
39
39
|
.div(pricePerEther)
|
|
40
|
-
.times(
|
|
40
|
+
.times(getValueOfUnit('ether'))
|
|
41
41
|
.round(0)
|
|
42
42
|
.toString(10);
|
|
43
43
|
}
|
|
44
44
|
export function toFiat(number, unit, multi) {
|
|
45
|
-
return new BigNumber(
|
|
45
|
+
return new BigNumber(toEther(number, unit))
|
|
46
46
|
.times(multi)
|
|
47
47
|
.round(5)
|
|
48
48
|
.toString(10);
|
|
49
49
|
}
|
|
50
50
|
export function toEther(number, unit) {
|
|
51
|
-
return new BigNumber(
|
|
52
|
-
.div(
|
|
51
|
+
return new BigNumber(toWei(number, unit))
|
|
52
|
+
.div(getValueOfUnit('ether'))
|
|
53
53
|
.toString(10);
|
|
54
54
|
}
|
|
55
55
|
export function toWei(number, unit) {
|
|
56
56
|
return new BigNumber(String(number))
|
|
57
|
-
.times(
|
|
57
|
+
.times(getValueOfUnit(unit))
|
|
58
58
|
.toString(10);
|
|
59
59
|
}
|
|
60
60
|
//# sourceMappingURL=etherUnits.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"etherUnits.js","sourceRoot":"","sources":["../../src/ethereum/etherUnits.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAA;AAEpC,MAAM,OAAO,GAAG;IACd,GAAG,EAAE,GAAG;IACR,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,MAAM;IACX,UAAU,EAAE,MAAM;IAClB,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,SAAS;IAClB,SAAS,EAAE,SAAS;IACpB,IAAI,EAAE,YAAY;IAClB,OAAO,EAAE,YAAY;IACrB,SAAS,EAAE,YAAY;IACvB,IAAI,EAAE,YAAY;IAClB,KAAK,EAAE,eAAe;IACtB,UAAU,EAAE,eAAe;IAC3B,KAAK,EAAE,eAAe;IACtB,MAAM,EAAE,kBAAkB;IAC1B,UAAU,EAAE,kBAAkB;IAC9B,KAAK,EAAE,kBAAkB;IACzB,KAAK,EAAE,qBAAqB;IAC5B,MAAM,EAAE,wBAAwB;IAChC,KAAK,EAAE,wBAAwB;IAC/B,QAAQ,EAAE,wBAAwB;IAClC,MAAM,EAAE,2BAA2B;IACnC,MAAM,EAAE,8BAA8B;IACtC,MAAM,EAAE,iCAAiC;CAC1C,CAAA;AAED,MAAM,UAAU,cAAc,CAAE,IAAI;IAClC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,OAAO,CAAA;IAC1C,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/B,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,MAAM,IAAI,KAAK,CACb,2CAA2C;YACzC,6BAA6B,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;KACtE;IACD,OAAO,IAAI,SAAS,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;AACrC,CAAC;AAED,MAAM,UAAU,SAAS,CAAE,MAAM,EAAE,aAAa;IAC9C,OAAO,IAAI,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SACjC,GAAG,CAAC,aAAa,CAAC;SAClB,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"etherUnits.js","sourceRoot":"","sources":["../../src/ethereum/etherUnits.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAA;AAEpC,MAAM,OAAO,GAAG;IACd,GAAG,EAAE,GAAG;IACR,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,MAAM;IACX,UAAU,EAAE,MAAM;IAClB,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,SAAS;IAClB,SAAS,EAAE,SAAS;IACpB,IAAI,EAAE,YAAY;IAClB,OAAO,EAAE,YAAY;IACrB,SAAS,EAAE,YAAY;IACvB,IAAI,EAAE,YAAY;IAClB,KAAK,EAAE,eAAe;IACtB,UAAU,EAAE,eAAe;IAC3B,KAAK,EAAE,eAAe;IACtB,MAAM,EAAE,kBAAkB;IAC1B,UAAU,EAAE,kBAAkB;IAC9B,KAAK,EAAE,kBAAkB;IACzB,KAAK,EAAE,qBAAqB;IAC5B,MAAM,EAAE,wBAAwB;IAChC,KAAK,EAAE,wBAAwB;IAC/B,QAAQ,EAAE,wBAAwB;IAClC,MAAM,EAAE,2BAA2B;IACnC,MAAM,EAAE,8BAA8B;IACtC,MAAM,EAAE,iCAAiC;CAC1C,CAAA;AAED,MAAM,UAAU,cAAc,CAAE,IAAI;IAClC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,OAAO,CAAA;IAC1C,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/B,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,MAAM,IAAI,KAAK,CACb,2CAA2C;YACzC,6BAA6B,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;KACtE;IACD,OAAO,IAAI,SAAS,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;AACrC,CAAC;AAED,MAAM,UAAU,SAAS,CAAE,MAAM,EAAE,aAAa;IAC9C,OAAO,IAAI,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SACjC,GAAG,CAAC,aAAa,CAAC;SAClB,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;SAC9B,KAAK,CAAC,CAAC,CAAC;SACR,QAAQ,CAAC,EAAE,CAAC,CAAA;AACjB,CAAC;AAED,MAAM,UAAU,MAAM,CAAE,MAAM,EAAE,IAAI,EAAE,KAAK;IACzC,OAAO,IAAI,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SACxC,KAAK,CAAC,KAAK,CAAC;SACZ,KAAK,CAAC,CAAC,CAAC;SACR,QAAQ,CAAC,EAAE,CAAC,CAAA;AACjB,CAAC;AAED,MAAM,UAAU,OAAO,CAAE,MAAM,EAAE,IAAI;IACnC,OAAO,IAAI,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SACtC,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;SAC5B,QAAQ,CAAC,EAAE,CAAC,CAAA;AACjB,CAAC;AAED,MAAM,UAAU,KAAK,CAAE,MAAM,EAAE,IAAI;IACjC,OAAO,IAAI,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SACjC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;SAC3B,QAAQ,CAAC,EAAE,CAAC,CAAA;AACjB,CAAC"}
|
|
@@ -24,28 +24,18 @@ function isTxDataValid(txData) {
|
|
|
24
24
|
txData.to = '';
|
|
25
25
|
}
|
|
26
26
|
export function generateTx(txData, data) {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
rawTx.signedTx = '0x' + eTx.serialize().toString('hex');
|
|
41
|
-
rawTx.isError = false;
|
|
42
|
-
return rawTx;
|
|
43
|
-
}
|
|
44
|
-
catch (e) {
|
|
45
|
-
return {
|
|
46
|
-
isError: true,
|
|
47
|
-
error: e
|
|
48
|
-
};
|
|
49
|
-
}
|
|
27
|
+
isTxDataValid(txData);
|
|
28
|
+
const rawTx = {
|
|
29
|
+
nonce: ethFuncs.sanitizeHex(data.nonce),
|
|
30
|
+
gasPrice: ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice)),
|
|
31
|
+
gasLimit: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(txData.gasLimit)),
|
|
32
|
+
to: ethFuncs.sanitizeHex(txData.to),
|
|
33
|
+
value: ethFuncs.sanitizeHex(ethFuncs.decimalToHex(etherUnits.toWei(txData.value, txData.unit))),
|
|
34
|
+
data: ethFuncs.sanitizeHex(txData.data)
|
|
35
|
+
};
|
|
36
|
+
const eTx = new Tx(rawTx);
|
|
37
|
+
eTx.sign(Buffer.from(txData.key, 'hex'));
|
|
38
|
+
rawTx.rawTx = JSON.stringify(rawTx);
|
|
39
|
+
return '0x' + eTx.serialize().toString('hex');
|
|
50
40
|
}
|
|
51
41
|
//# sourceMappingURL=uiFuncs.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uiFuncs.js","sourceRoot":"","sources":["../../src/ethereum/uiFuncs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,eAAe,CAAA;AAC9B,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAA;AACtC,OAAO,KAAK,UAAU,MAAM,cAAc,CAAA;AAG1C,SAAS,SAAS,CAAE,CAAC;IACnB,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAA;AAC7C,CAAC;AAED,SAAS,aAAa,CAAE,MAAM;IAC5B,IAAI,MAAM,CAAC,EAAE,KAAK,YAAY;QAC1B,CAAC,QAAQ,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;QAC7C,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAA;KAC3B;SAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;QACxB,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAA;KAC3B;SAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC;QAC3B,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAC3C,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAA;KAC3B;SAAM,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACnD,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAA;KAC5B;IACD,IAAI,MAAM,CAAC,EAAE,KAAK,YAAY;QAAE,MAAM,CAAC,EAAE,GAAG,EAAE,CAAA;AAChD,CAAC;AAED,MAAM,UAAU,UAAU,CAAE,MAAM,EAAE,IAAI;IACtC,
|
|
1
|
+
{"version":3,"file":"uiFuncs.js","sourceRoot":"","sources":["../../src/ethereum/uiFuncs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,eAAe,CAAA;AAC9B,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAA;AACtC,OAAO,KAAK,UAAU,MAAM,cAAc,CAAA;AAG1C,SAAS,SAAS,CAAE,CAAC;IACnB,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAA;AAC7C,CAAC;AAED,SAAS,aAAa,CAAE,MAAM;IAC5B,IAAI,MAAM,CAAC,EAAE,KAAK,YAAY;QAC1B,CAAC,QAAQ,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;QAC7C,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAA;KAC3B;SAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;QACxB,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAA;KAC3B;SAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC;QAC3B,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAC3C,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAA;KAC3B;SAAM,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACnD,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAA;KAC5B;IACD,IAAI,MAAM,CAAC,EAAE,KAAK,YAAY;QAAE,MAAM,CAAC,EAAE,GAAG,EAAE,CAAA;AAChD,CAAC;AAED,MAAM,UAAU,UAAU,CAAE,MAAM,EAAE,IAAI;IACtC,aAAa,CAAC,MAAM,CAAC,CAAA;IAErB,MAAM,KAAK,GAAuB;QAChC,KAAK,EAAE,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC;QACvC,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAC5B,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAC5B,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACzC,EAAE,EAAE,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;QACnC,KAAK,EAAE,QAAQ,CAAC,WAAW,CACzB,QAAQ,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QACrE,IAAI,EAAE,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC;KACxC,CAAA;IACD,MAAM,GAAG,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,CAAA;IAEzB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAA;IACxC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IACnC,OAAO,IAAI,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;AAC/C,CAAC"}
|
package/build/index.d.ts
CHANGED
|
@@ -6,16 +6,17 @@ import ConnectionMgrAbstract from './connection';
|
|
|
6
6
|
import CustomizationAbstract from './customization';
|
|
7
7
|
import MessagingWalletAbstract from './wallet';
|
|
8
8
|
import BcReadAbstract from './bcRead';
|
|
9
|
-
import BcTransactionAbstract from './bcTransaction';
|
|
9
|
+
import { BcTransactionAbstract } from './bcTransaction';
|
|
10
10
|
declare abstract class AbstractJsc3l {
|
|
11
11
|
protected abstract httpRequest: t.HttpRequest;
|
|
12
12
|
protected abstract persistentStore: t.IPersistentStore;
|
|
13
13
|
localDefaultConf: {};
|
|
14
|
+
defaultTransactionDefs: [];
|
|
14
15
|
endpoint: string;
|
|
15
16
|
_Endpoint: new (baseUrl: any) => EndpointAbstract;
|
|
16
17
|
_connection: null | ConnectionMgrAbstract;
|
|
17
18
|
_http: null | HttpAbstract;
|
|
18
|
-
constructor(localDefaultConf?: any);
|
|
19
|
+
constructor(localDefaultConf?: any, defaultTransactionDefs?: any);
|
|
19
20
|
/**
|
|
20
21
|
* `connection` facility needs to be lazy loaded as `this` and
|
|
21
22
|
* abstract `httpRequest` is not available in constructor.
|
|
@@ -47,10 +48,10 @@ declare abstract class AbstractJsc3l {
|
|
|
47
48
|
getCustomization(config: any): CustomizationAbstract;
|
|
48
49
|
getWallet(endpointUrl: string, currencyName: string, unlockUrl: string): new () => MessagingWalletAbstract;
|
|
49
50
|
getBcRead(endpointUrl: any, contracts: any): BcReadAbstract;
|
|
50
|
-
getBcTransaction(endpointUrl: any, contracts: any): BcTransactionAbstract;
|
|
51
|
+
getBcTransaction(endpointUrl: any, contracts: any, transactionDefs: any): BcTransactionAbstract;
|
|
51
52
|
_currencyMgrPromises: {};
|
|
52
|
-
getCurrencyMgr(currencyName: string, endpointUrl?: string, repoUrl?: string): Promise<any>;
|
|
53
|
-
_getCurrencyMgr(currencyName: string, endpointUrl?: string, repoUrl?: string): Promise<any>;
|
|
53
|
+
getCurrencyMgr(currencyName: string, endpointUrl?: string, repoUrl?: string, transactionDefs?: any[]): Promise<any>;
|
|
54
|
+
_getCurrencyMgr(currencyName: string, endpointUrl?: string, repoUrl?: string, transactionDefs?: any[]): Promise<any>;
|
|
54
55
|
}
|
|
55
56
|
declare abstract class IntegratedJsc3lAbstract extends AbstractJsc3l {
|
|
56
57
|
/**
|
|
@@ -62,7 +63,10 @@ declare abstract class IntegratedJsc3lAbstract extends AbstractJsc3l {
|
|
|
62
63
|
get ajaxReq(): AjaxReqAbstract;
|
|
63
64
|
/**
|
|
64
65
|
* `customization` depends on a local configuration being available
|
|
65
|
-
* through a previous call to
|
|
66
|
+
* through a previous call to
|
|
67
|
+
* `this.connection.getConfJSON(..)`. Although as it has some
|
|
68
|
+
* fallback available, we need to be able to support being called
|
|
69
|
+
* even if no local conf is loaded yet.
|
|
66
70
|
*
|
|
67
71
|
* XXXvlab: We could cache the result with result of
|
|
68
72
|
* `connection.getLocalConf()` being the key.
|
package/build/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as ethFuncs from './ethereum/ethFuncs'; // Utilities to pass on
|
|
2
2
|
import * as memo from './memo';
|
|
3
|
+
import * as qr from './qr';
|
|
3
4
|
// Only required for blockie helper
|
|
4
5
|
import blockies from './blockies';
|
|
5
6
|
import Wallet from './ethereum/myetherwallet';
|
|
@@ -11,7 +12,8 @@ import ConnectionMgrAbstract from './connection';
|
|
|
11
12
|
import CustomizationAbstract from './customization';
|
|
12
13
|
import MessagingWalletAbstract from './wallet';
|
|
13
14
|
import BcReadAbstract from './bcRead';
|
|
14
|
-
import BcTransactionAbstract from './bcTransaction';
|
|
15
|
+
import { BcTransactionAbstract, transactionFactory } from './bcTransaction';
|
|
16
|
+
import localTransactionDefs from './config/transactions';
|
|
15
17
|
function createIcon(address) {
|
|
16
18
|
if (address instanceof Wallet) {
|
|
17
19
|
address = address.getAddressString();
|
|
@@ -23,9 +25,10 @@ function createIcon(address) {
|
|
|
23
25
|
}).toDataURL();
|
|
24
26
|
}
|
|
25
27
|
class AbstractJsc3l {
|
|
26
|
-
constructor(localDefaultConf) {
|
|
28
|
+
constructor(localDefaultConf, defaultTransactionDefs) {
|
|
27
29
|
this._currencyMgrPromises = {};
|
|
28
30
|
this.localDefaultConf = localDefaultConf || {};
|
|
31
|
+
this.defaultTransactionDefs = defaultTransactionDefs || localTransactionDefs;
|
|
29
32
|
}
|
|
30
33
|
/**
|
|
31
34
|
* `connection` facility needs to be lazy loaded as `this` and
|
|
@@ -141,7 +144,7 @@ class AbstractJsc3l {
|
|
|
141
144
|
}
|
|
142
145
|
return new BcRead();
|
|
143
146
|
}
|
|
144
|
-
getBcTransaction(endpointUrl, contracts) {
|
|
147
|
+
getBcTransaction(endpointUrl, contracts, transactionDefs) {
|
|
145
148
|
const self = this;
|
|
146
149
|
class BcTransaction extends BcTransactionAbstract {
|
|
147
150
|
constructor() {
|
|
@@ -150,17 +153,18 @@ class AbstractJsc3l {
|
|
|
150
153
|
this.contracts = contracts;
|
|
151
154
|
}
|
|
152
155
|
}
|
|
156
|
+
transactionFactory(transactionDefs, BcTransaction);
|
|
153
157
|
return new BcTransaction();
|
|
154
158
|
}
|
|
155
|
-
async getCurrencyMgr(currencyName, endpointUrl, repoUrl) {
|
|
156
|
-
const key = Array.from(arguments)
|
|
159
|
+
async getCurrencyMgr(currencyName, endpointUrl, repoUrl, transactionDefs) {
|
|
160
|
+
const key = JSON.stringify(Array.from(arguments));
|
|
157
161
|
if (!this._currencyMgrPromises[key]) {
|
|
158
162
|
this._currencyMgrPromises[key] =
|
|
159
|
-
this._getCurrencyMgr(currencyName, endpointUrl, repoUrl);
|
|
163
|
+
this._getCurrencyMgr(currencyName, endpointUrl, repoUrl, transactionDefs);
|
|
160
164
|
}
|
|
161
165
|
return await this._currencyMgrPromises[key];
|
|
162
166
|
}
|
|
163
|
-
async _getCurrencyMgr(currencyName, endpointUrl, repoUrl) {
|
|
167
|
+
async _getCurrencyMgr(currencyName, endpointUrl, repoUrl, transactionDefs) {
|
|
164
168
|
if (!repoUrl) {
|
|
165
169
|
if (this.connection.repo) {
|
|
166
170
|
repoUrl = this.connection.repo;
|
|
@@ -177,13 +181,14 @@ class AbstractJsc3l {
|
|
|
177
181
|
endpointUrl = (await this.connection.acquireEndPoint(repoUrl)).endpoint;
|
|
178
182
|
}
|
|
179
183
|
}
|
|
184
|
+
transactionDefs = transactionDefs || localTransactionDefs;
|
|
180
185
|
const config = await this.getConfig(repoUrl, currencyName);
|
|
181
186
|
const customization = this.getCustomization(config);
|
|
182
187
|
const contracts = [
|
|
183
188
|
customization.getContract1(),
|
|
184
|
-
customization.getContract2()
|
|
189
|
+
customization.getContract2(),
|
|
190
|
+
customization.getContract3()
|
|
185
191
|
];
|
|
186
|
-
const self = this;
|
|
187
192
|
const wallet = this.getWallet(endpointUrl, currencyName, customization.getUnlockUrl());
|
|
188
193
|
return {
|
|
189
194
|
// unlockWallet: (jsonData, password) => wallet.getWalletFromPrivKeyFile(jsonData, password),
|
|
@@ -192,14 +197,15 @@ class AbstractJsc3l {
|
|
|
192
197
|
ajaxReq: this.getAjaxReq(endpointUrl),
|
|
193
198
|
wallet: wallet,
|
|
194
199
|
bcRead: this.getBcRead(endpointUrl, contracts),
|
|
195
|
-
bcTransaction: this.getBcTransaction(endpointUrl, contracts),
|
|
200
|
+
bcTransaction: this.getBcTransaction(endpointUrl, contracts, transactionDefs),
|
|
196
201
|
};
|
|
197
202
|
}
|
|
198
203
|
}
|
|
199
204
|
Object.assign(AbstractJsc3l.prototype, {
|
|
200
205
|
memo,
|
|
201
206
|
ethFuncs,
|
|
202
|
-
createIcon
|
|
207
|
+
createIcon,
|
|
208
|
+
qr,
|
|
203
209
|
});
|
|
204
210
|
class IntegratedJsc3lAbstract extends AbstractJsc3l {
|
|
205
211
|
/**
|
|
@@ -216,7 +222,10 @@ class IntegratedJsc3lAbstract extends AbstractJsc3l {
|
|
|
216
222
|
}
|
|
217
223
|
/**
|
|
218
224
|
* `customization` depends on a local configuration being available
|
|
219
|
-
* through a previous call to
|
|
225
|
+
* through a previous call to
|
|
226
|
+
* `this.connection.getConfJSON(..)`. Although as it has some
|
|
227
|
+
* fallback available, we need to be able to support being called
|
|
228
|
+
* even if no local conf is loaded yet.
|
|
220
229
|
*
|
|
221
230
|
* XXXvlab: We could cache the result with result of
|
|
222
231
|
* `connection.getLocalConf()` being the key.
|
|
@@ -224,9 +233,10 @@ class IntegratedJsc3lAbstract extends AbstractJsc3l {
|
|
|
224
233
|
get customization() {
|
|
225
234
|
// XXXvlab: Probably don't need a module for that, as the configuration
|
|
226
235
|
// is always re-queried and quite small, we could cache-it in memory.
|
|
227
|
-
|
|
236
|
+
let localCfg = this.connection.getLocalConfJSON();
|
|
228
237
|
if (!localCfg) {
|
|
229
|
-
|
|
238
|
+
console.log('No local configuration available yet.');
|
|
239
|
+
localCfg = {};
|
|
230
240
|
}
|
|
231
241
|
return this.getCustomization(localCfg);
|
|
232
242
|
}
|
|
@@ -244,14 +254,14 @@ class IntegratedJsc3lAbstract extends AbstractJsc3l {
|
|
|
244
254
|
*/
|
|
245
255
|
get wallet() {
|
|
246
256
|
if (!this.ajaxReq) {
|
|
247
|
-
throw Error('a connect() is required before accessing wallet');
|
|
257
|
+
throw new Error('a connect() is required before accessing wallet');
|
|
248
258
|
}
|
|
249
259
|
let localCfg;
|
|
250
260
|
try {
|
|
251
261
|
localCfg = this.customization;
|
|
252
262
|
}
|
|
253
263
|
catch (e) {
|
|
254
|
-
throw Error('A local conf needs to be available before accessing wallet');
|
|
264
|
+
throw new Error('A local conf needs to be available before accessing wallet');
|
|
255
265
|
}
|
|
256
266
|
return this.getWallet(this.ajaxReq.endpoint.baseUrl, localCfg.getCurrencyName(), this.customization.getUnlockUrl());
|
|
257
267
|
}
|
|
@@ -269,14 +279,14 @@ class IntegratedJsc3lAbstract extends AbstractJsc3l {
|
|
|
269
279
|
*/
|
|
270
280
|
get bcRead() {
|
|
271
281
|
if (!this.ajaxReq) {
|
|
272
|
-
throw Error('an init() is required before accessing bcRead');
|
|
282
|
+
throw new Error('an init() is required before accessing bcRead');
|
|
273
283
|
}
|
|
274
284
|
let localCfg;
|
|
275
285
|
try {
|
|
276
286
|
localCfg = this.customization;
|
|
277
287
|
}
|
|
278
288
|
catch (e) {
|
|
279
|
-
throw Error('A local conf needs to be available before accessing wallet');
|
|
289
|
+
throw new Error('A local conf needs to be available before accessing wallet');
|
|
280
290
|
}
|
|
281
291
|
return this.getBcRead(this.ajaxReq.endpoint.baseUrl, [localCfg.getContract1(), localCfg.getContract2()]);
|
|
282
292
|
}
|
|
@@ -294,16 +304,20 @@ class IntegratedJsc3lAbstract extends AbstractJsc3l {
|
|
|
294
304
|
*/
|
|
295
305
|
get bcTransaction() {
|
|
296
306
|
if (!this.ajaxReq) {
|
|
297
|
-
throw Error('an init() is required before accessing bcTransaction');
|
|
307
|
+
throw new Error('an init() is required before accessing bcTransaction');
|
|
298
308
|
}
|
|
299
309
|
let localCfg;
|
|
300
310
|
try {
|
|
301
311
|
localCfg = this.customization;
|
|
302
312
|
}
|
|
303
313
|
catch (e) {
|
|
304
|
-
throw Error('A local conf needs to be available before accessing wallet');
|
|
314
|
+
throw new Error('A local conf needs to be available before accessing wallet');
|
|
305
315
|
}
|
|
306
|
-
return this.getBcTransaction(this.ajaxReq.endpoint.baseUrl, [
|
|
316
|
+
return this.getBcTransaction(this.ajaxReq.endpoint.baseUrl, [
|
|
317
|
+
localCfg.getContract1(),
|
|
318
|
+
localCfg.getContract2(),
|
|
319
|
+
localCfg.getContract3(),
|
|
320
|
+
], this.defaultTransactionDefs);
|
|
307
321
|
}
|
|
308
322
|
}
|
|
309
323
|
export default IntegratedJsc3lAbstract;
|
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA,CAAE,uBAAuB;AACxE,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/build/qr.d.ts
CHANGED
|
@@ -1,8 +1,33 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
type Signature = {
|
|
2
|
+
v: string;
|
|
3
|
+
r: string;
|
|
4
|
+
s: string;
|
|
4
5
|
};
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
type QRDataRaw = {
|
|
7
|
+
address: string;
|
|
8
|
+
destinary: string;
|
|
9
|
+
begin: string;
|
|
10
|
+
end: string;
|
|
11
|
+
viewbalance: boolean;
|
|
12
|
+
viewoldtran: boolean;
|
|
13
|
+
message_key?: string;
|
|
8
14
|
};
|
|
15
|
+
type QRData = {
|
|
16
|
+
address: string;
|
|
17
|
+
destinary: string;
|
|
18
|
+
begin: Date;
|
|
19
|
+
end: Date;
|
|
20
|
+
viewbalance: boolean;
|
|
21
|
+
viewoldtran: boolean;
|
|
22
|
+
message_key?: string;
|
|
23
|
+
};
|
|
24
|
+
export type SignedQR = {
|
|
25
|
+
data: QRDataRaw;
|
|
26
|
+
signature: Signature;
|
|
27
|
+
};
|
|
28
|
+
export declare function checkSignedQR(qrContent: SignedQR, intendedRecipientAddress: any): true | "InvalidFormat" | "InvalidSignature" | "NotForYou" | "Expired";
|
|
29
|
+
export declare function makeSignedQRFragments(qrContent: SignedQR, fragmentCount: number): {
|
|
30
|
+
full: string;
|
|
31
|
+
};
|
|
32
|
+
export declare function makeSignedQRContent(obj: QRData, privKey: string): SignedQR;
|
|
33
|
+
export {};
|
package/build/qr.js
CHANGED
|
@@ -1,24 +1,16 @@
|
|
|
1
1
|
import ethUtil from 'ethereumjs-util';
|
|
2
|
-
export function
|
|
3
|
-
let data, signature;
|
|
4
|
-
try {
|
|
5
|
-
({ data, signature } = JSON.parse(qrString));
|
|
6
|
-
}
|
|
7
|
-
catch (e) {
|
|
8
|
-
return 'InvalidFormat';
|
|
9
|
-
}
|
|
10
|
-
return checkSignedQR(data, signature, intendedRecipientAddress);
|
|
11
|
-
}
|
|
12
|
-
export function checkSignedQR(data, signature, intendedRecipientAddress) {
|
|
2
|
+
export function checkSignedQR(qrContent, intendedRecipientAddress) {
|
|
13
3
|
let hash;
|
|
14
4
|
let publicSignKey;
|
|
15
5
|
let receiverAddress;
|
|
6
|
+
const { data, signature } = qrContent;
|
|
16
7
|
try {
|
|
17
8
|
hash = ethUtil.sha3(JSON.stringify(data));
|
|
18
9
|
publicSignKey = ethUtil.ecrecover(hash, signature.v, signature.r, signature.s);
|
|
19
10
|
receiverAddress = ethUtil.bufferToHex(ethUtil.publicToAddress(publicSignKey));
|
|
20
11
|
}
|
|
21
12
|
catch (e) {
|
|
13
|
+
// XXXVlab: should probably use exceptions
|
|
22
14
|
return 'InvalidFormat';
|
|
23
15
|
}
|
|
24
16
|
if (receiverAddress !== data.address) {
|
|
@@ -30,6 +22,34 @@ export function checkSignedQR(data, signature, intendedRecipientAddress) {
|
|
|
30
22
|
if ((new Date(data.end)).getTime() < (new Date()).getTime()) {
|
|
31
23
|
return 'Expired';
|
|
32
24
|
}
|
|
33
|
-
return
|
|
25
|
+
return true;
|
|
26
|
+
}
|
|
27
|
+
export function makeSignedQRFragments(qrContent, fragmentCount) {
|
|
28
|
+
const signatureId = qrContent.signature.s.substring(4, 8);
|
|
29
|
+
const qrString = JSON.stringify(qrContent);
|
|
30
|
+
const fragmentSize = Math.ceil(qrString.length / fragmentCount);
|
|
31
|
+
const fragments = {
|
|
32
|
+
full: qrString,
|
|
33
|
+
};
|
|
34
|
+
for (let i = 0; i < fragmentCount; i++) {
|
|
35
|
+
fragments[i] = `FRAG_CR${signatureId}${i}${qrString.substring(fragmentSize * i, Math.min(fragmentSize * (i + 1), qrString.length))}`;
|
|
36
|
+
}
|
|
37
|
+
return fragments;
|
|
38
|
+
}
|
|
39
|
+
export function makeSignedQRContent(obj, privKey) {
|
|
40
|
+
const { begin, end } = obj;
|
|
41
|
+
const formatDate = (date) => `${date.getFullYear()}/${(date.getMonth() + 1)}/${date.getDate()}`;
|
|
42
|
+
const data = Object.assign(obj, {
|
|
43
|
+
begin: formatDate(begin),
|
|
44
|
+
end: formatDate(end),
|
|
45
|
+
});
|
|
46
|
+
const hash = ethUtil.sha3(JSON.stringify(data));
|
|
47
|
+
const { v, r, s } = ethUtil.ecsign(hash, privKey);
|
|
48
|
+
const signature = {
|
|
49
|
+
v,
|
|
50
|
+
r: '0x' + r.toString('hex'),
|
|
51
|
+
s: '0x' + s.toString('hex'),
|
|
52
|
+
};
|
|
53
|
+
return { data, signature };
|
|
34
54
|
}
|
|
35
55
|
//# sourceMappingURL=qr.js.map
|
package/build/qr.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"qr.js","sourceRoot":"","sources":["../src/qr.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"qr.js","sourceRoot":"","sources":["../src/qr.ts"],"names":[],"mappings":"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"}
|
package/build/rest/ajaxReq.d.ts
CHANGED
|
@@ -5,20 +5,12 @@ export default abstract class AjaxReqAbstract {
|
|
|
5
5
|
queuePost(): void;
|
|
6
6
|
getBalance(addr: any): Promise<unknown>;
|
|
7
7
|
getTransactionData(addr: any): Promise<unknown>;
|
|
8
|
-
sendTx(rawTx: any,
|
|
9
|
-
isError: boolean;
|
|
10
|
-
error: any;
|
|
11
|
-
}>;
|
|
12
|
-
getEstimatedGas(txobj: any): Promise<unknown>;
|
|
8
|
+
sendTx(rawTx: any, more: any): Promise<unknown>;
|
|
13
9
|
getEthCall(txobj: any): Promise<unknown>;
|
|
14
10
|
getEthCallAt(txobj: any, blockNb: any): Promise<unknown>;
|
|
15
11
|
enrollPost(data: any): any;
|
|
16
|
-
validateEnrollmentLetter(id: any, currency: any, signature: any): any;
|
|
17
|
-
enrollAddress(id: any, address: any, currency: any, token: any): any;
|
|
18
12
|
getTransList(id: any, count: any, offset: any): Promise<any>;
|
|
19
|
-
|
|
20
|
-
getExportTransList(id: any, start: any, end: any): any;
|
|
21
|
-
getExportTransListWithId(id: any, start: any, end: any): any;
|
|
13
|
+
getExportTransList(id: any, start: any, end: any): Promise<any>;
|
|
22
14
|
getCodesFromAddresses(addresses: any, currency: any, caller: any, signature: any): any;
|
|
23
15
|
getAddressesFromCode(code: any, currency: any, caller: any, signature: any): any;
|
|
24
16
|
getMessageKey(addr: any, withPrivate: any): any;
|
package/build/rest/ajaxReq.js
CHANGED
|
@@ -3,7 +3,6 @@ class URL {
|
|
|
3
3
|
URL.SERVER = 'api.php';
|
|
4
4
|
URL.ENROLL = 'enroll.php';
|
|
5
5
|
URL.TRANLIST = 'trnslist.php';
|
|
6
|
-
URL.TRANCHECK = 'api.php';
|
|
7
6
|
URL.EXPORTTRAN = 'export.php';
|
|
8
7
|
URL.GETCODE = 'getuid.php';
|
|
9
8
|
URL.GETADDRESS = 'getadd.php';
|
|
@@ -26,15 +25,12 @@ export default class AjaxReqAbstract {
|
|
|
26
25
|
}
|
|
27
26
|
queuePost() {
|
|
28
27
|
const { data, resolve, reject } = this.pendingPosts[0];
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
resolve(data
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
console.log(err);
|
|
36
|
-
reject(err);
|
|
37
|
-
}
|
|
28
|
+
this.endpoint.post(URL.SERVER, data).then(data => {
|
|
29
|
+
if (data.error) {
|
|
30
|
+
resolve(data);
|
|
31
|
+
}
|
|
32
|
+
resolve(data.data);
|
|
33
|
+
});
|
|
38
34
|
this.pendingPosts.splice(0, 1);
|
|
39
35
|
if (this.pendingPosts.length > 0) {
|
|
40
36
|
this.queuePost();
|
|
@@ -42,14 +38,7 @@ export default class AjaxReqAbstract {
|
|
|
42
38
|
}
|
|
43
39
|
getBalance(addr) { return this.post({ balance: addr }); }
|
|
44
40
|
getTransactionData(addr) { return this.post({ txdata: addr }); }
|
|
45
|
-
|
|
46
|
-
const data = await this.post(Object.assign({}, { rawtx: rawTx }, additionalData !== null && additionalData !== void 0 ? additionalData : {}));
|
|
47
|
-
return {
|
|
48
|
-
isError: !!data.error,
|
|
49
|
-
error: data.error ? data.data : data.msg
|
|
50
|
-
};
|
|
51
|
-
}
|
|
52
|
-
getEstimatedGas(txobj) { return this.post({ estimatedGas: txobj }); }
|
|
41
|
+
sendTx(rawTx, more) { return this.post(Object.assign({ rawtx: rawTx }, (more !== null && more !== void 0 ? more : {}))); }
|
|
53
42
|
getEthCall(txobj) { return this.post({ ethCall: txobj }); }
|
|
54
43
|
getEthCallAt(txobj, blockNb) {
|
|
55
44
|
return this.post({ ethCallAt: txobj, blockNb });
|
|
@@ -60,26 +49,15 @@ export default class AjaxReqAbstract {
|
|
|
60
49
|
enrollPost(data) {
|
|
61
50
|
return this.endpoint.post(URL.ENROLL, { data: JSON.stringify(data) });
|
|
62
51
|
}
|
|
63
|
-
validateEnrollmentLetter(id, currency, signature) {
|
|
64
|
-
return this.enrollPost({ id, currency, signature });
|
|
65
|
-
}
|
|
66
|
-
enrollAddress(id, address, currency, token) {
|
|
67
|
-
return this.enrollPost({ id, addresse: address, token, currency });
|
|
68
|
-
}
|
|
69
52
|
async getTransList(id, count, offset) {
|
|
70
53
|
// for some strange reasons, the answer is stringified 2 times,
|
|
71
54
|
// so we need to unpack each entry a second time.
|
|
72
55
|
const data = await this.endpoint.get(URL.TRANLIST, { addr: id, count, offset });
|
|
73
56
|
return data.map((dataJSON) => JSON.parse(dataJSON));
|
|
74
57
|
}
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
getExportTransList(id, start, end) {
|
|
79
|
-
return this.endpoint.get(URL.EXPORTTRAN, { addr: id, start, end });
|
|
80
|
-
}
|
|
81
|
-
getExportTransListWithId(id, start, end) {
|
|
82
|
-
return this.endpoint.get(URL.EXPORTTRAN, { addr: id, start, end });
|
|
58
|
+
async getExportTransList(id, start, end) {
|
|
59
|
+
const data = await this.endpoint.get(URL.EXPORTTRAN, { addr: id, start, end });
|
|
60
|
+
return data.map((dataJSON) => JSON.parse(dataJSON));
|
|
83
61
|
}
|
|
84
62
|
getCodesFromAddresses(addresses, currency, caller, signature) {
|
|
85
63
|
return this.endpoint.post(URL.GETCODE, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ajaxReq.js","sourceRoot":"","sources":["../../src/rest/ajaxReq.ts"],"names":[],"mappings":"AACA,MAAM,GAAG;;AACA,UAAM,GAAG,SAAS,CAAC;AACnB,UAAM,GAAG,YAAY,CAAC;AACtB,YAAQ,GAAG,cAAc,CAAC;AAC1B,
|
|
1
|
+
{"version":3,"file":"ajaxReq.js","sourceRoot":"","sources":["../../src/rest/ajaxReq.ts"],"names":[],"mappings":"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"}
|