Page MenuHomePhabricator
Differential D5506

Revert "Rename deviceIDTypes to deviceTypes, add comments"
AbandonedPublicDraft
Actions

Authored by inka on Oct 31 2022, 1:56 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Apr 20, 10:01 AM
Unknown Object (File)
Sun, Apr 20, 3:56 AM
Unknown Object (File)
Fri, Apr 18, 8:59 PM
Unknown Object (File)
Wed, Apr 9, 4:24 AM
Unknown Object (File)
Wed, Apr 9, 4:24 AM
Unknown Object (File)
Wed, Apr 9, 4:23 AM
Unknown Object (File)
Tue, Apr 1, 6:36 AM
Unknown Object (File)
Mar 15 2025, 9:31 PM
View All Files
Subscribers
• abosh

Details

Reviewers
ashoat
tomek
varun
atul
• jon
Summary

This reverts commit 1482f5e7c1640629f2503bbc1061bf95bc419b73.

Test Plan

The test is pushing to phabricator and seeing if CI fails

Diff Detail

Repository
rCOMM Comm
Branch
master
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

inka created this revision.Oct 31 2022, 1:56 AM
Herald added a reviewer: • jon. · View Herald TranscriptOct 31 2022, 1:56 AM
Herald added a subscriber: • abosh. · View Herald Transcript
Harbormaster returned this revision to the author for changes because remote builds failed.Oct 31 2022, 2:04 AM
Harbormaster failed remote builds in B13098: Diff 17984!
inka abandoned this revision.Nov 2 2022, 1:21 AM

Revision Contents
Changeset List

PathSize
services/
tunnelbroker/
src/
4 lines
web/
redux/
4 lines
utils/
20 lines
28 lines

Diff 17984

View Options

services/tunnelbroker/src/Constants.h

