Merge pull request #9 from Numoen/dev

release alpha 2
numocash · Oct 12, 2023 · cb8fc2b · cb8fc2b
2 parents 9dc7546 + 646c1fd
commit cb8fc2b
Show file tree

Hide file tree

Showing 36 changed files with 53 additions and 44 deletions.
diff --git a/.changeset/clean-news-hunt.md b/.changeset/clean-news-hunt.md
@@ -0,0 +1,6 @@
+---
+"@panoptic-xyz/uniswap-v3-sdk": patch
+"@panoptic-xyz/sdk": patch
+---
+
+Fix resolution
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -3,12 +3,8 @@
   "tag": "alpha",
   "initialVersions": {
     "reverse-mirage-next-example": "0.1.3",
-    "panoptic-sdk": "1.0.0",
-    "uniswap-v3-sdk": "1.0.0",
     "@panoptic-xyz/sdk": "0.0.0",
     "@panoptic-xyz/uniswap-v3-sdk": "0.0.0"
   },
-  "changesets": [
-    "lucky-vans-behave"
-  ]
+  "changesets": ["lucky-vans-behave"]
 }
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,6 +22,7 @@ jobs:
         uses: foundry-rs/foundry-toolchain@v1
         with:
           version: nightly
+      - run: forge install
       - run: pnpm install
       - run: pnpm wagmi generate
       - run: pnpm build

diff --git a/packages/panoptic-sdk/package.json b/packages/panoptic-sdk/package.json
@@ -61,6 +61,6 @@
   "dependencies": {
     "reverse-mirage": "1.0.2",
     "tiny-invariant": "^1.3.1",
-    "uniswap-v3-sdk": "workspace:*"
+    "@panoptic-xyz/uniswap-v3-sdk": "workspace:*"
   }
 }
