Merge pull request #664 from EYBlockchain/david/production-release

nightfall mainnet deployment
EYBlockchain · May 16, 2022 · 2c6a05a · 2c6a05a
2 parents bc3e475 + 8970777
commit 2c6a05a
Show file tree

Hide file tree

Showing 8 changed files with 4,894 additions and 8,492 deletions.
diff --git a/cli/lib/constants.mjs b/cli/lib/constants.mjs
@@ -21,3 +21,5 @@ export const DEFAULT_BLOCK_STAKE = 1;
 export const WEBSOCKET_PING_TIME = 15000;
 
 export const GAS_MULTIPLIER = Number(process.env.GAS_MULTIPLIER) || 2;
+export const GAS = process.env.GAS || 8000000;
+export const GAS_PRICE = process.env.GAS_PRICE || '20000000000';
diff --git a/cli/lib/nf3.mjs b/cli/lib/nf3.mjs
@@ -16,6 +16,8 @@ import {
   DEFAULT_FEE,
   WEBSOCKET_PING_TIME,
   GAS_MULTIPLIER,
+  GAS,
+  GAS_PRICE,
 } from './constants.mjs';
 
 // TODO when SDK is refactored such that these functions are split by user, proposer and challenger,
@@ -220,10 +222,20 @@ class Nf3 {
   ) {
     // if (!this.nonce)
     //   this.nonce = await this.web3.eth.getTransactionCount(this.ethereumAddress, 'pending');
-    let gasPrice = 20000000000;
+
+    // let gasPrice = 200000000000;
+    /*
     const gas = (await this.web3.eth.getBlock('latest')).gasLimit;
     const blockGasPrice = GAS_MULTIPLIER * Number(await this.web3.eth.getGasPrice());
     if (blockGasPrice > gasPrice) gasPrice = blockGasPrice;
+    */
+    let gasPrice = GAS_PRICE;
+    const blockGasPrice = GAS_MULTIPLIER * Number(await this.web3.eth.getGasPrice());
+    if (blockGasPrice > gasPrice) gasPrice = blockGasPrice;
+    const gas = GAS;
+
+    // const gasPrice = GAS_PRICE;
+    // const gas = GAS;
 
     const tx = {
       from: this.ethereumAddress,

diff --git a/config/default.js b/config/default.js
@@ -29,6 +29,7 @@ module.exports = {
   SHIELD_CONTRACT_NAME: 'Shield',
   CHALLENGES_CONTRACT_NAME: 'Challenges',
   STATE_CONTRACT_NAME: 'State',
+  STATE_GENESIS_BLOCK: process.env.STATE_GENESIS_BLOCK,
   BLOCK_PROPOSED_EVENT_NAME: 'BlockProposed',
   CIRCUITS_HOME: process.env.CIRCUITS_HOME || '/app/circuits/',
   ALWAYS_DO_TRUSTED_SETUP: process.env.ALWAYS_DO_TRUSTED_SETUP || false,

diff --git a/nightfall-client/src/services/state-sync.mjs b/nightfall-client/src/services/state-sync.mjs
@@ -10,9 +10,16 @@ import { waitForContract } from '../event-handlers/subscribe.mjs';
 import blockProposedEventHandler from '../event-handlers/block-proposed.mjs';
 import rollbackEventHandler from '../event-handlers/rollback.mjs';
 
-const { MONGO_URL, COMMITMENTS_DB, COMMITMENTS_COLLECTION, STATE_CONTRACT_NAME } = config;
+const {
+  MONGO_URL,
+  COMMITMENTS_DB,
+  COMMITMENTS_COLLECTION,
+  STATE_CONTRACT_NAME,
+  STATE_GENESIS_BLOCK,
+} = config;
 
 const syncState = async (fromBlock = 'earliest', toBlock = 'latest', eventFilter = 'allEvents') => {
+  console.log('From block', fromBlock);
   const stateContractInstance = await waitForContract(STATE_CONTRACT_NAME); // Rollback, BlockProposed
 
   const pastStateEvents = await stateContractInstance.getPastEvents(eventFilter, {
@@ -50,6 +57,6 @@ export const initialClientSync = async () => {
   const firstSeenBlockNumber = Math.min(...commitmentBlockNumbers);
   logger.info(`firstSeenBlockNumber: ${firstSeenBlockNumber}`);
   // fistSeenBlockNumber can be infinity if the commitmentBlockNumbers array is empty
-  if (firstSeenBlockNumber === Infinity) return syncState();
+  if (firstSeenBlockNumber === Infinity) return syncState(STATE_GENESIS_BLOCK);
   return syncState(firstSeenBlockNumber);
 };