fix: script robustness

.env.template

@@ -0,0 +1,2 @@
+INFURA_API_KEY=
+ALCHEMY_API_KEY=

.github/workflows/fetch-data.yml

@@ -3,7 +3,7 @@ name: Fetch Chain Data
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 */4 * * *'
+    - cron: '0 */6 * * *'
 
 jobs:
   fetch-data:

script/checks/opcodes.ts

@@ -31,13 +31,17 @@ async function checkOpcode(opcode: Opcode, client: PublicClient): Promise<boolea
 		return true; // Call succeeded so opcode is supported.
 	} catch (e: unknown) {
 		const err = e as CallError;
+		const details = err.details.toLowerCase();
 		// TODO These might be specific to the node implementation, can this be more robust?
-		if (opcode === 0xfe && err.details === 'invalid opcode: INVALID') return true; // Designated invalid opcode.
-		if (err.details.includes('stack underflow')) return true; // Implies opcode is supported.
-		if (err.details.includes('not defined')) return false;
-		if (err.details.includes('not supported')) return false;
-		if (err.details.includes('invalid opcode')) return false;
+		if (opcode === 0xfe && details.includes('invalid opcode: invalid')) return true; // Designated invalid opcode.
+		if (details.includes('stack underflow')) return true; // Implies opcode is supported.
+		if (details.includes('not defined')) return false;
+		if (details.includes('not supported')) return false;
+		if (details.includes('invalid opcode')) return false;
 
+		console.log(`\n======== Opcode ${opcode} ========`);
+		console.log('err.details:', err.details);
+		console.log(JSON.stringify(err, null, 2));
 		throw new Error(`Unexpected error: ${err}`);
 	}
 }

script/data/chain/1.json

@@ -44,7 +44,9 @@
 			"https://rpc.mevblocker.io/noreverts",
 			"https://rpc.mevblocker.io/fullprivacy",
 			"https://eth.drpc.org",
-			"wss://eth.drpc.org"
+			"wss://eth.drpc.org",
+			"https://api.securerpc.com/v1",
+			"https://eth-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
 		],
 		"slip44": 60
 	},

script/data/chain/10.json

@@ -31,7 +31,9 @@
 			"https://optimism.gateway.tenderly.co",
 			"wss://optimism.gateway.tenderly.co",
 			"https://optimism.drpc.org",
-			"wss://optimism.drpc.org"
+			"wss://optimism.drpc.org",
+			"https://optimism-mainnet.infura.io/v3/${INFURA_API_KEY}",
+			"https://opt-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
 		]
 	},
 	"opcodes": [

script/data/chain/137.json

@@ -30,7 +30,9 @@
 			"https://polygon.gateway.tenderly.co",
 			"wss://polygon.gateway.tenderly.co",
 			"https://polygon.drpc.org",
-			"wss://polygon.drpc.org"
+			"wss://polygon.drpc.org",
+			"https://polygon-mainnet.infura.io/v3/${INFURA_API_KEY}",
+			"https://polygon-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
 		],
 		"slip44": 966
 	},

script/data/chain/42161.json

@@ -27,8 +27,8 @@
 			"https://arbitrum-mainnet.infura.io/v3/${INFURA_API_KEY}",
 			"https://arb-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}",
 			"https://arb1.arbitrum.io/rpc",
-			"https://arbitrum-one.publicnode.com",
-			"wss://arbitrum-one.publicnode.com"
+			"https://arbitrum-one-rpc.publicnode.com",
+			"wss://arbitrum-one-rpc.publicnode.com"
 		]
 	},
 	"opcodes": [

script/data/chain/43114.json

@@ -18,7 +18,10 @@
 		"rpc": [
 			"https://api.avax.network/ext/bc/C/rpc",
 			"https://avalanche-c-chain-rpc.publicnode.com",
-			"wss://avalanche-c-chain-rpc.publicnode.com"
+			"wss://avalanche-c-chain-rpc.publicnode.com",
+			"https://rpc.ankr.com/avalanche",
+			"https://ava-mainnet.public.blastapi.io/ext/bc/C/rpc",
+			"https://avalanche-mainnet.infura.io/v3/${INFURA_API_KEY}"
 		],
 		"slip44": 9005
 	},
@@ -75,8 +78,8 @@
 		{ "number": "0x46", "name": "CHAINID", "supported": true },
 		{ "number": "0x47", "name": "SELFBALANCE", "supported": true },
 		{ "number": "0x48", "name": "BASEFEE", "supported": true },
