Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version up to 1.1.1 #70

Merged
merged 5 commits into from
Dec 26, 2024
Merged

Version up to 1.1.1 #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e53a984
feat: update unit conversion helpers for v6
Sotatek-TanHoang Dec 24, 2024
b6eee68
feat: ignore import unresolved for js-ext-core/ethers-v6
Sotatek-TanHoang Dec 24, 2024
bfa4445
Merge pull request #67 from kaiachain/feat/ethers-ext-unit-conversion-v6
Sotatek-TanHoang Dec 24, 2024
1cdc505
feat: version up to 1.1.1
Sotatek-TanHoang Dec 25, 2024
ee66888
Merge pull request #69 from kaiachain/feat/version-up-to-1-1-1
Sotatek-TanHoang Dec 25, 2024
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
26 changes: 17 additions & 9 deletions ethers-ext/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ethers-ext/example/v6/accountKey/sign_tx_AccountKeyPublic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ethers-ext/example/v6/accountKey/sign_tx_AccountKeyRoleBased.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -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,
};

Expand Down
4 changes: 2 additions & 2 deletions ethers-ext/example/v6/accountKey/sign_tx_AccountKeyWeightedMultiSig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const {
Wallet,
TxType,
AccountKeyType,
parseKlay,
parseKaia,
} = require("@kaiachain/ethers-ext/v6");

const senderAddr = "0x82c6a8d94993d49cfd0c1d30f0f8caa65782cc7e";
Expand All @@ -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,
};

Expand Down
42 changes: 29 additions & 13 deletions ethers-ext/example/v6/browser-react/src/components/KlaytnFeeDelVT.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand All @@ -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;
43 changes: 29 additions & 14 deletions ethers-ext/example/v6/browser-react/src/components/KlaytnVT.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
};
Expand All @@ -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 {
Expand All @@ -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;
42 changes: 29 additions & 13 deletions ethers-ext/example/v6/browser-react/src/components/LegacyVT.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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,
Expand All @@ -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;
4 changes: 2 additions & 2 deletions ethers-ext/example/v6/transactions/Basic_08_TxTypeValueTransfer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ethers-ext/example/v6/transactions/Basic_10_TxTypeValueTransferMemo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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",
};

Expand Down
4 changes: 2 additions & 2 deletions ethers-ext/example/v6/transactions/FeeDel_09_TxTypeFeeDelegatedValueTransfer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -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,
};

Expand Down
4 changes: 2 additions & 2 deletions ethers-ext/example/v6/transactions/FeeDel_11_TxTypeFeeDelegatedValueTransferMemo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -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",
};

Expand Down
2 changes: 1 addition & 1 deletion ethers-ext/example/v6/transactions/FeeDel_39_TxTypeFeeDelegatedCancel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
4 changes: 2 additions & 2 deletions ...-ext/example/v6/transactions/PartialFeeDel_0a_TxTypeFeeDelegatedValueTransferWithRatio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -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,
};
Expand Down
4 changes: 2 additions & 2 deletions .../example/v6/transactions/PartialFeeDel_12_TxTypeFeeDelegatedValueTransferMemoWithRatio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -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,
};
Expand Down
2 changes: 1 addition & 1 deletion ethers-ext/example/v6/transactions/PartialFeeDel_3a_TxTypeFeeDelegatedCancelWithRatio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
Loading
Loading