Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New chains #372

Merged
merged 5 commits into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ POLYNOMIAL_TESTNET_RPC=''
BOB_RPC=''
KINTO_RPC=''
KINTO_DEVNET_RPC=''
SIPHER_FUNKI_TESTNET_RPC=''
WINR_RPC=''
BLAST_RPC=''

# update these settings

Expand Down
2 changes: 1 addition & 1 deletion deploy.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
npx hardhat run scripts/deploy/1-deploy.ts &&
npx ts-node scripts/deploy/2-check-roles.ts --no-compile &&
npx hardhat run scripts/deploy/3-configure.ts --no-compile &&
# npx hardhat run scripts/deploy/4-connect.ts --no-compile &&
npx hardhat run scripts/deploy/4-connect.ts --no-compile &&
npx hardhat run scripts/deploy/5-verify.ts --no-compile
432 changes: 429 additions & 3 deletions deployments/prod_addresses.json

Large diffs are not rendered by default.

42 changes: 41 additions & 1 deletion hardhat.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,11 @@ if (isProduction) {
[HardhatChainName.BOB]: getChainConfig(ChainId.BOB),
[HardhatChainName.KINTO]: getChainConfig(ChainId.KINTO),
[HardhatChainName.KINTO_DEVNET]: getChainConfig(ChainId.KINTO_DEVNET),
[HardhatChainName.SIPHER_FUNKI_TESTNET]: getChainConfig(
ChainId.SIPHER_FUNKI_TESTNET
),
[HardhatChainName.WINR]: getChainConfig(ChainId.WINR),
[HardhatChainName.BLAST]: getChainConfig(ChainId.BLAST),
};
}

