From 5ad15b1aab96580805f3ddc7d677aba0383a0862 Mon Sep 17 00:00:00 2001 From: Rubilmax Date: Wed, 9 Oct 2024 09:03:20 +0200 Subject: [PATCH 1/6] Revert "v1.0.0" This reverts commit e1b0deaacc356ccabbbea6b204fd13a4f441feec. --- lerna.json | 2 +- packages/blue-api-sdk/package.json | 2 +- packages/blue-sdk-ethers-liquidation/package.json | 2 +- packages/blue-sdk-ethers/package.json | 2 +- packages/blue-sdk-viem/package.json | 2 +- packages/blue-sdk/package.json | 2 +- packages/morpho-test/package.json | 2 +- packages/morpho-ts/package.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lerna.json b/lerna.json index d1400bb1..8394b6d1 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/@lerna-lite/cli/schemas/lerna-schema.json", - "version": "1.0.0", + "version": "1.0.0-integ-745.1", "npmClient": "yarn", "useWorkspaces": true } diff --git a/packages/blue-api-sdk/package.json b/packages/blue-api-sdk/package.json index 2307211a..b6ade145 100644 --- a/packages/blue-api-sdk/package.json +++ b/packages/blue-api-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-api-sdk", - "version": "1.0.0", + "version": "1.0.0-integ-745.1", "author": "Morpho Association ", "main": "src/index.ts", "files": [ diff --git a/packages/blue-sdk-ethers-liquidation/package.json b/packages/blue-sdk-ethers-liquidation/package.json index 284c9a49..3ace49b6 100644 --- a/packages/blue-sdk-ethers-liquidation/package.json +++ b/packages/blue-sdk-ethers-liquidation/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk-ethers-liquidation", - "version": "1.0.0", + "version": "1.0.0-integ-745.1", "author": "Morpho Association ", "main": "src/index.ts", "files": [ diff --git a/packages/blue-sdk-ethers/package.json b/packages/blue-sdk-ethers/package.json index 279ed672..1fe3d187 100644 --- a/packages/blue-sdk-ethers/package.json +++ b/packages/blue-sdk-ethers/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk-ethers", - "version": "1.0.0", + "version": "1.0.0-integ-745.1", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", diff --git a/packages/blue-sdk-viem/package.json b/packages/blue-sdk-viem/package.json index d042a450..9d5d7b17 100644 --- a/packages/blue-sdk-viem/package.json +++ b/packages/blue-sdk-viem/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk-viem", - "version": "1.0.0", + "version": "1.0.0-integ-745.1", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", diff --git a/packages/blue-sdk/package.json b/packages/blue-sdk/package.json index 48dfd243..7c176848 100644 --- a/packages/blue-sdk/package.json +++ b/packages/blue-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk", - "version": "1.0.0", + "version": "1.0.0-integ-745.1", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", diff --git a/packages/morpho-test/package.json b/packages/morpho-test/package.json index 6b7eceb8..57acb53d 100644 --- a/packages/morpho-test/package.json +++ b/packages/morpho-test/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/morpho-test", - "version": "1.0.0", + "version": "1.0.0-integ-745.1", "main": "src/index.ts", "files": [ "lib" diff --git a/packages/morpho-ts/package.json b/packages/morpho-ts/package.json index e1e2c933..be717dbd 100644 --- a/packages/morpho-ts/package.json +++ b/packages/morpho-ts/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/morpho-ts", - "version": "1.0.0", + "version": "1.0.0-integ-745.1", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", From 5252578a76baf71a10d383dbff593bdf1f37b50d Mon Sep 17 00:00:00 2001 From: Rubilmax Date: Wed, 9 Oct 2024 09:07:48 +0200 Subject: [PATCH 2/6] fix(sdks): no git tag version when unstable --- .github/workflows/npm-release.yml | 2 +- lerna.json | 2 +- package.json | 2 +- packages/blue-api-sdk/package.json | 2 +- packages/blue-sdk-ethers-liquidation/package.json | 2 +- packages/blue-sdk-ethers/package.json | 2 +- packages/blue-sdk-viem/package.json | 2 +- packages/blue-sdk/package.json | 2 +- packages/morpho-test/package.json | 2 +- packages/morpho-ts/package.json | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/npm-release.yml b/.github/workflows/npm-release.yml index 3ae08d31..1a12861e 100644 --- a/.github/workflows/npm-release.yml +++ b/.github/workflows/npm-release.yml @@ -48,7 +48,7 @@ jobs: run: | echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc if [ -n "${{ inputs.custom_version }}" ]; then - yarn lerna version ${{ inputs.custom_version }} --y --force-publish + yarn lerna version ${{ inputs.custom_version }} --y --force-publish --no-git-tag-version yarn run publish --y --dist-tag unstable else yarn lerna version ${{ inputs.version }} --no-private --no-changelog --conventional-commits --y diff --git a/lerna.json b/lerna.json index 8394b6d1..a4c87e93 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/@lerna-lite/cli/schemas/lerna-schema.json", - "version": "1.0.0-integ-745.1", + "version": "1.12.0", "npmClient": "yarn", "useWorkspaces": true } diff --git a/package.json b/package.json index 3b0d35de..01709e68 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/sdks", - "version": "1.0.0", + "version": "0.0.0", "description": "Collection of SDKs to interact with Morpho", "repository": "git@github.com:morpho-org/sdks.git", "author": "Morpho Association ", diff --git a/packages/blue-api-sdk/package.json b/packages/blue-api-sdk/package.json index b6ade145..94754551 100644 --- a/packages/blue-api-sdk/package.json +++ b/packages/blue-api-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-api-sdk", - "version": "1.0.0-integ-745.1", + "version": "1.12.0", "author": "Morpho Association ", "main": "src/index.ts", "files": [ diff --git a/packages/blue-sdk-ethers-liquidation/package.json b/packages/blue-sdk-ethers-liquidation/package.json index 3ace49b6..b8bb42eb 100644 --- a/packages/blue-sdk-ethers-liquidation/package.json +++ b/packages/blue-sdk-ethers-liquidation/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk-ethers-liquidation", - "version": "1.0.0-integ-745.1", + "version": "1.12.0", "author": "Morpho Association ", "main": "src/index.ts", "files": [ diff --git a/packages/blue-sdk-ethers/package.json b/packages/blue-sdk-ethers/package.json index 1fe3d187..4bf082dc 100644 --- a/packages/blue-sdk-ethers/package.json +++ b/packages/blue-sdk-ethers/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk-ethers", - "version": "1.0.0-integ-745.1", + "version": "1.12.0", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", diff --git a/packages/blue-sdk-viem/package.json b/packages/blue-sdk-viem/package.json index 9d5d7b17..100e8768 100644 --- a/packages/blue-sdk-viem/package.json +++ b/packages/blue-sdk-viem/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk-viem", - "version": "1.0.0-integ-745.1", + "version": "1.12.0", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", diff --git a/packages/blue-sdk/package.json b/packages/blue-sdk/package.json index 7c176848..2e184e91 100644 --- a/packages/blue-sdk/package.json +++ b/packages/blue-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk", - "version": "1.0.0-integ-745.1", + "version": "1.12.0", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", diff --git a/packages/morpho-test/package.json b/packages/morpho-test/package.json index 57acb53d..e477b907 100644 --- a/packages/morpho-test/package.json +++ b/packages/morpho-test/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/morpho-test", - "version": "1.0.0-integ-745.1", + "version": "1.12.0", "main": "src/index.ts", "files": [ "lib" diff --git a/packages/morpho-ts/package.json b/packages/morpho-ts/package.json index be717dbd..43cd9834 100644 --- a/packages/morpho-ts/package.json +++ b/packages/morpho-ts/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/morpho-ts", - "version": "1.0.0-integ-745.1", + "version": "1.12.0", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", From 00d55e7569dd007e019bf7c0dc656afdd6d3302a Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 9 Oct 2024 07:09:38 +0000 Subject: [PATCH 3/6] v1.12.1 --- lerna.json | 2 +- packages/blue-api-sdk/package.json | 2 +- packages/blue-sdk-ethers-liquidation/package.json | 2 +- packages/blue-sdk-ethers/package.json | 2 +- packages/blue-sdk-viem/package.json | 2 +- packages/blue-sdk/package.json | 2 +- packages/morpho-test/package.json | 2 +- packages/morpho-ts/package.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lerna.json b/lerna.json index a4c87e93..e121e948 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/@lerna-lite/cli/schemas/lerna-schema.json", - "version": "1.12.0", + "version": "1.12.1", "npmClient": "yarn", "useWorkspaces": true } diff --git a/packages/blue-api-sdk/package.json b/packages/blue-api-sdk/package.json index 94754551..4f997c84 100644 --- a/packages/blue-api-sdk/package.json +++ b/packages/blue-api-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-api-sdk", - "version": "1.12.0", + "version": "1.12.1", "author": "Morpho Association ", "main": "src/index.ts", "files": [ diff --git a/packages/blue-sdk-ethers-liquidation/package.json b/packages/blue-sdk-ethers-liquidation/package.json index b8bb42eb..64f24a53 100644 --- a/packages/blue-sdk-ethers-liquidation/package.json +++ b/packages/blue-sdk-ethers-liquidation/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk-ethers-liquidation", - "version": "1.12.0", + "version": "1.12.1", "author": "Morpho Association ", "main": "src/index.ts", "files": [ diff --git a/packages/blue-sdk-ethers/package.json b/packages/blue-sdk-ethers/package.json index 4bf082dc..86a49fcc 100644 --- a/packages/blue-sdk-ethers/package.json +++ b/packages/blue-sdk-ethers/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk-ethers", - "version": "1.12.0", + "version": "1.12.1", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", diff --git a/packages/blue-sdk-viem/package.json b/packages/blue-sdk-viem/package.json index 100e8768..f6b6bce7 100644 --- a/packages/blue-sdk-viem/package.json +++ b/packages/blue-sdk-viem/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk-viem", - "version": "1.12.0", + "version": "1.12.1", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", diff --git a/packages/blue-sdk/package.json b/packages/blue-sdk/package.json index 2e184e91..aabb6128 100644 --- a/packages/blue-sdk/package.json +++ b/packages/blue-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk", - "version": "1.12.0", + "version": "1.12.1", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", diff --git a/packages/morpho-test/package.json b/packages/morpho-test/package.json index e477b907..5a2fdb32 100644 --- a/packages/morpho-test/package.json +++ b/packages/morpho-test/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/morpho-test", - "version": "1.12.0", + "version": "1.12.1", "main": "src/index.ts", "files": [ "lib" diff --git a/packages/morpho-ts/package.json b/packages/morpho-ts/package.json index 43cd9834..69e2e61a 100644 --- a/packages/morpho-ts/package.json +++ b/packages/morpho-ts/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/morpho-ts", - "version": "1.12.0", + "version": "1.12.1", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", From c42f2904f2b1267e03ba2fe8f53f10cfffd4ace2 Mon Sep 17 00:00:00 2001 From: Rubilmax Date: Wed, 9 Oct 2024 09:13:24 +0200 Subject: [PATCH 4/6] fix(blue-sdk-ethers-liquidation): do not import from module --- .../src/LiquidationEncoder.ts | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/packages/blue-sdk-ethers-liquidation/src/LiquidationEncoder.ts b/packages/blue-sdk-ethers-liquidation/src/LiquidationEncoder.ts index 0d1ed3e4..f7a51fb0 100644 --- a/packages/blue-sdk-ethers-liquidation/src/LiquidationEncoder.ts +++ b/packages/blue-sdk-ethers-liquidation/src/LiquidationEncoder.ts @@ -1,18 +1,15 @@ import { Address, ChainId } from "@morpho-org/blue-sdk"; -import { - curvePools, - mainnetAddresses, - pendle, -} from "@morpho-org/blue-sdk-ethers-liquidation"; -import { CurveStableSwapNG__factory } from "@morpho-org/blue-sdk-ethers-liquidation/src/contracts/curve"; +import { AbstractSigner, MaxUint256, Provider } from "ethers"; +import { ExecutorEncoder } from "executooor"; +import { curvePools, mainnetAddresses } from "./addresses"; +import { CurveStableSwapNG__factory } from "./contracts/curve"; +import * as pendle from "./tokens/pendle"; import { USD0_USD0PP_USD0_INDEX, USD0_USD0PP_USDPP_INDEX, USD0_USDC_USD0_INDEX, USD0_USDC_USDC_INDEX, -} from "@morpho-org/blue-sdk-ethers-liquidation/src/tokens/usual"; -import { AbstractSigner, MaxUint256, Provider } from "ethers"; -import { ExecutorEncoder } from "executooor"; +} from "./tokens/usual"; export class LiquidationEncoder extends ExecutorEncoder { constructor(address: string, runner: AbstractSigner) { From 3a2ddfadaaf2d2ca35781ccb6c4ace20922ded3e Mon Sep 17 00:00:00 2001 From: Rubilmax Date: Wed, 9 Oct 2024 09:14:45 +0200 Subject: [PATCH 5/6] Revert "v1.12.1" This reverts commit 00d55e7569dd007e019bf7c0dc656afdd6d3302a. --- lerna.json | 2 +- packages/blue-api-sdk/package.json | 2 +- packages/blue-sdk-ethers-liquidation/package.json | 2 +- packages/blue-sdk-ethers/package.json | 2 +- packages/blue-sdk-viem/package.json | 2 +- packages/blue-sdk/package.json | 2 +- packages/morpho-test/package.json | 2 +- packages/morpho-ts/package.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lerna.json b/lerna.json index e121e948..a4c87e93 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/@lerna-lite/cli/schemas/lerna-schema.json", - "version": "1.12.1", + "version": "1.12.0", "npmClient": "yarn", "useWorkspaces": true } diff --git a/packages/blue-api-sdk/package.json b/packages/blue-api-sdk/package.json index 4f997c84..94754551 100644 --- a/packages/blue-api-sdk/package.json +++ b/packages/blue-api-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-api-sdk", - "version": "1.12.1", + "version": "1.12.0", "author": "Morpho Association ", "main": "src/index.ts", "files": [ diff --git a/packages/blue-sdk-ethers-liquidation/package.json b/packages/blue-sdk-ethers-liquidation/package.json index 64f24a53..b8bb42eb 100644 --- a/packages/blue-sdk-ethers-liquidation/package.json +++ b/packages/blue-sdk-ethers-liquidation/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk-ethers-liquidation", - "version": "1.12.1", + "version": "1.12.0", "author": "Morpho Association ", "main": "src/index.ts", "files": [ diff --git a/packages/blue-sdk-ethers/package.json b/packages/blue-sdk-ethers/package.json index 86a49fcc..4bf082dc 100644 --- a/packages/blue-sdk-ethers/package.json +++ b/packages/blue-sdk-ethers/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk-ethers", - "version": "1.12.1", + "version": "1.12.0", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", diff --git a/packages/blue-sdk-viem/package.json b/packages/blue-sdk-viem/package.json index f6b6bce7..100e8768 100644 --- a/packages/blue-sdk-viem/package.json +++ b/packages/blue-sdk-viem/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk-viem", - "version": "1.12.1", + "version": "1.12.0", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", diff --git a/packages/blue-sdk/package.json b/packages/blue-sdk/package.json index aabb6128..2e184e91 100644 --- a/packages/blue-sdk/package.json +++ b/packages/blue-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk", - "version": "1.12.1", + "version": "1.12.0", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", diff --git a/packages/morpho-test/package.json b/packages/morpho-test/package.json index 5a2fdb32..e477b907 100644 --- a/packages/morpho-test/package.json +++ b/packages/morpho-test/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/morpho-test", - "version": "1.12.1", + "version": "1.12.0", "main": "src/index.ts", "files": [ "lib" diff --git a/packages/morpho-ts/package.json b/packages/morpho-ts/package.json index 69e2e61a..43cd9834 100644 --- a/packages/morpho-ts/package.json +++ b/packages/morpho-ts/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/morpho-ts", - "version": "1.12.1", + "version": "1.12.0", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", From 8f982e2dc5931ba1a117bc11887f8c528a201058 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 9 Oct 2024 07:15:26 +0000 Subject: [PATCH 6/6] v1.12.1 --- lerna.json | 2 +- packages/blue-api-sdk/package.json | 2 +- packages/blue-sdk-ethers-liquidation/package.json | 2 +- packages/blue-sdk-ethers/package.json | 2 +- packages/blue-sdk-viem/package.json | 2 +- packages/blue-sdk/package.json | 2 +- packages/morpho-test/package.json | 2 +- packages/morpho-ts/package.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lerna.json b/lerna.json index a4c87e93..e121e948 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/@lerna-lite/cli/schemas/lerna-schema.json", - "version": "1.12.0", + "version": "1.12.1", "npmClient": "yarn", "useWorkspaces": true } diff --git a/packages/blue-api-sdk/package.json b/packages/blue-api-sdk/package.json index 94754551..4f997c84 100644 --- a/packages/blue-api-sdk/package.json +++ b/packages/blue-api-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-api-sdk", - "version": "1.12.0", + "version": "1.12.1", "author": "Morpho Association ", "main": "src/index.ts", "files": [ diff --git a/packages/blue-sdk-ethers-liquidation/package.json b/packages/blue-sdk-ethers-liquidation/package.json index b8bb42eb..64f24a53 100644 --- a/packages/blue-sdk-ethers-liquidation/package.json +++ b/packages/blue-sdk-ethers-liquidation/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk-ethers-liquidation", - "version": "1.12.0", + "version": "1.12.1", "author": "Morpho Association ", "main": "src/index.ts", "files": [ diff --git a/packages/blue-sdk-ethers/package.json b/packages/blue-sdk-ethers/package.json index 4bf082dc..86a49fcc 100644 --- a/packages/blue-sdk-ethers/package.json +++ b/packages/blue-sdk-ethers/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk-ethers", - "version": "1.12.0", + "version": "1.12.1", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", diff --git a/packages/blue-sdk-viem/package.json b/packages/blue-sdk-viem/package.json index 100e8768..f6b6bce7 100644 --- a/packages/blue-sdk-viem/package.json +++ b/packages/blue-sdk-viem/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk-viem", - "version": "1.12.0", + "version": "1.12.1", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", diff --git a/packages/blue-sdk/package.json b/packages/blue-sdk/package.json index 2e184e91..aabb6128 100644 --- a/packages/blue-sdk/package.json +++ b/packages/blue-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk", - "version": "1.12.0", + "version": "1.12.1", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", diff --git a/packages/morpho-test/package.json b/packages/morpho-test/package.json index e477b907..5a2fdb32 100644 --- a/packages/morpho-test/package.json +++ b/packages/morpho-test/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/morpho-test", - "version": "1.12.0", + "version": "1.12.1", "main": "src/index.ts", "files": [ "lib" diff --git a/packages/morpho-ts/package.json b/packages/morpho-ts/package.json index 43cd9834..69e2e61a 100644 --- a/packages/morpho-ts/package.json +++ b/packages/morpho-ts/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/morpho-ts", - "version": "1.12.0", + "version": "1.12.1", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts",