Skip to content
This repository has been archived by the owner on Jul 23, 2024. It is now read-only.

ethers: Separate v5 and v6 subpaths #621

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 89 additions & 4 deletions ethers-ext/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions ethers-ext/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,20 @@
},
"main": "dist/index.js",
"types": "dist/index.d.ts",
"exports": {
".": {
"types": "./dist/index.d.ts",
"default": "./dist/index.js"
},
"./v5": {
"types": "./dist/v5/index.d.ts",
"default": "./dist/v5/index.js"
},
"./v6": {
"types": "./dist/v6/index.d.ts",
"default": "./dist/v6/index.js"
}
},
"files": [
"./dist",
"./src"
Expand Down Expand Up @@ -75,6 +89,7 @@
"@ethersproject/web": "^5.7.1",
"@klaytn/js-ext-core": "^1.0.0",
"@klaytn/web3rpc": "^0.9.9",
"ethers6": "npm:ethers@^6.12.1",
"lodash": "^4.17.21"
}
}
31 changes: 10 additions & 21 deletions ethers-ext/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,12 @@
// Pass-through js-ext-core exports
export * from "@klaytn/js-ext-core/util";
export {
AccountKey,
AccountKeyFactory,
KlaytnTx,
KlaytnTxFactory,
parseTransaction,
} from "@klaytn/js-ext-core";
// require("@klaytn/ethers-ext") exports the extension for ethers v5
export * from "./v5";

// ethers-ext classes and functions
export * from "./accountStore";
export * from "./keystore";
export * from "./signer";
// require("@klaytn/ethers-ext").v5 exports the extension for ethers v5
// require("@klaytn/ethers-ext").v6 exports the extension for ethers v6
import * as v5 from "./v5";
import * as v6 from "./v6";
export { v5, v6 };

// Follow ethers v6 convention like `ethers.JsonRpcProvider`
export * from "./provider";
// Follow ethers v5 convention like `ethers.providers.JsonRpcProvider`
import { JsonRpcProvider, Web3Provider } from "./provider";
export const providers = {
JsonRpcProvider,
Web3Provider,
};
// require("@klaytn/ethers-ext/v5") exports the extension for ethers v5
// require("@klaytn/ethers-ext/v6") exports the extension for ethers v6
// (declared in package.json:exports. No code needeed here)
23 changes: 23 additions & 0 deletions ethers-ext/src/v5/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Pass-through js-ext-core exports
export * from "@klaytn/js-ext-core/util";
export {
AccountKey,
AccountKeyFactory,
KlaytnTx,
KlaytnTxFactory,
parseTransaction,
} from "@klaytn/js-ext-core";

// ethers-ext classes and functions
export * from "./accountStore";
export * from "./keystore";
export * from "./signer";

// Follow ethers v6 convention like `ethers.JsonRpcProvider`
export * from "./provider";
// Follow ethers v5 convention like `ethers.providers.JsonRpcProvider`
import { JsonRpcProvider, Web3Provider } from "./provider";
export const providers = {
JsonRpcProvider,
Web3Provider,
};
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions ethers-ext/src/v6/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "./signer";
5 changes: 5 additions & 0 deletions ethers-ext/src/v6/signer.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { Wallet as EthersWallet } from "ethers6";

export class Wallet extends EthersWallet {

}
Loading