rebase

MantisClone · Nov 9, 2022 · d4b1dcd · d4b1dcd
1 parent f2c5a79
commit d4b1dcd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/app/controllers/quote.controller.js b/app/controllers/quote.controller.js
@@ -621,7 +621,6 @@ exports.getLink = async (req, res) => {
 		});
 		return;
 	}
-
 	const tokenAmount = priceWei.add(priceWei.div(10)); // add 10% buffer since prices fluctuate
 >>>>>>> 03f4b2f (Partially Resolves #19)
 

diff --git a/app/controllers/upload.controller.js b/app/controllers/upload.controller.js
@@ -184,6 +184,7 @@ exports.upload = async (req, res) => {
 		}
 >>>>>>> 03f4b2f (Partially Resolves #19)
 
+<<<<<<< HEAD
 	let oldNonce;
 	try {
 		oldNonce = Nonce.get(userAddress)?.nonce || 0.0;
@@ -210,6 +211,8 @@ exports.upload = async (req, res) => {
 		if(quote.status == Quote.QUOTE_STATUS_UPLOAD_END) {
 			errorResponse(req, res, null, 400, "Quote has been completed.");
 =======
+=======
+>>>>>>> 396a214 (rebase)
 		let priceWei;
 		try {
 			priceWei = await bundlr.getPrice(quote.size);
@@ -426,6 +429,7 @@ exports.upload = async (req, res) => {
 		// TODO: Unwrap WETH to ETH
 
 		// Fund our EOA's Bundlr Account
+
 		// TODO: Check the balance first
 >>>>>>> 03f4b2f (Partially Resolves #19)
 		try {

diff --git a/app/models/quote.model.js b/app/models/quote.model.js
@@ -141,8 +141,12 @@ Quote.getLink = (quoteId, result) => {
 			result(null, rows);
 		});
 	});
+<<<<<<< HEAD
 }
 
 >>>>>>> abbe0a9 (add getLink endpoint)
+=======
+};
+>>>>>>> 396a214 (rebase)
 
 module.exports = Quote;
-Original file line number
+Diff line change
@@ Expand Up / @@ -621,7 +621,6 @@ exports.getLink = async (req, res) => { @@
     		});
     		return;
     	}
     	const tokenAmount = priceWei.add(priceWei.div(10)); // add 10% buffer since prices fluctuate
     >>>>>>> 03f4b2f (Partially Resolves #19)
@@ Expand Down @@