-		{ "number": "0x49", "name": "BLOBHASH", "supported": false },
-		{ "number": "0x4a", "name": "BLOBBASEFEE", "supported": false },
+		{ "number": "0x49", "name": "BLOBHASH", "supported": true },
+		{ "number": "0x4a", "name": "BLOBBASEFEE", "supported": true },
 		{ "number": "0x50", "name": "POP", "supported": true },
 		{ "number": "0x51", "name": "MLOAD", "supported": true },
 		{ "number": "0x52", "name": "MSTORE", "supported": true },
@@ -89,9 +92,9 @@
 		{ "number": "0x59", "name": "MSIZE", "supported": true },
 		{ "number": "0x5a", "name": "GAS", "supported": true },
 		{ "number": "0x5b", "name": "JUMPDEST", "supported": true },
-		{ "number": "0x5c", "name": "TLOAD", "supported": false },
-		{ "number": "0x5d", "name": "TSTORE", "supported": false },
-		{ "number": "0x5e", "name": "MCOPY", "supported": false },
+		{ "number": "0x5c", "name": "TLOAD", "supported": true },
+		{ "number": "0x5d", "name": "TSTORE", "supported": true },
+		{ "number": "0x5e", "name": "MCOPY", "supported": true },
 		{ "number": "0x5f", "name": "PUSH0", "supported": true },
 		{ "number": "0x60", "name": "PUSH1", "supported": true },
 		{ "number": "0x61", "name": "PUSH2", "supported": true },
@@ -266,7 +269,7 @@
 		{
 			"name": "point evaluation",
 			"address": "0x000000000000000000000000000000000000000a",
-			"implemented": false
+			"implemented": true
 		},
 		{
 			"name": "secp256r1",

script/data/chain/534352.json

@@ -19,7 +19,9 @@
 			"https://rpc.ankr.com/scroll",
 			"https://scroll-mainnet.chainstacklabs.com",
 			"https://scroll-rpc.publicnode.com",
-			"wss://scroll-rpc.publicnode.com"
+			"wss://scroll-rpc.publicnode.com",
+			"https://scroll-mainnet.infura.io/v3/${INFURA_API_KEY}",
+			"https://scroll-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
 		],
 		"status": "active"
 	},

script/data/chain/59144.json

@@ -35,7 +35,8 @@
 			"https://linea-mainnet.infura.io/v3/${INFURA_API_KEY}",
 			"wss://linea-mainnet.infura.io/ws/v3/${INFURA_API_KEY}",
 			"https://linea-rpc.publicnode.com",
-			"wss://linea-rpc.publicnode.com"
+			"wss://linea-rpc.publicnode.com",
+			"https://linea-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
 		],
 		"status": "active",
 		"title": "Linea Mainnet"

script/data/chain/8453.json

@@ -31,7 +31,9 @@
 			"https://base.gateway.tenderly.co",
 			"wss://base.gateway.tenderly.co",
 			"https://base-rpc.publicnode.com",
-			"wss://base-rpc.publicnode.com"
+			"wss://base-rpc.publicnode.com",
+			"https://base-mainnet.infura.io/v3/${INFURA_API_KEY}",
+			"https://base-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
 		],
 		"status": "active"
 	},

script/data/feature/metadata.json

@@ -44,7 +44,9 @@
 			"https://rpc.mevblocker.io/noreverts",
 			"https://rpc.mevblocker.io/fullprivacy",
 			"https://eth.drpc.org",
-			"wss://eth.drpc.org"
+			"wss://eth.drpc.org",
+			"https://api.securerpc.com/v1",
+			"https://eth-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
 		],
 		"slip44": 60
 	},
@@ -80,7 +82,9 @@
 			"https://optimism.gateway.tenderly.co",
 			"wss://optimism.gateway.tenderly.co",
 			"https://optimism.drpc.org",
-			"wss://optimism.drpc.org"
+			"wss://optimism.drpc.org",
+			"https://optimism-mainnet.infura.io/v3/${INFURA_API_KEY}",
+			"https://opt-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
 		]
 	},
 	"137": {
@@ -114,7 +118,9 @@
 			"https://polygon.gateway.tenderly.co",
 			"wss://polygon.gateway.tenderly.co",
 			"https://polygon.drpc.org",
-			"wss://polygon.drpc.org"
+			"wss://polygon.drpc.org",
+			"https://polygon-mainnet.infura.io/v3/${INFURA_API_KEY}",
+			"https://polygon-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
 		],
 		"slip44": 966
 	},
