Merge pull request #67 from kaiachain/feat/ethers-ext-unit-conversion-v6

feat: update unit conversion helpers for v6
kaiachain · Dec 24, 2024 · bfa4445 · bfa4445
2 parents e088ae0 + b6eee68
commit bfa4445
Show file tree

Hide file tree

Showing 20 changed files with 144 additions and 83 deletions.
diff --git a/ethers-ext/.eslintrc.js b/ethers-ext/.eslintrc.js
@@ -33,17 +33,25 @@ module.exports = {
     "@typescript-eslint/ban-ts-comment": "off",
 
     // imports
-    "import/order": ["warn", {
-      "alphabetize": { "order": "asc", "caseInsensitive": true },
-      "pathGroups": [
-        { "pattern": "@kaiachain/**", "group": "parent", "position": "after" },
-      ],
-      "newlines-between": "always",
-      "pathGroupsExcludedImportTypes": ["@kaiachain/**"],
-    }],
+    "import/order": [
+      "warn",
+      {
+        alphabetize: { order: "asc", caseInsensitive: true },
+        pathGroups: [
+          { pattern: "@kaiachain/**", group: "parent", position: "after" },
+        ],
+        "newlines-between": "always",
+        pathGroupsExcludedImportTypes: ["@kaiachain/**"],
+      },
+    ],
     "import/no-unresolved": [
       "error", // eslint-plugin-import cannot resolve subpaths https://github.com/firebase/firebase-admin-node/discussions/1359
-      { ignore: ["^@kaiachain/js-ext-core/util$"] }
+      {
+        ignore: [
+          "^@kaiachain/js-ext-core/util$",
+          "^@kaiachain/js-ext-core/ethers-v6$",
+        ],
+      },
     ],
 
     // formatting

diff --git a/ethers-ext/example/v6/accountKey/sign_tx_AccountKeyPublic.js b/ethers-ext/example/v6/accountKey/sign_tx_AccountKeyPublic.js
@@ -3,7 +3,7 @@
 
 const { ethers } = require("ethers6");
 
-const { Wallet, TxType, parseKlay } = require("@kaiachain/ethers-ext/v6");
+const { Wallet, TxType, parseKaia } = require("@kaiachain/ethers-ext/v6");
 
 const senderAddr = "0xe15cd70a41dfb05e7214004d7d054801b2a2f06b";
 const senderPriv =
@@ -23,7 +23,7 @@ async function main() {
     type: TxType.ValueTransfer,
     from: senderAddr,
     to: recieverAddr,
-    value: parseKlay("0.01").toString(),
+    value: parseKaia("0.01"),
   };
 
   const populatedTx = await newWallet.populateTransaction(tx);

diff --git a/ethers-ext/example/v6/accountKey/sign_tx_AccountKeyRoleBased.js b/ethers-ext/example/v6/accountKey/sign_tx_AccountKeyRoleBased.js
@@ -3,7 +3,7 @@
 
 const { ethers } = require("ethers6");
 
-const { Wallet, TxType, parseKlay } = require("@kaiachain/ethers-ext/v6");
+const { Wallet, TxType, parseKaia } = require("@kaiachain/ethers-ext/v6");
 
 const senderAddr = "0x5bd2fb3c21564c023a4a735935a2b7a238c4ccea";
 const senderPriv =
@@ -27,7 +27,7 @@ async function main() {
     type: TxType.ValueTransfer,
     from: senderAddr,
     to: recieverAddr,
-    value: parseKlay("0.01").toString(),
+    value: parseKaia("0.01"),
     gasLimit: 100000,
   };
 

diff --git a/ethers-ext/example/v6/accountKey/sign_tx_AccountKeyWeightedMultiSig.js b/ethers-ext/example/v6/accountKey/sign_tx_AccountKeyWeightedMultiSig.js
@@ -7,7 +7,7 @@ const {
   Wallet,
   TxType,
   AccountKeyType,
-  parseKlay,
+  parseKaia,
 } = require("@kaiachain/ethers-ext/v6");
 
 const senderAddr = "0x82c6a8d94993d49cfd0c1d30f0f8caa65782cc7e";
@@ -34,7 +34,7 @@ async function main() {
     type: TxType.ValueTransfer,
     from: senderAddr,
     to: recieverAddr,
-    value: parseKlay("0.01").toString(),
+    value: parseKaia("0.01"),
     gasLimit: 100000,
   };
 

diff --git a/ethers-ext/example/v6/browser-react/src/components/KlaytnFeeDelVT.tsx b/ethers-ext/example/v6/browser-react/src/components/KlaytnFeeDelVT.tsx
@@ -1,7 +1,8 @@
-import { useState } from 'react';
-import { Account } from '../types';
-import { doSignTx } from '../util';
-import { TxType, parseKlay } from '@kaiachain/js-ext-core';
+import { useState } from "react";
+import { Account } from "../types";
+import { doSignTx } from "../util";
+import { TxType } from "@kaiachain/js-ext-core";
+import { parseKaia } from "@kaiachain/ethers-ext/v6";
 
 type Props = {
   account: Account;
@@ -16,7 +17,7 @@ function KlaytnFeeDelVT({ account }: Props) {
     const tx = {
       type: TxType.FeeDelegatedValueTransfer,
       to: e.target.to.value,
-      value:  parseKlay(e.target.amount.value).toString(),
+      value: parseKaia(e.target.amount.value),
     };
 
     try {
@@ -30,14 +31,29 @@ function KlaytnFeeDelVT({ account }: Props) {
   return (
     <div className="menu-component">
       <form onSubmit={handleSubmit}>
-        <p>To: <input type="text" name="to" defaultValue={account.address}></input></p>
-        <p>Value: <input type="text" name="amount" defaultValue="0.01"></input></p>
-        <p><input type="submit"></input></p>
+        <p>
+          To:{" "}
+          <input type="text" name="to" defaultValue={account.address}></input>
+        </p>
+        <p>
+          Value: <input type="text" name="amount" defaultValue="0.01"></input>
+        </p>
+        <p>
+          <input type="submit"></input>
+        </p>
       </form>
-      { txhash? <a target="_blank" href={txhash} rel="noreferrer">{txhash}</a> : null }
-    { error? <text><b style={{ color: "red" }}>{error}</b></text> : null }
-  </div>
-);
-};
+      {txhash ? (
+        <a target="_blank" href={txhash} rel="noreferrer">
+          {txhash}
+        </a>
+      ) : null}
+      {error ? (
+        <text>
+          <b style={{ color: "red" }}>{error}</b>
+        </text>
+      ) : null}
+    </div>
+  );
+}
 
 export default KlaytnFeeDelVT;
diff --git a/ethers-ext/example/v6/browser-react/src/components/KlaytnVT.tsx b/ethers-ext/example/v6/browser-react/src/components/KlaytnVT.tsx
@@ -1,8 +1,8 @@
-import { useState } from 'react';
-import { Account } from '../types';
-import { doSendTx } from '../util';
-import { TxType, parseKlay } from '@kaiachain/js-ext-core';
-
+import { useState } from "react";
+import { Account } from "../types";
+import { doSendTx } from "../util";
+import { TxType } from "@kaiachain/js-ext-core";
+import { parseKaia } from "@kaiachain/ethers-ext/v6";
 type Props = {
   account: Account;
 };
@@ -16,7 +16,7 @@ function KlaytnVT({ account }: Props) {
     const tx = {
       type: TxType.ValueTransfer,
       to: e.target.to.value,
-      value: parseKlay(e.target.amount.value).toString(),
+      value: parseKaia(e.target.amount.value),
     };
 
     try {
@@ -30,14 +30,29 @@ function KlaytnVT({ account }: Props) {
   return (
     <div className="menu-component">
       <form onSubmit={handleSubmit}>
-        <p>To: <input type="text" name="to" defaultValue={account.address}></input></p>
-        <p>Value: <input type="text" name="amount" defaultValue="0.01"></input></p>
-        <p><input type="submit"></input></p>
+        <p>
+          To:{" "}
+          <input type="text" name="to" defaultValue={account.address}></input>
+        </p>
+        <p>
+          Value: <input type="text" name="amount" defaultValue="0.01"></input>
+        </p>
+        <p>
+          <input type="submit"></input>
+        </p>
       </form>
-      { txhash? <a target="_blank" href={txhash} rel="noreferrer">{txhash}</a> : null }
-    { error? <text><b style={{ color: "red" }}>{error}</b></text> : null }
-  </div>
-);
-};
+      {txhash ? (
+        <a target="_blank" href={txhash} rel="noreferrer">
+          {txhash}
+        </a>
+      ) : null}
+      {error ? (
+        <text>
+          <b style={{ color: "red" }}>{error}</b>
+        </text>
+      ) : null}
+    </div>
+  );
+}
 
 export default KlaytnVT;
diff --git a/ethers-ext/example/v6/browser-react/src/components/LegacyVT.tsx b/ethers-ext/example/v6/browser-react/src/components/LegacyVT.tsx
@@ -1,7 +1,7 @@
-import { useState } from 'react';
-import { Account } from '../types';
-import { doSendTx } from '../util';
-import { parseKlay } from '@kaiachain/ethers-ext/v6';
+import { useState } from "react";
+import { Account } from "../types";
+import { doSendTx } from "../util";
+import { parseKaia } from "@kaiachain/ethers-ext/v6";
 
 type Props = {
   account: Account;
@@ -14,7 +14,7 @@ function LegacyVT({ account }: Props) {
   async function handleSubmit(e: any) {
     e.preventDefault();
     const toAddr = e.target.to.value;
-    const valuePeb = parseKlay(e.target.amount.value).toString();
+    const valuePeb = parseKaia(e.target.amount.value);
     const tx = {
       to: toAddr,
       value: valuePeb,
@@ -31,14 +31,30 @@ function LegacyVT({ account }: Props) {
   return (
     <div className="menu-component">
       <form onSubmit={handleSubmit}>
-        <p>To: <input type="text" name="to" defaultValue={account.address}></input></p>
-        <p>Amount (ETH/KLAY): <input type="text" name="amount" defaultValue="0.01"></input></p>
-        <p><input type="submit"></input></p>
+        <p>
+          To:{" "}
+          <input type="text" name="to" defaultValue={account.address}></input>
+        </p>
+        <p>
+          Amount (ETH/KLAY):{" "}
+          <input type="text" name="amount" defaultValue="0.01"></input>
+        </p>
+        <p>
+          <input type="submit"></input>
+        </p>
       </form>
-      { txhash? <a target="_blank" href={txhash} rel="noreferrer">{txhash}</a> : null }
-    { error? <text><b style={{ color: "red" }}>{error}</b></text> : null }
-  </div>
-);
-};
+      {txhash ? (
+        <a target="_blank" href={txhash} rel="noreferrer">
+          {txhash}
+        </a>
+      ) : null}
+      {error ? (
+        <text>
+          <b style={{ color: "red" }}>{error}</b>
+        </text>
+      ) : null}
+    </div>
+  );
+}
 
 export default LegacyVT;
diff --git a/ethers-ext/example/v6/transactions/Basic_08_TxTypeValueTransfer.js b/ethers-ext/example/v6/transactions/Basic_08_TxTypeValueTransfer.js
@@ -3,7 +3,7 @@
 
 const ethers = require("ethers6");
 
-const { Wallet, TxType, parseKlay } = require("@kaiachain/ethers-ext/v6");
+const { Wallet, TxType, parseKaia } = require("@kaiachain/ethers-ext/v6");
 
 const recieverAddr = "0xc40b6909eb7085590e1c26cb3becc25368e249e9";
 const senderAddr = "0xa2a8854b1802d8cd5de631e690817c253d6a9153";
@@ -20,7 +20,7 @@ async function main() {
     type: TxType.ValueTransfer,
     from: senderAddr,
     to: recieverAddr,
-    value: parseKlay("0.01").toString(),
+    value: parseKaia("0.01"),
   };
 
   const sentTx = await wallet.sendTransaction(tx);

diff --git a/ethers-ext/example/v6/transactions/Basic_10_TxTypeValueTransferMemo.js b/ethers-ext/example/v6/transactions/Basic_10_TxTypeValueTransferMemo.js
@@ -3,7 +3,7 @@
 
 const ethers = require("ethers6");
 
-const { Wallet, TxType, parseKlay } = require("@kaiachain/ethers-ext/v6");
+const { Wallet, TxType, parseKaia } = require("@kaiachain/ethers-ext/v6");
 
 const recieverAddr = "0xc40b6909eb7085590e1c26cb3becc25368e249e9";
 const senderAddr = "0xa2a8854b1802d8cd5de631e690817c253d6a9153";
@@ -20,7 +20,7 @@ async function main() {
     type: TxType.ValueTransferMemo,
     from: senderAddr,
     to: recieverAddr,
-    value: parseKlay("0.01").toString(),
+    value: parseKaia("0.01"),
     data: "0x1234567890",
   };
 

diff --git a/ethers-ext/example/v6/transactions/FeeDel_09_TxTypeFeeDelegatedValueTransfer.js b/ethers-ext/example/v6/transactions/FeeDel_09_TxTypeFeeDelegatedValueTransfer.js
@@ -3,7 +3,7 @@
 
 const ethers = require("ethers6");
 
-const { Wallet, TxType, parseKlay } = require("@kaiachain/ethers-ext/v6");
+const { Wallet, TxType, parseKaia } = require("@kaiachain/ethers-ext/v6");
 
 const senderAddr = "0xa2a8854b1802d8cd5de631e690817c253d6a9153";
 const senderPriv =
@@ -23,7 +23,7 @@ async function main() {
   const tx = {
     type: TxType.FeeDelegatedValueTransfer,
     to: recieverAddr,
-    value: parseKlay("0.01").toString(),
+    value: parseKaia("0.01"),
     from: senderAddr,
   };
 

diff --git a/ethers-ext/example/v6/transactions/FeeDel_11_TxTypeFeeDelegatedValueTransferMemo.js b/ethers-ext/example/v6/transactions/FeeDel_11_TxTypeFeeDelegatedValueTransferMemo.js
@@ -3,7 +3,7 @@
 
 const ethers = require("ethers6");
 
-const { Wallet, TxType, parseKlay } = require("@kaiachain/ethers-ext/v6");
+const { Wallet, TxType, parseKaia } = require("@kaiachain/ethers-ext/v6");
 
 const senderAddr = "0xa2a8854b1802d8cd5de631e690817c253d6a9153";
 const senderPriv =
@@ -24,7 +24,7 @@ async function main() {
     type: TxType.FeeDelegatedValueTransferMemo,
     from: senderAddr,
     to: recieverAddr,
-    value: parseKlay("0.01").toString(),
+    value: parseKaia("0.01"),
     data: "0x1234567890",
   };
 

diff --git a/ethers-ext/example/v6/transactions/FeeDel_39_TxTypeFeeDelegatedCancel.js b/ethers-ext/example/v6/transactions/FeeDel_39_TxTypeFeeDelegatedCancel.js
@@ -3,7 +3,7 @@
 
 const ethers = require("ethers6");
 
-const { Wallet, TxType, parseKlay } = require("@kaiachain/ethers-ext/v6");
+const { Wallet, TxType, parseKaia } = require("@kaiachain/ethers-ext/v6");
 
 const senderAddr = "0xa2a8854b1802d8cd5de631e690817c253d6a9153";
 const senderPriv =

diff --git a/...-ext/example/v6/transactions/PartialFeeDel_0a_TxTypeFeeDelegatedValueTransferWithRatio.js b/...-ext/example/v6/transactions/PartialFeeDel_0a_TxTypeFeeDelegatedValueTransferWithRatio.js
@@ -3,7 +3,7 @@
 
 const ethers = require("ethers6");
 
-const { Wallet, TxType, parseKlay } = require("@kaiachain/ethers-ext/v6");
+const { Wallet, TxType, parseKaia } = require("@kaiachain/ethers-ext/v6");
 
 const senderAddr = "0xa2a8854b1802d8cd5de631e690817c253d6a9153";
 const senderPriv =
@@ -23,7 +23,7 @@ async function main() {
   const tx = {
     type: TxType.FeeDelegatedValueTransferWithRatio,
     to: recieverAddr,
-    value: parseKlay("0.01").toString(),
+    value: parseKaia("0.01"),
     from: senderAddr,
     feeRatio: 30,
   };

diff --git a/.../example/v6/transactions/PartialFeeDel_12_TxTypeFeeDelegatedValueTransferMemoWithRatio.js b/.../example/v6/transactions/PartialFeeDel_12_TxTypeFeeDelegatedValueTransferMemoWithRatio.js
@@ -3,7 +3,7 @@
 
 const ethers = require("ethers6");
 
-const { Wallet, TxType, parseKlay } = require("@kaiachain/ethers-ext/v6");
+const { Wallet, TxType, parseKaia } = require("@kaiachain/ethers-ext/v6");
 
 const senderAddr = "0xa2a8854b1802d8cd5de631e690817c253d6a9153";
 const senderPriv =
@@ -24,7 +24,7 @@ async function main() {
     type: TxType.FeeDelegatedValueTransferMemoWithRatio,
     from: senderAddr,
     to: recieverAddr,
-    value: parseKlay("0.01").toString(),
+    value: parseKaia("0.01"),
     data: "0x1234567890",
     feeRatio: 30,
   };

diff --git a/ethers-ext/example/v6/transactions/PartialFeeDel_3a_TxTypeFeeDelegatedCancelWithRatio.js b/ethers-ext/example/v6/transactions/PartialFeeDel_3a_TxTypeFeeDelegatedCancelWithRatio.js
@@ -3,7 +3,7 @@
 
 const ethers = require("ethers6");
 
-const { Wallet, TxType, parseKlay } = require("@kaiachain/ethers-ext/v6");
+const { Wallet, TxType, parseKaia } = require("@kaiachain/ethers-ext/v6");
 
 const senderAddr = "0xa2a8854b1802d8cd5de631e690817c253d6a9153";
 const senderPriv =