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.

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

standarts import paths fixed #293

Merged
merged 2 commits into from
Nov 10, 2022
Merged
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
5 changes: 3 additions & 2 deletions lib/index.d.ts

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

4 changes: 2 additions & 2 deletions lib/index.js

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

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

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

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

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

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

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

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

17 changes: 8 additions & 9 deletions near-contract-standards/lib/non_fungible_token/impl.d.ts

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

17 changes: 8 additions & 9 deletions near-contract-standards/lib/non_fungible_token/impl.js

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

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

3 changes: 1 addition & 2 deletions near-contract-standards/lib/non_fungible_token/utils.d.ts

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

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { PromiseOrValue } from "near-sdk-js/lib";
import { AccountId } from "near-sdk-js/lib/types";
import { AccountId, PromiseOrValue } from "near-sdk-js";
import { TokenId } from "../token";

/** Approval receiver is the interface for the method called (or attempted to be called) when an NFT contract adds an approval for an account. */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { AccountId } from "near-sdk-js/lib/types";
import { NearPromise } from "near-sdk-js/lib";
import { AccountId, NearPromise } from "near-sdk-js";
import { TokenId } from "../token";
import { Option } from "../utils";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AccountId } from "near-sdk-js/lib/types";
import { AccountId } from "near-sdk-js";
import { Token, TokenId } from "../token";
import { Option } from "../utils";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { PromiseOrValue } from "near-sdk-js/lib";
import { AccountId } from "near-sdk-js/lib/types";
import { AccountId, PromiseOrValue } from "near-sdk-js";
import { TokenId } from "../token";

/** Used when an NFT is transferred using `nft_transfer_call`. This interface is implemented on the receiving contract, not on the NFT contract. */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AccountId } from "../../../../lib/types";
import { AccountId } from "near-sdk-js";
import { TokenId } from "../token";
import { Option } from "../utils";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AccountId } from "../../../../lib/types";
import { AccountId } from "near-sdk-js";
import { Token } from "../token";

/** Offers methods helpful in determining account ownership of NFTs and provides a way to page through NFTs per owner, determine total supply, etc. */
Expand Down
2 changes: 1 addition & 1 deletion near-contract-standards/src/non_fungible_token/events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* [`NftMint.emit_many`], [`NftTransfer.emit_many`],
* or [`NftBurn.emit_many`] respectively.
*/
import { AccountId } from "near-sdk-js/lib/types";
import { AccountId } from "near-sdk-js";
import { NearEvent } from "../event";
import { TokenId } from "./token";
import { Option } from "./utils";
Expand Down
6 changes: 3 additions & 3 deletions near-contract-standards/src/non_fungible_token/impl.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {
AccountId,
UnorderedMap,
LookupMap,
Bytes,
Expand All @@ -7,8 +8,8 @@ import {
assert,
NearPromise,
bytes,
} from "near-sdk-js/lib";
import { serialize } from "near-sdk-js/lib/utils";
serialize,
} from "near-sdk-js";
import { TokenMetadata } from "./metadata";
import {
refund_approved_account_ids,
Expand All @@ -23,7 +24,6 @@ import {
} from "./utils";
import { NftMint, NftTransfer } from "./events";
import { NonFungibleTokenResolver } from "./core/resolver";
import { AccountId } from "near-sdk-js/lib/types/index";
import { Token, TokenId } from "./token";
import { NonFungibleTokenCore } from "./core";
import { NonFungibleTokenApproval } from "./approval";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Bytes } from "near-sdk-js";
import { assert } from "near-sdk-js";
import { assert, Bytes } from "near-sdk-js";
import { Option } from "./utils";

/** This spec can be treated like a version of the standard. */
Expand Down
2 changes: 1 addition & 1 deletion near-contract-standards/src/non_fungible_token/token.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { TokenMetadata } from "./metadata";
import { AccountId } from "near-sdk-js/lib/types";
import { AccountId } from "near-sdk-js";
import { Option } from "./utils";

/** Note that token IDs for NFTs are strings on NEAR. It's still fine to use autoincrementing numbers as unique IDs if desired, but they should be stringified. This is to make IDs more future-proof as chain-agnostic conventions and standards arise, and allows for more flexibility with considerations like bridging NFTs across chains, etc. */
Expand Down
3 changes: 1 addition & 2 deletions near-contract-standards/src/non_fungible_token/utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { near, assert, Bytes } from "near-sdk-js";
import { AccountId } from "near-sdk-js/lib/types";
import { near, assert, Bytes, AccountId } from "near-sdk-js";

export function bytes_for_approved_account_id(account_id: AccountId): number {
// The extra 4 bytes are coming from Borsh serialization to store the length of the string.
Expand Down
Loading