diff --git a/ingest/ledgerbackend/configs/captive-core-pubnet.cfg b/ingest/ledgerbackend/configs/captive-core-pubnet.cfg index 5af59efaf9..124c485254 100644 --- a/ingest/ledgerbackend/configs/captive-core-pubnet.cfg +++ b/ingest/ledgerbackend/configs/captive-core-pubnet.cfg @@ -10,7 +10,7 @@ HOME_DOMAIN="publicnode.org" QUALITY="HIGH" [[HOME_DOMAINS]] -HOME_DOMAIN="lobstr.co" +HOME_DOMAIN="lobstr" QUALITY="HIGH" [[HOME_DOMAINS]] @@ -18,178 +18,178 @@ HOME_DOMAIN="www.franklintempleton.com" QUALITY="HIGH" [[HOME_DOMAINS]] -HOME_DOMAIN="satoshipay.io" +HOME_DOMAIN="satoshipay" QUALITY="HIGH" [[HOME_DOMAINS]] -HOME_DOMAIN="whalestack.com" +HOME_DOMAIN="stellar.creit.tech" QUALITY="HIGH" [[HOME_DOMAINS]] -HOME_DOMAIN="www.stellar.org" +HOME_DOMAIN="sdf" QUALITY="HIGH" [[HOME_DOMAINS]] -HOME_DOMAIN="stellar.blockdaemon.com" +HOME_DOMAIN="blockdaemon" QUALITY="HIGH" [[VALIDATORS]] -NAME="Boötes" +NAME="bootes" PUBLIC_KEY="GCVJ4Z6TI6Z2SOGENSPXDQ2U4RKH3CNQKYUHNSSPYFPNWTLGS6EBH7I2" ADDRESS="bootes.publicnode.org:11625" HISTORY="curl -sf https://bootes-history.publicnode.org/{0} -o {1}" HOME_DOMAIN="publicnode.org" [[VALIDATORS]] -NAME="Lyra by BP Ventures" +NAME="lyra" PUBLIC_KEY="GCIXVKNFPKWVMKJKVK2V4NK7D4TC6W3BUMXSIJ365QUAXWBRPPJXIR2Z" ADDRESS="lyra.publicnode.org:11625" HISTORY="curl -sf https://lyra-history.publicnode.org/{0} -o {1}" HOME_DOMAIN="publicnode.org" [[VALIDATORS]] -NAME="Hercules by OG Technologies" +NAME="hercules" PUBLIC_KEY="GBLJNN3AVZZPG2FYAYTYQKECNWTQYYUUY2KVFN2OUKZKBULXIXBZ4FCT" ADDRESS="hercules.publicnode.org:11625" HISTORY="curl -sf https://hercules-history.publicnode.org/{0} -o {1}" HOME_DOMAIN="publicnode.org" [[VALIDATORS]] -NAME="LOBSTR 3 (North America)" +NAME="lobstr_3_north_america" PUBLIC_KEY="GD5QWEVV4GZZTQP46BRXV5CUMMMLP4JTGFD7FWYJJWRL54CELY6JGQ63" ADDRESS="v3.stellar.lobstr.co:11625" HISTORY="curl -sf https://archive.v3.stellar.lobstr.co/{0} -o {1}" -HOME_DOMAIN="lobstr.co" +HOME_DOMAIN="lobstr" [[VALIDATORS]] -NAME="LOBSTR 1 (Europe)" +NAME="lobstr_1_eu" PUBLIC_KEY="GCFONE23AB7Y6C5YZOMKUKGETPIAJA4QOYLS5VNS4JHBGKRZCPYHDLW7" ADDRESS="v1.stellar.lobstr.co:11625" HISTORY="curl -sf https://archive.v1.stellar.lobstr.co/{0} -o {1}" -HOME_DOMAIN="lobstr.co" +HOME_DOMAIN="lobstr" [[VALIDATORS]] -NAME="LOBSTR 2 (Europe)" +NAME="lobstr_2_eu" PUBLIC_KEY="GCB2VSADESRV2DDTIVTFLBDI562K6KE3KMKILBHUHUWFXCUBHGQDI7VL" ADDRESS="v2.stellar.lobstr.co:11625" HISTORY="curl -sf https://archive.v2.stellar.lobstr.co/{0} -o {1}" -HOME_DOMAIN="lobstr.co" +HOME_DOMAIN="lobstr" [[VALIDATORS]] -NAME="LOBSTR 4 (Asia)" +NAME="lobstr_4_asia" PUBLIC_KEY="GA7TEPCBDQKI7JQLQ34ZURRMK44DVYCIGVXQQWNSWAEQR6KB4FMCBT7J" ADDRESS="v4.stellar.lobstr.co:11625" HISTORY="curl -sf https://archive.v4.stellar.lobstr.co/{0} -o {1}" -HOME_DOMAIN="lobstr.co" +HOME_DOMAIN="lobstr" [[VALIDATORS]] -NAME="LOBSTR 5 (India)" +NAME="lobstr_5_india" PUBLIC_KEY="GA5STBMV6QDXFDGD62MEHLLHZTPDI77U3PFOD2SELU5RJDHQWBR5NNK7" ADDRESS="v5.stellar.lobstr.co:11625" HISTORY="curl -sf https://archive.v5.stellar.lobstr.co/{0} -o {1}" -HOME_DOMAIN="lobstr.co" +HOME_DOMAIN="lobstr" [[VALIDATORS]] -NAME="FT SCV 2" +NAME="FT_SCV_2" PUBLIC_KEY="GCMSM2VFZGRPTZKPH5OABHGH4F3AVS6XTNJXDGCZ3MKCOSUBH3FL6DOB" ADDRESS="stellar2.franklintempleton.com:11625" HISTORY="curl -sf https://stellar-history-usc.franklintempleton.com/azuscshf401/{0} -o {1}" HOME_DOMAIN="www.franklintempleton.com" [[VALIDATORS]] -NAME="FT SCV 3" +NAME="FT_SCV_3" PUBLIC_KEY="GA7DV63PBUUWNUFAF4GAZVXU2OZMYRATDLKTC7VTCG7AU4XUPN5VRX4A" ADDRESS="stellar3.franklintempleton.com:11625" HISTORY="curl -sf https://stellar-history-ins.franklintempleton.com/azinsshf401/{0} -o {1}" HOME_DOMAIN="www.franklintempleton.com" [[VALIDATORS]] -NAME="FT SCV 1" +NAME="FT_SCV_1" PUBLIC_KEY="GARYGQ5F2IJEBCZJCBNPWNWVDOFK7IBOHLJKKSG2TMHDQKEEC6P4PE4V" ADDRESS="stellar1.franklintempleton.com:11625" HISTORY="curl -sf https://stellar-history-usw.franklintempleton.com/azuswshf401/{0} -o {1}" HOME_DOMAIN="www.franklintempleton.com" [[VALIDATORS]] -NAME="SatoshiPay Frankfurt" +NAME="satoshipay_de" PUBLIC_KEY="GC5SXLNAM3C4NMGK2PXK4R34B5GNZ47FYQ24ZIBFDFOCU6D4KBN4POAE" ADDRESS="stellar-de-fra.satoshipay.io:11625" HISTORY="curl -sf https://stellar-history-de-fra.satoshipay.io/{0} -o {1}" -HOME_DOMAIN="satoshipay.io" +HOME_DOMAIN="satoshipay" [[VALIDATORS]] -NAME="SatoshiPay Singapore" +NAME="satoshipay_sg" PUBLIC_KEY="GBJQUIXUO4XSNPAUT6ODLZUJRV2NPXYASKUBY4G5MYP3M47PCVI55MNT" ADDRESS="stellar-sg-sin.satoshipay.io:11625" HISTORY="curl -sf https://stellar-history-sg-sin.satoshipay.io/{0} -o {1}" -HOME_DOMAIN="satoshipay.io" +HOME_DOMAIN="satoshipay" [[VALIDATORS]] -NAME="SatoshiPay Iowa" +NAME="satoshipay_us" PUBLIC_KEY="GAK6Z5UVGUVSEK6PEOCAYJISTT5EJBB34PN3NOLEQG2SUKXRVV2F6HZY" ADDRESS="stellar-us-iowa.satoshipay.io:11625" HISTORY="curl -sf https://stellar-history-us-iowa.satoshipay.io/{0} -o {1}" -HOME_DOMAIN="satoshipay.io" +HOME_DOMAIN="satoshipay" [[VALIDATORS]] -NAME="Whalestack (Germany)" -PUBLIC_KEY="GD6SZQV3WEJUH352NTVLKEV2JM2RH266VPEM7EH5QLLI7ZZAALMLNUVN" -ADDRESS="germany.stellar.whalestack.com:11625" -HISTORY="curl -sf https://germany.stellar.whalestack.com/history/{0} -o {1}" -HOME_DOMAIN="whalestack.com" +NAME = "Gamma Node Validator" +PUBLIC_KEY = "GBF7QOLFPTHUEDUPTT4ZTULDTA3QXDIO75JHKJN2IYD7YGQLYUTR75BT" +ADDRESS = "gamma.validator.stellar.creit.tech:11625" +HISTORY = "curl -sf https://gamma-history.validator.stellar.creit.tech/{0} -o {1}" +HOME_DOMAIN = "stellar.creit.tech" [[VALIDATORS]] -NAME="Whalestack (Hong Kong)" -PUBLIC_KEY="GAZ437J46SCFPZEDLVGDMKZPLFO77XJ4QVAURSJVRZK2T5S7XUFHXI2Z" -ADDRESS="hongkong.stellar.whalestack.com:11625" -HISTORY="curl -sf https://hongkong.stellar.whalestack.com/history/{0} -o {1}" -HOME_DOMAIN="whalestack.com" +NAME = "Alpha Node Validator" +PUBLIC_KEY = "GBPLJDBFZO2H7QQH7YFCH3HFT6EMC42Z2DNJ2QFROCKETAPY54V4DCZD" +ADDRESS = "alpha.validator.stellar.creit.tech:11625" +HISTORY = "curl -sf https://alpha-history.validator.stellar.creit.tech/{0} -o {1}" +HOME_DOMAIN = "stellar.creit.tech" [[VALIDATORS]] -NAME="Whalestack (Finland)" -PUBLIC_KEY="GADLA6BJK6VK33EM2IDQM37L5KGVCY5MSHSHVJA4SCNGNUIEOTCR6J5T" -ADDRESS="finland.stellar.whalestack.com:11625" -HISTORY="curl -sf https://finland.stellar.whalestack.com/history/{0} -o {1}" -HOME_DOMAIN="whalestack.com" +NAME = "Beta Node Validator" +PUBLIC_KEY = "GDDANSYOYSY5EPSFHBRPCLX6XMHPPLIMHVIDXG6IPQLVVLRI2BN4HMH3" +ADDRESS = "beta.validator.stellar.creit.tech:11625" +HISTORY = "curl -sf https://beta-history.validator.stellar.creit.tech/{0} -o {1}" +HOME_DOMAIN = "stellar.creit.tech" [[VALIDATORS]] NAME="SDF 2" PUBLIC_KEY="GCM6QMP3DLRPTAZW2UZPCPX2LF3SXWXKPMP3GKFZBDSF3QZGV2G5QSTK" ADDRESS="core-live-b.stellar.org:11625" HISTORY="curl -sf http://history.stellar.org/prd/core-live/core_live_002/{0} -o {1}" -HOME_DOMAIN="www.stellar.org" +HOME_DOMAIN="sdf" [[VALIDATORS]] NAME="SDF 1" PUBLIC_KEY="GCGB2S2KGYARPVIA37HYZXVRM2YZUEXA6S33ZU5BUDC6THSB62LZSTYH" ADDRESS="core-live-a.stellar.org:11625" HISTORY="curl -sf http://history.stellar.org/prd/core-live/core_live_001/{0} -o {1}" -HOME_DOMAIN="www.stellar.org" +HOME_DOMAIN="sdf" [[VALIDATORS]] NAME="SDF 3" PUBLIC_KEY="GABMKJM6I25XI4K7U6XWMULOUQIQ27BCTMLS6BYYSOWKTBUXVRJSXHYQ" ADDRESS="core-live-c.stellar.org:11625" HISTORY="curl -sf http://history.stellar.org/prd/core-live/core_live_003/{0} -o {1}" -HOME_DOMAIN="www.stellar.org" +HOME_DOMAIN="sdf" [[VALIDATORS]] NAME="Blockdaemon Validator 3" PUBLIC_KEY="GAYXZ4PZ7P6QOX7EBHPIZXNWY4KCOBYWJCA4WKWRKC7XIUS3UJPT6EZ4" ADDRESS="stellar-full-validator3.bdnodes.net:11625" HISTORY="curl -sf https://stellar-full-history3.bdnodes.net/{0} -o {1}" -HOME_DOMAIN="stellar.blockdaemon.com" +HOME_DOMAIN="blockdaemon" [[VALIDATORS]] -NAME="Blockdaemon Validator 2" +NAME="blockdaemon_2" PUBLIC_KEY="GAVXB7SBJRYHSG6KSQHY74N7JAFRL4PFVZCNWW2ARI6ZEKNBJSMSKW7C" ADDRESS="stellar-full-validator2.bdnodes.net:11625" HISTORY="curl -sf https://stellar-full-history2.bdnodes.net/{0} -o {1}" -HOME_DOMAIN="stellar.blockdaemon.com" +HOME_DOMAIN="blockdaemon" [[VALIDATORS]] -NAME="Blockdaemon Validator 1" +NAME="blockdaemon_1" PUBLIC_KEY="GAAV2GCVFLNN522ORUYFV33E76VPC22E72S75AQ6MBR5V45Z5DWVPWEU" ADDRESS="stellar-full-validator1.bdnodes.net:11625" HISTORY="curl -sf https://stellar-full-history1.bdnodes.net/{0} -o {1}" -HOME_DOMAIN="stellar.blockdaemon.com" +HOME_DOMAIN="blockdaemon" diff --git a/services/galexie/internal/config_test.go b/services/galexie/internal/config_test.go index 3925c5b0de..8a2d4bb442 100644 --- a/services/galexie/internal/config_test.go +++ b/services/galexie/internal/config_test.go @@ -124,7 +124,7 @@ func TestValidCaptiveCorePreconfiguredNetwork(t *testing.T) { require.Equal(t, ccConfig.HistoryArchiveURLs, network.PublicNetworkhistoryArchiveURLs) require.Empty(t, ccConfig.Toml.HistoryEntries) require.Len(t, ccConfig.Toml.Validators, 23) - require.Equal(t, ccConfig.Toml.Validators[0].Name, "Boötes") + require.Equal(t, ccConfig.Toml.Validators[0].Name, "bootes") } func TestValidCaptiveCoreManualNetwork(t *testing.T) { @@ -187,7 +187,7 @@ func TestValidCaptiveCoreOverridenArchiveUrls(t *testing.T) { require.Equal(t, ccConfig.HistoryArchiveURLs, []string{"http://testarchive"}) require.Empty(t, ccConfig.Toml.HistoryEntries) require.Len(t, ccConfig.Toml.Validators, 23) - require.Equal(t, ccConfig.Toml.Validators[0].Name, "Boötes") + require.Equal(t, ccConfig.Toml.Validators[0].Name, "bootes") } func TestInvalidCaptiveCoreTomlPath(t *testing.T) { diff --git a/services/horizon/CHANGELOG.md b/services/horizon/CHANGELOG.md index 4191ac7a0c..6875534c48 100644 --- a/services/horizon/CHANGELOG.md +++ b/services/horizon/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## Pending + +- Update default pubnet captive core configuration to replace Whalestack with Creit Technologies in the quorum set ([5564](https://github.com/stellar/go/pull/5564)). + ## 22.0.2 ### Fixed