Fix package.json issues and hardhat tests

projects/dex-ui/package.json

@@ -21,18 +21,9 @@
   },
   "dependencies": {
     "@beanstalk/sdk": "workspace:*",
-<<<<<<< HEAD
     "@tanstack/react-query": "5.28.4",
     "@tanstack/react-query-devtools": "5.28.4",
     "@typechain/ethers-v5": "10.2.1",
-=======
-    "@radix-ui/react-dialog": "1.0.5",
-    "@radix-ui/react-dropdown-menu": "2.1.1",
-    "@tanstack/react-query": "5.28.4",
-    "@tanstack/react-query-devtools": "5.28.4",
-    "@typechain/ethers-v5": "10.2.1",
-    "alchemy-sdk": "3.3.1",
->>>>>>> master
     "connectkit": "1.7.2",
     "ethers": "^5.7.2",
     "graphql-request": "5.2.0",

projects/subgraph-basin/package.json

@@ -11,11 +11,7 @@
     "codegen": "rm -rf ./generated && graph codegen",
     "build": "yarn codegen && graph build",
     "test": "graph test",
-<<<<<<< HEAD
-    "testd": "docker run -it --rm --mount type=bind,source=\"$(pwd)\"/matchstick.yaml.docker,target=/matchstick/matchstick.yaml --mount type=bind,source=\"$(pwd)\"/../../,target=/matchstick/repo-mounted/ matchstick",
-=======
     "testd": "docker run -it --rm --mount type=bind,source=\"$(pwd)\"/matchstick-docker.yaml,target=/matchstick/matchstick.yaml --mount type=bind,source=\"$(pwd)\"/../../,target=/matchstick/repo-mounted/ matchstick",
->>>>>>> master
     "testd-named": "../subgraph-core/tests/scripts/docker-run-named.sh",
     "create-local": "graph create --node http://127.0.0.1:8020/ basin",
     "remove-local": "graph remove --node http://127.0.0.1:8020/ basin",

projects/subgraph-beanft/package.json

@@ -5,11 +5,7 @@
     "codegen": "rm -rf ./generated && graph codegen",
     "build": "yarn codegen && graph build",
     "test": "graph test",
-<<<<<<< HEAD
-    "testd": "docker run -it --rm --mount type=bind,source=\"$(pwd)\"/matchstick.yaml.docker,target=/matchstick/matchstick.yaml --mount type=bind,source=\"$(pwd)\"/../../,target=/matchstick/repo-mounted/ matchstick",
-=======
     "testd": "docker run -it --rm --mount type=bind,source=\"$(pwd)\"/matchstick-docker.yaml,target=/matchstick/matchstick.yaml --mount type=bind,source=\"$(pwd)\"/../../,target=/matchstick/repo-mounted/ matchstick",
->>>>>>> master
     "testd-named": "../subgraph-core/tests/scripts/docker-run-named.sh",
     "create-local": "graph create --node http://localhost:8020/ beanft",
     "remove-local": "graph remove --node http://localhost:8020/ beanft",

projects/ui/package.json

@@ -38,10 +38,7 @@
     "buffer": "^6.0.3",
     "d3-scale": "^4.0.2",
     "d3-time-format": "^4.1.0",
-<<<<<<< HEAD
-=======
     "date-fns": "3.6.0",
->>>>>>> master
     "ethers": "^5.7.2",
     "ethers-multicall": "^0.2.3",
     "events": "^3.3.0",

protocol/test/hardhat/Marketplace.test.js

@@ -677,7 +677,7 @@ describe("Marketplace", function () {
           beforeEach(async function () {
             this.userBeanBalance = await bean.balanceOf(user.address);
             this.beanstalkBeanBalance = await bean.balanceOf(mockBeanstalk.address);
-            this.podOrder = PodOrder(user.address, 0, 100000, 1000, 0);
+            this.podOrder = PodOrder(user.address, 0, 100000, 1000, 1);
             this.result = await mockBeanstalk
               .connect(user)
               .createPodOrder(this.podOrder, 500, EXTERNAL);
@@ -698,13 +698,13 @@ describe("Marketplace", function () {
           it("emits an event", async function () {
             await expect(this.result)
               .to.emit(mockBeanstalk, "PodOrderCreated")
-              .withArgs(user.address, this.id, 500, 0, 100000, 1000, 0);
+              .withArgs(user.address, this.id, 500, 0, 100000, 1000, 1);
           });
 
           it("cancels old order, replacing with new order", async function () {
             let newOrder = await mockBeanstalk
               .connect(user)
-              .createPodOrder(PodOrder(user.address, 0, 100000, 1000, 0), 100, EXTERNAL);
+              .createPodOrder(PodOrder(user.address, 0, 100000, 1000, 1), 100, EXTERNAL);
             await expect(newOrder)
               .to.emit(mockBeanstalk, "PodOrderCancelled")
               .withArgs(user.address, this.id);
@@ -944,7 +944,7 @@ describe("Marketplace", function () {
 
       describe("Cancel", async function () {
         beforeEach(async function () {
-          this.podOrder = PodOrder(user.address, 0, 100000, 1000, 0);
+          this.podOrder = PodOrder(user.address, 0, 100000, 1000, 1);
           this.result = await mockBeanstalk
             .connect(user)
             .createPodOrder(this.podOrder, 500, EXTERNAL);