From 0eaf4deb4ca0c53f54b96ef833bf4f9275d179de Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Mon, 15 Jul 2024 11:27:50 +0900 Subject: [PATCH] fix: update url (#1804) --- .github/workflows/cli.test.yaml | 2 +- .github/workflows/dal.test.yaml | 2 +- .github/workflows/delegator.test+build.yaml | 2 +- .github/workflows/node.test.yaml | 2 +- .github/workflows/sentinel.test.yaml | 2 +- contracts/v0.1/hardhat.config.cjs | 2 +- contracts/v0.2/foundry.toml | 2 +- contracts/v0.2/package.json | 6 +++--- core/test/caver-js.test.ts | 2 +- core/test/nonce-manager.test.ts | 2 +- core/test/reporter.test.ts | 4 ++-- dockerfiles/local-data-feed/envs/.core.env | 2 +- dockerfiles/local-data-feed/envs/.delegator.env | 2 +- inspector/hardhat.config.ts | 2 +- inspector/scripts/json-rpc-sync-check.sh | 4 ++-- node/.env.local | 2 +- node/pkg/chain/tests/chain_test.go | 4 ++-- 17 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/cli.test.yaml b/.github/workflows/cli.test.yaml index 74ec43b86..3e77ff950 100644 --- a/.github/workflows/cli.test.yaml +++ b/.github/workflows/cli.test.yaml @@ -85,7 +85,7 @@ jobs: run: go run main.go & env: DATABASE_URL: "postgresql://postgres:postgres@localhost:5432/delegator?search_path=public" - PROVIDER_URL: "https://public-en.kairos.node.kaia.io" + PROVIDER_URL: "https://public-en-kairos.node.kaia.io" APP_PORT: "3002" - name: Run api diff --git a/.github/workflows/dal.test.yaml b/.github/workflows/dal.test.yaml index ffa364569..6573e6bfa 100644 --- a/.github/workflows/dal.test.yaml +++ b/.github/workflows/dal.test.yaml @@ -77,7 +77,7 @@ jobs: DATABASE_URL: "postgresql://postgres:postgres@localhost:5432/orakl-test?search_path=public" REDIS_HOST: "localhost" REDIS_PORT: "6379" - KAIA_PROVIDER_URL: "https://public-en.kairos.node.kaia.io" + KAIA_PROVIDER_URL: "https://public-en-kairos.node.kaia.io" KAIA_WEBSOCKET_URL: "wss://public-en-baobab.klaytn.net/ws" SUBMISSION_PROXY_CONTRACT: "0x35bA1102A4954147272782302856BD8440227B85" SIGNER_PK: ${{ secrets.TEST_DELEGATOR_REPORTER_PK}} diff --git a/.github/workflows/delegator.test+build.yaml b/.github/workflows/delegator.test+build.yaml index 3ad8f1808..04b57b2c7 100644 --- a/.github/workflows/delegator.test+build.yaml +++ b/.github/workflows/delegator.test+build.yaml @@ -69,6 +69,6 @@ jobs: go test ./tests -v env: DATABASE_URL: "postgresql://postgres:postgres@localhost:5432/orakl-test?search_path=public" - PROVIDER_URL: "https://public-en.kairos.node.kaia.io" + PROVIDER_URL: "https://public-en-kairos.node.kaia.io" TEST_DELEGATOR_REPORTER_PK: ${{ secrets.TEST_DELEGATOR_REPORTER_PK}} DELEGATOR_FEEPAYER_PK: ${{ secrets.DELEGATOR_FEEPAYER_PK}} diff --git a/.github/workflows/node.test.yaml b/.github/workflows/node.test.yaml index e9cf0f7ec..12c9ba150 100644 --- a/.github/workflows/node.test.yaml +++ b/.github/workflows/node.test.yaml @@ -78,7 +78,7 @@ jobs: ENCRYPT_PASSWORD: "anything" KAIA_WEBSOCKET_URL: "wss://public-en-cypress.klaytn.net/ws" ETH_WEBSOCKET_URL: "wss://ethereum-rpc.publicnode.com" - KAIA_PROVIDER_URL: "https://public-en.kairos.node.kaia.io" + KAIA_PROVIDER_URL: "https://public-en-kairos.node.kaia.io" KAIA_REPORTER_PK: ${{ secrets.TEST_DELEGATOR_REPORTER_PK}} ETH_PROVIDER_URL: "https://ethereum-sepolia.g.allthatnode.com/full/evm" ETH_REPORTER_PK: ${{ secrets.TEST_DELEGATOR_REPORTER_PK}} diff --git a/.github/workflows/sentinel.test.yaml b/.github/workflows/sentinel.test.yaml index d1a579c70..fb5ed9ed4 100644 --- a/.github/workflows/sentinel.test.yaml +++ b/.github/workflows/sentinel.test.yaml @@ -68,4 +68,4 @@ jobs: task test env: CHAIN: "baobab" - JSON_RPC_URL: "https://public-en.kairos.node.kaia.io" + JSON_RPC_URL: "https://public-en-kairos.node.kaia.io" diff --git a/contracts/v0.1/hardhat.config.cjs b/contracts/v0.1/hardhat.config.cjs index 8acea2760..94c1fe2bf 100644 --- a/contracts/v0.1/hardhat.config.cjs +++ b/contracts/v0.1/hardhat.config.cjs @@ -15,7 +15,7 @@ const commonConfig = { } const _baobab = { - url: 'https://public-en.kairos.node.kaia.io', + url: 'https://public-en-kairos.node.kaia.io', chainId: 1001, ...commonConfig, gasPrice: 250_000_000_000, diff --git a/contracts/v0.2/foundry.toml b/contracts/v0.2/foundry.toml index b164bdb36..d938d6274 100644 --- a/contracts/v0.2/foundry.toml +++ b/contracts/v0.2/foundry.toml @@ -10,4 +10,4 @@ optimizer-runs = 100_000 [rpc_endpoints] anvil = "http://127.0.0.1:8545" -baobab = "https://public-en.kairos.node.kaia.io" +baobab = "https://public-en-kairos.node.kaia.io" diff --git a/contracts/v0.2/package.json b/contracts/v0.2/package.json index a0a2db2ff..d6b514b0f 100644 --- a/contracts/v0.2/package.json +++ b/contracts/v0.2/package.json @@ -32,9 +32,9 @@ "deploy:localhost:Feed": "forge script DeployFeed --broadcast --gas-estimate-multiplier 300 --rpc-url http://localhost:8545", "deploy:localhost:FeedRouter": "forge script DeployFeedRouter --broadcast --gas-estimate-multiplier 300 --rpc-url http://localhost:8545", "deploy:localhost:SubmissionProxy": "forge script DeploySubmissionProxy --broadcast --gas-estimate-multiplier 300 --rpc-url http://localhost:8545", - "deploy:baobab:Feed": "forge script DeployFeed --broadcast --gas-estimate-multiplier 300 --rpc-url https://public-en.kairos.node.kaia.io", - "deploy:baobab:FeedRouter": "forge script DeployFeedRouter --broadcast --gas-estimate-multiplier 300 --rpc-url https://public-en.kairos.node.kaia.io", - "deploy:baobab:SubmissionProxy": "forge script DeploySubmissionProxy --broadcast --gas-estimate-multiplier 300 --rpc-url https://public-en.kairos.node.kaia.io", + "deploy:baobab:Feed": "forge script DeployFeed --broadcast --gas-estimate-multiplier 300 --rpc-url https://public-en-kairos.node.kaia.io", + "deploy:baobab:FeedRouter": "forge script DeployFeedRouter --broadcast --gas-estimate-multiplier 300 --rpc-url https://public-en-kairos.node.kaia.io", + "deploy:baobab:SubmissionProxy": "forge script DeploySubmissionProxy --broadcast --gas-estimate-multiplier 300 --rpc-url https://public-en-kairos.node.kaia.io", "deploy:cypress:Feed": "forge script DeployFeed --broadcast --gas-estimate-multiplier 300 --rpc-url https://public-en-cypress.klaytn.net", "deploy:cypress:FeedRouter": "forge script DeployFeedRouter --broadcast --gas-estimate-multiplier 300 --rpc-url https://public-en-cypress.klaytn.net", "deploy:cypress:SubmissionProxy": "forge script DeploySubmissionProxy --broadcast --gas-estimate-multiplier 300 --rpc-url https://public-en-cypress.klaytn.net" diff --git a/core/test/caver-js.test.ts b/core/test/caver-js.test.ts index 1d13861b4..5f1324ebd 100644 --- a/core/test/caver-js.test.ts +++ b/core/test/caver-js.test.ts @@ -7,7 +7,7 @@ describe('Test Caver-js', function () { if (process.env.GITHUB_ACTIONS) { test('Send signed tx with is caver-js on Baobab', async function () { - const PROVIDER_URL = 'https://public-en.kairos.node.kaia.io' + const PROVIDER_URL = 'https://public-en-kairos.node.kaia.io' const caver = new Caver(PROVIDER_URL) const privateKey = process.env.CAVER_PRIVATE_KEY || '' const account = caver.klay.accounts.wallet.add(privateKey) diff --git a/core/test/nonce-manager.test.ts b/core/test/nonce-manager.test.ts index b5a6cfd63..3deecacec 100644 --- a/core/test/nonce-manager.test.ts +++ b/core/test/nonce-manager.test.ts @@ -6,7 +6,7 @@ import { State } from '../src/reporter/state' describe('nonce-manager', () => { const PROVIDER_URL = process.env.GITHUB_ACTIONS ? 'https://public-en-cypress.klaytn.net' - : 'https://public-en.kairos.node.kaia.io' + : 'https://public-en-kairos.node.kaia.io' const redisClient: RedisClientType = createClient({ url: '' }) const ORACLE_ADDRESS = '0x0E4E90de7701B72df6F21343F51C833F7d2d3CFb' const REPORTER = { diff --git a/core/test/reporter.test.ts b/core/test/reporter.test.ts index d8957daea..a08d8e172 100644 --- a/core/test/reporter.test.ts +++ b/core/test/reporter.test.ts @@ -79,7 +79,7 @@ describe('Reporter', function () { // 0 $KLAY in Account // address: '0x9bf123A486DD67d5B2B859c74BFa3035c99b9243' privateKey: '0xaa8707622845b72c76b7b9f329b154140441eda385ca39e3cdc66d2bee5f98e0', - providerUrl: 'https://public-en.kairos.node.kaia.io', + providerUrl: 'https://public-en-kairos.node.kaia.io', }) const nonce = Number(await wallet.caver.rpc.klay.getTransactionCount(wallet.address)) @@ -100,7 +100,7 @@ describe('Reporter', function () { describe('Filter invalid reporters inside of State', function () { const PROVIDER_URL = process.env.GITHUB_ACTIONS ? 'https://public-en-cypress.klaytn.net' - : 'https://public-en.kairos.node.kaia.io' + : 'https://public-en-kairos.node.kaia.io' const redisClient: RedisClientType = createClient({ url: '' }) const VALID_REPORTER = { diff --git a/dockerfiles/local-data-feed/envs/.core.env b/dockerfiles/local-data-feed/envs/.core.env index 2ecd1850b..4de9daf27 100644 --- a/dockerfiles/local-data-feed/envs/.core.env +++ b/dockerfiles/local-data-feed/envs/.core.env @@ -3,7 +3,7 @@ CHAIN=baobab_test ORAKL_NETWORK_API_URL=http://api:3000/api/v1 ORAKL_NETWORK_DELEGATOR_URL=http://delegator:3002/api/v1 NODE_ENV=production -PROVIDER_URL=https://public-en.kairos.node.kaia.io +PROVIDER_URL=https://public-en-kairos.node.kaia.io # Logging LOG_LEVEL=debug diff --git a/dockerfiles/local-data-feed/envs/.delegator.env b/dockerfiles/local-data-feed/envs/.delegator.env index 98bd7cdfa..9786c2f27 100644 --- a/dockerfiles/local-data-feed/envs/.delegator.env +++ b/dockerfiles/local-data-feed/envs/.delegator.env @@ -1,3 +1,3 @@ DATABASE_URL=postgresql://testuser@postgres:5432/test?search_path=delegator -PROVIDER_URL=https://public-en.kairos.node.kaia.io +PROVIDER_URL=https://public-en-kairos.node.kaia.io APP_PORT=3002 diff --git a/inspector/hardhat.config.ts b/inspector/hardhat.config.ts index 18d6a6a0c..41b37729e 100644 --- a/inspector/hardhat.config.ts +++ b/inspector/hardhat.config.ts @@ -39,7 +39,7 @@ const config: HardhatUserConfig = { gasPrice: 250_000_000_000, }, baobab: { - url: process.env.PROVIDER || "https://public-en.kairos.node.kaia.io", + url: process.env.PROVIDER || "https://public-en-kairos.node.kaia.io", chainId: 1001, ...commonConfig, gasPrice: 250_000_000_000, diff --git a/inspector/scripts/json-rpc-sync-check.sh b/inspector/scripts/json-rpc-sync-check.sh index 18b43ad1d..01f665d97 100755 --- a/inspector/scripts/json-rpc-sync-check.sh +++ b/inspector/scripts/json-rpc-sync-check.sh @@ -5,7 +5,7 @@ readonly OUR_KAIROS_JSON_RPC="http://100.93.31.29:8551" readonly OUR_KAIA_JSON_RPC="http://100.75.43.49:8551" -readonly PUBLIC_KAIROS_JSON_RPC="https://public-en.kairos.node.kaia.io" +readonly PUBLIC_KAIROS_JSON_RPC="https://public-en-kairos.node.kaia.io" readonly PUBLIC_KAIA_JSON_RPC="https://public-en-cypress.klaytn.net" check_klay_sync_baobab() { @@ -78,7 +78,7 @@ get_our_klay_block() { --data '{"jsonrpc":"2.0","method":"klay_blockNumber","params":[],"id":1}' \ -s \ $our_json_rpc) - + exit_code=$? if [ $exit_code -ne 0 ]; then diff --git a/node/.env.local b/node/.env.local index 7f4387d62..5d659961f 100644 --- a/node/.env.local +++ b/node/.env.local @@ -3,7 +3,7 @@ DATABASE_URL=postgresql://{$USER}@localhost:5432 REDIS_HOST=localhost REDIS_PORT=6379 LISTEN_PORT=10010 -KAIA_PROVIDER_URL=https://public-en.kairos.node.kaia.io +KAIA_PROVIDER_URL=https://public-en-kairos.node.kaia.io ENCRYPT_PASSWORD=anything CHAIN=test diff --git a/node/pkg/chain/tests/chain_test.go b/node/pkg/chain/tests/chain_test.go index 04a74d83f..1ea3f76e1 100644 --- a/node/pkg/chain/tests/chain_test.go +++ b/node/pkg/chain/tests/chain_test.go @@ -29,7 +29,7 @@ func TestNewKaiaHelper(t *testing.T) { err := db.QueryWithoutResult(ctx, InsertProviderUrlQuery, map[string]any{ "chain_id": 1001, - "url": "https://public-en.kairos.node.kaia.io", + "url": "https://public-en-kairos.node.kaia.io", "priority": 1, }) if err != nil { @@ -38,7 +38,7 @@ func TestNewKaiaHelper(t *testing.T) { } err = db.QueryWithoutResult(ctx, InsertProviderUrlQuery, map[string]any{ "chain_id": 1001, - "url": "https://public-en.kairos.node.kaia.io", + "url": "https://public-en-kairos.node.kaia.io", "priority": 2, }) if err != nil {