fix: refactored constants and config

common-files/classes/timber.mjs

@@ -9,8 +9,8 @@ import config from 'config';
 import utils from '../utils/crypto/merkle-tree/utils.mjs';
 import constants from '../constants/index.mjs';
 
-const { TIMBER_HEIGHT } = config;
-const { HASH_TYPE, ZERO } = constants;
+const { TIMBER_HEIGHT, HASH_TYPE } = config;
+const { ZERO } = constants;
 
 /**
 Helper functions for use in the Timber class, defined here before use

common-files/constants/constants.json

@@ -1,21 +1,12 @@
 {
-"CONTRACT_ARTIFACTS": "/app/build/contracts",
 "PROPOSERS_CONTRACT_NAME": "Proposers",
 "SHIELD_CONTRACT_NAME": "Shield",
 "CHALLENGES_CONTRACT_NAME": "Challenges",
 "STATE_CONTRACT_NAME": "State",
 "BLOCK_PROPOSED_EVENT_NAME": "BlockProposed",
-"EXCLUDE_DIRS": "common",
-"PROOF_QUEUE": "generate-proof",
-"MAX_QUEUE": 5,
 "ZKP_KEY_LENGTH": 32,
-"CONFIRMATION_POLL_TIME": 1000,
-"CONFIRMATIONS": 12,
 "NODE_HASHLENGTH": 32,
-"DEFAULT_ACCOUNT_NUM": 10,
 "ZERO": "0x0000000000000000000000000000000000000000000000000000000000000000",
-"HASH_TYPE": "poseidon",
-"TXHASH_TREE_HASH_TYPE": "keccak256",
 "BLOCK_TYPES": "(uint48,address,bytes32,uint256,bytes32,bytes32)",
 "TRANSACTION_TYPES":
 "(uint112,uint64[2],uint8,uint8,bytes32,bytes32,bytes32,bytes32[2],bytes32[2],bytes32[2],uint[4])",

common-files/utils/contract.mjs

@@ -3,7 +3,6 @@
 
 import fs from 'fs';
 import config from 'config';
-import constants from '../constants/index.mjs';
 
 import Web3 from './web3.mjs';
 import logger from './logger.mjs';
@@ -13,7 +12,7 @@ export const web3 = Web3.connection();
 const options = config.WEB3_OPTIONS;
 
 export const contractPath = contractName => {
-return `${constants.CONTRACT_ARTIFACTS}/${contractName}.json`;
+return `${config.CONTRACT_ARTIFACTS}/${contractName}.json`;
 };
 
 export async function getContractInterface(contractName) {

common-files/utils/event-queue.mjs

@@ -20,11 +20,11 @@ event with its `removed` property set to true. In the code below, we look out fo
 and catch these removals, processing them appropriately.
 */
 import Queue from 'queue';
+import config from 'config';
 import logger from 'common-files/utils/logger.mjs';
 import { web3 } from 'common-files/utils/contract.mjs';
-import constants from '../constants/index.mjs';
 
-const { MAX_QUEUE, CONFIRMATION_POLL_TIME, CONFIRMATIONS } = constants;
+const { MAX_QUEUE, CONFIRMATION_POLL_TIME, CONFIRMATIONS } = config;
 const fastQueue = new Queue({ autostart: false, concurrency: 1 });
 const slowQueue = new Queue({ autostart: false, concurrency: 1 });
 const removed = {}; // singleton holding transaction hashes of any removed events

config/default.js

