Merge pull request #21 from jbx-protocol/feat/deployments

feat:deployment
jbx-protocol · Oct 13, 2023 · 409b3ac · 409b3ac
2 parents 73bf06c + cac351c
commit 409b3ac
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 44 deletions.
diff --git a/broadcast/Deploy.s.sol/1/run-latest.json b/broadcast/Deploy.s.sol/1/run-latest.json
diff --git a/broadcast/Deploy.s.sol/5/run-latest.json b/broadcast/Deploy.s.sol/5/run-latest.json
diff --git a/contracts/JBBuybackDelegate.sol b/contracts/JBBuybackDelegate.sol
@@ -163,7 +163,7 @@ contract JBBuybackDelegate is ERC165, JBOperatable, IJBBuybackDelegate {
 
             // Unpack the quote from the pool, given by the frontend.
             (_quoteExists, _metadata) = JBDelegateMetadataLib.getMetadata(DELEGATE_ID, _data.metadata);
-            if (_quoteExists) (_minimumSwapAmountOut, _amountToSwapWith) = abi.decode(_metadata, (uint256, uint256));
+            if (_quoteExists) (_amountToSwapWith, _minimumSwapAmountOut) = abi.decode(_metadata, (uint256, uint256));
         }
 
         // If no amount was specified to swap with, default to the full amount of the payment.

diff --git a/contracts/test/JBBuybackDelegate_Fork.t.sol b/contracts/test/JBBuybackDelegate_Fork.t.sol
@@ -217,7 +217,7 @@ contract TestJBBuybackDelegate_Fork is Test, UniswapV3ForgeQuoter {
 
         // Build the metadata using the quote at that block
         bytes[] memory _data = new bytes[](1);
-        _data[0] = abi.encode(_amountOutQuoted, _amountIn);
+        _data[0] = abi.encode(_amountIn, _amountOutQuoted);
 
         // Pass the delegate id
         bytes4[] memory _ids = new bytes4[](1);
@@ -286,7 +286,7 @@ contract TestJBBuybackDelegate_Fork is Test, UniswapV3ForgeQuoter {
 
         // Build the metadata using the quote at that block
         bytes[] memory _data = new bytes[](1);
-        _data[0] = abi.encode(_amountOutQuoted, _amountIn);
+        _data[0] = abi.encode(_amountIn, _amountOutQuoted);
 
         // Pass the delegate id
         bytes4[] memory _ids = new bytes4[](1);
@@ -334,7 +334,7 @@ contract TestJBBuybackDelegate_Fork is Test, UniswapV3ForgeQuoter {
         // Build the metadata using the quote at that block
         // Build the metadata using the quote at that block
         bytes[] memory _data = new bytes[](1);
-        _data[0] = abi.encode(amountOutQuoted, amountPaid);
+        _data[0] = abi.encode(amountPaid, amountOutQuoted);
 
         // Pass the delegate id
         bytes4[] memory _ids = new bytes4[](1);
@@ -371,7 +371,7 @@ contract TestJBBuybackDelegate_Fork is Test, UniswapV3ForgeQuoter {
         assert(_previousQuote != amountOutQuoted);
 
         // Update the metadata
-        _data[0] = abi.encode(amountOutQuoted, amountPaid);
+        _data[0] = abi.encode(amountPaid, amountOutQuoted);
 
         // Generate the metadata
         _delegateMetadata = metadataHelper.createMetadata(_ids, _data);
@@ -416,7 +416,7 @@ contract TestJBBuybackDelegate_Fork is Test, UniswapV3ForgeQuoter {
 
         // Build the metadata using the quote
         bytes[] memory _data = new bytes[](1);
-        _data[0] = abi.encode(_quote, _amountIn);
+        _data[0] = abi.encode(_amountIn, _quote);
 
         // Pass the delegate id
         bytes4[] memory _ids = new bytes4[](1);
@@ -567,8 +567,8 @@ contract TestJBBuybackDelegate_Fork is Test, UniswapV3ForgeQuoter {
         // Build the metadata using the quote at that block
         bytes[] memory _data = new bytes[](1);
         _data[0] = abi.encode(
-            69412820131620254304865 + 10, // 10 more than quote at that block
-            0
+            0,
+            69412820131620254304865 + 10 // 10 more than quote at that block
         );
 
         // Pass the delegate id
@@ -612,7 +612,7 @@ contract TestJBBuybackDelegate_Fork is Test, UniswapV3ForgeQuoter {
 
         // Build the metadata using the quote at that block
         bytes[] memory _data = new bytes[](1);
-        _data[0] = abi.encode(amountOutQuoted, _amountIn);
+        _data[0] = abi.encode(_amountIn, amountOutQuoted);
 
         // Pass the delegate id
         bytes4[] memory _ids = new bytes4[](1);

diff --git a/contracts/test/JBBuybackDelegate_Invariant.t.sol b/contracts/test/JBBuybackDelegate_Invariant.t.sol
@@ -111,7 +111,7 @@ contract BBDHandler is Test {
 
         // set only valid metadata
         bytes[] memory _quoteData = new bytes[](1);
-        _quoteData[0] = abi.encode(_quote, _amountIn);
+        _quoteData[0] = abi.encode(_amountIn, _quote);
 
         // Pass the delegate id
         bytes4[] memory _ids = new bytes4[](1);

diff --git a/contracts/test/JBBuybackDelegate_Unit.t.sol b/contracts/test/JBBuybackDelegate_Unit.t.sol
@@ -158,7 +158,7 @@ contract TestJBBuybackDelegate_Units is Test {
 
         // Pass the quote as metadata
         bytes[] memory _data = new bytes[](1);
-        _data[0] = abi.encode(_swapOutCount, _amountIn);
+        _data[0] = abi.encode(_amountIn, _swapOutCount);
 
         // Pass the delegate id
         bytes4[] memory _ids = new bytes4[](1);
@@ -335,7 +335,7 @@ contract TestJBBuybackDelegate_Units is Test {
 
         // Pass the quote as metadata
         bytes[] memory _data = new bytes[](1);
-        _data[0] = abi.encode(_swapOutCount, _amountIn);
+        _data[0] = abi.encode(_amountIn, _swapOutCount);
 
         // Pass the delegate id
         bytes4[] memory _ids = new bytes4[](1);

diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "type": "git",
     "url": "https://github.com/jbx-protocol/juice-buyback"
   },
-  "version": "1.0.1",
+  "version": "1.0.2",
   "license": "MIT",
   "devDependencies": {
     "@exhausted-pigeon/uniswap-v3-forge-quoter": "^1.0.1",