Skip to content

Commit cc7a1cb

Browse files
author
Iztok
committed
use Flare infra for all default nodes, verifiers and DALs
1 parent 35c22d7 commit cc7a1cb

19 files changed

+113
-70
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ Log files are created every hour and can be found in `packages/fasset-bots-core/
157157
- [Testnet BTC Explorer](https://blockstream.info/testnet)
158158
- [Testnet DOGE Explorer](https://sochain.com/DOGETEST)
159159
- [Coston Explorer](https://coston-explorer.flare.network)
160-
- [Verifier and Indexer Server for testnet XRP](https://testnet-verifier-fdc-test.aflabs.org/verifier/xrp/api-doc#)
161-
- [Verifier and Indexer Server for testnet BTC](https://testnet-verifier-fdc-test.aflabs.org/verifier/btc/api-doc#)
162-
- [Verifier and Indexer Server for testnet DOGE](https://testnet-verifier-fdc-test.aflabs.org/verifier/doge/api-doc#)
163-
- [Attestation Client Public Server connected to Coston](https://da.cflr.testfsp.aflabs.org:4443/api-doc)
160+
- [Verifier and Indexer Server for testnet XRP](https://fdc-verifiers-testnet.flare.network/verifier/xrp/api-doc)
161+
- [Verifier and Indexer Server for testnet DOGE](https://fdc-verifiers-testnet.flare.network/verifier/doge/api-doc)
162+
- [Attestation Client Public Server connected to Coston](https://ctn-data-availability.flare.network/api-doc)
163+
- [Attestation Client Public Server connected to Coston2](https://ctn2-data-availability.flare.network/api-doc)

‎docs/config.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ Can be found [here](../packages/fasset-bots-core/run-config/coston-bot.json).
155155
"tokenName": "Test XRP",
156156
"tokenSymbol": "testXRP",
157157
"tokenDecimals": 6,
158-
"indexerUrls": ["https://testnet-verifier-fdc-test.aflabs.org/verifier/xrp"],
159-
"walletUrls": ["https://s.altnet.rippletest.net:51234"]
158+
"indexerUrls": ["https://fdc-verifiers-testnet.flare.network/verifier/xrp"],
159+
"walletUrls": ["https://xrpl-testnet-api.flare.network"]
160160
}
161161
},
162162
"ormOptions": {
@@ -166,7 +166,7 @@ Can be found [here](../packages/fasset-bots-core/run-config/coston-bot.json).
166166
"type": "sqlite"
167167
},
168168
"rpcUrl": "https://coston-api.flare.network/ext/C/rpc",
169-
"dataAccessLayerUrls": ["https://da.cflr.testfsp.aflabs.org:4443"],
169+
"dataAccessLayerUrls": ["https://ctn-data-availability.flare.network"],
170170
"liquidationStrategy": {
171171
"className": "DexLiquidationStrategy",
172172
"config": {

‎packages/fasset-bots-core/run-config/coston-bot.json‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@
1717
"tokenName": "Test XRP",
1818
"tokenSymbol": "testXRP",
1919
"tokenDecimals": 6,
20-
"indexerUrls": ["https://testnet-verifier-fdc-test.aflabs.org/verifier/xrp"],
21-
"walletUrls": ["https://s.altnet.rippletest.net:51234"],
20+
"indexerUrls": [
21+
"https://fdc-verifiers-testnet.flare.network/verifier/xrp"
22+
],
23+
"walletUrls": [
24+
"https://xrpl-testnet-api.flare.network"
25+
],
2226
"minimumAccountBalance": "10",
2327
"faucet": "https://faucet.tequ.dev/",
2428
"priceChangeEmitter": "FtsoV2PriceStore"
@@ -29,7 +33,10 @@
2933
"liquidationPreventionFactor": "1.1",
3034
"vaultCollateralReserveFactor": "0.1",
3135
"poolCollateralReserveFactor": "0.1",
32-
"trustedPingSenders": ["0x8B7843E9768599EEF1136e59380e6F79dB6fb901","0x459BC23f08f0091A15cc3871c325463DeA609905"],
36+
"trustedPingSenders": [
37+
"0x8B7843E9768599EEF1136e59380e6F79dB6fb901",
38+
"0x459BC23f08f0091A15cc3871c325463DeA609905"
39+
],
3340
"minBalanceOnServiceAccount": "2",
3441
"minBalanceOnWorkAccount": "200",
3542
"defaultAgentSettings": {
@@ -56,7 +63,7 @@
5663
"recommendedOwnerBalance": "50",
5764
"minimumFreeUnderlyingBalance": "0.01",
5865
"feeSafetyFactorPerKB": 0,
59-
"transferToCVRatio": 0.7,
66+
"transferToCVRatio": 0.7,
6067
"returnFromCVRatio": 0.3,
6168
"targetTransferToCVRatio": 0.4,
6269
"targetReturnFromCVRatio": 0.6,
@@ -86,7 +93,7 @@
8693
},
8794
"rpcUrl": "https://coston-api-tracer.flare.network/ext/C/rpc",
8895
"dataAccessLayerUrls": [
89-
"https://da.cflr.testfsp.aflabs.org:4443"
96+
"https://ctn-data-availability.flare.network"
9097
],
9198
"ormOptions": {
9299
"type": "sqlite",
@@ -103,4 +110,4 @@
103110
"challengeStrategy": {
104111
"className": "DefaultChallengeStrategy"
105112
}
106-
}
113+
}

‎packages/fasset-bots-core/run-config/coston2-bot.json‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@
1717
"tokenName": "Test XRP",
1818
"tokenSymbol": "testXRP",
1919
"tokenDecimals": 6,
20-
"indexerUrls": ["https://testnet-verifier-fdc-test.aflabs.org/verifier/xrp"],
21-
"walletUrls": ["https://s.altnet.rippletest.net:51234"],
20+
"indexerUrls": [
21+
"https://fdc-verifiers-testnet.flare.network/verifier/xrp"
22+
],
23+
"walletUrls": [
24+
"https://xrpl-testnet-api.flare.network"
25+
],
2226
"minimumAccountBalance": "1",
2327
"faucet": "https://faucet.tequ.dev/",
2428
"priceChangeEmitter": "FtsoV2PriceStore"
@@ -29,7 +33,10 @@
2933
"liquidationPreventionFactor": "1.1",
3034
"vaultCollateralReserveFactor": "0.1",
3135
"poolCollateralReserveFactor": "0.1",
32-
"trustedPingSenders": ["0x8B7843E9768599EEF1136e59380e6F79dB6fb901","0x459BC23f08f0091A15cc3871c325463DeA609905"],
36+
"trustedPingSenders": [
37+
"0x8B7843E9768599EEF1136e59380e6F79dB6fb901",
38+
"0x459BC23f08f0091A15cc3871c325463DeA609905"
39+
],
3340
"minBalanceOnServiceAccount": "2",
3441
"minBalanceOnWorkAccount": "200",
3542
"defaultAgentSettings": {
@@ -73,4 +80,4 @@
7380
"challengeStrategy": {
7481
"className": "DefaultChallengeStrategy"
7582
}
76-
}
83+
}

‎packages/fasset-bots-core/run-config/songbird-bot.json‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@
1616
"tokenName": "XRP",
1717
"tokenSymbol": "XRP",
1818
"tokenDecimals": 6,
19-
"indexerUrls": ["https://fdc-verifiers-mainnet.flare.network/verifier/xrp"],
20-
"walletUrls": ["https://xrpl-api.flare.network"],
19+
"indexerUrls": [
20+
"https://fdc-verifiers-mainnet.flare.network/verifier/xrp"
21+
],
22+
"walletUrls": [
23+
"https://xrpl-api.flare.network"
24+
],
2125
"minimumAccountBalance": "1",
2226
"priceChangeEmitter": "FtsoV2PriceStore"
2327
}
@@ -27,7 +31,10 @@
2731
"liquidationPreventionFactor": "1.1",
2832
"vaultCollateralReserveFactor": "0.1",
2933
"poolCollateralReserveFactor": "0.1",
30-
"trustedPingSenders": ["0x8B7843E9768599EEF1136e59380e6F79dB6fb901","0x459BC23f08f0091A15cc3871c325463DeA609905"],
34+
"trustedPingSenders": [
35+
"0x8B7843E9768599EEF1136e59380e6F79dB6fb901",
36+
"0x459BC23f08f0091A15cc3871c325463DeA609905"
37+
],
3138
"minBalanceOnServiceAccount": "10",
3239
"minBalanceOnWorkAccount": "1000",
3340
"defaultAgentSettings": {
@@ -65,4 +72,4 @@
6572
"challengeStrategy": {
6673
"className": "DefaultChallengeStrategy"
6774
}
68-
}
75+
}

‎packages/fasset-bots-core/test-hardhat/test-utils/run-config-tests/run-config-missing-contracts-and-addressUpdater.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
1414
"tokenName": "Test XRP",
1515
"tokenSymbol": "testXRP",
1616
"tokenDecimals": 6,
17-
"indexerUrls": ["https://testnet-verifier-fdc-test.aflabs.org/verifier/xrp"],
18-
"walletUrls": ["https://s.altnet.rippletest.net:51234"],
17+
"indexerUrls": [
18+
"https://fdc-verifiers-testnet.flare.network/verifier/xrp"
19+
],
20+
"walletUrls": [
21+
"https://xrpl-testnet-api.flare.network"
22+
],
1923
"priceChangeEmitter": "FtsoV2PriceStore"
2024
}
2125
},
@@ -57,6 +61,6 @@
5761
},
5862
"rpcUrl": "https://coston-api.flare.network/ext/C/rpc",
5963
"dataAccessLayerUrls": [
60-
"https://da.cflr.testfsp.aflabs.org:4443"
64+
"https://ctn-data-availability.flare.network"
6165
]
62-
}
66+
}

‎packages/fasset-bots-core/test/e2e/config/botConfig.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import { DATA_ACCESS_LAYER_URLS, COSTON_CONTRACTS_MISSING_SC, COSTON_RPC, COSTON
1212
import { getNativeAccounts } from "../../test-utils/test-helpers";
1313
use(chaiAsPromised);
1414

15-
const indexerTestBTCUrls = ["https://testnet-verifier-fdc-test.aflabs.org/verifier/btc/"];
16-
const indexerTestDOGEUrls = ["https://testnet-verifier-fdc-test.aflabs.org/verifier/doge/"];
17-
const indexerTestXRPUrls = ["https://testnet-verifier-fdc-test.aflabs.org/verifier/xrp"];
15+
const indexerTestBTCUrls = ["https://fdc-verifiers-testnet.flare.network/verifier/btc"];
16+
const indexerTestDOGEUrls = ["https://fdc-verifiers-testnet.flare.network/verifier/doge"];
17+
const indexerTestXRPUrls = ["https://fdc-verifiers-testnet.flare.network/verifier/xrp"];
1818
const walletTestBTCUrls = ["https://api.bitcore.io/api/BTC/testnet/"];
1919
const walletTestDOGEUrls = ["https://api.bitcore.io/api/DOGE/testnet/"];
2020
const walletBTCUrls = ["https://api.bitcore.io/api/BTC/mainnet/"];
2121
const walletDOGEUrls = ["https://api.bitcore.io/api/DOGE/mainnet/"];
22-
const walletTestXRPUrls = ["https://s.altnet.rippletest.net:51234"];
22+
const walletTestXRPUrls = ["https://xrpl-testnet-api.flare.network"];
2323
const walletXRPUrls = ["https://s1.ripple.com:51234/"];
2424

2525
describe("Bot config tests", () => {

‎packages/fasset-bots-core/test/integration/transactions.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ export const targetPrivateKeyXRP = "00AF22D6EB35EFFC065BC7DBA21068DB400F1EC127A3
2323
describe("XRP transaction integration tests", () => {
2424
let secrets: Secrets;
2525
const chainId: ChainId = ChainId.testXRP;
26-
const indexerUrls: string[] = ["https://testnet-verifier-fdc-test.aflabs.org/verifier/xrp"];
27-
const walletUrls: string[] = ["https://s.altnet.rippletest.net:51234"];
26+
const indexerUrls: string[] = ["https://fdc-verifiers-testnet.flare.network/verifier/xrp"];
27+
const walletUrls: string[] = ["https://xrpl-testnet-api.flare.network"];
2828
const amountToSendDrops = 1000000;
2929
let monitor: ITransactionMonitor;
3030

‎packages/fasset-bots-core/test/test-utils/run-config-test/run-config-coston-invalid.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
},
1111
"rpcUrl": "https://coston-api.flare.network/ext/C/rpc",
1212
"dataAccessLayerUrls": [
13-
"https://da.cflr.testfsp.aflabs.org:4443"
13+
"https://ctn-data-availability.flare.network"
1414
]
15-
}
15+
}

‎packages/fasset-bots-core/test/test-utils/run-config-test/run-config-coston-with-address-updater.json‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
1414
"tokenName": "Test XRP",
1515
"tokenSymbol": "testXRP",
1616
"tokenDecimals": 6,
17-
"indexerUrls": ["https://testnet-verifier-fdc-test.aflabs.org/verifier/xrp"],
18-
"walletUrls": ["https://s.altnet.rippletest.net:51234"],
17+
"indexerUrls": [
18+
"https://fdc-verifiers-testnet.flare.network/verifier/xrp"
19+
],
20+
"walletUrls": [
21+
"https://xrpl-testnet-api.flare.network"
22+
],
1923
"priceChangeEmitter": "FtsoManager"
2024
}
2125
},
@@ -40,7 +44,12 @@
4044
"FTestXRP": {
4145
"recommendedOwnerBalance": "50",
4246
"minimumFreeUnderlyingBalance": "0.01",
43-
"feeSafetyFactorPerKB": 0
47+
"feeSafetyFactorPerKB": 0,
48+
"transferToCVRatio": 0.7,
49+
"returnFromCVRatio": 0.3,
50+
"targetTransferToCVRatio": 0.4,
51+
"targetReturnFromCVRatio": 0.6,
52+
"useAutomaticCoreVaultTransferAndReturn": true
4453
}
4554
}
4655
},
@@ -52,7 +61,7 @@
5261
},
5362
"rpcUrl": "https://coston-api.flare.network/ext/C/rpc",
5463
"dataAccessLayerUrls": [
55-
"https://da.cflr.testfsp.aflabs.org:4443"
64+
"https://ctn-data-availability.flare.network"
5665
],
5766
"assetManagerController": "0x572DeF121DC83332887E25e34aD51C2f5f40BC97"
58-
}
67+
}

0 commit comments

Comments
 (0)