lastFetcLocalTime + contract time

wighawag · Nov 12, 2023 · c9d62bb · c9d62bb
1 parent dfffc70
commit c9d62bb
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 29 deletions.
diff --git a/jolly-roger.code-workspace b/jolly-roger.code-workspace
@@ -34,7 +34,7 @@
  "[solidity]": {
  "editor.defaultFormatter": "esbenp.prettier-vscode"
  },
- "prettier.documentSelectors": ["**/*.sol"],
+ "prettier.documentSelectors": ["**/*.sol", "**/*.ts", "**/*.svelte"],
  "solidity.formatter": "prettier",
  "npm.exclude": "**/lib/**"
  },

diff --git a/web/src/lib/time.ts b/web/src/lib/time.ts
@@ -1,48 +1,81 @@
-import {derived, writable} from 'svelte/store';
+import {writable} from 'svelte/store';
 import {connection, devProvider} from './web3';
-// import {initialContractsInfos} from './config';
 
 let timestamp = Math.floor(Date.now() / 1000);
-const _time = writable({timestamp, synced: false}, (set) => {
- let timeout: NodeJS.Timeout | undefined;
- async function getTime() {
- try {
- if (typeof window !== 'undefined' && devProvider) {
- // TODO offer option to use a contract's time or blockTime
- // const rawTimestamp = await devProvider.request({
- // method: 'eth_call',
- // params: [{data: '0xb80777ea', to: initialContractsInfos.contracts.Dungeon.address}],
- // });
- // timestamp = parseInt(rawTimestamp.slice(2), 16);
 
+let synced = false;
+let lastFetchLocalTime = performance.now();
+let contract: `0x${string}` | undefined;
+
+async function getTime() {
+ if (typeof window !== 'undefined' && devProvider) {
+ if (connection.$state.provider) {
+ if (contract) {
+ const rawTimestamp = await devProvider.request({
+ method: 'eth_call',
+ params: [{data: '0xb80777ea', to: contract}],
+ });
+ const parsedTimestamp = parseInt(rawTimestamp.slice(2), 16);
+ timestamp = await connection.$state.provider?.syncTime(parsedTimestamp);
+ lastFetchLocalTime = performance.now();
+ } else {
  const block = await devProvider.request({
  method: 'eth_getBlockByNumber',
  params: ['latest', false],
  });
- timestamp = (await connection.$state.provider?.syncTime(block)) || Math.floor(Date.now() / 1000);
+ timestamp = await connection.$state.provider?.syncTime(block);
+ lastFetchLocalTime = performance.now();
+ }
+ synced = true;
+ } else {
+ synced = false;
+ timestamp = Math.floor(Date.now() / 1000);
+ lastFetchLocalTime = performance.now();
+ }
+ } else {
+ if (connection.$state.provider) {
+ if (contract) {
+ const rawTimestamp = await connection.$state.provider?.request({
+ method: 'eth_call',
+ params: [{data: '0xb80777ea', to: contract}],
+ });
+ timestamp = parseInt(rawTimestamp.slice(2), 16);
+ lastFetchLocalTime = performance.now();
  } else {
- // TODO offer option to use a contract's time or blockTime
- // const rawTimestamp = await connection.$state.provider?.request({
- // method: 'eth_call',
- // params: [{data: '0xb80777ea', to: initialContractsInfos.contracts.Dungeon.address}],
- // });
- // if (rawTimestamp) {
- // timestamp = parseInt(rawTimestamp.slice(2), 16);
- // }
-
- timestamp = connection.$state.provider?.currentTime() || Math.floor(Date.now() / 1000);
+ timestamp = connection.$state.provider.currentTime();
+ lastFetchLocalTime = performance.now();
  }
+ synced = true;
+ } else {
+ synced = false;
+ timestamp = Math.floor(Date.now() / 1000);
+ lastFetchLocalTime = performance.now();
+ }
+ }
+ return timestamp;
+}
+
+const _time = writable({timestamp, synced}, (set) => {
+ let timeout: NodeJS.Timeout | undefined;
 
+ async function fetchTime() {
+ const lastTimestamp = timestamp;
+ const lastSynced = synced;
+ try {
+ const timestamp = await getTime();
  if (timestamp && !isNaN(timestamp)) {
- set({timestamp, synced: true});
+ if (lastTimestamp != timestamp || lastSynced != synced) {
+ set({timestamp, synced});
+ }
  }
  } finally {
  if (timeout) {
- timeout = setTimeout(getTime, 3000);
+ timeout = setTimeout(fetchTime, 3000);
  }
  }
  }
- timeout = setTimeout(getTime, 3000);
+
+ timeout = setTimeout(fetchTime, 3000);
  return () => {
  clearTimeout(timeout);
  timeout = undefined;
@@ -52,7 +85,11 @@ const _time = writable({timestamp, synced: false}, (set) => {
 export const time = {
  subscribe: _time.subscribe,
  get now() {
- return timestamp;
+ let n = performance.now();
+ return timestamp + Math.floor((n - lastFetchLocalTime) / 1000);
+ },
+ setTimeKeeperContract(contractAddress: `0x${string}`) {
+ contract = contractAddress;
  },
 };