From baa37d9c7fa5d447dcc5b0d35950d59a3998f5b0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 18 Mar 2025 04:42:53 +0000 Subject: [PATCH 1/4] chore: version packages --- .changeset/chilly-pants-relax.md | 11 ----------- .changeset/forty-cups-run.md | 5 ----- .changeset/grumpy-files-move.md | 5 ----- .changeset/poor-pens-brake.md | 5 ----- .changeset/purple-lemons-brake.md | 5 ----- .changeset/tricky-fireants-cross.md | 5 ----- .changeset/young-crabs-wave.md | 5 ----- apps/example/package.json | 2 +- packages/drift-ethers-v5/CHANGELOG.md | 13 +++++++++++++ packages/drift-ethers-v5/package.json | 6 +++--- packages/drift-ethers/CHANGELOG.md | 13 +++++++++++++ packages/drift-ethers/package.json | 6 +++--- packages/drift-viem/CHANGELOG.md | 13 +++++++++++++ packages/drift-viem/package.json | 6 +++--- packages/drift-web3/CHANGELOG.md | 13 +++++++++++++ packages/drift-web3/package.json | 6 +++--- packages/drift/CHANGELOG.md | 21 +++++++++++++++++++++ packages/drift/package.json | 2 +- 18 files changed, 87 insertions(+), 55 deletions(-) delete mode 100644 .changeset/chilly-pants-relax.md delete mode 100644 .changeset/forty-cups-run.md delete mode 100644 .changeset/grumpy-files-move.md delete mode 100644 .changeset/poor-pens-brake.md delete mode 100644 .changeset/purple-lemons-brake.md delete mode 100644 .changeset/tricky-fireants-cross.md delete mode 100644 .changeset/young-crabs-wave.md diff --git a/.changeset/chilly-pants-relax.md b/.changeset/chilly-pants-relax.md deleted file mode 100644 index e273c23d..00000000 --- a/.changeset/chilly-pants-relax.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -"@delvtech/drift": minor ---- - -Renamed and restructured types for clarity. -- `ContractCallOptions` is now `CallOptions` -- `ContractGetEventsOptions` is now `GetEventsOptions` -- `ContractReadOptions` is now `ReadOptions` -- `ContractWriteOptions` is now `TransactionOptions` -- `OnMinedParam` was combined with `TransactionOptions` in new type, `WriteOptions`. -- `Eip4844CallOptions` => `Eip4844Options` \ No newline at end of file diff --git a/.changeset/forty-cups-run.md b/.changeset/forty-cups-run.md deleted file mode 100644 index 0e2fece1..00000000 --- a/.changeset/forty-cups-run.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@delvtech/drift": minor ---- - -Renamed all `*Config` types to `*Options` for clarity and alignment with existing patterns. diff --git a/.changeset/grumpy-files-move.md b/.changeset/grumpy-files-move.md deleted file mode 100644 index e3c709df..00000000 --- a/.changeset/grumpy-files-move.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@delvtech/drift": minor ---- - -Renamed `AbiFriendlyType` to `AbiSimplifiedType`, and `arrayToFriendly` to `arrayToSimplified`. diff --git a/.changeset/poor-pens-brake.md b/.changeset/poor-pens-brake.md deleted file mode 100644 index bae6c7eb..00000000 --- a/.changeset/poor-pens-brake.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@delvtech/drift": minor ---- - -Removed `Store` operations on the `ClientCache` and made a couple methods private to simplify the API. Store operations can still be accessed via the `store` property on the cache. diff --git a/.changeset/purple-lemons-brake.md b/.changeset/purple-lemons-brake.md deleted file mode 100644 index b6549b1c..00000000 --- a/.changeset/purple-lemons-brake.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@delvtech/drift": patch ---- - -Fixed formatting for nested `DriftError`s by filtering out repeated lines. diff --git a/.changeset/tricky-fireants-cross.md b/.changeset/tricky-fireants-cross.md deleted file mode 100644 index 6c38d6e2..00000000 --- a/.changeset/tricky-fireants-cross.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@delvtech/drift": patch ---- - -Removed unused `ReadClient` and `ReadWriteClient` type aliases. diff --git a/.changeset/young-crabs-wave.md b/.changeset/young-crabs-wave.md deleted file mode 100644 index e5e63d1f..00000000 --- a/.changeset/young-crabs-wave.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@delvtech/drift": minor ---- - -Removed cache operation methods from the `Contract` class, e.g., `preloadRead`. The methods have been moved to a new `ContractCache` class which is accessible on the contract via the `cache` property. This streamlines the API and mirrors the design of the underlying `Client` and `ClientCache`. diff --git a/apps/example/package.json b/apps/example/package.json index b61dbd6b..d6ba2970 100644 --- a/apps/example/package.json +++ b/apps/example/package.json @@ -10,7 +10,7 @@ "sdk": "tsx -r dotenv/config src/sdk.ts" }, "dependencies": { - "@delvtech/drift": "^0.6.0", + "@delvtech/drift": "^0.7.0", "@delvtech/fixed-point-wasm": "^0.0.8" }, "devDependencies": { diff --git a/packages/drift-ethers-v5/CHANGELOG.md b/packages/drift-ethers-v5/CHANGELOG.md index 56826f0b..92fba4b6 100644 --- a/packages/drift-ethers-v5/CHANGELOG.md +++ b/packages/drift-ethers-v5/CHANGELOG.md @@ -1,5 +1,18 @@ # @delvtech/drift-ethers-v5 +## 1.0.0 + +### Patch Changes + +- Updated dependencies [8163702] +- Updated dependencies [10d4d97] +- Updated dependencies [2eeb5c3] +- Updated dependencies [bf5463d] +- Updated dependencies [0d20425] +- Updated dependencies [bf5463d] +- Updated dependencies [bf5463d] + - @delvtech/drift@0.7.0 + ## 0.6.0 ### Patch Changes diff --git a/packages/drift-ethers-v5/package.json b/packages/drift-ethers-v5/package.json index 4bdd089b..45707c78 100644 --- a/packages/drift-ethers-v5/package.json +++ b/packages/drift-ethers-v5/package.json @@ -1,7 +1,7 @@ { "name": "@delvtech/drift-ethers-v5", "description": "Ethers.js v5 adapter for Drift", - "version": "0.6.0", + "version": "1.0.0", "license": "Apache-2.0", "type": "module", "main": "dist/index.cjs", @@ -28,11 +28,11 @@ "typecheck:watch": "tsc --noEmit --watch" }, "peerDependencies": { - "@delvtech/drift": "^0.6.0", + "@delvtech/drift": "^0.7.0", "ethers": "^5.7.2" }, "devDependencies": { - "@delvtech/drift": "^0.6.0", + "@delvtech/drift": "^0.7.0", "@repo/typescript-config": "*", "ethers": "^5.7.2", "tsconfig-paths": "^4.2.0", diff --git a/packages/drift-ethers/CHANGELOG.md b/packages/drift-ethers/CHANGELOG.md index 4d026160..3f3f9a56 100644 --- a/packages/drift-ethers/CHANGELOG.md +++ b/packages/drift-ethers/CHANGELOG.md @@ -1,5 +1,18 @@ # @delvtech/drift-ethers +## 1.0.0 + +### Patch Changes + +- Updated dependencies [8163702] +- Updated dependencies [10d4d97] +- Updated dependencies [2eeb5c3] +- Updated dependencies [bf5463d] +- Updated dependencies [0d20425] +- Updated dependencies [bf5463d] +- Updated dependencies [bf5463d] + - @delvtech/drift@0.7.0 + ## 0.6.0 ### Patch Changes diff --git a/packages/drift-ethers/package.json b/packages/drift-ethers/package.json index 02017ae6..313616a2 100644 --- a/packages/drift-ethers/package.json +++ b/packages/drift-ethers/package.json @@ -1,7 +1,7 @@ { "name": "@delvtech/drift-ethers", "description": "Ethers.js adapter for Drift", - "version": "0.6.0", + "version": "1.0.0", "license": "Apache-2.0", "type": "module", "main": "dist/index.cjs", @@ -28,11 +28,11 @@ "typecheck:watch": "tsc --noEmit --watch" }, "peerDependencies": { - "@delvtech/drift": "^0.6.0", + "@delvtech/drift": "^0.7.0", "ethers": "^6.13.5" }, "devDependencies": { - "@delvtech/drift": "^0.6.0", + "@delvtech/drift": "^0.7.0", "@repo/typescript-config": "*", "ethers": "^6.13.5", "tsconfig-paths": "^4.2.0", diff --git a/packages/drift-viem/CHANGELOG.md b/packages/drift-viem/CHANGELOG.md index 4eeda939..54bea931 100644 --- a/packages/drift-viem/CHANGELOG.md +++ b/packages/drift-viem/CHANGELOG.md @@ -1,5 +1,18 @@ # @delvtech/drift-viem +## 1.0.0 + +### Patch Changes + +- Updated dependencies [8163702] +- Updated dependencies [10d4d97] +- Updated dependencies [2eeb5c3] +- Updated dependencies [bf5463d] +- Updated dependencies [0d20425] +- Updated dependencies [bf5463d] +- Updated dependencies [bf5463d] + - @delvtech/drift@0.7.0 + ## 0.6.0 ### Patch Changes diff --git a/packages/drift-viem/package.json b/packages/drift-viem/package.json index a7feb76d..dfcd3543 100644 --- a/packages/drift-viem/package.json +++ b/packages/drift-viem/package.json @@ -1,7 +1,7 @@ { "name": "@delvtech/drift-viem", "description": "Viem adapter for Drift", - "version": "0.6.0", + "version": "1.0.0", "license": "Apache-2.0", "type": "module", "main": "dist/index.cjs", @@ -28,11 +28,11 @@ "typecheck:watch": "tsc --noEmit --watch" }, "peerDependencies": { - "@delvtech/drift": "^0.6.0", + "@delvtech/drift": "^0.7.0", "viem": "^2.22.16" }, "devDependencies": { - "@delvtech/drift": "^0.6.0", + "@delvtech/drift": "^0.7.0", "@repo/typescript-config": "*", "tsconfig-paths": "^4.2.0", "tsup": "^8.3.6", diff --git a/packages/drift-web3/CHANGELOG.md b/packages/drift-web3/CHANGELOG.md index 68b631e1..a1b48591 100644 --- a/packages/drift-web3/CHANGELOG.md +++ b/packages/drift-web3/CHANGELOG.md @@ -1,5 +1,18 @@ # @delvtech/drift-web3 +## 1.0.0 + +### Patch Changes + +- Updated dependencies [8163702] +- Updated dependencies [10d4d97] +- Updated dependencies [2eeb5c3] +- Updated dependencies [bf5463d] +- Updated dependencies [0d20425] +- Updated dependencies [bf5463d] +- Updated dependencies [bf5463d] + - @delvtech/drift@0.7.0 + ## 0.6.0 ### Patch Changes diff --git a/packages/drift-web3/package.json b/packages/drift-web3/package.json index e9ac34b4..2abe4327 100644 --- a/packages/drift-web3/package.json +++ b/packages/drift-web3/package.json @@ -1,7 +1,7 @@ { "name": "@delvtech/drift-web3", "description": "Web3.js adapter for Drift", - "version": "0.6.0", + "version": "1.0.0", "license": "Apache-2.0", "type": "module", "main": "dist/index.cjs", @@ -28,11 +28,11 @@ "typecheck:watch": "tsc --noEmit --watch" }, "peerDependencies": { - "@delvtech/drift": "^0.6.0", + "@delvtech/drift": "^0.7.0", "web3": "^4.16.0" }, "devDependencies": { - "@delvtech/drift": "^0.6.0", + "@delvtech/drift": "^0.7.0", "@repo/typescript-config": "*", "tsconfig-paths": "^4.2.0", "tsup": "^8.3.6", diff --git a/packages/drift/CHANGELOG.md b/packages/drift/CHANGELOG.md index c4539e66..0a4bf5cf 100644 --- a/packages/drift/CHANGELOG.md +++ b/packages/drift/CHANGELOG.md @@ -1,5 +1,26 @@ # @delvtech/drift +## 0.7.0 + +### Minor Changes + +- 8163702: Renamed and restructured types for clarity. + - `ContractCallOptions` is now `CallOptions` + - `ContractGetEventsOptions` is now `GetEventsOptions` + - `ContractReadOptions` is now `ReadOptions` + - `ContractWriteOptions` is now `TransactionOptions` + - `OnMinedParam` was combined with `TransactionOptions` in new type, `WriteOptions`. + - `Eip4844CallOptions` => `Eip4844Options` +- 10d4d97: Renamed all `*Config` types to `*Options` for clarity and alignment with existing patterns. +- 2eeb5c3: Renamed `AbiFriendlyType` to `AbiSimplifiedType`, and `arrayToFriendly` to `arrayToSimplified`. +- bf5463d: Removed `Store` operations on the `ClientCache` and made a couple methods private to simplify the API. Store operations can still be accessed via the `store` property on the cache. +- bf5463d: Removed cache operation methods from the `Contract` class, e.g., `preloadRead`. The methods have been moved to a new `ContractCache` class which is accessible on the contract via the `cache` property. This streamlines the API and mirrors the design of the underlying `Client` and `ClientCache`. + +### Patch Changes + +- 0d20425: Fixed formatting for nested `DriftError`s by filtering out repeated lines. +- bf5463d: Removed unused `ReadClient` and `ReadWriteClient` type aliases. + ## 0.6.0 ### Minor Changes diff --git a/packages/drift/package.json b/packages/drift/package.json index 34bd4f6a..b656806a 100644 --- a/packages/drift/package.json +++ b/packages/drift/package.json @@ -1,7 +1,7 @@ { "name": "@delvtech/drift", "description": "Effortless ethereum development across Web3 libraries", - "version": "0.6.0", + "version": "0.7.0", "license": "Apache-2.0", "type": "module", "main": "dist/index.cjs", From 841cb6073fc9aac29de08eb78e376fb4d3fbbce4 Mon Sep 17 00:00:00 2001 From: Ryan Goree Date: Mon, 17 Mar 2025 23:50:08 -0500 Subject: [PATCH 2/4] Fix versions, patch changelog --- packages/drift-ethers-v5/CHANGELOG.md | 2 +- packages/drift-ethers-v5/package.json | 2 +- packages/drift-ethers/CHANGELOG.md | 2 +- packages/drift-ethers/package.json | 2 +- packages/drift-viem/CHANGELOG.md | 2 +- packages/drift-viem/package.json | 2 +- packages/drift-web3/CHANGELOG.md | 2 +- packages/drift-web3/package.json | 2 +- packages/drift/CHANGELOG.md | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/drift-ethers-v5/CHANGELOG.md b/packages/drift-ethers-v5/CHANGELOG.md index 92fba4b6..3247b1d2 100644 --- a/packages/drift-ethers-v5/CHANGELOG.md +++ b/packages/drift-ethers-v5/CHANGELOG.md @@ -1,6 +1,6 @@ # @delvtech/drift-ethers-v5 -## 1.0.0 +## 0.7.0 ### Patch Changes diff --git a/packages/drift-ethers-v5/package.json b/packages/drift-ethers-v5/package.json index 45707c78..b1c27624 100644 --- a/packages/drift-ethers-v5/package.json +++ b/packages/drift-ethers-v5/package.json @@ -1,7 +1,7 @@ { "name": "@delvtech/drift-ethers-v5", "description": "Ethers.js v5 adapter for Drift", - "version": "1.0.0", + "version": "0.7.0", "license": "Apache-2.0", "type": "module", "main": "dist/index.cjs", diff --git a/packages/drift-ethers/CHANGELOG.md b/packages/drift-ethers/CHANGELOG.md index 3f3f9a56..d9c62978 100644 --- a/packages/drift-ethers/CHANGELOG.md +++ b/packages/drift-ethers/CHANGELOG.md @@ -1,6 +1,6 @@ # @delvtech/drift-ethers -## 1.0.0 +## 0.7.0 ### Patch Changes diff --git a/packages/drift-ethers/package.json b/packages/drift-ethers/package.json index 313616a2..5c4ea55e 100644 --- a/packages/drift-ethers/package.json +++ b/packages/drift-ethers/package.json @@ -1,7 +1,7 @@ { "name": "@delvtech/drift-ethers", "description": "Ethers.js adapter for Drift", - "version": "1.0.0", + "version": "0.7.0", "license": "Apache-2.0", "type": "module", "main": "dist/index.cjs", diff --git a/packages/drift-viem/CHANGELOG.md b/packages/drift-viem/CHANGELOG.md index 54bea931..da730813 100644 --- a/packages/drift-viem/CHANGELOG.md +++ b/packages/drift-viem/CHANGELOG.md @@ -1,6 +1,6 @@ # @delvtech/drift-viem -## 1.0.0 +## 0.7.0 ### Patch Changes diff --git a/packages/drift-viem/package.json b/packages/drift-viem/package.json index dfcd3543..02a17149 100644 --- a/packages/drift-viem/package.json +++ b/packages/drift-viem/package.json @@ -1,7 +1,7 @@ { "name": "@delvtech/drift-viem", "description": "Viem adapter for Drift", - "version": "1.0.0", + "version": "0.7.0", "license": "Apache-2.0", "type": "module", "main": "dist/index.cjs", diff --git a/packages/drift-web3/CHANGELOG.md b/packages/drift-web3/CHANGELOG.md index a1b48591..49fa739a 100644 --- a/packages/drift-web3/CHANGELOG.md +++ b/packages/drift-web3/CHANGELOG.md @@ -1,6 +1,6 @@ # @delvtech/drift-web3 -## 1.0.0 +## 0.7.0 ### Patch Changes diff --git a/packages/drift-web3/package.json b/packages/drift-web3/package.json index 2abe4327..b9e61269 100644 --- a/packages/drift-web3/package.json +++ b/packages/drift-web3/package.json @@ -1,7 +1,7 @@ { "name": "@delvtech/drift-web3", "description": "Web3.js adapter for Drift", - "version": "1.0.0", + "version": "0.7.0", "license": "Apache-2.0", "type": "module", "main": "dist/index.cjs", diff --git a/packages/drift/CHANGELOG.md b/packages/drift/CHANGELOG.md index 0a4bf5cf..6fbb2064 100644 --- a/packages/drift/CHANGELOG.md +++ b/packages/drift/CHANGELOG.md @@ -4,13 +4,13 @@ ### Minor Changes -- 8163702: Renamed and restructured types for clarity. +- 8163702: Simplified option types: - `ContractCallOptions` is now `CallOptions` - `ContractGetEventsOptions` is now `GetEventsOptions` - `ContractReadOptions` is now `ReadOptions` - `ContractWriteOptions` is now `TransactionOptions` - `OnMinedParam` was combined with `TransactionOptions` in new type, `WriteOptions`. - - `Eip4844CallOptions` => `Eip4844Options` + - `Eip4844CallOptions` is now `Eip4844Options` - 10d4d97: Renamed all `*Config` types to `*Options` for clarity and alignment with existing patterns. - 2eeb5c3: Renamed `AbiFriendlyType` to `AbiSimplifiedType`, and `arrayToFriendly` to `arrayToSimplified`. - bf5463d: Removed `Store` operations on the `ClientCache` and made a couple methods private to simplify the API. Store operations can still be accessed via the `store` property on the cache. From b584c99a855a863f359fa4735cd8a57135e20404 Mon Sep 17 00:00:00 2001 From: Ryan Goree Date: Mon, 17 Mar 2025 23:57:42 -0500 Subject: [PATCH 3/4] Add log --- packages/drift/src/adapter/OxAdapter.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/drift/src/adapter/OxAdapter.ts b/packages/drift/src/adapter/OxAdapter.ts index 20fdae32..1adc807e 100644 --- a/packages/drift/src/adapter/OxAdapter.ts +++ b/packages/drift/src/adapter/OxAdapter.ts @@ -57,6 +57,7 @@ export class OxAdapter extends AbiEncoder implements ReadWriteAdapter { pollingInterval = OxAdapter.DEFAULT_POLLING_INTERVAL, }: OxAdapterOptions = {}) { super(); + console.log("Constructing OxAdapter with rpcUrl:", rpcUrl); try { const provider = rpcUrl ? RpcTransport.fromHttp(rpcUrl) From dab45e347c6931b039ea983f3fafd8597814a030 Mon Sep 17 00:00:00 2001 From: Ryan Goree Date: Tue, 18 Mar 2025 00:07:39 -0500 Subject: [PATCH 4/4] Remove log, move variables inside `describe` --- packages/drift/src/adapter/OxAdapter.test.ts | 10 +++++----- packages/drift/src/adapter/OxAdapter.ts | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/drift/src/adapter/OxAdapter.test.ts b/packages/drift/src/adapter/OxAdapter.test.ts index aaccce5b..d8d30fa8 100644 --- a/packages/drift/src/adapter/OxAdapter.test.ts +++ b/packages/drift/src/adapter/OxAdapter.test.ts @@ -15,12 +15,12 @@ import { MockErc20Example } from "src/artifacts/MockErc20Example"; import { ZERO_ADDRESS } from "src/constants"; import { describe, expect, it } from "vitest"; -const address = ( - process.env.VITE_TOKEN_ADDRESS || ZERO_ADDRESS -).toLowerCase() as AddressType; -const rpcUrl = process.env.VITE_RPC_URL; - describe("OxAdapter", () => { + const address = ( + process.env.VITE_TOKEN_ADDRESS || ZERO_ADDRESS + ).toLowerCase() as AddressType; + const rpcUrl = process.env.VITE_RPC_URL; + it("fetches the chain id", async () => { const adapter = new OxAdapter({ rpcUrl }); const chainId = await adapter.getChainId(); diff --git a/packages/drift/src/adapter/OxAdapter.ts b/packages/drift/src/adapter/OxAdapter.ts index 1adc807e..20fdae32 100644 --- a/packages/drift/src/adapter/OxAdapter.ts +++ b/packages/drift/src/adapter/OxAdapter.ts @@ -57,7 +57,6 @@ export class OxAdapter extends AbiEncoder implements ReadWriteAdapter { pollingInterval = OxAdapter.DEFAULT_POLLING_INTERVAL, }: OxAdapterOptions = {}) { super(); - console.log("Constructing OxAdapter with rpcUrl:", rpcUrl); try { const provider = rpcUrl ? RpcTransport.fromHttp(rpcUrl)