@com-chain/jsc3l 2.0.1-rc.1 → 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 +6 -5
- package/build/index.js +28 -17
- 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 +1 -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 +43 -23
- package/src/qr.ts +86 -12
- package/src/rest/ajaxReq.ts +10 -39
- package/src/wallet.ts +40 -50
package/build/bcRead.d.ts
CHANGED
|
@@ -2,14 +2,13 @@ import AjaxReq from './rest/ajaxReq';
|
|
|
2
2
|
export default abstract class BcReadAbstract {
|
|
3
3
|
abstract ajaxReq: AjaxReq;
|
|
4
4
|
abstract contracts: string[];
|
|
5
|
-
getContractStatus(): Promise<
|
|
6
|
-
getTaxAccount(): Promise<
|
|
7
|
-
getHistoricalGlobalBalance(walletAddress: any, blockNb: any): Promise<
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
getAmountForElement(contract: any, functionAddress: any, callerAddress: any, elementAddress: any): Promise<string>;
|
|
5
|
+
getContractStatus(): Promise<string>;
|
|
6
|
+
getTaxAccount(): Promise<string>;
|
|
7
|
+
getHistoricalGlobalBalance(walletAddress: any, blockNb: any): Promise<any>;
|
|
8
|
+
getVersion(): Promise<any>;
|
|
9
|
+
getAmount(address: any, walletAddress: any): Promise<any>;
|
|
10
|
+
getAccInfo(address: any, walletAddress: any): Promise<any>;
|
|
11
|
+
read(contract: string, address: string, args?: any[], blockNb?: string): Promise<string>;
|
|
12
|
+
getAmountForElement(contract: any, functionAddress: any, callerAddress: any, elementAddress: any): Promise<any>;
|
|
14
13
|
getElementInList(contract: any, mapFunctionAddress: any, amountFunctionAddress: any, callerAddress: any, index: any, list: any, indMin: any): any;
|
|
15
14
|
}
|
package/build/bcRead.js
CHANGED
|
@@ -1,66 +1,121 @@
|
|
|
1
1
|
import BigNumber from 'bignumber.js';
|
|
2
2
|
import { getNakedAddress, padLeft, getDataObj } from './ethereum/ethFuncs';
|
|
3
|
-
function
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
3
|
+
function decodeData(abiType, data) {
|
|
4
|
+
if (data.startsWith('0x')) {
|
|
5
|
+
data = data.slice(2);
|
|
6
|
+
}
|
|
7
|
+
if (data.length === 0) {
|
|
8
|
+
return null;
|
|
9
|
+
}
|
|
10
|
+
let dataBuffer;
|
|
11
|
+
try {
|
|
12
|
+
dataBuffer = Buffer.from(data, 'hex');
|
|
13
|
+
}
|
|
14
|
+
catch (e) {
|
|
15
|
+
throw new Error('Invalid data provided: not an hex string');
|
|
16
|
+
}
|
|
17
|
+
if (dataBuffer.length % 32 !== 0) {
|
|
18
|
+
throw new Error('Invalid data provided: data length is not a multiple of 32');
|
|
19
|
+
}
|
|
20
|
+
const uintData = dataBuffer.readUIntBE(0, 32);
|
|
21
|
+
switch (abiType) {
|
|
22
|
+
case 'string':
|
|
23
|
+
const dataLocation = uintData;
|
|
24
|
+
if (dataLocation % 32 !== 0) {
|
|
25
|
+
throw new Error('Invalid data provided while decoding string: ' +
|
|
26
|
+
'first 32byte word is not a valid address');
|
|
27
|
+
}
|
|
28
|
+
if (dataLocation + 64 > dataBuffer.length) {
|
|
29
|
+
throw new Error('Invalid data provided while decoding string: ' +
|
|
30
|
+
'not enough data to decode length and first word at given location');
|
|
31
|
+
}
|
|
32
|
+
const dataLength = dataBuffer.readUIntBE(dataLocation, 32);
|
|
33
|
+
const expectedLength = Math.ceil((dataLocation + 32 + dataLength) / 32) * 32;
|
|
34
|
+
console.log("expected:", expectedLength);
|
|
35
|
+
if (dataBuffer.length !== expectedLength) {
|
|
36
|
+
throw new Error('Invalid data provided while decoding string: ' +
|
|
37
|
+
'not enough data to decode advertised string');
|
|
38
|
+
}
|
|
39
|
+
const dataValue = dataBuffer.slice(dataLocation + 32, dataLocation + 32 + dataLength);
|
|
40
|
+
return dataValue.toString();
|
|
41
|
+
case 'uint':
|
|
42
|
+
case 'uint256':
|
|
43
|
+
return uintData;
|
|
44
|
+
case 'number/100':
|
|
45
|
+
return (decodeData('number', data) / 100.0).toString();
|
|
46
|
+
case 'number':
|
|
47
|
+
const shortData = '0x' + data.slice(-12);
|
|
48
|
+
let a = parseInt(shortData, 16);
|
|
49
|
+
if (a > (34359738368 * 4096)) {
|
|
50
|
+
a -= 68719476736 * 4096;
|
|
51
|
+
}
|
|
52
|
+
return a;
|
|
53
|
+
case 'bool':
|
|
54
|
+
return uintData === 1;
|
|
55
|
+
default:
|
|
56
|
+
throw new Error(`Unsupported ABI type: ${abiType}`);
|
|
8
57
|
}
|
|
9
|
-
return a / ratio;
|
|
10
58
|
}
|
|
11
59
|
export default class BcReadAbstract {
|
|
12
60
|
// Get Global status of the contract
|
|
13
|
-
|
|
61
|
+
getContractStatus() { return this.read(this.contracts[0], '0x8b3c7c69'); }
|
|
14
62
|
// Get Global infos: Tax destinary Account
|
|
15
|
-
|
|
63
|
+
getTaxAccount() { return this.read(this.contracts[0], '0x4f2eabe0'); }
|
|
16
64
|
// Get Historical infos infos: Global balance
|
|
17
65
|
async getHistoricalGlobalBalance(walletAddress, blockNb) {
|
|
18
|
-
|
|
66
|
+
const data = await this.read(this.contracts[0], '0x70a08231', [
|
|
67
|
+
getNakedAddress(walletAddress)
|
|
68
|
+
], blockNb);
|
|
69
|
+
return decodeData('number/100', data);
|
|
70
|
+
}
|
|
71
|
+
async getVersion() {
|
|
72
|
+
const data = await this.read(this.contracts[0], '0x54fd4d50');
|
|
73
|
+
return decodeData('string', data);
|
|
19
74
|
}
|
|
20
75
|
// //////////////////////////////////////////////////////////////////////////
|
|
21
76
|
// Generic read function
|
|
22
77
|
async getAmount(address, walletAddress) {
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
|
|
78
|
+
const data = await this.read(this.contracts[0], address, [
|
|
79
|
+
getNakedAddress(walletAddress)
|
|
80
|
+
]);
|
|
81
|
+
return decodeData('number/100', data);
|
|
26
82
|
}
|
|
27
83
|
async getAccInfo(address, walletAddress) {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
return this.ajaxReq.getEthCall(userInfo);
|
|
33
|
-
}
|
|
34
|
-
async getAmountAt(address, walletAddress, blockNb) {
|
|
35
|
-
const userInfo = getDataObj(this.contracts[0], address, [getNakedAddress(walletAddress)]);
|
|
36
|
-
const blockHex = '0x' + new BigNumber(blockNb).toString(16);
|
|
37
|
-
const data = await this.ajaxReq.getEthCallAt(userInfo, blockHex);
|
|
38
|
-
return getNumber(data, 100.0).toString();
|
|
84
|
+
const data = await this.read(this.contracts[0], address, [
|
|
85
|
+
getNakedAddress(walletAddress)
|
|
86
|
+
]);
|
|
87
|
+
return decodeData('number', data);
|
|
39
88
|
}
|
|
40
|
-
async
|
|
41
|
-
|
|
42
|
-
const
|
|
43
|
-
|
|
89
|
+
async read(contract, address, args, blockNb = 'pending') {
|
|
90
|
+
args = args || [];
|
|
91
|
+
const ethCall = getDataObj(contract, address, args);
|
|
92
|
+
if (blockNb !== 'pending') {
|
|
93
|
+
blockNb = '0x' + new BigNumber(blockNb).toString(16);
|
|
94
|
+
}
|
|
95
|
+
try {
|
|
96
|
+
return (await this.ajaxReq.getEthCallAt(ethCall, blockNb));
|
|
97
|
+
}
|
|
98
|
+
catch (e) {
|
|
99
|
+
throw new Error(`Failed read contract: ${contract}, fn: ${address}`);
|
|
100
|
+
}
|
|
44
101
|
}
|
|
45
102
|
async getAmountForElement(contract, functionAddress, callerAddress, elementAddress) {
|
|
46
|
-
const
|
|
103
|
+
const data = await this.read(contract, functionAddress, [
|
|
47
104
|
getNakedAddress(callerAddress),
|
|
48
105
|
getNakedAddress(elementAddress)
|
|
49
106
|
]);
|
|
50
|
-
|
|
51
|
-
return getNumber(data, 100.0).toString();
|
|
107
|
+
return decodeData('number/100', data);
|
|
52
108
|
}
|
|
53
109
|
async getElementInList(contract, mapFunctionAddress, amountFunctionAddress, callerAddress, index, list, indMin) {
|
|
54
110
|
if (index < indMin)
|
|
55
111
|
return list;
|
|
56
|
-
const
|
|
112
|
+
const data = await this.read(contract, mapFunctionAddress, [
|
|
57
113
|
getNakedAddress(callerAddress),
|
|
58
114
|
padLeft(new BigNumber(index).toString(16), 64)
|
|
59
115
|
]);
|
|
60
|
-
const data = await this.ajaxReq.getEthCall(userInfo);
|
|
61
116
|
const amount = await this.getAmountForElement(contract, amountFunctionAddress, callerAddress, data);
|
|
62
|
-
const
|
|
63
|
-
const element = { address
|
|
117
|
+
const address = '0x' + data.substring(data.length - 40);
|
|
118
|
+
const element = { address, amount };
|
|
64
119
|
list.unshift(element);
|
|
65
120
|
return this.getElementInList(contract, mapFunctionAddress, amountFunctionAddress, callerAddress, index - 1, list, indMin);
|
|
66
121
|
}
|
|
@@ -114,7 +169,10 @@ for (const key in ListFunction) {
|
|
|
114
169
|
// avoid unwanted infinite loops
|
|
115
170
|
indMax = indMax || 0;
|
|
116
171
|
indMin = indMin || 0;
|
|
117
|
-
const
|
|
172
|
+
const data = await this.read(this.contracts[1], `0x${configList.count}`, [
|
|
173
|
+
getNakedAddress(walletAddress)
|
|
174
|
+
]);
|
|
175
|
+
const count = decodeData('number', data);
|
|
118
176
|
const list = [];
|
|
119
177
|
const index = Math.min(count - 1, indMax);
|
|
120
178
|
return this.getElementInList(this.contracts[1], `0x${configList.map}`, `0x${configList.amount}`, walletAddress, index, list, indMin);
|
package/build/bcRead.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bcRead.js","sourceRoot":"","sources":["../src/bcRead.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAA;AAGpC,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"bcRead.js","sourceRoot":"","sources":["../src/bcRead.ts"],"names":[],"mappings":"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"}
|
package/build/bcTransaction.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import AjaxReq from './rest/ajaxReq';
|
|
2
|
-
export
|
|
2
|
+
export declare abstract class BcTransactionAbstract {
|
|
3
3
|
abstract ajaxReq: AjaxReq;
|
|
4
4
|
abstract contracts: string[];
|
|
5
5
|
getSplitting(nantVal: any, cmVal: any, cmMinusLim: any, amount: any): {
|
|
@@ -8,3 +8,4 @@ export default abstract class BcTransactionAbstract {
|
|
|
8
8
|
cm: number;
|
|
9
9
|
};
|
|
10
10
|
}
|
|
11
|
+
export declare function transactionFactory(transactionDefs: any[], bcTransactionClass: any): void;
|
package/build/bcTransaction.js
CHANGED
|
@@ -7,18 +7,24 @@ function typeConv(label) {
|
|
|
7
7
|
if (label.endsWith('Address')) {
|
|
8
8
|
return (a) => padLeft(getNakedAddress(a), 64);
|
|
9
9
|
}
|
|
10
|
+
if (label === 'int') {
|
|
11
|
+
return (nb) => encodeNumber(parseInt(nb, 19));
|
|
12
|
+
}
|
|
10
13
|
if (label.startsWith('limit') || label === 'amount') {
|
|
11
14
|
return (nb) => encodeNumber(roundCent(nb));
|
|
12
15
|
}
|
|
13
|
-
if (label.endsWith('Status') || label.endsWith('Type')) {
|
|
16
|
+
if (label.endsWith('Status') || label.endsWith('Type') || label.endsWith('Int')) {
|
|
14
17
|
return (nb) => encodeNumber(nb);
|
|
15
18
|
}
|
|
19
|
+
if (label.endsWith('Hex')) {
|
|
20
|
+
return (s) => s.padEnd(128, '0');
|
|
21
|
+
}
|
|
16
22
|
if (label === 'status') {
|
|
17
|
-
return (nb) => (parseInt(nb, 10) === 0 ? 0 : 1);
|
|
23
|
+
return (nb) => encodeNumber(parseInt(nb, 10) === 0 ? 0 : 1);
|
|
18
24
|
}
|
|
19
25
|
throw new Error(`Unexpected label '${label}' in FnDefs.`);
|
|
20
26
|
}
|
|
21
|
-
export
|
|
27
|
+
export class BcTransactionAbstract {
|
|
22
28
|
// //////////////////////////////////////////////////////////////////////////
|
|
23
29
|
// CM VS Nant Handling
|
|
24
30
|
getSplitting(nantVal, cmVal, cmMinusLim, amount) {
|
|
@@ -57,79 +63,52 @@ export default class BcTransactionAbstract {
|
|
|
57
63
|
return { possible: possible, nant: nant, cm: cm };
|
|
58
64
|
}
|
|
59
65
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
setOwnerAccount: 'f2fde38b:accAddress',
|
|
71
|
-
setContractStatus: '0x88b8084f:status',
|
|
72
|
-
},
|
|
73
|
-
// Second Contract
|
|
74
|
-
{
|
|
75
|
-
transferNant: 'a5f7c148:toAddress amount *',
|
|
76
|
-
transferCM: '60ca9c4c:toAddress amount *',
|
|
77
|
-
transferOnBehalfNant: '1b6b1ee5:fromAddress toAddress amount D',
|
|
78
|
-
transferOnBehalfCM: '74c421fe:fromAddress toAddress amount D',
|
|
79
|
-
askTransferFrom: '58258353:fromAddress amount',
|
|
80
|
-
askTransferCMFrom: '2ef9ade2:fromAddress amount',
|
|
81
|
-
payRequestNant: '132019f4:toAddress amount *',
|
|
82
|
-
payRequestCM: '1415707c:toAddress amount *',
|
|
83
|
-
rejectRequest: 'af98f757:toAddress',
|
|
84
|
-
dismissAcceptedInfo: 'ccf93c7a:accAddress',
|
|
85
|
-
dismissRejectedInfo: '88759215:accAddress',
|
|
86
|
-
}
|
|
87
|
-
].forEach((contractFnDefs, contractNb) => {
|
|
88
|
-
for (const fnName in contractFnDefs) {
|
|
89
|
-
const [fnHash, argStringList] = contractFnDefs[fnName].split(':');
|
|
90
|
-
const argList = argStringList.split(' ');
|
|
91
|
-
let hasAdditionalPostData = false;
|
|
92
|
-
let hasDelegate = false;
|
|
93
|
-
if (argList.slice(-1)[0] === '*') {
|
|
94
|
-
hasAdditionalPostData = true;
|
|
95
|
-
argList.pop();
|
|
96
|
-
}
|
|
97
|
-
else if (argList.slice(-1)[0] === 'D') {
|
|
98
|
-
hasAdditionalPostData = true;
|
|
99
|
-
hasDelegate = true;
|
|
100
|
-
argList.pop();
|
|
101
|
-
}
|
|
102
|
-
// Build argument array function
|
|
103
|
-
const argFnList = argList.map((arg) => typeConv(arg));
|
|
104
|
-
const concatArgs = (args) => args.map((arg, idx) => argFnList[idx](arg)).join('');
|
|
105
|
-
BcTransactionAbstract.prototype[fnName] = async function (wallet, ...args) {
|
|
106
|
-
const addr = wallet.getAddressString();
|
|
107
|
-
const data = await this.ajaxReq.getTransactionData(addr);
|
|
108
|
-
// TODO: must test this
|
|
109
|
-
if (data.error) {
|
|
110
|
-
console.log(`Failed getTransactionData(${addr})`);
|
|
111
|
-
throw new Error(data.msg);
|
|
66
|
+
export function transactionFactory(transactionDefs, bcTransactionClass) {
|
|
67
|
+
transactionDefs.forEach((contractFnDefs, contractNb) => {
|
|
68
|
+
for (const fnName in contractFnDefs) {
|
|
69
|
+
const [fnHash, argStringList] = contractFnDefs[fnName].split(':');
|
|
70
|
+
const argList = argStringList.split(' ');
|
|
71
|
+
let hasAdditionalPostData = false;
|
|
72
|
+
let hasDelegate = false;
|
|
73
|
+
if (argList.slice(-1)[0] === '*') {
|
|
74
|
+
hasAdditionalPostData = true;
|
|
75
|
+
argList.pop();
|
|
112
76
|
}
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
77
|
+
else if (argList.slice(-1)[0] === 'D') {
|
|
78
|
+
hasAdditionalPostData = true;
|
|
79
|
+
hasDelegate = true;
|
|
80
|
+
argList.pop();
|
|
116
81
|
}
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
82
|
+
// Build argument array function
|
|
83
|
+
const argFnList = argList.map((arg) => typeConv(arg));
|
|
84
|
+
const concatArgs = (args) => args.map((arg, idx) => argFnList[idx](arg)).join('');
|
|
85
|
+
bcTransactionClass.prototype[fnName] = async function (wallet, ...args) {
|
|
86
|
+
const addr = wallet.getAddressString();
|
|
87
|
+
const data = await this.ajaxReq.getTransactionData(addr);
|
|
88
|
+
// TODO: must test this
|
|
89
|
+
if (data.error) {
|
|
90
|
+
console.log(`Failed getTransactionData(${addr})`);
|
|
91
|
+
throw new Error(data.msg);
|
|
92
|
+
}
|
|
93
|
+
const additionalPostData = hasAdditionalPostData ? args.pop() : {};
|
|
94
|
+
if (hasDelegate) {
|
|
95
|
+
additionalPostData.delegate = wallet.getAddressString();
|
|
96
|
+
}
|
|
97
|
+
const rawSignedTx = generateTx({
|
|
98
|
+
gasLimit: 500000,
|
|
99
|
+
data: fnHash + concatArgs(args),
|
|
100
|
+
to: this.contracts[contractNb],
|
|
101
|
+
unit: 'ether',
|
|
102
|
+
value: 0,
|
|
103
|
+
nonce: 1,
|
|
104
|
+
gasPrice: null,
|
|
105
|
+
donate: false,
|
|
106
|
+
from: addr,
|
|
107
|
+
key: wallet.getPrivateKeyString()
|
|
108
|
+
}, data);
|
|
109
|
+
return this.ajaxReq.sendTx(rawSignedTx, additionalPostData);
|
|
110
|
+
};
|
|
111
|
+
}
|
|
112
|
+
});
|
|
113
|
+
}
|
|
135
114
|
//# sourceMappingURL=bcTransaction.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bcTransaction.js","sourceRoot":"","sources":["../src/bcTransaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAI/C,SAAS,SAAS,CAAE,SAAgB;IAClC,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,CAAA;AAChD,CAAC;AAGD,SAAS,QAAQ,CAAE,KAAa;IAC9B,IAAI,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;QAC7B,OAAO,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;KAC9C;IACD,IAAI,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,KAAK,KAAK,QAAQ,EAAE;QACnD,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAA;KAC3C;IACD,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"bcTransaction.js","sourceRoot":"","sources":["../src/bcTransaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
declare const _default: ({
|
|
2
|
+
setAccountParam: string;
|
|
3
|
+
pledgeAccount: string;
|
|
4
|
+
setAllowance: string;
|
|
5
|
+
setDelegation: string;
|
|
6
|
+
setTaxAmount: string;
|
|
7
|
+
setTaxLegAmount: string;
|
|
8
|
+
setTaxAccount: string;
|
|
9
|
+
setOwnerAccount: string;
|
|
10
|
+
setContractStatus: string;
|
|
11
|
+
transferNant?: undefined;
|
|
12
|
+
transferCM?: undefined;
|
|
13
|
+
transferOnBehalfNant?: undefined;
|
|
14
|
+
transferOnBehalfCM?: undefined;
|
|
15
|
+
askTransferFrom?: undefined;
|
|
16
|
+
askTransferCMFrom?: undefined;
|
|
17
|
+
payRequestNant?: undefined;
|
|
18
|
+
payRequestCM?: undefined;
|
|
19
|
+
rejectRequest?: undefined;
|
|
20
|
+
dismissAcceptedInfo?: undefined;
|
|
21
|
+
dismissRejectedInfo?: undefined;
|
|
22
|
+
} | {
|
|
23
|
+
transferNant: string;
|
|
24
|
+
transferCM: string;
|
|
25
|
+
transferOnBehalfNant: string;
|
|
26
|
+
transferOnBehalfCM: string;
|
|
27
|
+
askTransferFrom: string;
|
|
28
|
+
askTransferCMFrom: string;
|
|
29
|
+
payRequestNant: string;
|
|
30
|
+
payRequestCM: string;
|
|
31
|
+
rejectRequest: string;
|
|
32
|
+
dismissAcceptedInfo: string;
|
|
33
|
+
dismissRejectedInfo: string;
|
|
34
|
+
setAccountParam?: undefined;
|
|
35
|
+
pledgeAccount?: undefined;
|
|
36
|
+
setAllowance?: undefined;
|
|
37
|
+
setDelegation?: undefined;
|
|
38
|
+
setTaxAmount?: undefined;
|
|
39
|
+
setTaxLegAmount?: undefined;
|
|
40
|
+
setTaxAccount?: undefined;
|
|
41
|
+
setOwnerAccount?: undefined;
|
|
42
|
+
setContractStatus?: undefined;
|
|
43
|
+
})[];
|
|
44
|
+
export default _default;
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
export default [
|
|
2
|
+
// First Contract
|
|
3
|
+
{
|
|
4
|
+
setAccountParam: '848b2592:accAddress accStatus accType limitPlus limitMinus',
|
|
5
|
+
pledgeAccount: '6c343eef:accAddress amount *',
|
|
6
|
+
setAllowance: 'd4e12f2e:spenderAddress amount',
|
|
7
|
+
setDelegation: '75741c79:spenderAddress limit',
|
|
8
|
+
setTaxAmount: 'f6f1897d:int',
|
|
9
|
+
setTaxLegAmount: 'fafaf4c0:int',
|
|
10
|
+
setTaxAccount: 'd0385b5e:accAddress',
|
|
11
|
+
setOwnerAccount: 'f2fde38b:accAddress',
|
|
12
|
+
setContractStatus: '88b8084f:status',
|
|
13
|
+
},
|
|
14
|
+
// Second Contract
|
|
15
|
+
{
|
|
16
|
+
transferNant: 'a5f7c148:toAddress amount *',
|
|
17
|
+
transferCM: '60ca9c4c:toAddress amount *',
|
|
18
|
+
transferOnBehalfNant: '1b6b1ee5:fromAddress toAddress amount D',
|
|
19
|
+
transferOnBehalfCM: '74c421fe:fromAddress toAddress amount D',
|
|
20
|
+
askTransferFrom: '58258353:fromAddress amount',
|
|
21
|
+
askTransferCMFrom: '2ef9ade2:fromAddress amount',
|
|
22
|
+
payRequestNant: '132019f4:toAddress amount *',
|
|
23
|
+
payRequestCM: '1415707c:toAddress amount *',
|
|
24
|
+
rejectRequest: 'af98f757:toAddress',
|
|
25
|
+
dismissAcceptedInfo: 'ccf93c7a:accAddress',
|
|
26
|
+
dismissRejectedInfo: '88759215:accAddress',
|
|
27
|
+
},
|
|
28
|
+
];
|
|
29
|
+
//# sourceMappingURL=transactions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"transactions.js","sourceRoot":"","sources":["../../src/config/transactions.ts"],"names":[],"mappings":"AAEA,eAAe;IACb,iBAAiB;IACjB;QACE,eAAe,EAAE,4DAA4D;QAC7E,aAAa,EAAE,8BAA8B;QAC7C,YAAY,EAAE,gCAAgC;QAC9C,aAAa,EAAE,+BAA+B;QAC9C,YAAY,EAAE,cAAc;QAC5B,eAAe,EAAE,cAAc;QAC/B,aAAa,EAAE,qBAAqB;QACpC,eAAe,EAAE,qBAAqB;QACtC,iBAAiB,EAAE,iBAAiB;KACrC;IACD,kBAAkB;IAClB;QACE,YAAY,EAAE,6BAA6B;QAC3C,UAAU,EAAE,6BAA6B;QACzC,oBAAoB,EAAE,yCAAyC;QAC/D,kBAAkB,EAAE,yCAAyC;QAC7D,eAAe,EAAE,6BAA6B;QAC9C,iBAAiB,EAAE,6BAA6B;QAChD,cAAc,EAAE,6BAA6B;QAC7C,YAAY,EAAE,6BAA6B;QAC3C,aAAa,EAAE,oBAAoB;QACnC,mBAAmB,EAAE,qBAAqB;QAC1C,mBAAmB,EAAE,qBAAqB;KAC3C;CACF,CAAA"}
|
package/build/connection.js
CHANGED
|
@@ -32,8 +32,14 @@ class ConnectionAbstract {
|
|
|
32
32
|
///
|
|
33
33
|
// [Lower level] Get the list of ComChain end-points from given repo
|
|
34
34
|
///
|
|
35
|
-
getCCEndPointList(repo) {
|
|
36
|
-
|
|
35
|
+
async getCCEndPointList(repo) {
|
|
36
|
+
try {
|
|
37
|
+
return await this.http.get(repo + config.nodesRepo, { _: new Date().getTime() });
|
|
38
|
+
}
|
|
39
|
+
catch (e) {
|
|
40
|
+
console.error(`Failed to get endpoint list on ${repo}`, e);
|
|
41
|
+
return false;
|
|
42
|
+
}
|
|
37
43
|
}
|
|
38
44
|
///
|
|
39
45
|
// [Lower level] Select a ComChain end-point with up and running APIs
|
|
@@ -192,12 +198,12 @@ export default class ConnectionMgrAbstract extends ConnectionAbstract {
|
|
|
192
198
|
if (this.conf)
|
|
193
199
|
return this.conf;
|
|
194
200
|
const cfgJson = this.persistentStore.get('ServerConf');
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
+
const cfg = cfgJson ? JSON.parse(cfgJson) : {};
|
|
202
|
+
// Completing with other informations if available
|
|
203
|
+
if (this.repo) {
|
|
204
|
+
cfg.repo = this.repo;
|
|
205
|
+
cfg.custoRepo = this.repo + config.custoRepo;
|
|
206
|
+
}
|
|
201
207
|
return cfg;
|
|
202
208
|
}
|
|
203
209
|
}
|
package/build/connection.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,UAAU,CAAA;AAKlC,MAAe,kBAAkB;IAK/B,GAAG;IACH,kEAAkE;IAClE,GAAG;IAEI,KAAK,CAAC,2BAA2B,CAAE,yBAAoC;QAC5E,4EAA4E;QAC5E,MAAM,eAAe,GAAG,yBAAyB,IAAI,EAAE,CAAA;QAEvD,MAAM,aAAa,GAAG;YACpB,eAAe;YACf,MAAM,CAAC,gBAAgB;YACvB,MAAM,CAAC,kBAAkB,CAAC,kDAAkD;SAC7E,CAAA;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC7C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;YACnD,IAAI,IAAI;gBAAE,OAAO,IAAI,CAAA;SACtB;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAED,GAAG;IACH,kEAAkE;IAClE,kBAAkB;IAClB,GAAG;IACI,KAAK,CAAC,eAAe,CAAE,IAAY;QACxC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAA;QACnD,IAAI,CAAC,QAAQ;YAAE,OAAO,KAAK,CAAA;QAC3B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;QACpD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAA;IAC/B,CAAC;IAED,GAAG;IACH,oEAAoE;IACpE,GAAG;IACH,iBAAiB,CAAE,IAAY;
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,UAAU,CAAA;AAKlC,MAAe,kBAAkB;IAK/B,GAAG;IACH,kEAAkE;IAClE,GAAG;IAEI,KAAK,CAAC,2BAA2B,CAAE,yBAAoC;QAC5E,4EAA4E;QAC5E,MAAM,eAAe,GAAG,yBAAyB,IAAI,EAAE,CAAA;QAEvD,MAAM,aAAa,GAAG;YACpB,eAAe;YACf,MAAM,CAAC,gBAAgB;YACvB,MAAM,CAAC,kBAAkB,CAAC,kDAAkD;SAC7E,CAAA;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC7C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;YACnD,IAAI,IAAI;gBAAE,OAAO,IAAI,CAAA;SACtB;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAED,GAAG;IACH,kEAAkE;IAClE,kBAAkB;IAClB,GAAG;IACI,KAAK,CAAC,eAAe,CAAE,IAAY;QACxC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAA;QACnD,IAAI,CAAC,QAAQ;YAAE,OAAO,KAAK,CAAA;QAC3B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;QACpD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAA;IAC/B,CAAC;IAED,GAAG;IACH,oEAAoE;IACpE,GAAG;IACH,KAAK,CAAC,iBAAiB,CAAE,IAAY;QACnC,IAAI;YACF,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CACxB,IAAI,GAAG,MAAM,CAAC,SAAS,EACvB,EAAE,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;SAC/B;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,kCAAkC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAA;YAC1D,OAAO,KAAK,CAAA;SACb;IACH,CAAC;IAED,GAAG;IACH,qEAAqE;IACrE,GAAG;IACH,KAAK,CAAC,cAAc,CAAE,KAAe;QACnC,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,qDAAqD;YACrD,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;YACrD,MAAM,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC,CAAA;YAEtB,mCAAmC;YACnC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YACzC,IAAI,OAAO;gBAAE,OAAO,IAAI,CAAA;YACxB,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;SACpB;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAED,GAAG;IACH,4DAA4D;IAC5D,GAAG;IACH,KAAK,CAAC,QAAQ,CAAE,UAAU;QACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;QAC/C,IAAI,CAAC,MAAM;YAAE,OAAO,KAAK,CAAA;QAEzB,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IACjC,CAAC;IAGD,6EAA6E;IAE7E,KAAK,CAAC,SAAS,CAAE,QAAQ;QACvB,OAAO,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,EAAE;YACvB,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;YACxD,MAAM,IAAI,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAA;YACzB,IAAI;gBACF,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;gBAChE,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAA;gBACvC,OAAO,IAAI,CAAA;aACZ;YAAC,OAAO,GAAG,EAAE;gBACZ,OAAO,CAAC,GAAG,CAAC,0BAA0B,IAAI,kBAAkB,CAAC,CAAA;gBAC7D,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,EAAE,CAAC,CAAA;gBAC/B,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;aACvB;SACF;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAED,KAAK,CAAC,OAAO,CAAE,UAAU;QACvB,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAChC,UAAU,GAAG,UAAU,EAAE,IAAI,EAC7B,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;YACpB,OAAO,MAAM,KAAK,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,MAAM,CAAA;SACpD;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,GAAG,CAAC,8BAA8B,UAAU,SAAS,EAAE,GAAG,CAAC,CAAA;YACnE,OAAO,KAAK,CAAA;SACb;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CAAE,UAAU;QACzB,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAChC,UAAU,GAAG,cAAc,EAAE,IAAI,EACjC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;YACpB,OAAO,MAAM,KAAK,MAAM,CAAA;SACzB;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,GAAG,CAAC,gCAAgC,UAAU,SAAS,EAAE,GAAG,CAAC,CAAA;YACrE,OAAO,KAAK,CAAA;SACb;IACH,CAAC;IAGD;;;OAGG;IACI,KAAK,CAAC,WAAW,CAAE,IAAI,EAAE,YAAY;QAC1C,IAAI;YACF,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CACxB,GAAG,IAAI,GAAG,MAAM,CAAC,UAAU,IAAI,YAAY,OAAO,EAClD,EAAE,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;SAC/B;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,KAAK,CAAA;SACb;IACH,CAAC;CAEF;AAGD;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAgB,qBAAsB,SAAQ,kBAAkB;IAS5E;;OAEG;IACI,KAAK,CAAC,2BAA2B,CAAE,yBAAoC;QAE5E,IAAI,CAAC,yBAAyB,EAAE;YAC9B,MAAM,kBAAkB,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;YACrE,yBAAyB,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;SAC3D;QACD,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,2BAA2B,CAAC,yBAAyB,CAAC,CAAA;QAC/E,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;SAC5C;QACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,OAAO,IAAI,CAAA;IACb,CAAC;IAGD;;;OAGG;IACI,KAAK,CAAC,eAAe,CAAE,IAAa;QACzC,IAAI,CAAC,IAAI,EAAE;YACT,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;gBACd,4DAA4D;gBAC5D,wDAAwD;gBACxD,MAAM,IAAI,CAAC,2BAA2B,EAAE,CAAA;aACzC;YACD,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;SACjB;QACD,MAAM,gBAAgB,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAC1D,IAAI,CAAC,gBAAgB,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;SACnD;QACD,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,gBAAgB,CAAA;QAC/C,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;SACxD;QAED,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC9D,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAA;IAC/B,CAAC;IAGD;;;;;;OAMG;IACI,KAAK,CAAC,WAAW,CAAE,YAAoB,EAAE,IAAa;QAC3D,IAAI,CAAC,IAAI,EAAE;YACT,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;gBACd,4DAA4D;gBAC5D,wDAAwD;gBACxD,MAAM,IAAI,CAAC,2BAA2B,EAAE,CAAA;aACzC;YACD,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;SACjB;QACD,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,YAAY,CAAC,CAAA;QACxD,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;SACvC;QACD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAA;QAC5D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,qCAAqC;QACrC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,SAAS,GAAG,IAAI,GAAG,MAAM,CAAC,SAAS,CAAA;QACxC,OAAO,IAAI,CAAA;IACb,CAAC;IAGD;;;OAGG;IACI,gBAAgB;QACrB,IAAI,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC,IAAI,CAAA;QAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QACtD,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAC9C,kDAAkD;QAClD,IAAI,IAAI,CAAC,IAAI,EAAE;YACb,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;YACpB,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,SAAS,CAAA;SAC7C;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;CAEF"}
|
package/build/customization.js
CHANGED
|
@@ -104,14 +104,21 @@ export default class CustomizationAbstract {
|
|
|
104
104
|
if (!currencyName) {
|
|
105
105
|
currencyName = this.cfg.server.name;
|
|
106
106
|
}
|
|
107
|
+
if (!this.cfg.custoRepo) {
|
|
108
|
+
throw Error('Requested getCurrencyAssetBaseUrl while configuration is not available (yet?)');
|
|
109
|
+
}
|
|
107
110
|
return `${this.cfg.custoRepo}${currencyName}`;
|
|
108
111
|
}
|
|
109
112
|
getCssUrl(currencyName) {
|
|
110
113
|
try {
|
|
111
|
-
// XXXvlab: I guess that we don't need to keep 'etherwallet' css
|
|
112
|
-
|
|
114
|
+
// XXXvlab: I guess that we don't need to keep 'etherwallet' css
|
|
115
|
+
// names
|
|
116
|
+
return this.getCurrencyAssetBaseUrl(currencyName) +
|
|
117
|
+
'/css/etherwallet-master.min.css';
|
|
113
118
|
}
|
|
114
119
|
catch (e) {
|
|
120
|
+
console.log('`customization.getCssUrl(..)` called before configuration was ' +
|
|
121
|
+
"ready. Returning `localDefaultConf`'s value.");
|
|
115
122
|
return this.localDefaultConf.server.url_Css;
|
|
116
123
|
}
|
|
117
124
|
}
|
|
@@ -122,6 +129,8 @@ export default class CustomizationAbstract {
|
|
|
122
129
|
return `${this.getCurrencyAssetBaseUrl(currencyName)}/images/lem.png`;
|
|
123
130
|
}
|
|
124
131
|
catch (e) {
|
|
132
|
+
console.log('`customization.getCurrencyLogoUrl(..)` called before configuration ' +
|
|
133
|
+
'was ready. Returning empty string.');
|
|
125
134
|
return '';
|
|
126
135
|
}
|
|
127
136
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customization.js","sourceRoot":"","sources":["../src/customization.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"customization.js","sourceRoot":"","sources":["../src/customization.ts"],"names":[],"mappings":"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"}
|