diff --git a/packages/panoptic-sdk/src/_test/utils.ts b/packages/panoptic-sdk/src/_test/utils.ts
@@ -1,10 +1,10 @@
-import { createERC20, createFraction } from "reverse-mirage";
-import invariant from "tiny-invariant";
 import {
   createUniswapV3Pool,
   uniswapV3FactoryABI,
   uniswapV3PoolABI,
-} from "uniswap-v3-sdk";
+} from "@panoptic-xyz/uniswap-v3-sdk";
+import { createERC20, createFraction } from "reverse-mirage";
+import invariant from "tiny-invariant";
 import {
   http,
   type Hex,

diff --git a/packages/panoptic-sdk/src/chains/sepolia.ts b/packages/panoptic-sdk/src/chains/sepolia.ts
@@ -1,5 +1,5 @@
+import { sepoliaUniswapV3 } from "@panoptic-xyz/uniswap-v3-sdk";
 import { sepoliaTokens } from "reverse-mirage";
-import { sepoliaUniswapV3 } from "uniswap-v3-sdk";
 import type { PanopticFactory } from "../types/PanopticFactory.js";
 
 export const sepoliaPanoptic = {

diff --git a/packages/panoptic-sdk/src/publicActions/getPanopticPool.ts b/packages/panoptic-sdk/src/publicActions/getPanopticPool.ts
@@ -1,4 +1,4 @@
-import { type UniswapV3Pool } from "uniswap-v3-sdk";
+import { type UniswapV3Pool } from "@panoptic-xyz/uniswap-v3-sdk";
 import type {
   Address,
   Chain,

diff --git a/packages/panoptic-sdk/src/publicActions/getPanopticPoolData.ts b/packages/panoptic-sdk/src/publicActions/getPanopticPoolData.ts
@@ -1,4 +1,4 @@
-import { getUniswapV3PoolData } from "uniswap-v3-sdk";
+import { getUniswapV3PoolData } from "@panoptic-xyz/uniswap-v3-sdk";
 import type { Chain, Client, ReadContractParameters, Transport } from "viem";
 import { collateralTrackerABI } from "../generated.js";
 import type { PanopticPool, PanopticPoolData } from "../types/PanopticPool.js";

diff --git a/packages/panoptic-sdk/src/publicActions/getPanopticPositionData.test.ts b/packages/panoptic-sdk/src/publicActions/getPanopticPositionData.test.ts
@@ -1,5 +1,5 @@
+import { createUniswapV3Tick } from "@panoptic-xyz/uniswap-v3-sdk";
 import { createAmountFromString } from "reverse-mirage";
-import { createUniswapV3Tick } from "uniswap-v3-sdk";
 import { type Hex } from "viem";
 import { simulateContract, writeContract } from "viem/actions";
 import { beforeEach, expect, test } from "vitest";

diff --git a/packages/panoptic-sdk/src/publicActions/getPanopticSemiFungiblePositionData.test.ts b/packages/panoptic-sdk/src/publicActions/getPanopticSemiFungiblePositionData.test.ts
@@ -1,4 +1,4 @@
-import { createUniswapV3Tick } from "uniswap-v3-sdk";
+import { createUniswapV3Tick } from "@panoptic-xyz/uniswap-v3-sdk";
 import { type Hex } from "viem";
 import { simulateContract, writeContract } from "viem/actions";
 import { sepolia } from "viem/chains";

diff --git a/packages/panoptic-sdk/src/publicActions/getPanopticSemiFungiblePositionData.ts b/packages/panoptic-sdk/src/publicActions/getPanopticSemiFungiblePositionData.ts
@@ -1,4 +1,4 @@
-import type { UniswapV3Tick } from "uniswap-v3-sdk";
+import type { UniswapV3Tick } from "@panoptic-xyz/uniswap-v3-sdk";
 import type { Chain, Client, ReadContractParameters, Transport } from "viem";
 import { readContract } from "viem/actions";
 import {

diff --git a/packages/panoptic-sdk/src/publicActions/getPanoptionLegData.test.ts b/packages/panoptic-sdk/src/publicActions/getPanoptionLegData.test.ts
@@ -1,4 +1,4 @@
-import { createUniswapV3Tick } from "uniswap-v3-sdk";
+import { createUniswapV3Tick } from "@panoptic-xyz/uniswap-v3-sdk";
 import { type Hex } from "viem";
 import { simulateContract, writeContract } from "viem/actions";
 import { sepolia } from "viem/chains";

diff --git a/packages/panoptic-sdk/src/publicActions/getPanoptionLegData.ts b/packages/panoptic-sdk/src/publicActions/getPanoptionLegData.ts
@@ -1,4 +1,7 @@
-import type { UniswapV3Pool, UniswapV3Tick } from "uniswap-v3-sdk";
+import type {
+  UniswapV3Pool,
+  UniswapV3Tick,
+} from "@panoptic-xyz/uniswap-v3-sdk";
 import type {
   Address,
   Chain,

diff --git a/packages/panoptic-sdk/src/publicActions/simulatePanopticBurnOptions.test.ts b/packages/panoptic-sdk/src/publicActions/simulatePanopticBurnOptions.test.ts
@@ -1,5 +1,5 @@
+import { createUniswapV3Tick } from "@panoptic-xyz/uniswap-v3-sdk";
 import { createAmountFromString } from "reverse-mirage";
-import { createUniswapV3Tick } from "uniswap-v3-sdk";
 import { type Hex } from "viem";
 import { simulateContract, writeContract } from "viem/actions";
 import { beforeEach, test } from "vitest";

diff --git a/packages/panoptic-sdk/src/publicActions/simulatePanopticDeployNewPool.test.ts b/packages/panoptic-sdk/src/publicActions/simulatePanopticDeployNewPool.test.ts
@@ -1,11 +1,11 @@
-import { createERC20 } from "reverse-mirage";
-import invariant from "tiny-invariant";
 import {
   type UniswapV3Pool,
   createUniswapV3Pool,
   uniswapV3FactoryABI,
   uniswapV3PoolABI,
-} from "uniswap-v3-sdk";
+} from "@panoptic-xyz/uniswap-v3-sdk";
+import { createERC20 } from "reverse-mirage";
+import invariant from "tiny-invariant";
 import { type Hex } from "viem";
 import { sepolia } from "viem/chains";
 import { beforeEach, expect, test } from "vitest";

diff --git a/packages/panoptic-sdk/src/publicActions/simulatePanopticDeployNewPool.ts b/packages/panoptic-sdk/src/publicActions/simulatePanopticDeployNewPool.ts
@@ -1,4 +1,4 @@
-import type { UniswapV3Pool } from "uniswap-v3-sdk";
+import type { UniswapV3Pool } from "@panoptic-xyz/uniswap-v3-sdk";
 import type {
   Chain,
   Client,

diff --git a/packages/panoptic-sdk/src/publicActions/simulatePanopticMintOptions.test.ts b/packages/panoptic-sdk/src/publicActions/simulatePanopticMintOptions.test.ts
@@ -1,5 +1,5 @@
+import { createUniswapV3Tick } from "@panoptic-xyz/uniswap-v3-sdk";
 import { createAmountFromString } from "reverse-mirage";
-import { createUniswapV3Tick } from "uniswap-v3-sdk";
 import { type Hex } from "viem";
 import { simulateContract, writeContract } from "viem/actions";
 import { beforeEach, test } from "vitest";

diff --git a/packages/panoptic-sdk/src/publicActions/simulatePanopticRollOptions.test.ts b/packages/panoptic-sdk/src/publicActions/simulatePanopticRollOptions.test.ts
@@ -1,5 +1,5 @@
+import { createUniswapV3Tick } from "@panoptic-xyz/uniswap-v3-sdk";
 import { createAmountFromString } from "reverse-mirage";
-import { createUniswapV3Tick } from "uniswap-v3-sdk";
 import { type Hex } from "viem";
 import { simulateContract, writeContract } from "viem/actions";
 import { beforeEach, test } from "vitest";

diff --git a/packages/panoptic-sdk/src/publicActions/simulatePanopticSFPMBurnTokenizedPosition.test.ts b/packages/panoptic-sdk/src/publicActions/simulatePanopticSFPMBurnTokenizedPosition.test.ts
@@ -1,5 +1,5 @@
+import { createUniswapV3Tick } from "@panoptic-xyz/uniswap-v3-sdk";
 import { getERC1155BalanceOf } from "reverse-mirage";
-import { createUniswapV3Tick } from "uniswap-v3-sdk";
 import { type Hex } from "viem";
 import { simulateContract, writeContract } from "viem/actions";
 import { sepolia } from "viem/chains";

diff --git a/packages/panoptic-sdk/src/publicActions/simulatePanopticSFPMBurnTokenizedPosition.ts b/packages/panoptic-sdk/src/publicActions/simulatePanopticSFPMBurnTokenizedPosition.ts
@@ -1,4 +1,4 @@
-import { MAX_TICK, MIN_TICK } from "uniswap-v3-sdk";
+import { MAX_TICK, MIN_TICK } from "@panoptic-xyz/uniswap-v3-sdk";
 import type {
   Chain,
   Client,

diff --git a/packages/panoptic-sdk/src/publicActions/simulatePanopticSFPMInitializeAMMPool.ts b/packages/panoptic-sdk/src/publicActions/simulatePanopticSFPMInitializeAMMPool.ts
@@ -1,4 +1,4 @@
-import type { UniswapV3Pool } from "uniswap-v3-sdk";
+import type { UniswapV3Pool } from "@panoptic-xyz/uniswap-v3-sdk";
 import type {
   Chain,
   Client,

diff --git a/packages/panoptic-sdk/src/publicActions/simulatePanopticSFPMMintTokenizedPosition.test.ts b/packages/panoptic-sdk/src/publicActions/simulatePanopticSFPMMintTokenizedPosition.test.ts
@@ -1,5 +1,5 @@
+import { createUniswapV3Tick } from "@panoptic-xyz/uniswap-v3-sdk";
 import { getERC1155BalanceOf } from "reverse-mirage";
-import { createUniswapV3Tick } from "uniswap-v3-sdk";
 import { type Hex } from "viem";
 import { simulateContract, writeContract } from "viem/actions";
 import { sepolia } from "viem/chains";

diff --git a/packages/panoptic-sdk/src/publicActions/simulatePanopticSFPMMintTokenizedPosition.ts b/packages/panoptic-sdk/src/publicActions/simulatePanopticSFPMMintTokenizedPosition.ts
@@ -1,4 +1,4 @@
-import { MAX_TICK, MIN_TICK } from "uniswap-v3-sdk";
+import { MAX_TICK, MIN_TICK } from "@panoptic-xyz/uniswap-v3-sdk";
 import type {
   Chain,
   Client,

diff --git a/packages/panoptic-sdk/src/publicActions/simulatePanopticSFPMRollTokenizedPositions.test.ts b/packages/panoptic-sdk/src/publicActions/simulatePanopticSFPMRollTokenizedPositions.test.ts
@@ -1,5 +1,5 @@
+import { createUniswapV3Tick } from "@panoptic-xyz/uniswap-v3-sdk";
 import { getERC1155BalanceOf } from "reverse-mirage";
-import { createUniswapV3Tick } from "uniswap-v3-sdk";
 import { type Hex } from "viem";
 import { simulateContract, writeContract } from "viem/actions";
 import { sepolia } from "viem/chains";

diff --git a/packages/panoptic-sdk/src/publicActions/simulatePanopticSFPMRollTokenizedPositions.ts b/packages/panoptic-sdk/src/publicActions/simulatePanopticSFPMRollTokenizedPositions.ts
@@ -1,4 +1,4 @@
-import { MAX_TICK, MIN_TICK } from "uniswap-v3-sdk";
+import { MAX_TICK, MIN_TICK } from "@panoptic-xyz/uniswap-v3-sdk";
 import type {
   Chain,
   Client,

diff --git a/packages/panoptic-sdk/src/types/PanopticFactory.ts b/packages/panoptic-sdk/src/types/PanopticFactory.ts
@@ -1,5 +1,5 @@
+import type { UniswapV3Factory } from "@panoptic-xyz/uniswap-v3-sdk";
 import type { WETH } from "reverse-mirage";
-import type { UniswapV3Factory } from "uniswap-v3-sdk";
 import type { Address } from "viem/accounts";
 import type { PanopticSemiFungiblePositionManager } from "./PanopticSemiFungiblePositionManager.js";
 

diff --git a/packages/panoptic-sdk/src/types/PanopticPool.ts b/packages/panoptic-sdk/src/types/PanopticPool.ts
@@ -1,4 +1,7 @@
-import type { UniswapV3Pool, UniswapV3PoolData } from "uniswap-v3-sdk";
+import type {
+  UniswapV3Pool,
+  UniswapV3PoolData,
+} from "@panoptic-xyz/uniswap-v3-sdk";
 import type { Address } from "viem/accounts";
 import type {
   PanopticCollateral,

diff --git a/packages/panoptic-sdk/src/types/PanopticPosition.ts b/packages/panoptic-sdk/src/types/PanopticPosition.ts
@@ -1,5 +1,5 @@
+import type { UniswapV3Tick } from "@panoptic-xyz/uniswap-v3-sdk";
 import type { Fraction, Tuple } from "reverse-mirage";
-import type { UniswapV3Tick } from "uniswap-v3-sdk";
 import type { Address } from "viem/accounts";
 import type { PanopticPool } from "./PanopticPool.js";
 

diff --git a/packages/panoptic-sdk/src/types/PanopticSemiFungiblePositionManager.ts b/packages/panoptic-sdk/src/types/PanopticSemiFungiblePositionManager.ts
@@ -1,5 +1,5 @@
+import type { UniswapV3Pool } from "@panoptic-xyz/uniswap-v3-sdk";
 import type { BaseERC1155, ERC1155Data, Tuple } from "reverse-mirage";
-import type { UniswapV3Pool } from "uniswap-v3-sdk";
 import type { Address } from "viem/accounts";
 import type { PanoptionLeg, PanoptionLegData } from "./PanopticPosition.js";
 

diff --git a/packages/panoptic-sdk/src/utils/calculatePanopticTokenID.ts b/packages/panoptic-sdk/src/utils/calculatePanopticTokenID.ts
@@ -1,5 +1,5 @@
+import type { TickSpacing, UniswapV3Pool } from "@panoptic-xyz/uniswap-v3-sdk";
 import type { Tuple } from "reverse-mirage";
-import type { TickSpacing, UniswapV3Pool } from "uniswap-v3-sdk";
 import type { PanoptionLeg } from "../types/PanopticPosition.js";
 
 export const calculateLegID = (leg: PanoptionLeg, tickSpacing: TickSpacing) => {

diff --git a/packages/panoptic-sdk/src/utils/createPanopticCollateral.ts b/packages/panoptic-sdk/src/utils/createPanopticCollateral.ts
@@ -1,5 +1,5 @@
+import type { FeeTier } from "@panoptic-xyz/uniswap-v3-sdk";
 import type { BaseERC20 } from "reverse-mirage";
-import type { FeeTier } from "uniswap-v3-sdk";
 import type { Address } from "viem/accounts";
 import type {
   PanopticCollateral,

diff --git a/packages/panoptic-sdk/src/utils/createPanopticPool.ts b/packages/panoptic-sdk/src/utils/createPanopticPool.ts
@@ -1,4 +1,4 @@
-import type { UniswapV3Pool } from "uniswap-v3-sdk";
+import type { UniswapV3Pool } from "@panoptic-xyz/uniswap-v3-sdk";
 import type { Address } from "viem/accounts";
 import type { PanopticCollateral } from "../types/PanopticCollateral.js";
 import type { PanopticFactory } from "../types/PanopticFactory.js";

diff --git a/packages/panoptic-sdk/src/utils/createPanopticSemiFungiblePosition.ts b/packages/panoptic-sdk/src/utils/createPanopticSemiFungiblePosition.ts
@@ -1,5 +1,5 @@
+import type { UniswapV3Pool } from "@panoptic-xyz/uniswap-v3-sdk";
 import type { Tuple } from "reverse-mirage";
-import type { UniswapV3Pool } from "uniswap-v3-sdk";
 import type { Address } from "viem/accounts";
 import type { PanoptionLeg } from "../types/PanopticPosition.js";
 import type {

diff --git a/packages/uniswap-v3-sdk/package.json b/packages/uniswap-v3-sdk/package.json
@@ -41,7 +41,7 @@
       "limit": "11 kB"
     },
     {
-      "name": "uniswap-v3-sdk",
+      "name": "@panoptic-xyz/uniswap-v3-sdk",
       "path": "./dist/index.js",
       "limit": "7 kB",
       "import": "*"

diff --git a/packages/uniswap-v3-sdk/tsup.config.ts b/packages/uniswap-v3-sdk/tsup.config.ts
@@ -1,7 +1,7 @@
 import { defineConfig } from "tsup";
 
 export default defineConfig({
-  name: "uniswap-v3-sdk",
+  name: "@panoptic-xyz/uniswap-v3-sdk",
   entry: ["src/index.ts"],
   outDir: "dist",
   format: ["esm", "cjs"],

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml