Skip to content

Commit c238223

Browse files
committed
chore: remove orbit from get contract version functions names
1 parent 1cd239c commit c238223

4 files changed

Lines changed: 30 additions & 33 deletions

File tree

src/constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ export const defaultSubmissionFeePercentIncrease = 300n;
2222
export const createTokenBridgeDefaultMaxGasForContracts = 20_000_000n;
2323
export const createTokenBridgeDefaultGasLimitForWethGateway = 100_000n;
2424

25-
export const DEFAULT_ORBIT_ACTIONS_IMAGE =
25+
export const DEFAULT_CHAIN_ACTIONS_IMAGE =
2626
'offchainlabs/chain-actions@sha256:150d84f832ea4361bbe4876ecc89d4e5433f49b31b11d55229282b6568042c75';
Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import type { Address } from 'viem';
22

33
import { runChainVersioner } from '@arbitrum/chain-actions';
44

5-
import { DEFAULT_ORBIT_ACTIONS_IMAGE } from './constants';
5+
import { DEFAULT_CHAIN_ACTIONS_IMAGE } from './constants';
66
import { runDockerCommand } from './runDockerCommand';
77

8-
export type GetOrbitChainContractVersionsResult = {
8+
export type GetChainContractVersionsResult = {
99
versions: Record<string, string | null>;
1010
upgradeRecommendation: unknown;
1111
};
@@ -30,9 +30,9 @@ function getDockerNetworkConfig(parentChainRpc: string): {
3030
};
3131
}
3232

33-
function parseOrbitChainContractVersionsResult(
34-
result: string | GetOrbitChainContractVersionsResult,
35-
): GetOrbitChainContractVersionsResult {
33+
function parseChainContractVersionsResult(
34+
result: string | GetChainContractVersionsResult,
35+
): GetChainContractVersionsResult {
3636
const parsed =
3737
typeof result === 'string'
3838
? (() => {
@@ -53,14 +53,14 @@ function parseOrbitChainContractVersionsResult(
5353
throw new Error('Failed to parse Orbit chain contract versions');
5454
}
5555

56-
return parsed as GetOrbitChainContractVersionsResult;
56+
return parsed as GetChainContractVersionsResult;
5757
}
5858

59-
async function getOrbitChainContractVersionsWithDocker(
59+
async function getChainContractVersionsWithDocker(
6060
inboxAddress: Address,
6161
parentChainRpc: string,
6262
image: string,
63-
): Promise<GetOrbitChainContractVersionsResult> {
63+
): Promise<GetChainContractVersionsResult> {
6464
const dockerConfig = getDockerNetworkConfig(parentChainRpc);
6565

6666
const { stdout } = await runDockerCommand({
@@ -75,27 +75,27 @@ async function getOrbitChainContractVersionsWithDocker(
7575
},
7676
});
7777

78-
return parseOrbitChainContractVersionsResult(stdout);
78+
return parseChainContractVersionsResult(stdout);
7979
}
8080

81-
async function getOrbitChainContractVersionsWithNative(
81+
async function getChainContractVersionsWithNative(
8282
inboxAddress: Address,
8383
parentChainRpc: string,
84-
): Promise<GetOrbitChainContractVersionsResult> {
84+
): Promise<GetChainContractVersionsResult> {
8585
const result = await runChainVersioner(inboxAddress, parentChainRpc, true);
8686

87-
return parseOrbitChainContractVersionsResult(result);
87+
return parseChainContractVersionsResult(result);
8888
}
8989

90-
export async function getOrbitChainContractVersions(
90+
export async function getChainContractVersions(
9191
inboxAddress: Address,
9292
parentChainRpc: string,
9393
executionMode = 'native',
94-
image = DEFAULT_ORBIT_ACTIONS_IMAGE,
95-
): Promise<GetOrbitChainContractVersionsResult> {
94+
image = DEFAULT_CHAIN_ACTIONS_IMAGE,
95+
): Promise<GetChainContractVersionsResult> {
9696
if (executionMode.toLowerCase() === 'docker') {
97-
return getOrbitChainContractVersionsWithDocker(inboxAddress, parentChainRpc, image);
97+
return getChainContractVersionsWithDocker(inboxAddress, parentChainRpc, image);
9898
}
9999

100-
return getOrbitChainContractVersionsWithNative(inboxAddress, parentChainRpc);
100+
return getChainContractVersionsWithNative(inboxAddress, parentChainRpc);
101101
}

src/getOrbitChainContractVersions.unit.test.ts renamed to src/getChainContractVersions.unit.test.ts

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { beforeEach, describe, expect, it, vi } from 'vitest';
22

3-
import { DEFAULT_ORBIT_ACTIONS_IMAGE } from './constants';
4-
import { getOrbitChainContractVersions } from './getOrbitChainContractVersions';
3+
import { DEFAULT_CHAIN_ACTIONS_IMAGE } from './constants';
4+
import { getChainContractVersions } from './getChainContractVersions';
55
import { runDockerCommand } from './runDockerCommand';
66
import { runChainVersioner } from '@arbitrum/chain-actions';
77

@@ -31,10 +31,7 @@ describe('getOrbitChainContractVersions', () => {
3131
});
3232

3333
await expect(
34-
getOrbitChainContractVersions(
35-
'0xaE21fDA3de92dE2FDAF606233b2863782Ba046F9',
36-
'https://rpc.example',
37-
),
34+
getChainContractVersions('0xaE21fDA3de92dE2FDAF606233b2863782Ba046F9', 'https://rpc.example'),
3835
).resolves.toEqual({
3936
versions: {
4037
Inbox: 'v1.1.1',
@@ -63,7 +60,7 @@ describe('getOrbitChainContractVersions', () => {
6360
});
6461

6562
await expect(
66-
getOrbitChainContractVersions(
63+
getChainContractVersions(
6764
'0xaE21fDA3de92dE2FDAF606233b2863782Ba046F9',
6865
'https://arb-sepolia.example/rpc',
6966
'docker',
@@ -99,14 +96,14 @@ describe('getOrbitChainContractVersions', () => {
9996
exitCode: 0,
10097
});
10198

102-
await getOrbitChainContractVersions(
99+
await getChainContractVersions(
103100
'0xaE21fDA3de92dE2FDAF606233b2863782Ba046F9',
104101
'http://127.0.0.1:8545',
105102
'docker',
106103
);
107104

108105
expect(runDockerCommand).toHaveBeenCalledWith({
109-
image: DEFAULT_ORBIT_ACTIONS_IMAGE,
106+
image: DEFAULT_CHAIN_ACTIONS_IMAGE,
110107
entrypoint: 'yarn',
111108
dockerRunArgs: ['--add-host', 'host.docker.internal:host-gateway'],
112109
command: ['--silent', 'orbit:contracts:version'],
@@ -127,7 +124,7 @@ describe('getOrbitChainContractVersions', () => {
127124
});
128125

129126
await expect(
130-
getOrbitChainContractVersions(
127+
getChainContractVersions(
131128
'0xaE21fDA3de92dE2FDAF606233b2863782Ba046F9',
132129
'https://rpc.example',
133130
'docker',
@@ -146,7 +143,7 @@ describe('getOrbitChainContractVersions', () => {
146143
});
147144

148145
await expect(
149-
getOrbitChainContractVersions(
146+
getChainContractVersions(
150147
'0xaE21fDA3de92dE2FDAF606233b2863782Ba046F9',
151148
'https://rpc.example',
152149
'docker',
@@ -164,7 +161,7 @@ describe('getOrbitChainContractVersions', () => {
164161
});
165162

166163
await expect(
167-
getOrbitChainContractVersions(
164+
getChainContractVersions(
168165
'0xaE21fDA3de92dE2FDAF606233b2863782Ba046F9',
169166
'https://rpc.example',
170167
'docker',
@@ -181,7 +178,7 @@ describe('getOrbitChainContractVersions', () => {
181178
});
182179

183180
await expect(
184-
getOrbitChainContractVersions(
181+
getChainContractVersions(
185182
'0xaE21fDA3de92dE2FDAF606233b2863782Ba046F9',
186183
'https://rpc.example',
187184
'docker',

src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ import {
195195
FetchDecimalsProps,
196196
} from './utils/erc20';
197197
import { prepareArbitrumNetwork } from './utils/registerNewNetwork';
198-
import { getOrbitChainContractVersions } from './getOrbitChainContractVersions';
198+
import { getChainContractVersions } from './getChainContractVersions';
199199

200200
export {
201201
arbOwnerPublicActions,
@@ -364,7 +364,7 @@ export {
364364
//
365365
prepareArbitrumNetwork,
366366
//
367-
getOrbitChainContractVersions,
367+
getChainContractVersions,
368368
};
369369

370370
export * from './scripting/scriptUtils';

0 commit comments

Comments
 (0)