Skip to content

Commit c39f4ca

Browse files
authored
Merge pull request #179 from liquality/dev
Dev Merge
2 parents 4f79653 + 827462d commit c39f4ca

36 files changed

+376
-688
lines changed

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,3 @@ jobs:
6666
- <<: *deploy_app
6767
env:
6868
- REACT_APP_TRAVIS_COMMIT=$TRAVIS_COMMIT APP_CONFIG=./.travis/liquality.io.testnet.config.js DESTINATION_PATH=/var/www/html/it/leep/swap-testnet SWAP_DIR_SUFFIX=-testnet
69-
- <<: *deploy_app
70-
env:
71-
- REACT_APP_TRAVIS_COMMIT=$TRAVIS_COMMIT APP_CONFIG=./.travis/liquality.io.denver.config.js DESTINATION_PATH=/var/www/html/it/leep/swap-denver SWAP_DIR_SUFFIX=-denver

.travis/liquality.io.denver.config.js

Lines changed: 0 additions & 210 deletions
This file was deleted.

.travis/liquality.io.mainnet.config.js

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@ export default {
1212
type: 'scraper',
1313
url: 'https://liquality.io/eth-mainnet-api'
1414
},
15-
network: 'mainnet'
15+
network: 'mainnet',
16+
explorerPath: 'https://etherscan.io/tx/0x'
1617
},
1718
btc: {
1819
api: {
1920
url: 'https://blockstream.info/api'
2021
},
2122
feeNumberOfBlocks: 2,
22-
network: 'bitcoin'
23+
network: 'bitcoin',
24+
explorerPath: 'https://blockstream.info/tx/'
2325
},
2426
dai: {
2527
type: 'erc20',
@@ -31,9 +33,10 @@ export default {
3133
url: 'https://liquality.io/eth-mainnet-api'
3234
},
3335
contractAddress: '0x6b175474e89094c44da98b954eedeac495271d0f',
34-
network: 'mainnet'
36+
network: 'mainnet',
37+
explorerPath: 'https://etherscan.io/tx/0x'
3538
},
36-
usdt: {
39+
usdc: {
3740
type: 'erc20',
3841
rpc: {
3942
url: 'https://mainnet.infura.io/v3/3bbb5ebeb45e4b2b9a35261f272fb611'
@@ -42,13 +45,14 @@ export default {
4245
type: 'scraper',
4346
url: 'https://liquality.io/eth-mainnet-api'
4447
},
45-
contractAddress: '0xdac17f958d2ee523a2206206994597c13d831ec7',
46-
network: 'mainnet'
48+
contractAddress: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
49+
network: 'mainnet',
50+
explorerPath: 'https://etherscan.io/tx/0x'
4751
}
4852
},
4953
hostName: 'Liquality',
5054
hostIcon: 'https://raw.githubusercontent.com/liquality/chainabstractionlayer/master/liquality-logo.png',
51-
hostAgent: 'https://liquality.io/agent',
55+
hostAgent: 'agent',
5256
injectScript: `
5357
function addSentry () {
5458
(function loadScript(src, callback) {
@@ -69,9 +73,13 @@ export default {
6973
};
7074
t = document.getElementsByTagName('script')[0];
7175
t.parentNode.insertBefore(s, t);
72-
})('https://browser.sentry-cdn.com/4.6.4/bundle.min.js', function () {
76+
})('https://browser.sentry-cdn.com/5.14.2/bundle.min.js', function () {
77+
var dsn = window.location.pathname.indexOf('-dev') !== -1
78+
? 'https://816ae35527f34f4fbde7165d34046382@sentry.io/4693986'
79+
: 'https://8ecc6862378646dd819d160876b47f75@sentry.io/4693923'
80+
7381
Sentry.init({
74-
dsn: 'https://12ddc74cff10472ebb8a940da86e12d9@sentry.io/1415462',
82+
dsn: dsn,
7583
release: '${footerVersion}'
7684
})
7785
});

.travis/liquality.io.testnet.config.js

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@ export default {
1212
type: 'scraper',
1313
url: 'https://liquality.io/eth-rinkeby-api'
1414
},
15-
network: 'rinkeby'
15+
network: 'rinkeby',
16+
explorerPath: 'https://rinkeby.etherscan.io/tx/0x'
1617
},
1718
btc: {
1819
api: {
1920
url: 'https://blockstream.info/testnet/api'
2021
},
2122
feeNumberOfBlocks: 2,
22-
network: 'bitcoin_testnet'
23+
network: 'bitcoin_testnet',
24+
explorerPath: 'https://blockstream.info/testnet/tx/'
2325
},
2426
dai: {
2527
type: 'erc20',
@@ -31,13 +33,14 @@ export default {
3133
url: 'https://liquality.io/eth-rinkeby-api'
3234
},
3335
contractAddress: '0xcE2748BE67fB4346654B4500c4BB0642536365FC',
34-
network: 'rinkeby'
36+
network: 'rinkeby',
37+
explorerPath: 'https://rinkeby.etherscan.io/tx/0x'
3538
}
3639
},
3740
minConfirmations: 0,
3841
hostName: 'Liquality',
3942
hostIcon: 'https://raw.githubusercontent.com/liquality/chainabstractionlayer/master/liquality-logo.png',
40-
hostAgent: 'https://liquality.io/agenttestnet',
43+
hostAgent: 'agent',
4144
injectScript: `
4245
function addSentry () {
4346
(function loadScript(src, callback) {
@@ -58,9 +61,13 @@ export default {
5861
};
5962
t = document.getElementsByTagName('script')[0];
6063
t.parentNode.insertBefore(s, t);
61-
})('https://browser.sentry-cdn.com/4.6.4/bundle.min.js', function () {
64+
})('https://browser.sentry-cdn.com/5.14.2/bundle.min.js', function () {
65+
var dsn = window.location.pathname.indexOf('-dev') !== -1
66+
? 'https://47837321894a4befa9211cf8754587dc@sentry.io/4694007'
67+
: 'https://d9929a726dba4e929d6fded47f4b3fb4@sentry.io/4693957'
68+
6269
Sentry.init({
63-
dsn: 'https://12ddc74cff10472ebb8a940da86e12d9@sentry.io/1415462',
70+
dsn: dsn,
6471
release: '${footerVersion}'
6572
})
6673
});

0 commit comments

Comments
 (0)