Expand Down Expand Up @@ -129,7 +134,7 @@ const config: HardhatUserConfig = {
modeTestnet: process.env.MODE_API_KEY || "",
victionTestnet: process.env.VICTION_API_KEY || "",
base: process.env.BASESCAN_API_KEY || "",
mode: process.env.MODE_API_KEY || "",
mode: process.env.MODE_API_KEY || "none",
ancient8Testnet: process.env.ANCIENT8_API_KEY || "",
ancient8Testnet2: process.env.ANCIENT8_API_KEY || "",
hookTestnet: process.env.HOOK_API_KEY || "",
Expand All @@ -140,6 +145,9 @@ const config: HardhatUserConfig = {
syndrSepoliaL3: process.env.SYNDR_API_KEY || "",
kinto: process.env.KINTO_API_KEY || "",
kinto_devnet: process.env.KINTO_DEVNET_API_KEY || "",
sipher_funki_testnet: "none",
winr: "none",
blast: process.env.BLASTSCAN_API_KEY || "",
},
customChains: [
{
Expand Down Expand Up @@ -182,6 +190,38 @@ const config: HardhatUserConfig = {
browserURL: "https://explorer.kinto.xyz",
},
},
{
network: "sipher_funki_testnet",
chainId: ChainId.SIPHER_FUNKI_TESTNET,
urls: {
apiURL: "https://sepolia-sandbox.funkichain.com/api",
browserURL: "https://sepolia-sandbox.funkichain.com",
},
},
{
network: "winr",
chainId: ChainId.WINR,
urls: {
apiURL: "https://explorerl2new-winr-mainnet-0.t.conduit.xyz/api",
browserURL: "https://explorerl2new-winr-mainnet-0.t.conduit.xyz",
},
},
{
network: "blast",
chainId: ChainId.BLAST,
urls: {
apiURL: "https://api.blastscan.io/api",
browserURL: "https://blastscan.io",
},
},
{
network: "mode",
chainId: ChainId.MODE,
urls: {
apiURL: "https://explorer.mode.network/api",
browserURL: "https://explorer.mode.network",
},
},
],
},
networks: {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@socket.tech/dl-core",
"license": "UNLICENSED",
"version": "2.7.0",
"version": "2.9.0",
"description": "Smart contracts for socket data layer.",
"main": "./dist/src/index.js",
"types": "./dist/src/index.d.ts",
Expand Down
15 changes: 15 additions & 0 deletions scripts/constants/networks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,21 @@ export function getJsonRpcUrl(chain: HardhatChainName | ChainId): string {
jsonRpcUrl = process.env.KINTO_DEVNET_RPC as string;
break;

case HardhatChainName.SIPHER_FUNKI_TESTNET:
case ChainId.SIPHER_FUNKI_TESTNET:
jsonRpcUrl = process.env.SIPHER_FUNKI_TESTNET_RPC as string;
break;

case HardhatChainName.WINR:
case ChainId.WINR:
jsonRpcUrl = process.env.WINR_RPC as string;
break;

case HardhatChainName.BLAST:
case ChainId.BLAST:
jsonRpcUrl = process.env.BLAST_RPC as string;
break;

default:
if (process.env.NEW_RPC) {
jsonRpcUrl = process.env.NEW_RPC as string;
Expand Down
69 changes: 48 additions & 21 deletions scripts/deploy/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ export const chains: Array<ChainSlug> = [
// ChainSlug.XAI_TESTNET,
// ChainSlug.CDK_TESTNET,
// ChainSlug.AEVO,
// ChainSlug.MAINNET,
// ChainSlug.ARBITRUM,
// ChainSlug.OPTIMISM,
// ChainSlug.POLYGON_MAINNET,
// ChainSlug.LYRA,
ChainSlug.MAINNET,
ChainSlug.ARBITRUM,
ChainSlug.OPTIMISM,
ChainSlug.POLYGON_MAINNET,
ChainSlug.LYRA,
// ChainSlug.BSC,
ChainSlug.BASE,
// ChainSlug.MODE,
ChainSlug.MODE,
// ChainSlug.ANCIENT8_TESTNET,
// ChainSlug.ANCIENT8_TESTNET2,
// ChainSlug.SYNDR_SEPOLIA_L3,
Expand All @@ -60,9 +60,12 @@ export const chains: Array<ChainSlug> = [
// ChainSlug.PARALLEL,
// ChainSlug.MANTLE,
// ChainSlug.REYA_CRONOS,
ChainSlug.REYA,
// ChainSlug.REYA,
// ChainSlug.POLYNOMIAL_TESTNET,
// ChainSlug.BOB,
// ChainSlug.SIPHER_FUNKI_TESTNET,
// ChainSlug.WINR,
ChainSlug.BLAST,
];

export const executionManagerVersion = CORE_CONTRACTS.ExecutionManager;
Expand Down Expand Up @@ -126,9 +129,9 @@ export const overrides = (
} => {
if (chain == ChainSlug.ARBITRUM) {
return {
type,
gasLimit: 200_000_000,
gasPrice,
// type,
// gasLimit: 200_000_000,
// gasPrice,
};
} else if (chain == ChainSlug.ARBITRUM_SEPOLIA) {
return {
Expand All @@ -138,15 +141,15 @@ export const overrides = (
};
} else if (chain == ChainSlug.OPTIMISM) {
return {
type,
gasLimit: 4_000_000,
gasPrice,
// type,
// gasLimit: 4_000_000,
// gasPrice,
};
} else if (chain == ChainSlug.BASE) {
return {
type,
gasLimit: 2_000_000,
gasPrice: 2_000_000_000,
// type,
// gasLimit: 2_000_000,
// gasPrice: 2_000_000_000,
};
} else if (chain == ChainSlug.OPTIMISM_SEPOLIA) {
return {
Expand All @@ -170,7 +173,7 @@ export const overrides = (
return {
// type: 1,
gasLimit: 4_000_000,
gasPrice: 40_000_000_000,
gasPrice: 30_000_000_000,
};
} else if (chain == ChainSlug.GOERLI) {
return {
Expand All @@ -182,13 +185,13 @@ export const overrides = (
return {
type,
gasLimit,
gasPrice: 200_000_000_000,
gasPrice: 50_000_000_000,
};
} else if (chain == ChainSlug.SEPOLIA) {
return {
type,
gasLimit: 2_000_000,
gasPrice: 250_000_000_000,
// type,
// gasLimit: 2_000_000,
// gasPrice: 250_000_000_000,
};
} else if (chain == ChainSlug.AEVO_TESTNET) {
return {
Expand Down Expand Up @@ -232,6 +235,12 @@ export const overrides = (
// gasLimit,
gasPrice: 100_000_000,
};
} else if (chain == ChainSlug.MODE) {
return {
type: 1,
gasLimit: 10_000_000,
gasPrice: 1_000_000,
};
} else if (chain == ChainSlug.SYNDR_SEPOLIA_L3) {
return {
type: 1,
Expand Down Expand Up @@ -286,6 +295,24 @@ export const overrides = (
gasLimit: 4_000_000,
gasPrice,
};
} else if (chain == ChainSlug.SIPHER_FUNKI_TESTNET) {
return {
// type,
// gasLimit,
// gasPrice,
};
} else if (chain == ChainSlug.WINR) {
return {
// type,
// gasLimit,
// gasPrice,
};
} else if (chain == ChainSlug.BLAST) {
return {
// type,
// gasLimit,
// gasPrice,
};
} else if (chainConfig[chain] && chainConfig[chain].overrides) {
return chainConfig[chain].overrides!;
} else return { type, gasLimit, gasPrice };
Expand Down
16 changes: 14 additions & 2 deletions scripts/rpcConfig/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export function checkEnvVar(envVar: string) {
return value;
}

export const prodVersion = "prod-1.0.15";
export const prodVersion = "prod-1.0.17";
export const devVersion = "dev-1.0.1";

export const rpcs = {
Expand Down Expand Up @@ -51,6 +51,9 @@ export const rpcs = {
[ChainSlug.KINTO]: checkEnvVar("KINTO_RPC"),
[ChainSlug.KINTO_DEVNET]: checkEnvVar("KINTO_DEVNET_RPC"),
[ChainSlug.CDK_TESTNET]: checkEnvVar("CDK_TESTNET_RPC"),
[ChainSlug.SIPHER_FUNKI_TESTNET]: checkEnvVar("SIPHER_FUNKI_TESTNET_RPC"),
[ChainSlug.WINR]: checkEnvVar("WINR_RPC"),
[ChainSlug.BLAST]: checkEnvVar("BLAST_RPC"),
};

export const explorers = {
Expand All @@ -59,6 +62,9 @@ export const explorers = {
[ChainSlug.HOOK]: "https://hook.calderaexplorer.xyz",
[ChainSlug.MANTLE]: "https://explorer.mantle.xyz",
[ChainSlug.REYA]: "https://explorer.reya.network",
[ChainSlug.SIPHER_FUNKI_TESTNET]: "https://sepolia-sandbox.funkichain.com",
[ChainSlug.WINR]: "https://explorerl2new-winr-mainnet-0.t.conduit.xyz",
[ChainSlug.BLAST]: "https://blastscan.io",
};

export const icons = {
Expand Down Expand Up @@ -107,6 +113,9 @@ export const confirmations = {
[ChainSlug.BOB]: 0,
[ChainSlug.KINTO]: 0,
[ChainSlug.KINTO_DEVNET]: 0,
[ChainSlug.SIPHER_FUNKI_TESTNET]: 0,
[ChainSlug.WINR]: 0,
[ChainSlug.BLAST]: 0,
};

export const prodBatcherSupportedChainSlugs = [
Expand All @@ -129,7 +138,7 @@ export const prodBatcherSupportedChainSlugs = [
ChainSlug.OPTIMISM_SEPOLIA,
// ChainSlug.MODE_TESTNET,
ChainSlug.BASE,
// ChainSlug.MODE,
ChainSlug.MODE,
// ChainSlug.ANCIENT8_TESTNET2,
ChainSlug.HOOK_TESTNET,
ChainSlug.REYA_CRONOS,
Expand All @@ -138,6 +147,9 @@ export const prodBatcherSupportedChainSlugs = [
ChainSlug.BOB,
ChainSlug.KINTO,
ChainSlug.KINTO_DEVNET,
ChainSlug.SIPHER_FUNKI_TESTNET,
ChainSlug.WINR,
ChainSlug.BLAST,
];

export const prodFeesUpdaterSupportedChainSlugs = (): ChainSlug[] => {
Expand Down
3 changes: 3 additions & 0 deletions src/enums/chain-type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ export const opStackL2Chain = [
ChainSlug.MANTLE,
ChainSlug.POLYNOMIAL_TESTNET,
ChainSlug.BOB,
ChainSlug.SIPHER_FUNKI_TESTNET,
ChainSlug.BLAST,
];

export const arbL3Chains = [
Expand All @@ -22,6 +24,7 @@ export const arbL3Chains = [
ChainSlug.SYNDR_SEPOLIA_L3,
ChainSlug.KINTO,
ChainSlug.KINTO_DEVNET,
ChainSlug.WINR,
];

export const arbChains = [
Expand Down
3 changes: 3 additions & 0 deletions src/enums/chainId.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,7 @@ export enum ChainId {
BOB = 60808,
KINTO = 7887,
KINTO_DEVNET = 412346,
SIPHER_FUNKI_TESTNET = 3397901,
WINR = 777777,
BLAST = 81457,
}
3 changes: 3 additions & 0 deletions src/enums/chainSlug.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,7 @@ export enum ChainSlug {
BOB = ChainId.BOB,
KINTO = ChainId.KINTO,
KINTO_DEVNET = ChainId.KINTO_DEVNET,
SIPHER_FUNKI_TESTNET = ChainId.SIPHER_FUNKI_TESTNET,
WINR = ChainId.WINR,
BLAST = ChainId.BLAST,
}
3 changes: 3 additions & 0 deletions src/enums/chainSlugToHardhatChainName.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,7 @@ export const chainSlugToHardhatChainName = {
[ChainSlug.BOB]: HardhatChainName.BOB,
[ChainSlug.KINTO]: HardhatChainName.KINTO,
[ChainSlug.KINTO_DEVNET]: HardhatChainName.KINTO_DEVNET,
[ChainSlug.SIPHER_FUNKI_TESTNET]: HardhatChainName.SIPHER_FUNKI_TESTNET,
[ChainSlug.WINR]: HardhatChainName.WINR,
[ChainSlug.BLAST]: HardhatChainName.BLAST,
};
3 changes: 3 additions & 0 deletions src/enums/chainSlugToId.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,7 @@ export const ChainSlugToId = {
[ChainSlug.BOB]: ChainId.BOB,
[ChainSlug.KINTO]: ChainId.KINTO,
[ChainSlug.KINTO_DEVNET]: ChainId.KINTO_DEVNET,
[ChainSlug.SIPHER_FUNKI_TESTNET]: ChainId.SIPHER_FUNKI_TESTNET,
[ChainSlug.WINR]: ChainId.WINR,
[ChainSlug.BLAST]: ChainId.BLAST,
};
3 changes: 3 additions & 0 deletions src/enums/chainSlugToKey.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,7 @@ export const ChainSlugToKey = {
[ChainSlug.BOB]: HardhatChainName.BOB,
[ChainSlug.KINTO]: HardhatChainName.KINTO,
[ChainSlug.KINTO_DEVNET]: HardhatChainName.KINTO_DEVNET,
[ChainSlug.SIPHER_FUNKI_TESTNET]: HardhatChainName.SIPHER_FUNKI_TESTNET,
[ChainSlug.WINR]: HardhatChainName.WINR,
[ChainSlug.BLAST]: HardhatChainName.BLAST,
};
3 changes: 3 additions & 0 deletions src/enums/hardhatChainName.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,7 @@ export enum HardhatChainName {
BOB = "bob",
KINTO = "kinto",
KINTO_DEVNET = "kinto_devnet",
SIPHER_FUNKI_TESTNET = "sipher_funki_testnet",
WINR = "winr",
BLAST = "blast",
}
3 changes: 3 additions & 0 deletions src/enums/hardhatChainNameToSlug.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,7 @@ export const hardhatChainNameToSlug = {
[HardhatChainName.BOB]: ChainSlug.BOB,
[HardhatChainName.KINTO]: ChainSlug.KINTO,
[HardhatChainName.KINTO_DEVNET]: ChainSlug.KINTO_DEVNET,
[HardhatChainName.SIPHER_FUNKI_TESTNET]: ChainSlug.SIPHER_FUNKI_TESTNET,
[HardhatChainName.WINR]: ChainSlug.WINR,
[HardhatChainName.BLAST]: ChainSlug.BLAST,
};
2 changes: 2 additions & 0 deletions src/enums/mainnetIds.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ export const MainnetIds: ChainSlug[] = [
ChainSlug.SX_NETWORK,
ChainSlug.BOB,
ChainSlug.KINTO,
ChainSlug.WINR,
ChainSlug.BLAST,
];
1 change: 1 addition & 0 deletions src/enums/testnetIds.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ export const TestnetIds: ChainSlug[] = [
ChainSlug.SYNDR_SEPOLIA_L3,
ChainSlug.POLYNOMIAL_TESTNET,
ChainSlug.KINTO_DEVNET,
ChainSlug.SIPHER_FUNKI_TESTNET,
];
Loading