@@ -150,7 +156,9 @@
 			"https://base.gateway.tenderly.co",
 			"wss://base.gateway.tenderly.co",
 			"https://base-rpc.publicnode.com",
-			"wss://base-rpc.publicnode.com"
+			"wss://base-rpc.publicnode.com",
+			"https://base-mainnet.infura.io/v3/${INFURA_API_KEY}",
+			"https://base-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
 		],
 		"status": "active"
 	},
@@ -198,8 +206,8 @@
 			"https://arbitrum-mainnet.infura.io/v3/${INFURA_API_KEY}",
 			"https://arb-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}",
 			"https://arb1.arbitrum.io/rpc",
-			"https://arbitrum-one.publicnode.com",
-			"wss://arbitrum-one.publicnode.com"
+			"https://arbitrum-one-rpc.publicnode.com",
+			"wss://arbitrum-one-rpc.publicnode.com"
 		]
 	},
 	"43114": {
@@ -221,7 +229,10 @@
 		"rpc": [
 			"https://api.avax.network/ext/bc/C/rpc",
 			"https://avalanche-c-chain-rpc.publicnode.com",
-			"wss://avalanche-c-chain-rpc.publicnode.com"
+			"wss://avalanche-c-chain-rpc.publicnode.com",
+			"https://rpc.ankr.com/avalanche",
+			"https://ava-mainnet.public.blastapi.io/ext/bc/C/rpc",
+			"https://avalanche-mainnet.infura.io/v3/${INFURA_API_KEY}"
 		],
 		"slip44": 9005
 	},
@@ -261,7 +272,8 @@
 			"https://linea-mainnet.infura.io/v3/${INFURA_API_KEY}",
 			"wss://linea-mainnet.infura.io/ws/v3/${INFURA_API_KEY}",
 			"https://linea-rpc.publicnode.com",
-			"wss://linea-rpc.publicnode.com"
+			"wss://linea-rpc.publicnode.com",
+			"https://linea-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
 		],
 		"status": "active",
 		"title": "Linea Mainnet"
@@ -286,7 +298,9 @@
 			"https://rpc.ankr.com/scroll",
 			"https://scroll-mainnet.chainstacklabs.com",
 			"https://scroll-rpc.publicnode.com",
-			"wss://scroll-rpc.publicnode.com"
+			"wss://scroll-rpc.publicnode.com",
+			"https://scroll-mainnet.infura.io/v3/${INFURA_API_KEY}",
+			"https://scroll-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
 		],
 		"status": "active"
 	}

script/data/feature/opcodes.json

@@ -958,8 +958,8 @@
 		{ "number": "0x46", "name": "CHAINID", "supported": true },
 		{ "number": "0x47", "name": "SELFBALANCE", "supported": true },
 		{ "number": "0x48", "name": "BASEFEE", "supported": true },
-		{ "number": "0x49", "name": "BLOBHASH", "supported": false },
-		{ "number": "0x4a", "name": "BLOBBASEFEE", "supported": false },
+		{ "number": "0x49", "name": "BLOBHASH", "supported": true },
+		{ "number": "0x4a", "name": "BLOBBASEFEE", "supported": true },
 		{ "number": "0x50", "name": "POP", "supported": true },
 		{ "number": "0x51", "name": "MLOAD", "supported": true },
 		{ "number": "0x52", "name": "MSTORE", "supported": true },
@@ -972,9 +972,9 @@
 		{ "number": "0x59", "name": "MSIZE", "supported": true },
 		{ "number": "0x5a", "name": "GAS", "supported": true },
 		{ "number": "0x5b", "name": "JUMPDEST", "supported": true },
-		{ "number": "0x5c", "name": "TLOAD", "supported": false },
-		{ "number": "0x5d", "name": "TSTORE", "supported": false },
-		{ "number": "0x5e", "name": "MCOPY", "supported": false },
+		{ "number": "0x5c", "name": "TLOAD", "supported": true },
+		{ "number": "0x5d", "name": "TSTORE", "supported": true },
+		{ "number": "0x5e", "name": "MCOPY", "supported": true },
 		{ "number": "0x5f", "name": "PUSH0", "supported": true },
 		{ "number": "0x60", "name": "PUSH1", "supported": true },
 		{ "number": "0x61", "name": "PUSH2", "supported": true },

script/data/feature/precompiles.json

