Skip to content

Commit 8fa43cc

Browse files
cctdanielcctdaniel
authored
Merge pull request #2711 from pyth-network/contract-manager-refactor
refactor(contract_manager): restructure contract_manager
2 parents 9927372 + f33586e commit 8fa43cc

File tree

130 files changed

+4613
-2895
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+4613
-2895
lines changed

‎contract_manager/package.json‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,31 @@
33
"version": "1.0.0",
44
"description": "Set of tools to manage pyth contracts",
55
"private": true,
6-
"main": "lib/index.js",
7-
"types": "lib/index.d.ts",
6+
"exports": {
7+
"./node/*": {
8+
"types": "./lib/node/utils/*.d.ts",
9+
"default": "./lib/node/utils/*.js"
10+
},
11+
"./core/*": {
12+
"types": "./lib/core/*.d.ts",
13+
"default": "./lib/core/*.js"
14+
},
15+
"./data/chains/*.json": {
16+
"default": "./store/chains/*.json"
17+
},
18+
"./data/contracts/*.json": {
19+
"default": "./store/contracts/*.json"
20+
},
21+
"./data/tokens/*.json": {
22+
"default": "./store/tokens/*.json"
23+
},
24+
"./data/vaults/*.json": {
25+
"default": "./store/vaults/*.json"
26+
}
27+
},
828
"files": [
9-
"lib/**/*"
29+
"lib/**/*",
30+
"store/**/*.json"
1031
],
1132
"scripts": {
1233
"build": "tsc",
@@ -63,8 +84,7 @@
6384
"typescript": "catalog:",
6485
"viem": "^2.23.5",
6586
"web3": "^1.8.2",
66-
"web3-eth-contract": "^1.8.2",
67-
"yaml": "^2.1.1"
87+
"web3-eth-contract": "^1.8.2"
6888
},
6989
"devDependencies": {
7090
"@types/web3": "^1.2.2",

‎contract_manager/scripts/check_proposal.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import yargs from "yargs";
22
import { hideBin } from "yargs/helpers";
3-
import { CosmWasmChain, EvmChain } from "../src/chains";
3+
import { CosmWasmChain, EvmChain } from "../src/core/chains";
44
import { createHash } from "crypto";
5-
import { DefaultStore } from "../src/store";
5+
import { DefaultStore } from "../src/node/utils/store";
66
import {
77
CosmosUpgradeContract,
88
EvmExecute,
@@ -24,7 +24,7 @@ import {
2424
EvmPriceFeedContract,
2525
getCodeDigestWithoutAddress,
2626
EvmWormholeContract,
27-
} from "../src/contracts/evm";
27+
} from "../src/core/contracts/evm";
2828
import Web3 from "web3";
2929

3030
const parser = yargs(hideBin(process.argv))

‎contract_manager/scripts/common.ts‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
1-
import {
2-
DefaultStore,
3-
EvmChain,
4-
EvmEntropyContract,
5-
EvmWormholeContract,
6-
getDefaultDeploymentConfig,
7-
PrivateKey,
8-
} from "../src";
1+
import { DefaultStore } from "../src/node/utils/store";
92
import { existsSync, readFileSync, writeFileSync } from "fs";
103
import { join } from "path";
114
import Web3 from "web3";
125
import { Contract } from "web3-eth-contract";
136
import { InferredOptionType } from "yargs";
7+
import { PrivateKey, getDefaultDeploymentConfig } from "../src/core/base";
8+
import { EvmChain } from "../src/core/chains";
9+
import { EvmEntropyContract, EvmWormholeContract } from "../src/core/contracts";
1410

1511
export interface BaseDeployConfig {
1612
gasMultiplier: number;

‎contract_manager/scripts/deploy_cosmwasm.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import yargs from "yargs";
22
import { hideBin } from "yargs/helpers";
3-
import { CosmWasmChain } from "../src/chains";
4-
import { CosmWasmPriceFeedContract } from "../src/contracts/cosmwasm";
5-
import { DefaultStore } from "../src/store";
3+
import { CosmWasmChain } from "../src/core/chains";
4+
import { CosmWasmPriceFeedContract } from "../src/core/contracts/cosmwasm";
5+
import { DefaultStore } from "../src/node/utils/store";
66

77
import { COMMON_DEPLOY_OPTIONS } from "./common";
88

‎contract_manager/scripts/deploy_evm_contract.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import yargs from "yargs";
22
import { hideBin } from "yargs/helpers";
3-
import { EvmChain } from "../src/chains";
4-
import { DefaultStore } from "../src/store";
3+
import { EvmChain } from "../src/core/chains";
4+
import { DefaultStore } from "../src/node/utils/store";
55
import { readFileSync } from "fs";
6-
import { toPrivateKey } from "../src";
6+
import { toPrivateKey } from "../src/core/base";
77

88
import { COMMON_DEPLOY_OPTIONS } from "./common";
99

‎contract_manager/scripts/deploy_evm_entropy_contracts.ts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
import yargs from "yargs";
22
import { hideBin } from "yargs/helpers";
3-
import { EvmChain } from "../src/chains";
4-
import { DefaultStore } from "../src/store";
3+
import { EvmChain } from "../src/core/chains";
4+
import { DefaultStore } from "../src/node/utils/store";
55
import {
6-
DeploymentType,
76
ENTROPY_DEFAULT_KEEPER,
87
ENTROPY_DEFAULT_PROVIDER,
98
EvmEntropyContract,
9+
} from "../src/core/contracts/evm";
10+
import {
11+
DeploymentType,
1012
getDefaultDeploymentConfig,
1113
toDeploymentType,
1214
toPrivateKey,
13-
} from "../src";
15+
} from "../src/core/base";
1416
import {
1517
COMMON_DEPLOY_OPTIONS,
1618
deployIfNotCached,

‎contract_manager/scripts/deploy_evm_pricefeed_contracts.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
import yargs from "yargs";
22
import { hideBin } from "yargs/helpers";
3-
import { EvmChain } from "../src/chains";
4-
import { DefaultStore } from "../src/store";
5-
import {
6-
DeploymentType,
7-
EvmPriceFeedContract,
8-
getDefaultDeploymentConfig,
9-
toDeploymentType,
10-
toPrivateKey,
11-
} from "../src";
123
import {
134
COMMON_DEPLOY_OPTIONS,
145
deployIfNotCached,
@@ -17,6 +8,15 @@ import {
178
BaseDeployConfig,
189
} from "./common";
1910
import { HermesClient } from "@pythnetwork/hermes-client";
11+
import {
12+
DeploymentType,
13+
getDefaultDeploymentConfig,
14+
toDeploymentType,
15+
toPrivateKey,
16+
} from "../src/core/base";
17+
import { EvmChain } from "../src/core/chains";
18+
import { EvmPriceFeedContract } from "../src/core/contracts";
19+
import { DefaultStore } from "../src/node/utils/store";
2020

2121
interface DeploymentConfig extends BaseDeployConfig {
2222
type: DeploymentType;

‎contract_manager/scripts/deploy_evm_pulse_contracts.ts‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
import yargs from "yargs";
22
import { hideBin } from "yargs/helpers";
3-
import { EvmChain } from "../src/chains";
4-
import { DefaultStore } from "../src/store";
5-
import {
6-
DeploymentType,
7-
toDeploymentType,
8-
toPrivateKey,
9-
EvmPulseContract,
10-
PULSE_DEFAULT_PROVIDER,
11-
PULSE_DEFAULT_KEEPER,
12-
} from "../src";
133
import {
144
COMMON_DEPLOY_OPTIONS,
155
deployIfNotCached,
@@ -21,6 +11,18 @@ import {
2111
} from "./common";
2212
import fs from "fs";
2313
import path from "path";
14+
import {
15+
DeploymentType,
16+
toDeploymentType,
17+
toPrivateKey,
18+
} from "../src/core/base";
19+
import { EvmChain } from "../src/core/chains";
20+
import {
21+
PULSE_DEFAULT_PROVIDER,
22+
PULSE_DEFAULT_KEEPER,
23+
EvmPulseContract,
24+
} from "../src/core/contracts";
25+
import { DefaultStore } from "../src/node/utils/store";
2426

2527
interface DeploymentConfig extends BaseDeployConfig {
2628
type: DeploymentType;

‎contract_manager/scripts/entropy-accept-admin-and-ownership.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import yargs from "yargs";
22
import { hideBin } from "yargs/helpers";
3-
import { DefaultStore, EvmChain, loadHotWallet } from "../src";
3+
import { EvmChain } from "../src/core/chains";
4+
import { loadHotWallet } from "../src/node/utils/governance";
5+
import { DefaultStore } from "../src/node/utils/store";
46

57
const parser = yargs(hideBin(process.argv))
68
.usage(

‎contract_manager/scripts/entropy_debug_reveal.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import yargs from "yargs";
22
import { hideBin } from "yargs/helpers";
3-
import { DefaultStore, EvmChain, toPrivateKey } from "../src";
43
import { COMMON_DEPLOY_OPTIONS, findEntropyContract } from "./common";
4+
import { toPrivateKey } from "../src/core/base";
5+
import { EvmChain } from "../src/core/chains";
6+
import { DefaultStore } from "../src/node/utils/store";
57

68
const parser = yargs(hideBin(process.argv))
79
.usage(

0 commit comments

Comments
 (0)