Skip to content

Commit 61f19d5

Browse files
evan-grayevan-gray
committed
watcher: fix terra block path
1 parent 796917d commit 61f19d5

File tree

4 files changed

+19
-47
lines changed

4 files changed

+19
-47
lines changed

‎watcher/src/consts.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ export const RPCS_BY_CHAIN: { [key in Network]: { [key in Chain]?: string } } =
5050
Aptos: process.env.APTOS_RPC || 'https://fullnode.mainnet.aptoslabs.com/',
5151
Near: process.env.NEAR_RPC || 'https://rpc.mainnet.near.org',
5252
Xpla: process.env.XPLA_RPC || 'https://dimension-lcd.xpla.dev',
53-
Terra2: process.env.TERRA2_RPC || 'https://phoenix-lcd.terra.dev',
54-
// Terra: 'https://columbus-fcd.terra.dev',
53+
Terra2: process.env.TERRA2_RPC || 'https://terra-lcd.publicnode.com',
5554
Terra: process.env.TERRA_RPC || 'https://terra-classic-fcd.publicnode.com',
5655
Injective: process.env.INJECTIVE_RPC || 'https://sentry.exchange.grpc-web.injective.network',
5756
Solana: process.env.SOLANA_RPC || 'https://api.mainnet-beta.solana.com',

‎watcher/src/utils/logger.ts

+7-5
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,13 @@ const createBaseLogger = (): WormholeLogger => {
7474
})
7575
);
7676
}
77-
console.log(
78-
`watcher is logging to ${logPath ?? 'the console'} ${
79-
usingLoki ? 'and loki' : ''
80-
} at level ${logLevel}`
81-
);
77+
if (process.env.CI !== 'true') {
78+
console.log(
79+
`watcher is logging to ${logPath ?? 'the console'} ${
80+
usingLoki ? 'and loki' : ''
81+
} at level ${logLevel}`
82+
);
83+
}
8284