@@ -390,7 +390,7 @@
 		{
 			"name": "point evaluation",
 			"address": "0x000000000000000000000000000000000000000a",
-			"implemented": false
+			"implemented": true
 		},
 		{
 			"name": "secp256r1",

script/index.ts

@@ -86,6 +86,13 @@ async function getMetadata(chainId: number): Promise<Metadata> {
 	const data = await response.json();
 	const metadata = data.find((chain: Metadata) => chain.chainId === chainId);
 	if (!metadata) throw new Error(`Chain with ID ${chainId} not found.`);
+
+	// Add in the custom RPC URLs from input.json.
+	const chains = await Bun.file('script/input.json').json();
+	const chain = chains.find((chain: Metadata) => chain.chainId === chainId);
+	if (chain?.rpcUrls) metadata.rpc.push(...chain.rpcUrls);
+	metadata.rpc = [...new Set(metadata.rpc)]; // Deduplicate RPC URLs.
+
 	return metadata;
 }
 
@@ -128,6 +135,8 @@ function selectRpcUrls(rpcUrls: string[]): string[] {
 		'matic-mainnet-full-rpc.bwarelabs.com', // "This endpoint is deprecated".
 		'publicnode.com', // Transaction creation failed.
 		'cloudflare', // Requested resource not found.
+		'api.avax.network', // Unrecognized token '<', 429's easily.
+		'rpc.linea.build', // All error messages are identical so can't distinguish opcode support.
 	];
 	const filteredRpcUrls = rpcUrls.filter(
 		(url) => !domainsToSkip.some((domain) => url.includes(domain)),

script/input.json

@@ -1,11 +1,64 @@
 [
-	{ "chainId": 1 },
-	{ "chainId": 10 },
-	{ "chainId": 137 },
-	{ "chainId": 8453 },
-	{ "chainId": 34443 },
-	{ "chainId": 42161 },
-	{ "chainId": 43114 },
-	{ "chainId": 59144 },
-	{ "chainId": 534352 }
+	{
+		"chainId": 1,
+		"rpcUrls": [
+			"https://mainnet.infura.io/v3/${INFURA_API_KEY}",
+			"https://eth-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
+		]
+	},
+	{
+		"chainId": 10,
+		"rpcUrls": [
+			"https://optimism-mainnet.infura.io/v3/${INFURA_API_KEY}",
+			"https://opt-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
+		]
+	},
+	{
+		"chainId": 137,
+		"rpcUrls": [
+			"https://polygon-mainnet.infura.io/v3/${INFURA_API_KEY}",
+			"https://polygon-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
+		]
+	},
+	{
+		"chainId": 8453,
+		"rpcUrls": [
+			"https://base-mainnet.infura.io/v3/${INFURA_API_KEY}",
+			"https://base-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
+		]
+	},
+	{
+		"chainId": 34443,
+		"rpcUrls": []
+	},
+	{
+		"chainId": 42161,
+		"rpcUrls": [
+			"https://arbitrum-mainnet.infura.io/v3/${INFURA_API_KEY}",
+			"https://arb-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
+		]
+	},
+	{
+		"chainId": 43114,
+		"rpcUrls": [
+			"https://avalanche-c-chain-rpc.publicnode.com",
+			"https://rpc.ankr.com/avalanche",
+			"https://ava-mainnet.public.blastapi.io/ext/bc/C/rpc",
+			"https://avalanche-mainnet.infura.io/v3/${INFURA_API_KEY}"
+		]
+	},
+	{
+		"chainId": 59144,
+		"rpcUrls": [
+			"https://linea-mainnet.infura.io/v3/${INFURA_API_KEY}",
+			"https://linea-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
+		]
+	},
+	{
+		"chainId": 534352,
+		"rpcUrls": [
+			"https://scroll-mainnet.infura.io/v3/${INFURA_API_KEY}",
+			"https://scroll-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
+		]
+	}
 ]

script/main.sh

@@ -1,6 +1,11 @@
 #!/bin/bash
 set -euo pipefail
 
+# Load API keys from the repo root.
+repoRoot=$(git rev-parse --show-toplevel)
+# shellcheck disable=SC1091
+source "$repoRoot"/.env
+
 # Function to handle final preparation steps.
 final_preparation() {
     local exitStatus=$?
@@ -19,7 +24,6 @@ final_preparation() {
 # Set up a trap to run final preparation steps on script exit.
 trap final_preparation EXIT
 
-
 if [ $# -eq 0 ]; then
   # No input provided, read from `input.json`.
   chainIds=$(jq -r '.[].chainId' script/input.json)