allow reading from file for deployments

jolly-roger-eth · Nov 24, 2023 · 8498cfe · 8498cfe
1 parent e95c0ef
commit 8498cfe
Show file tree

Hide file tree

Showing 16 changed files with 105 additions and 10 deletions.
diff --git a/examples/mud/CHANGELOG.md b/examples/mud/CHANGELOG.md
@@ -1,5 +1,15 @@
 # web-demo
 
+## 0.1.40
+
+### Patch Changes
+
+- Updated dependencies
+  - [email protected]
+  - [email protected]
+  - [email protected]
+  - [email protected]
+
 ## 0.1.39
 
 ### Patch Changes

diff --git a/examples/mud/package.json b/examples/mud/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "mud-demo",
 	"private": true,
-	"version": "0.1.39",
+	"version": "0.1.40",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",

diff --git a/examples/web-demo/CHANGELOG.md b/examples/web-demo/CHANGELOG.md
@@ -1,5 +1,15 @@
 # web-demo
 
+## 0.1.40
+
+### Patch Changes
+
+- Updated dependencies
+  - [email protected]
+  - [email protected]
+  - [email protected]
+  - [email protected]
+
 ## 0.1.39
 
 ### Patch Changes

diff --git a/examples/web-demo/package.json b/examples/web-demo/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "web-demo",
 	"private": true,
-	"version": "0.1.39",
+	"version": "0.1.40",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",

diff --git a/packages/ethereum-indexer-browser/CHANGELOG.md b/packages/ethereum-indexer-browser/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ethereum-indexer-browser
 
+## 0.6.13
+
+### Patch Changes
+
+- allow reading from file for deployments
+
 ## 0.6.12
 
 ### Patch Changes

diff --git a/packages/ethereum-indexer-browser/package.json b/packages/ethereum-indexer-browser/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ethereum-indexer-browser",
-	"version": "0.6.12",
+	"version": "0.6.13",
 	"publishConfig": {
 		"access": "public"
 	},

diff --git a/packages/ethereum-indexer-browser/src/storage/state/OnIndexedDB.ts b/packages/ethereum-indexer-browser/src/storage/state/OnIndexedDB.ts
@@ -8,14 +8,29 @@ function getStorageID<ProcessorConfig = undefined>(name: string, chainId: string
 
 type StateData<ABI extends Abi, ProcessResultType, Extra> = AllData<ABI, ProcessResultType, Extra>;
 
-export function keepStateOnIndexedDB<ABI extends Abi, ProcessResultType, ProcessorConfig>(name: string) {
+export function keepStateOnIndexedDB<ABI extends Abi, ProcessResultType, ProcessorConfig>(name: string, remote?: string) {
 	return {
 		fetch: async (context: ProcessorContext<ABI, ProcessorConfig>) => {
 			const storageID = getStorageID(name, context.source.chainId, 'config' in context ? context.config : undefined);
 			const existingState = await get<StateData<ABI, ProcessResultType, unknown>>(storageID);
+
+			let remoteState: StateData<ABI, ProcessResultType, unknown> | undefined; 
+			if (remote) {
+				try {
+					const response = await fetch(remote);
+					const json = await response.json();
+					remoteState = json;
+				} catch(err) {
+					console.error(`failed to fetch remote-state`, err);
+				}
+			}
+
 			if (!existingState) {
-				return undefined;
+				return remoteState;
 			} else {
+				if (remoteState && remoteState.lastSync.lastToBlock >= existingState.lastSync.lastToBlock) {
+					return remoteState;
+				}
 				return existingState;
 			}
 		},

diff --git a/packages/ethereum-indexer-cli/CHANGELOG.md b/packages/ethereum-indexer-cli/CHANGELOG.md
@@ -1,5 +1,12 @@
 # ethereum-indexer-cli
 
+## 0.6.14
+
+### Patch Changes
+
+- Updated dependencies
+  - [email protected]
+
 ## 0.6.13
 
 ### Patch Changes

diff --git a/packages/ethereum-indexer-cli/package.json b/packages/ethereum-indexer-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ethereum-indexer-cli",
-  "version": "0.6.13",
+  "version": "0.6.14",
   "description": "",
   "keywords": [],
   "author": "",

diff --git a/packages/ethereum-indexer-server/CHANGELOG.md b/packages/ethereum-indexer-server/CHANGELOG.md
@@ -1,5 +1,12 @@
 # ethereum-indexer-server
 
+## 0.6.17
+
+### Patch Changes
+
+- Updated dependencies
+  - [email protected]
+
 ## 0.6.16
 
 ### Patch Changes

diff --git a/packages/ethereum-indexer-server/package.json b/packages/ethereum-indexer-server/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ethereum-indexer-server",
-	"version": "0.6.16",
+	"version": "0.6.17",
 	"description": "",
 	"keywords": [],
 	"author": "",

diff --git a/packages/ethereum-indexer-streams/CHANGELOG.md b/packages/ethereum-indexer-streams/CHANGELOG.md
@@ -1,5 +1,12 @@
 # ethereum-indexer-server
 
+## 0.6.16
+
+### Patch Changes
+
+- Updated dependencies
+  - [email protected]
+
 ## 0.6.15
 
 ### Patch Changes

diff --git a/packages/ethereum-indexer-streams/package.json b/packages/ethereum-indexer-streams/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ethereum-indexer-streams",
-	"version": "0.6.15",
+	"version": "0.6.16",
 	"description": "",
 	"keywords": [],
 	"author": "",

diff --git a/packages/ethereum-indexer-utils/CHANGELOG.md b/packages/ethereum-indexer-utils/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ethereum-indexer-utils
 
+## 0.6.9
+
+### Patch Changes
+
+- allow reading from file for deployments
+
 ## 0.6.8
 
 ### Patch Changes

diff --git a/packages/ethereum-indexer-utils/package.json b/packages/ethereum-indexer-utils/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ethereum-indexer-utils",
-	"version": "0.6.8",
+	"version": "0.6.9",
 	"description": "",
 	"publishConfig": {
 		"access": "public"

diff --git a/packages/ethereum-indexer-utils/src/contracts.ts b/packages/ethereum-indexer-utils/src/contracts.ts
@@ -18,7 +18,34 @@ function mergeABIs(abi1: any[], abi2: any[]): any[] {
 	return newABI;
 }
 
-export function loadContracts<ABI extends Abi>(folder: string): IndexingSource<ABI> {
+export function loadContracts<ABI extends Abi>(folderOrFile: string): IndexingSource<ABI> {
+	if (fs.statSync(folderOrFile).isDirectory()) {
+		return loadContractsFromFolder(folderOrFile);
+	} else {
+		return loadContractsFromFile(folderOrFile)
+	}
+}
+
+
+export function loadContractsFromFile<ABI extends Abi>(file: string): IndexingSource<ABI> {
+
+	let contractSTR = fs.readFileSync(file, 'utf-8');
+	if (contractSTR.startsWith('export default {') && contractSTR.endsWith('} as const;')) {
+		contractSTR = contractSTR.slice(15, -10);
+	}
+	const contracts = JSON.parse(contractSTR);
+
+	return {
+		chainId: contracts.chainId,
+			contracts: Object.keys(contracts.contracts).map(
+				(name) => (contracts as any).contracts[name],
+			),
+	}
+}
+
+
+
+export function loadContractsFromFolder<ABI extends Abi>(folder: string): IndexingSource<ABI> {
 	const contractsAdded: {[address: string]: {index: number}} = {};
 	const contractsData: ContractData<ABI>[] = [];
 	const files = fs.readdirSync(folder);