Show First 20 Lines • Show All 101 Lines • ▼ Show 20 Lines const [alchemySecret, walletConnectSecret] = await Promise.all([
getConfig({ folder: 'secrets', name: 'alchemy' }), getConfig({ folder: 'secrets', name: 'alchemy' }),
getConfig({ folder: 'secrets', name: 'walletconnect' }), getConfig({ folder: 'secrets', name: 'walletconnect' }),
]); ]);
const alchemyKey = alchemySecret?.key; const alchemyKey = alchemySecret?.key;
const walletConnectKey = walletConnectSecret?.key; const walletConnectKey = walletConnectSecret?.key;
return { alchemyKey, walletConnectKey }; return { alchemyKey, walletConnectKey };
} }
async function createProdBrowserConfig(baseConfig, babelConfig) { async function createProdBrowserConfig(baseConfig, babelConfig, envVars) {
const browserConfig = createBaseBrowserConfig(baseConfig); const browserConfig = createBaseBrowserConfig(baseConfig);
const babelRule = getBrowserBabelRule(babelConfig); const babelRule = getBrowserBabelRule(babelConfig);
const { alchemyKey, walletConnectKey } = await getConfigs(); const { alchemyKey, walletConnectKey } = await getConfigs();
return { return {
...browserConfig, ...browserConfig,
mode: 'production', mode: 'production',
plugins: [ plugins: [
...browserConfig.plugins, ...browserConfig.plugins,
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env': { 'process.env': {
NODE_ENV: JSON.stringify('production'), NODE_ENV: JSON.stringify('production'),
BROWSER: true, BROWSER: true,
COMM_ALCHEMY_KEY: JSON.stringify(alchemyKey), COMM_ALCHEMY_KEY: JSON.stringify(alchemyKey),
COMM_WALLETCONNECT_KEY: JSON.stringify(walletConnectKey), COMM_WALLETCONNECT_KEY: JSON.stringify(walletConnectKey),
...envVars,
}, },
}), }),
new MiniCssExtractPlugin({ new MiniCssExtractPlugin({
filename: 'prod.[contenthash:12].build.css', filename: 'prod.[contenthash:12].build.css',
}), }),
], ],
module: { module: {
rules: [ rules: [
Show All 37 Lines module: {
}, },
], ],
}, },
], ],
}, },
}; };
} }
async function createDevBrowserConfig(baseConfig, babelConfig) { async function createDevBrowserConfig(baseConfig, babelConfig, envVars) {
const browserConfig = createBaseBrowserConfig(baseConfig); const browserConfig = createBaseBrowserConfig(baseConfig);
const babelRule = getBrowserBabelRule(babelConfig); const babelRule = getBrowserBabelRule(babelConfig);
const { alchemyKey, walletConnectKey } = await getConfigs(); const { alchemyKey, walletConnectKey } = await getConfigs();
return { return {
...browserConfig, ...browserConfig,
mode: 'development', mode: 'development',
plugins: [ plugins: [
...browserConfig.plugins, ...browserConfig.plugins,
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env': { 'process.env': {
NODE_ENV: JSON.stringify('development'), NODE_ENV: JSON.stringify('development'),
BROWSER: true, BROWSER: true,
COMM_ALCHEMY_KEY: JSON.stringify(alchemyKey), COMM_ALCHEMY_KEY: JSON.stringify(alchemyKey),
COMM_WALLETCONNECT_KEY: JSON.stringify(walletConnectKey), COMM_WALLETCONNECT_KEY: JSON.stringify(walletConnectKey),
...envVars,
}, },
}), }),
new ReactRefreshWebpackPlugin(), new ReactRefreshWebpackPlugin(),
], ],
module: { module: {
rules: [ rules: [
{ {
...babelRule, ...babelRule,
▲ Show 20 Lines • Show All 99 Lines • Show Last 20 Lines
View Options

web/redux/device-id-updater.js

Show First 20 Lines • Show All 101 Lines • ▼ Show 20 Lines const [alchemySecret, walletConnectSecret] = await Promise.all([
getConfig({ folder: 'secrets', name: 'alchemy' }), getConfig({ folder: 'secrets', name: 'alchemy' }),
getConfig({ folder: 'secrets', name: 'walletconnect' }), getConfig({ folder: 'secrets', name: 'walletconnect' }),
]); ]);
const alchemyKey = alchemySecret?.key; const alchemyKey = alchemySecret?.key;
const walletConnectKey = walletConnectSecret?.key; const walletConnectKey = walletConnectSecret?.key;
return { alchemyKey, walletConnectKey }; return { alchemyKey, walletConnectKey };
} }
async function createProdBrowserConfig(baseConfig, babelConfig) { async function createProdBrowserConfig(baseConfig, babelConfig, envVars) {
const browserConfig = createBaseBrowserConfig(baseConfig); const browserConfig = createBaseBrowserConfig(baseConfig);
const babelRule = getBrowserBabelRule(babelConfig); const babelRule = getBrowserBabelRule(babelConfig);
const { alchemyKey, walletConnectKey } = await getConfigs(); const { alchemyKey, walletConnectKey } = await getConfigs();
return { return {
...browserConfig, ...browserConfig,
mode: 'production', mode: 'production',
plugins: [ plugins: [
...browserConfig.plugins, ...browserConfig.plugins,
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env': { 'process.env': {
NODE_ENV: JSON.stringify('production'), NODE_ENV: JSON.stringify('production'),
BROWSER: true, BROWSER: true,
COMM_ALCHEMY_KEY: JSON.stringify(alchemyKey), COMM_ALCHEMY_KEY: JSON.stringify(alchemyKey),
COMM_WALLETCONNECT_KEY: JSON.stringify(walletConnectKey), COMM_WALLETCONNECT_KEY: JSON.stringify(walletConnectKey),
...envVars,
}, },
}), }),
new MiniCssExtractPlugin({ new MiniCssExtractPlugin({
filename: 'prod.[contenthash:12].build.css', filename: 'prod.[contenthash:12].build.css',
}), }),
], ],
module: { module: {
rules: [ rules: [
Show All 37 Lines module: {
}, },
], ],
}, },
], ],
}, },
}; };
} }
async function createDevBrowserConfig(baseConfig, babelConfig) { async function createDevBrowserConfig(baseConfig, babelConfig, envVars) {
const browserConfig = createBaseBrowserConfig(baseConfig); const browserConfig = createBaseBrowserConfig(baseConfig);
const babelRule = getBrowserBabelRule(babelConfig); const babelRule = getBrowserBabelRule(babelConfig);
const { alchemyKey, walletConnectKey } = await getConfigs(); const { alchemyKey, walletConnectKey } = await getConfigs();
return { return {
...browserConfig, ...browserConfig,
mode: 'development', mode: 'development',
plugins: [ plugins: [
...browserConfig.plugins, ...browserConfig.plugins,
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env': { 'process.env': {
NODE_ENV: JSON.stringify('development'), NODE_ENV: JSON.stringify('development'),
BROWSER: true, BROWSER: true,
COMM_ALCHEMY_KEY: JSON.stringify(alchemyKey), COMM_ALCHEMY_KEY: JSON.stringify(alchemyKey),
COMM_WALLETCONNECT_KEY: JSON.stringify(walletConnectKey), COMM_WALLETCONNECT_KEY: JSON.stringify(walletConnectKey),
...envVars,
}, },
}), }),
new ReactRefreshWebpackPlugin(), new ReactRefreshWebpackPlugin(),
], ],
module: { module: {
rules: [ rules: [
{ {
...babelRule, ...babelRule,
▲ Show 20 Lines • Show All 99 Lines • Show Last 20 Lines
View Options

web/utils/device-id.js

Show First 20 Lines • Show All 101 Lines • ▼ Show 20 Lines const [alchemySecret, walletConnectSecret] = await Promise.all([
getConfig({ folder: 'secrets', name: 'alchemy' }), getConfig({ folder: 'secrets', name: 'alchemy' }),
getConfig({ folder: 'secrets', name: 'walletconnect' }), getConfig({ folder: 'secrets', name: 'walletconnect' }),
]); ]);
const alchemyKey = alchemySecret?.key; const alchemyKey = alchemySecret?.key;
const walletConnectKey = walletConnectSecret?.key; const walletConnectKey = walletConnectSecret?.key;
return { alchemyKey, walletConnectKey }; return { alchemyKey, walletConnectKey };
} }
async function createProdBrowserConfig(baseConfig, babelConfig) { async function createProdBrowserConfig(baseConfig, babelConfig, envVars) {
const browserConfig = createBaseBrowserConfig(baseConfig); const browserConfig = createBaseBrowserConfig(baseConfig);
const babelRule = getBrowserBabelRule(babelConfig); const babelRule = getBrowserBabelRule(babelConfig);
const { alchemyKey, walletConnectKey } = await getConfigs(); const { alchemyKey, walletConnectKey } = await getConfigs();
return { return {
...browserConfig, ...browserConfig,
mode: 'production', mode: 'production',
plugins: [ plugins: [
...browserConfig.plugins, ...browserConfig.plugins,
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env': { 'process.env': {
NODE_ENV: JSON.stringify('production'), NODE_ENV: JSON.stringify('production'),
BROWSER: true, BROWSER: true,
COMM_ALCHEMY_KEY: JSON.stringify(alchemyKey), COMM_ALCHEMY_KEY: JSON.stringify(alchemyKey),
COMM_WALLETCONNECT_KEY: JSON.stringify(walletConnectKey), COMM_WALLETCONNECT_KEY: JSON.stringify(walletConnectKey),
...envVars,
}, },
}), }),
new MiniCssExtractPlugin({ new MiniCssExtractPlugin({
filename: 'prod.[contenthash:12].build.css', filename: 'prod.[contenthash:12].build.css',
}), }),
], ],
module: { module: {
rules: [ rules: [
Show All 37 Lines module: {
}, },
], ],
}, },
], ],
}, },
}; };
} }
async function createDevBrowserConfig(baseConfig, babelConfig) { async function createDevBrowserConfig(baseConfig, babelConfig, envVars) {
const browserConfig = createBaseBrowserConfig(baseConfig); const browserConfig = createBaseBrowserConfig(baseConfig);
const babelRule = getBrowserBabelRule(babelConfig); const babelRule = getBrowserBabelRule(babelConfig);
const { alchemyKey, walletConnectKey } = await getConfigs(); const { alchemyKey, walletConnectKey } = await getConfigs();
return { return {
...browserConfig, ...browserConfig,
mode: 'development', mode: 'development',
plugins: [ plugins: [
...browserConfig.plugins, ...browserConfig.plugins,
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env': { 'process.env': {
NODE_ENV: JSON.stringify('development'), NODE_ENV: JSON.stringify('development'),
BROWSER: true, BROWSER: true,
COMM_ALCHEMY_KEY: JSON.stringify(alchemyKey), COMM_ALCHEMY_KEY: JSON.stringify(alchemyKey),
COMM_WALLETCONNECT_KEY: JSON.stringify(walletConnectKey), COMM_WALLETCONNECT_KEY: JSON.stringify(walletConnectKey),
...envVars,
}, },
}), }),
new ReactRefreshWebpackPlugin(), new ReactRefreshWebpackPlugin(),
], ],
module: { module: {
rules: [ rules: [
{ {
...babelRule, ...babelRule,
▲ Show 20 Lines • Show All 99 Lines • Show Last 20 Lines
View Options

web/utils/device-id.test.js

Show First 20 Lines • Show All 101 Lines • ▼ Show 20 Lines const [alchemySecret, walletConnectSecret] = await Promise.all([
getConfig({ folder: 'secrets', name: 'alchemy' }), getConfig({ folder: 'secrets', name: 'alchemy' }),
getConfig({ folder: 'secrets', name: 'walletconnect' }), getConfig({ folder: 'secrets', name: 'walletconnect' }),
]); ]);
const alchemyKey = alchemySecret?.key; const alchemyKey = alchemySecret?.key;
const walletConnectKey = walletConnectSecret?.key; const walletConnectKey = walletConnectSecret?.key;
return { alchemyKey, walletConnectKey }; return { alchemyKey, walletConnectKey };
} }
async function createProdBrowserConfig(baseConfig, babelConfig) { async function createProdBrowserConfig(baseConfig, babelConfig, envVars) {
const browserConfig = createBaseBrowserConfig(baseConfig); const browserConfig = createBaseBrowserConfig(baseConfig);
const babelRule = getBrowserBabelRule(babelConfig); const babelRule = getBrowserBabelRule(babelConfig);
const { alchemyKey, walletConnectKey } = await getConfigs(); const { alchemyKey, walletConnectKey } = await getConfigs();
return { return {
...browserConfig, ...browserConfig,
mode: 'production', mode: 'production',
plugins: [ plugins: [
...browserConfig.plugins, ...browserConfig.plugins,
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env': { 'process.env': {
NODE_ENV: JSON.stringify('production'), NODE_ENV: JSON.stringify('production'),
BROWSER: true, BROWSER: true,
COMM_ALCHEMY_KEY: JSON.stringify(alchemyKey), COMM_ALCHEMY_KEY: JSON.stringify(alchemyKey),
COMM_WALLETCONNECT_KEY: JSON.stringify(walletConnectKey), COMM_WALLETCONNECT_KEY: JSON.stringify(walletConnectKey),
...envVars,
}, },
}), }),
new MiniCssExtractPlugin({ new MiniCssExtractPlugin({
filename: 'prod.[contenthash:12].build.css', filename: 'prod.[contenthash:12].build.css',
}), }),
], ],
module: { module: {
rules: [ rules: [
Show All 37 Lines module: {
}, },
], ],
}, },
], ],
}, },
}; };
} }
async function createDevBrowserConfig(baseConfig, babelConfig) { async function createDevBrowserConfig(baseConfig, babelConfig, envVars) {
const browserConfig = createBaseBrowserConfig(baseConfig); const browserConfig = createBaseBrowserConfig(baseConfig);
const babelRule = getBrowserBabelRule(babelConfig); const babelRule = getBrowserBabelRule(babelConfig);
const { alchemyKey, walletConnectKey } = await getConfigs(); const { alchemyKey, walletConnectKey } = await getConfigs();
return { return {
...browserConfig, ...browserConfig,
mode: 'development', mode: 'development',
plugins: [ plugins: [
...browserConfig.plugins, ...browserConfig.plugins,
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env': { 'process.env': {
NODE_ENV: JSON.stringify('development'), NODE_ENV: JSON.stringify('development'),
BROWSER: true, BROWSER: true,
COMM_ALCHEMY_KEY: JSON.stringify(alchemyKey), COMM_ALCHEMY_KEY: JSON.stringify(alchemyKey),
COMM_WALLETCONNECT_KEY: JSON.stringify(walletConnectKey), COMM_WALLETCONNECT_KEY: JSON.stringify(walletConnectKey),
...envVars,
}, },
}), }),
new ReactRefreshWebpackPlugin(), new ReactRefreshWebpackPlugin(),
], ],
module: { module: {
rules: [ rules: [
{ {
...babelRule, ...babelRule,
▲ Show 20 Lines • Show All 99 Lines • Show Last 20 Lines