Merge branch 'dev' into pure-css

wighawag · Jan 17, 2024 · a23d0e3 · a23d0e3
2 parents 6ee231d + f04e323
commit a23d0e3
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 35 deletions.
diff --git a/common/package.json b/common/package.json
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "ldenv": "^0.3.9",
-    "prettier": "^3.2.2",
+    "prettier": "^3.2.3",
     "tsup": "^8.0.1",
     "typescript": "^5.3.3"
   },

diff --git a/contracts/package.json b/contracts/package.json
@@ -11,7 +11,7 @@
     "hardhat-rocketh": "^1.0.4",
     "jolly-roger-common": "workspace:*",
     "ldenv": "^0.3.9",
-    "prettier": "^3.2.2",
+    "prettier": "^3.2.3",
     "prettier-plugin-solidity": "^1.3.1",
     "rocketh": "^0.7.4",
     "rocketh-deploy": "^1.0.5",

diff --git a/indexer/package.json b/indexer/package.json
@@ -15,7 +15,7 @@
     "ethereum-indexer-cli": "^0.6.24",
     "ethereum-indexer-server": "^0.6.27",
     "ldenv": "^0.3.9",
-    "prettier": "^3.2.2",
+    "prettier": "^3.2.3",
     "tsup": "^8.0.1",
     "typescript": "^5.3.3",
     "wait-on": "^7.2.0"

diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
   "devDependencies": {
     "ask-env": "^0.0.1",
     "ldenv": "^0.3.9",
-    "prettier": "^3.2.2",
+    "prettier": "^3.2.3",
     "syncpack": "^12.3.0",
     "vitepress": "1.0.0-rc.39"
   },

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/web/package.json b/web/package.json
@@ -11,7 +11,7 @@
     "abitype": "^0.10.3",
     "eip-1193": "^0.4.7",
     "ipfs-gateway-emulator": "4.2.1-ipfs.2",
-    "prettier": "^3.2.2",
+    "prettier": "^3.2.3",
     "prettier-plugin-svelte": "^3.1.2",
     "pwag": "0.2.0",
     "svelte": "^4.2.8",
@@ -33,7 +33,7 @@
     "lodash-es": "^4.17.21",
     "lz-string": "^1.5.0",
     "named-logs": "^0.2.2",
-    "radiate": "^0.0.1",
+    "radiate": "^0.0.2",
     "theme-change": "^2.5.0",
     "viem": "^2.1.1",
     "web3-connection": "^0.1.12",

diff --git a/web/src/lib/account/account-db.ts b/web/src/lib/account/account-db.ts
@@ -334,7 +334,6 @@ export class AccountDB<T extends Record<string, unknown>> implements Readable<Sy
 			throw new Error(`no sync URI`);
 		}
 		return fetch(this.syncURI, {
-			// TODO env variable
 			method: 'POST',
 			body: JSON.stringify({
 				method,

diff --git a/web/src/lib/account/base.ts b/web/src/lib/account/base.ts
@@ -1,6 +1,6 @@
 import type {PendingTransaction, EIP1193TransactionWithMetadata, PendingTransactionState} from 'ethereum-tx-observer';
 import type {AccountHandler, AccountInfo, OnPendingTransaction, SyncInfo} from './types';
-import {initEmitter} from 'radiate';
+import {initEmitter, type Emitter} from 'radiate';
 import {AccountDB} from './account-db';
 import {writable, type Readable, type Writable} from 'svelte/store';
 
@@ -9,13 +9,6 @@ export type OnChainAction<T> = {
 } & PendingTransactionState;
 export type OnChainActions<T> = {[hash: `0x${string}`]: OnChainAction<T>};
 
-// TODO export this type in radiate
-type Emitter<T> = {
-	on: (func: (v: T) => void) => () => void;
-	off: (func: (v: T) => void) => void;
-	emit(v: T): void;
-};
-
 export abstract class BaseAccountHandler<
 	T extends {onchainActions: OnChainActions<Metadata>},
 	Metadata extends Record<string, unknown>,