8385
const loggerConfig: LoggerOptions = {
8486
level: logLevel,

‎watcher/src/watchers/CosmwasmWatcher.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ export class CosmwasmWatcher extends Watcher {
2424
if (!this.rpc) {
2525
throw new Error(`${this.chain} RPC is not defined!`);
2626
}
27-
this.latestBlockTag = 'blocks/latest';
28-
this.getBlockTag = 'blocks/';
27+
this.latestBlockTag = 'cosmos/base/tendermint/v1beta1/blocks/latest';
28+
this.getBlockTag = 'cosmos/base/tendermint/v1beta1/blocks/';
2929
this.hashTag = 'cosmos/tx/v1beta1/txs/';
3030
this.latestBlockHeight = 0;
3131
if (chain === 'Sei') {

‎watcher/src/watchers/__tests__/CosmwasmWatcher.test.ts

+9-38
Original file line numberDiff line numberDiff line change
@@ -17,53 +17,31 @@ test('getFinalizedBlockNumber(terra2)', async () => {
1717

1818
test('getMessagesForBlocks(terra2)', async () => {
1919
const watcher = new CosmwasmWatcher('Mainnet', 'Terra2');
20-
const vaasByBlock = await watcher.getMessagesForBlocks(3165191, 3165192);
20+
const vaasByBlock = await watcher.getMessagesForBlocks(10094466, 10094467);
2121
const entries = Object.entries(vaasByBlock);
2222
expect(entries.length).toEqual(2);
2323
expect(entries.filter(([block, vaas]) => vaas.length === 0).length).toEqual(1);
2424
expect(entries.filter(([block, vaas]) => vaas.length === 1).length).toEqual(1);
2525
expect(entries.filter(([block, vaas]) => vaas.length === 2).length).toEqual(0);
26-
expect(vaasByBlock['3165191/2023-01-03T12:12:54.922Z']).toBeDefined();
27-
expect(vaasByBlock['3165191/2023-01-03T12:12:54.922Z'].length).toEqual(1);
28-
expect(vaasByBlock['3165191/2023-01-03T12:12:54.922Z'][0]).toEqual(
29-
'4FF15C860D78E65AA25DC41F634E158CC4D79BBD4EB5F72C0D09A1F6AC25810C:18/a463ad028fb79679cfc8ce1efba35ac0e77b35080a1abe9bebe83461f176b0a3/651'
26+
expect(vaasByBlock['10094466/2024-04-28T18:26:24.793Z']).toBeDefined();
27+
expect(vaasByBlock['10094466/2024-04-28T18:26:24.793Z'].length).toEqual(1);
28+
expect(vaasByBlock['10094466/2024-04-28T18:26:24.793Z'][0]).toEqual(
29+
'BA2A1A38B3E8C30626B9E2DD0308163CC72463B099A9CE18DBAC98805C69447E:18/a463ad028fb79679cfc8ce1efba35ac0e77b35080a1abe9bebe83461f176b0a3/3416'
3030
);
3131
});
3232

3333
test('getMessagesForBlocks(terra2)', async () => {
3434
const watcher = new CosmwasmWatcher('Mainnet', 'Terra2');
35-
const vaasByBlock = await watcher.getMessagesForBlocks(5635710, 5635712);
35+
const vaasByBlock = await watcher.getMessagesForBlocks(10094467, 10094469);
3636
const entries = Object.entries(vaasByBlock);
3737
// console.log(entries); // Leave this in for future debugging
3838
expect(entries.length).toEqual(3);
3939
expect(entries.filter(([block, vaas]) => vaas.length === 0).length).toEqual(3);
4040
expect(entries.filter(([block, vaas]) => vaas.length === 1).length).toEqual(0);
4141
expect(entries.filter(([block, vaas]) => vaas.length === 2).length).toEqual(0);
42-
expect(vaasByBlock['5635710/2023-06-23T12:54:10.949Z']).toBeDefined();
43-
expect(vaasByBlock['5635711/2023-06-23T12:54:16.979Z']).toBeDefined();
44-
expect(vaasByBlock['5635712/2023-06-23T12:54:23.010Z']).toBeDefined();
45-
});
46-
47-
test.skip('getFinalizedBlockNumber(terra)', async () => {
48-
const watcher = new CosmwasmWatcher('Mainnet', 'Terra');
49-
const blockNumber = await watcher.getFinalizedBlockNumber();
50-
expect(blockNumber).toBeGreaterThan(10980872);
51-
});
52-
53-
// flaky rpc, skip
54-
test.skip('getMessagesForBlocks(terra)', async () => {
55-
const watcher = new CosmwasmWatcher('Mainnet', 'Terra');
56-
const vaasByBlock = await watcher.getMessagesForBlocks(10974196, 10974197);
57-
const entries = Object.entries(vaasByBlock);
58-
expect(entries.length).toEqual(2);
59-
expect(entries.filter(([block, vaas]) => vaas.length === 0).length).toEqual(1);
60-
expect(entries.filter(([block, vaas]) => vaas.length === 1).length).toEqual(1);
61-
expect(entries.filter(([block, vaas]) => vaas.length === 2).length).toEqual(0);
62-
expect(vaasByBlock['10974196/2023-01-06T04:23:21.045Z']).toBeDefined();
63-
expect(vaasByBlock['10974196/2023-01-06T04:23:21.045Z'].length).toEqual(1);
64-
expect(vaasByBlock['10974196/2023-01-06T04:23:21.045Z'][0]).toEqual(
65-
'8A31CDE56ED3ACB7239D705949BD6C164747210A6C4C69D98756E0CF6D22C9EB:3/0000000000000000000000007cf7b764e38a0a5e967972c1df77d432510564e2/256813'
66-
);
42+
expect(vaasByBlock['10094467/2024-04-28T18:26:31.162Z']).toBeDefined();
43+
expect(vaasByBlock['10094468/2024-04-28T18:26:37.231Z']).toBeDefined();
44+
expect(vaasByBlock['10094469/2024-04-28T18:26:43.063Z']).toBeDefined();
6745
});
6846

6947
test('getFinalizedBlockNumber(terra explorer)', async () => {
@@ -72,7 +50,6 @@ test('getFinalizedBlockNumber(terra explorer)', async () => {
7250
expect(blockNumber).toBeGreaterThan(10980872);
7351
});
7452

75-
// flaky rpc, skip
7653
test('getMessagesForBlocks(terra explorer)', async () => {
7754
const watcher = new TerraExplorerWatcher('Mainnet', 'Terra');
7855
const vaasByBlock = await watcher.getMessagesForBlocks(14506733, 14506740);
@@ -146,7 +123,6 @@ test.skip('getMessagesForBlocks(injective)', async () => {
146123
test.skip('getFinalizedBlockNumber(sei)', async () => {
147124
const watcher = new CosmwasmWatcher('Mainnet', 'Sei');
148125
const blockNumber = await watcher.getFinalizedBlockNumber();
149-
console.log(blockNumber);
150126
expect(blockNumber).toBeGreaterThan(0);
151127
});
152128

@@ -155,7 +131,6 @@ test.skip('getMessagesForBlocks(sei)', async () => {
155131
const watcher = new CosmwasmWatcher('Mainnet', 'Sei');
156132
const vaasByBlock = await watcher.getMessagesForBlocks(18907686, 18907687);
157133
const entries = Object.entries(vaasByBlock);
158-
console.log(entries);
159134
expect(entries.length).toEqual(2);
160135
expect(entries.filter(([block, vaas]) => vaas.length === 0).length).toEqual(1);
161136
expect(entries.filter(([block, vaas]) => vaas.length === 1).length).toEqual(0);
@@ -171,7 +146,6 @@ test.skip('getMessagesForBlocks(sei)', async () => {
171146
test('getFinalizedBlockNumber(sei explorer)', async () => {
172147
const watcher = new SeiExplorerWatcher('Mainnet');
173148
const blockNumber = await watcher.getFinalizedBlockNumber();
174-
console.log(blockNumber);
175149
expect(blockNumber).toBeGreaterThan(0);
176150
});
177151

@@ -180,7 +154,6 @@ test.skip('getMessagesForBlocks(sei explorer)', async () => {
180154
const watcher = new SeiExplorerWatcher('Mainnet');
181155
const vaasByBlock = await watcher.getMessagesForBlocks(19061244, 19061245);
182156
const entries = Object.entries(vaasByBlock);
183-
console.log(entries);
184157
expect(entries.length).toEqual(1);
185158
expect(entries.filter(([block, vaas]) => vaas.length === 0).length).toEqual(0);
186159
expect(entries.filter(([block, vaas]) => vaas.length === 1).length).toEqual(1);
@@ -195,7 +168,6 @@ test.skip('getMessagesForBlocks(sei explorer)', async () => {
195168
test('getFinalizedBlockNumber(wormchain)', async () => {
196169
const watcher = new WormchainWatcher('Mainnet');
197170
const blockNumber = await watcher.getFinalizedBlockNumber();
198-
console.log(blockNumber);
199171
expect(blockNumber).toBeGreaterThan(
200172
Number(INITIAL_DEPLOYMENT_BLOCK_BY_NETWORK_AND_CHAIN['Mainnet'].Wormchain)
201173
);
@@ -205,7 +177,6 @@ test('getMessagesForBlocks(wormchain)', async () => {
205177
const watcher = new WormchainWatcher('Mainnet');
206178
const vaasByBlock = await watcher.getMessagesForBlocks(4510119, 4510119);
207179
const entries = Object.entries(vaasByBlock);
208-
console.log(entries);
209180
expect(entries.length).toEqual(1);
210181
expect(entries.filter(([block, vaas]) => vaas.length === 0).length).toEqual(0);
211182
expect(entries.filter(([block, vaas]) => vaas.length === 1).length).toEqual(1);

0 commit comments

Comments
 (0)