From 2331074c9c0aa06e4fc5dfa4308871458426fd7f Mon Sep 17 00:00:00 2001 From: Tanner Shaw Date: Tue, 2 Apr 2024 11:42:29 -0700 Subject: [PATCH 1/8] feature: adding constant for versioning for the notary, will change to .5 when released --- src/pages/Options/index.tsx | 3 ++- src/reducers/requests.ts | 3 ++- src/utils/constants.ts | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pages/Options/index.tsx b/src/pages/Options/index.tsx index abfbb5b8..6517244e 100644 --- a/src/pages/Options/index.tsx +++ b/src/pages/Options/index.tsx @@ -5,9 +5,10 @@ import { NOTARY_API_LS_KEY, PROXY_API_LS_KEY, } from '../../utils/storage'; +import { NOTARY_API } from '../../utils/constants'; export default function Options(): ReactElement { - const [notary, setNotary] = useState('https://notary.pse.dev'); + const [notary, setNotary] = useState(NOTARY_API); const [proxy, setProxy] = useState('wss://notary.pse.dev/proxy'); const [dirty, setDirty] = useState(false); diff --git a/src/reducers/requests.ts b/src/reducers/requests.ts index 79f5188d..49d754bd 100644 --- a/src/reducers/requests.ts +++ b/src/reducers/requests.ts @@ -8,6 +8,7 @@ import deepEqual from 'fast-deep-equal'; import { get, NOTARY_API_LS_KEY, PROXY_API_LS_KEY } from '../utils/storage'; import { BackgroundActiontype } from '../entries/Background/rpc'; import browser from 'webextension-polyfill'; +import { NOTARY_API } from '../utils/constants'; enum ActionType { '/requests/setRequests' = '/requests/setRequests', @@ -40,7 +41,7 @@ export const setRequests = (requests: RequestLog[]): Action => ({ }); export const notarizeRequest = (options: RequestHistory) => async () => { - const notaryUrl = await get(NOTARY_API_LS_KEY, 'https://notary.pse.dev'); + const notaryUrl = await get(NOTARY_API_LS_KEY, NOTARY_API); const websocketProxyUrl = await get( PROXY_API_LS_KEY, 'wss://notary.pse.dev/proxy', diff --git a/src/utils/constants.ts b/src/utils/constants.ts index 57ed97c0..d2b9ead1 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -1 +1,2 @@ export const EXPLORER_API = 'http://localhost:3000'; +export const NOTARY_API = 'https://notary.pse.dev/v0.1.0-alpha.4'; From d55279501e61ed208bbef3b09cb482f9a5d5a2c9 Mon Sep 17 00:00:00 2001 From: Tanner Shaw Date: Tue, 2 Apr 2024 12:15:52 -0700 Subject: [PATCH 2/8] refactor: just changing to .5 now, can push when released --- src/utils/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/constants.ts b/src/utils/constants.ts index d2b9ead1..66c466e0 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -1,2 +1,2 @@ export const EXPLORER_API = 'http://localhost:3000'; -export const NOTARY_API = 'https://notary.pse.dev/v0.1.0-alpha.4'; +export const NOTARY_API = 'https://notary.pse.dev/v0.1.0-alpha.5'; From 8bb76ad969730c66f3f94e37ff77ca6928f15551 Mon Sep 17 00:00:00 2001 From: Tanner Shaw Date: Wed, 3 Apr 2024 10:43:05 -0700 Subject: [PATCH 3/8] feature: added notary proxy to constants --- src/pages/Options/index.tsx | 4 ++-- src/reducers/requests.ts | 4 ++-- src/utils/constants.ts | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/pages/Options/index.tsx b/src/pages/Options/index.tsx index 6517244e..769bd344 100644 --- a/src/pages/Options/index.tsx +++ b/src/pages/Options/index.tsx @@ -5,11 +5,11 @@ import { NOTARY_API_LS_KEY, PROXY_API_LS_KEY, } from '../../utils/storage'; -import { NOTARY_API } from '../../utils/constants'; +import { NOTARY_API, NOTARY_PROXY } from '../../utils/constants'; export default function Options(): ReactElement { const [notary, setNotary] = useState(NOTARY_API); - const [proxy, setProxy] = useState('wss://notary.pse.dev/proxy'); + const [proxy, setProxy] = useState(NOTARY_PROXY); const [dirty, setDirty] = useState(false); useEffect(() => { diff --git a/src/reducers/requests.ts b/src/reducers/requests.ts index 49d754bd..47a4b14a 100644 --- a/src/reducers/requests.ts +++ b/src/reducers/requests.ts @@ -8,7 +8,7 @@ import deepEqual from 'fast-deep-equal'; import { get, NOTARY_API_LS_KEY, PROXY_API_LS_KEY } from '../utils/storage'; import { BackgroundActiontype } from '../entries/Background/rpc'; import browser from 'webextension-polyfill'; -import { NOTARY_API } from '../utils/constants'; +import { NOTARY_API, NOTARY_PROXY } from '../utils/constants'; enum ActionType { '/requests/setRequests' = '/requests/setRequests', @@ -44,7 +44,7 @@ export const notarizeRequest = (options: RequestHistory) => async () => { const notaryUrl = await get(NOTARY_API_LS_KEY, NOTARY_API); const websocketProxyUrl = await get( PROXY_API_LS_KEY, - 'wss://notary.pse.dev/proxy', + NOTARY_PROXY, ); chrome.runtime.sendMessage({ diff --git a/src/utils/constants.ts b/src/utils/constants.ts index 66c466e0..8825864e 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -1,2 +1,3 @@ export const EXPLORER_API = 'http://localhost:3000'; -export const NOTARY_API = 'https://notary.pse.dev/v0.1.0-alpha.5'; +export const NOTARY_API = 'https://notary.pse.dev/v0.1.0-alpha.4'; +export const NOTARY_PROXY = 'wss://notary.pse.dev/proxy/v0.1.0-alpha-4'; From c68e2e1548ae4c568fcf58016e52a9bda762ac8f Mon Sep 17 00:00:00 2001 From: Tanner Shaw Date: Wed, 3 Apr 2024 10:45:12 -0700 Subject: [PATCH 4/8] chore: fixing linter issues --- src/reducers/requests.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/reducers/requests.ts b/src/reducers/requests.ts index 47a4b14a..5f9ea156 100644 --- a/src/reducers/requests.ts +++ b/src/reducers/requests.ts @@ -42,10 +42,7 @@ export const setRequests = (requests: RequestLog[]): Action => ({ export const notarizeRequest = (options: RequestHistory) => async () => { const notaryUrl = await get(NOTARY_API_LS_KEY, NOTARY_API); - const websocketProxyUrl = await get( - PROXY_API_LS_KEY, - NOTARY_PROXY, - ); + const websocketProxyUrl = await get(PROXY_API_LS_KEY, NOTARY_PROXY); chrome.runtime.sendMessage({ type: BackgroundActiontype.prove_request_start, From 25689017b0d22029e15f8e1c0a3e8f0795d45eb3 Mon Sep 17 00:00:00 2001 From: Tanner Shaw Date: Wed, 3 Apr 2024 13:25:51 -0700 Subject: [PATCH 5/8] refactor: removing version from notary proxy --- src/utils/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/constants.ts b/src/utils/constants.ts index 8825864e..333898cb 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -1,3 +1,3 @@ export const EXPLORER_API = 'http://localhost:3000'; export const NOTARY_API = 'https://notary.pse.dev/v0.1.0-alpha.4'; -export const NOTARY_PROXY = 'wss://notary.pse.dev/proxy/v0.1.0-alpha-4'; +export const NOTARY_PROXY = 'wss://notary.pse.dev/proxy'; From 71cef56356ad7d06b3c34a93b89bff548fe16e72 Mon Sep 17 00:00:00 2001 From: Tanner Shaw Date: Mon, 8 Apr 2024 12:03:23 -0700 Subject: [PATCH 6/8] chore: updating notary api url constant to alpha.5 --- package.json | 2 +- src/utils/constants.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ffcf8c14..77a69439 100755 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "redux-logger": "^3.0.6", "redux-thunk": "^2.4.2", "tailwindcss": "^3.3.3", - "tlsn-js": "0.1.0-alpha.4.1" + "tlsn-js": "0.1.0-alpha.5.0" }, "devDependencies": { "@babel/core": "^7.20.12", diff --git a/src/utils/constants.ts b/src/utils/constants.ts index 333898cb..110cb0f9 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -1,3 +1,3 @@ export const EXPLORER_API = 'http://localhost:3000'; -export const NOTARY_API = 'https://notary.pse.dev/v0.1.0-alpha.4'; +export const NOTARY_API = 'https://notary.pse.dev/v0.1.0-alpha.5'; export const NOTARY_PROXY = 'wss://notary.pse.dev/proxy'; From 8348756f0a862658eef8dd6d5a98c26700f0cd37 Mon Sep 17 00:00:00 2001 From: Tanner Shaw Date: Tue, 9 Apr 2024 09:50:50 -0700 Subject: [PATCH 7/8] chore: bumping tlsn-js version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 77a69439..3e947ea0 100755 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "redux-logger": "^3.0.6", "redux-thunk": "^2.4.2", "tailwindcss": "^3.3.3", - "tlsn-js": "0.1.0-alpha.5.0" + "tlsn-js": "0.1.0-alpha.5.2" }, "devDependencies": { "@babel/core": "^7.20.12", From c481ee6bbffc287a7972ebdd76b58b85be17e668 Mon Sep 17 00:00:00 2001 From: Tanner Shaw Date: Tue, 9 Apr 2024 10:33:24 -0700 Subject: [PATCH 8/8] chore: fixing linter issues --- src/reducers/requests.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/reducers/requests.ts b/src/reducers/requests.ts index 034f9b97..5f9ea156 100644 --- a/src/reducers/requests.ts +++ b/src/reducers/requests.ts @@ -44,7 +44,6 @@ export const notarizeRequest = (options: RequestHistory) => async () => { const notaryUrl = await get(NOTARY_API_LS_KEY, NOTARY_API); const websocketProxyUrl = await get(PROXY_API_LS_KEY, NOTARY_PROXY); - chrome.runtime.sendMessage({ type: BackgroundActiontype.prove_request_start, data: {