Open
Conversation
❌ Deploy Preview for roaring-ganache-c7465f failed. Why did it fail? →
|
Collaborator
|
@navin-oss resolve conflicts |
Nitya-003
requested changes
Mar 7, 2026
Owner
Nitya-003
left a comment
There was a problem hiding this comment.
@navin-oss Please the mention you are resolving. I am assigning you all the issues raised by you but please mention the issue number you are solving so it gets easier for us.
Collaborator
|
@navin-oss which issue does this close? |
Collaborator
|
@navin-oss pls resolve conflicts in 3 pr's you opened |
Collaborator
|
@navin-oss pls check this asap |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes Applied:
server.js - Duplicate mongoose declaration - Removed duplicate on line 24
server.js - generateBatchId function - Fixed missing closing braces and removed duplicate definition
server.js - contractABI - Aligned with CropChain.sol:
string stage→uint8 stage(enum)reconcile.js - Fixed broken blockchain iteration:
getTotalBatches()instead of non-existentgetBatchCount()getBatchIdIndex(i)instead of non-existentbatches(i)server.js - Authentication - Removed duplicate auth middleware, uses middleware from auth.js exclusively
New file: config/blockchain.js - Provides getContract() function