Skip to content

Commit 4d363f5

Browse files
m30mm30m
committed
Merge branch 'main' into branch-B9DC5562
2 parents 1797db9 + f7cbb40 commit 4d363f5

File tree

165 files changed

+7066
-3368
lines changed

Some content is hidden

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

165 files changed

+7066
-3368
lines changed

‎.github/CODEOWNERS‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ turbo.json @pyth-network/web-team
1616
.github/workflows/ci-turbo-build.yml @pyth-network/web-team
1717
.github/workflows/ci-turbo-test.yml @pyth-network/web-team
1818

19+
/lazer/contracts/aptos @Riateche @ali-bahjati
20+
/lazer/contracts/evm @Riateche @ali-bahjati
21+
/lazer/contracts/solana @Riateche @ali-bahjati
22+
/lazer/publisher_sdk @darunrs @Riateche
23+
/lazer/sdk/js @ali-bahjati @keyvankhademi
24+
/lazer/sdk/rust @darunrs @Riateche
25+
1926
flake.lock @cprussin
2027
*.nix @cprussin
2128
.envrc @cprussin

‎apps/api-reference/src/evm-networks.ts‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export const NETWORK_INFO = {
7373
},
7474
[97]: {
7575
name: "bsc_testnet",
76-
rpcUrl: "https://rpc.ankr.com/bsc_testnet_chapel",
76+
rpcUrl: "https://bsc-testnet.drpc.org",
7777
isMainnet: false,
7878
contractAddress: "0x5744Cbf430D99456a0A8771208b674F27f8EF0Fb",
7979
},
@@ -257,11 +257,17 @@ export const NETWORK_INFO = {
257257
isMainnet: true,
258258
contractAddress: "0xA2aa501b19aff244D90cc15a4Cf739D2725B5729",
259259
},
260+
[1315]: {
261+
name: "story_testnet",
262+
rpcUrl: "https://aeneid.storyrpc.io",
263+
isMainnet: false,
264+
contractAddress: "0x36825bf3Fbdf5a29E2d5148bfe7Dcf7B5639e320",
265+
},
260266
[1328]: {
261267
name: "sei_evm_testnet",
262268
rpcUrl: "https://evm-rpc-testnet.sei-apis.com",
263269
isMainnet: false,
264-
contractAddress: "0x2880aB155794e7179c9eE2e38200202908C17B43",
270+
contractAddress: "0x36825bf3Fbdf5a29E2d5148bfe7Dcf7B5639e320",
265271
},
266272
[1329]: {
267273
name: "sei_evm_mainnet",
@@ -275,6 +281,12 @@ export const NETWORK_INFO = {
275281
isMainnet: false,
276282
contractAddress: "0xFf255f800044225f54Af4510332Aa3D67CC77635",
277283
},
284+
[1514]: {
285+
name: "story",
286+
rpcUrl: "https://homer.storyrpc.io",
287+
isMainnet: true,
288+
contractAddress: "0xD458261E832415CFd3BAE5E416FdF3230ce6F134",
289+
},
278290
[1625]: {
279291
name: "gravity",
280292
rpcUrl: "https://rpc.gravity.xyz/",

‎apps/developer-hub/eslint.config.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
1-
export { nextjs as default } from "@cprussin/eslint-config";
1+
import { nextjs } from "@cprussin/eslint-config";
2+
3+
export default [
4+
...nextjs,
5+
{
6+
ignores: [".source/**"],
7+
},
8+
];

‎apps/developer-hub/turbo.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@
1313
"fix:lint": {
1414
"dependsOn": [
1515
"//#install:modules",
16+
"^build",
17+
"build",
1618
"fix:lint:eslint",
1719
"fix:lint:stylelint"
1820
]
1921
},
2022
"fix:lint:eslint": {
21-
"dependsOn": ["//#install:modules", "^build"],
23+
"dependsOn": ["//#install:modules", "^build", "build"],
2224
"cache": false
2325
},
2426
"fix:lint:stylelint": {
@@ -32,7 +34,7 @@
3234
"dependsOn": ["test:lint:eslint", "test:lint:stylelint"]
3335
},
3436
"test:lint:eslint": {
35-
"dependsOn": ["//#install:modules", "^build"]
37+
"dependsOn": ["//#install:modules", "^build", "build"]
3638
},
3739
"test:lint:stylelint": {
3840
"dependsOn": ["//#install:modules"]

‎contract_manager/package.json‎

Lines changed: 26 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,11 +84,11 @@
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",
91+
"@types/node": "catalog:",
7192
"eslint": "^8.0.0",
7293
"prettier": "catalog:",
7394
"typedoc": "^0.25.7"

‎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,

0 commit comments

Comments
 (0)