@@ -40,8 +40,17 @@ module.exports = {
 TIMBER_COLLECTION: 'timber',
 CIRCUIT_COLLECTION: 'circuit_storage',
 KEYS_COLLECTION: 'keys',
+CONTRACT_ARTIFACTS: '/app/build/contracts',
+EXCLUDE_DIRS: 'common',
+PROOF_QUEUE: 'generate-proof',
+MAX_QUEUE: 5,
 TIMBER_HEIGHT: 32,
 TXHASH_TREE_HEIGHT: 5,
+CONFIRMATION_POLL_TIME: 1000,
+CONFIRMATIONS: 12,
+DEFAULT_ACCOUNT_NUM: 10,
+HASH_TYPE: 'poseidon',
+TXHASH_TREE_HASH_TYPE: 'keccak256',
 STATE_GENESIS_BLOCK: process.env.STATE_GENESIS_BLOCK,
 CIRCUITS_HOME: process.env.CIRCUITS_HOME || '/app/circuits/',
 ALWAYS_DO_TRUSTED_SETUP: process.env.ALWAYS_DO_TRUSTED_SETUP || false,

nightfall-client/src/event-handlers/block-proposed.mjs

@@ -23,8 +23,8 @@ import {
 } from '../services/database.mjs';
 import { decryptCommitment } from '../services/commitment-sync.mjs';
 
-const { TIMBER_HEIGHT, TXHASH_TREE_HEIGHT } = config;
-const { ZERO, HASH_TYPE, TXHASH_TREE_HASH_TYPE } = constants;
+const { TIMBER_HEIGHT, TXHASH_TREE_HEIGHT, HASH_TYPE, TXHASH_TREE_HASH_TYPE } = config;
+const { ZERO } = constants;
 
 /**
 This handler runs whenever a BlockProposed event is emitted by the blockchain

nightfall-client/src/services/database.mjs

@@ -9,16 +9,15 @@ import config from 'config';
 import mongo from 'common-files/utils/mongo.mjs';
 import Timber from 'common-files/classes/timber.mjs';
 import logger from 'common-files/utils/logger.mjs';
-import constants from 'common-files/constants/index.mjs';
 
-const { HASH_TYPE } = constants;
 const {
 MONGO_URL,
 COMMITMENTS_DB,
 TIMBER_COLLECTION,
 SUBMITTED_BLOCKS_COLLECTION,
 TRANSACTIONS_COLLECTION,
 TIMBER_HEIGHT,
+HASH_TYPE,
 } = config;
 
 /**

nightfall-client/src/services/state-sync.mjs

@@ -15,11 +15,12 @@ import { waitForContract } from '../event-handlers/subscribe.mjs';
 import blockProposedEventHandler from '../event-handlers/block-proposed.mjs';
 import rollbackEventHandler from '../event-handlers/rollback.mjs';
 
-const { STATE_CONTRACT_NAME, CONTRACT_ARTIFACTS } = constants;
+const { STATE_CONTRACT_NAME } = constants;
 const {
 MONGO_URL,
 COMMITMENTS_DB,
 COMMITMENTS_COLLECTION,
+CONTRACT_ARTIFACTS,
 STATE_GENESIS_BLOCK,
 DEPLOYMENT_FILES_URL: { DEFAULT_CONTRACT_FILES_URL },
 } = config;

nightfall-deployer/src/circuit-setup.mjs

@@ -10,7 +10,6 @@ import fs from 'fs';
 import path from 'path';
 import logger from 'common-files/utils/logger.mjs';
 import Web3 from 'common-files/utils/web3.mjs';
-import constants from 'common-files/constants/index.mjs';
 import { waitForContract, getContractAddress } from 'common-files/utils/contract.mjs';
 
 const fsPromises = fs.promises;
@@ -44,7 +43,7 @@ async function waitForZokrates() {
 
 async function walk(dir) {
 let files = await fsPromises.readdir(dir);
-files = files.filter(file => !file.includes(constants.EXCLUDE_DIRS)); // remove common dir
+files = files.filter(file => !file.includes(config.EXCLUDE_DIRS)); // remove common dir
 files = await Promise.all(
 files.map(async file => {
 const filePath = path.join(dir, file);

nightfall-optimist/src/classes/block.mjs

@@ -7,8 +7,8 @@ import Web3 from 'common-files/utils/web3.mjs';
 import constants from 'common-files/constants/index.mjs';
 import { getLatestBlockInfo, getTreeByBlockNumberL2 } from '../services/database.mjs';
 
-const { TIMBER_HEIGHT, TXHASH_TREE_HEIGHT } = config;
-const { ZERO, HASH_TYPE, TXHASH_TREE_HASH_TYPE, BLOCK_TYPES } = constants;
+const { TIMBER_HEIGHT, TXHASH_TREE_HEIGHT, HASH_TYPE, TXHASH_TREE_HASH_TYPE } = config;
+const { ZERO, BLOCK_TYPES } = constants;
 
 /**
 This Block class does not have the Block components that are computed on-chain.

nightfall-optimist/src/event-handlers/block-proposed.mjs

@@ -21,8 +21,8 @@ import { getProposeBlockCalldata } from '../services/process-calldata.mjs';
 import { increaseBlockInvalidCounter } from '../services/debug-counters.mjs';
 import transactionSubmittedEventHandler from './transaction-submitted.mjs';
 
-const { TIMBER_HEIGHT } = config;
-const { ZERO, HASH_TYPE } = constants;
+const { TIMBER_HEIGHT, HASH_TYPE } = config;
+const { ZERO } = constants;
 
 let ws;
 

nightfall-optimist/src/routes/proposer.mjs

@@ -25,9 +25,8 @@ import transactionSubmittedEventHandler from '../event-handlers/transaction-subm
 import getProposers from '../services/proposer.mjs';
 
 const router = express.Router();
-const { TIMBER_HEIGHT } = config;
-const { STATE_CONTRACT_NAME, PROPOSERS_CONTRACT_NAME, SHIELD_CONTRACT_NAME, ZERO, HASH_TYPE } =
-constants;
+const { TIMBER_HEIGHT, HASH_TYPE } = config;
+const { STATE_CONTRACT_NAME, PROPOSERS_CONTRACT_NAME, SHIELD_CONTRACT_NAME, ZERO } = constants;
 
 let proposer;
 export function setProposer(p) {

nightfall-optimist/src/services/database.mjs

@@ -9,7 +9,7 @@ import mongo from 'common-files/utils/mongo.mjs';
 import Timber from 'common-files/classes/timber.mjs';
 import constants from 'common-files/constants/index.mjs';
 
-const { ZERO, HASH_TYPE } = constants;
+const { ZERO } = constants;
 
 const {
 MONGO_URL,
@@ -23,6 +23,7 @@ const {
 COMMIT_COLLECTION,
 TIMBER_COLLECTION,
 TIMBER_HEIGHT,
+HASH_TYPE,
 } = config;
 
 /**

wallet/src/common-files/classes/timber.js

@@ -6,8 +6,8 @@ A class for timber-like merkle trees.
 */
 import utils from '../utils/crypto/merkle-tree/utils';
 
-const { TIMBER_HEIGHT } = global.config;
-const { HASH_TYPE, ZERO } = global.nightfallConstants;
+const { TIMBER_HEIGHT, HASH_TYPE } = global.config;
+const { ZERO } = global.nightfallConstants;
 
 /**
 Helper functions for use in the Timber class, defined here before use

wallet/src/common-files/utils/event-queue.js

@@ -20,7 +20,7 @@ and catch these removals, processing them appropriately.
 import Queue from 'queue';
 import logger from './logger';
 
-const { MAX_QUEUE } = global.nightfallConstants;
+const { MAX_QUEUE } = global.config;
 const fastQueue = new Queue({ autostart: true, concurrency: 1 });
 const slowQueue = new Queue({ autostart: true, concurrency: 1 });
 export const queues = [fastQueue, slowQueue];

wallet/src/nightfall-browser/event-handlers/block-proposed.js

@@ -24,8 +24,8 @@ import {
 updateTransactionTime,
 } from '../services/database';
 
-const { TIMBER_HEIGHT, TXHASH_TREE_HEIGHT } = global.config;
-const { ZERO, HASH_TYPE, TXHASH_TREE_HASH_TYPE } = global.nightfallConstants;
+const { TIMBER_HEIGHT, TXHASH_TREE_HEIGHT, HASH_TYPE, TXHASH_TREE_HASH_TYPE } = global.config;
+const { ZERO } = global.nightfallConstants;
 
 /**
 This handler runs whenever a BlockProposed event is emitted by the blockchain

wallet/src/nightfall-browser/services/database.js

@@ -16,8 +16,8 @@ const {
 KEYS_COLLECTION,
 CIRCUIT_COLLECTION,
 TIMBER_HEIGHT,
+HASH_TYPE,
 } = global.config;
-const { HASH_TYPE } = global.nightfallConstants;
 
 // This needs to have better indexDB performance.
 

wallet/src/views/wallet/index.jsx

@@ -33,7 +33,7 @@ import checkMarkCross from '../../assets/lottie/check-mark-cross.json';
 
 const supportedTokens = importTokens();
 
-const { DEFAULT_ACCOUNT_NUM } = global.nightfallConstants;
+const { DEFAULT_ACCOUNT_NUM } = global.config;
 
 const { ethereum } = global;