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

Jump to bottom

chore: remove crypto, unpin deps, bump version #51

Merged
merged 6 commits into from
Dec 11, 2020
Merged

chore: remove crypto, unpin deps, bump version #51

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e26c5be
fix(crypto): remove ArkCrypto export
amacar Dec 11, 2020
66c1c49
chore: unpin ark deps
amacar Dec 11, 2020
3546dd1
chore: version bump
amacar Dec 11, 2020
2812106
chore: update yarn lock
amacar Dec 11, 2020
4973548
feat: use utils from kernel
amacar Dec 11, 2020
c6f3d83
chore: remove use ark utils instead of protokol ones
amacar Dec 11, 2020
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
356 changes: 177 additions & 179 deletions .pnp.js
View file
Open in desktop

Large diffs are not rendered by default.

Binary file renamed ...core-npm-7.12.9-8369e5cab5-beefb9f490.zip → ...ore-npm-7.12.10-b02df7217e-4d7b892764.zip
View file
Open in desktop
Binary file not shown.
Binary file renamed ...ator-npm-7.12.5-e9ae5c4dd3-7706cb3d29.zip → ...tor-npm-7.12.10-b4f90b65bc-ddd59efc33.zip
View file
Open in desktop
Binary file not shown.
Binary file renamed ...rity-npm-7.10.4-29a99c32bb-4f0ddd4340.zip → ...ity-npm-7.12.10-cb02cbb9f3-5c645ed43c.zip
View file
Open in desktop
Binary file not shown.
Binary file added .yarn/cache/@babel-helper-optimise-call-expression-npm-7.12.10-1735a7949f-e96f37e943.zip
View file
Open in desktop
Binary file not shown.
Binary file removed .yarn/cache/@babel-helper-optimise-call-expression-npm-7.12.7-667935c7f4-105a32f560.zip
View file
Open in desktop
Binary file not shown.
Binary file added .yarn/cache/@babel-parser-npm-7.12.10-b5a43522c0-b21b51c2c5.zip
View file
Open in desktop
Binary file not shown.
Binary file removed .yarn/cache/@babel-parser-npm-7.12.7-138627a0ea-12daf20ffe.zip
View file
Open in desktop
Binary file not shown.
Binary file renamed ...erse-npm-7.12.9-2eb67583a9-6797d3f42d.zip → ...rse-npm-7.12.10-4c5f7cc299-63e8500aed.zip
View file
Open in desktop
Binary file not shown.
Binary file renamed ...ypes-npm-7.12.7-e698f7394b-1536350797.zip → ...pes-npm-7.12.10-becdb90a5e-4f791b6788.zip
View file
Open in desktop
Binary file not shown.
Binary file removed .yarn/cache/@types-jest-npm-26.0.18-01ca852e55-942433a3be.zip
View file
Open in desktop
Binary file not shown.
Binary file added .yarn/cache/@types-jest-npm-26.0.19-add5d117dd-98c8daaf89.zip
View file
Open in desktop
Binary file not shown.
Binary file renamed ...de-npm-14.14.11-34adc2d908-aa09069a49.zip → ...de-npm-14.14.12-ed91cd16f0-def4a93f6b.zip
View file
Open in desktop
Binary file not shown.
Binary file renamed ...debug-npm-4.3.1-22e08d605e-0d41ba5177.zip → ...debug-npm-4.3.2-f0148b6afe-5543570879.zip
View file
Open in desktop
Binary file not shown.
Binary file renamed .../got-npm-11.8.0-f85797ae8b-9ad3dddd72.zip → .../got-npm-11.8.1-7775de79cb-739e7ffe35.zip
View file
Open in desktop
Binary file not shown.
Binary file removed .yarn/cache/ini-npm-1.3.6-a17a750a35-8c7c0ff83e.zip
View file
Open in desktop
Binary file not shown.
Binary file added .yarn/cache/ini-npm-1.3.7-188ee858c0-cf00289cb4.zip
View file
Open in desktop
Binary file not shown.
Binary file removed .yarn/cache/inversify-npm-5.0.1-6f6ad10d83-f06e76e4dd.zip
View file
Open in desktop
Binary file not shown.
Binary file added .yarn/cache/inversify-npm-5.0.5-4d1f1420a9-4610c86e0f.zip
View file
Open in desktop
Binary file not shown.
Binary file removed .yarn/cache/marked-npm-1.2.5-7de5c0d58a-f4d370e267.zip
View file
Open in desktop
Binary file not shown.
Binary file added .yarn/cache/marked-npm-1.2.6-3b6c1165ab-d7d9a2d163.zip
View file
Open in desktop
Binary file not shown.
Binary file renamed ...ates-npm-10.2.3-fe26e75607-cb6c101e0e.zip → ...ates-npm-10.2.5-8215a67a50-87e38f6735.zip
View file
Open in desktop
Binary file not shown.
Binary file renamed ...-git-npm-2.25.0-cf37592cd3-75924323c2.zip → ...-git-npm-2.27.0-e6c1b540fd-8e00068d8e.zip
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"full:testnet": "cross-env CORE_PATH_CONFIG=./config/networks/testnet ark core:run --networkStart --env=test --network=testnet"
},
"dependencies": {
"@arkecosystem/core": "3.0.0-next.16",
"@arkecosystem/core-cli": "3.0.0-next.16"
"@arkecosystem/core": "^3.0.0-next",
"@arkecosystem/core-cli": "^3.0.0-next"
},
"devDependencies": {
"@sindresorhus/tsconfig": "^0.8.0",
Expand Down
20 changes: 10 additions & 10 deletions packages/guardian-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@protokol/guardian-api",
"version": "1.0.0-beta.35",
"version": "1.0.0-beta.36",
"description": "REST API For Guardian Functionality",
"license": "CC-BY-NC-SA-4.0",
"homepage": "https://docs.protokol.com/nft/",
Expand Down Expand Up @@ -41,9 +41,9 @@
"publish:beta": "yarn build && yarn npm publish --tag beta --access public --tolerate-republish"
},
"dependencies": {
"@arkecosystem/core-api": "3.0.0-next.16",
"@arkecosystem/core-kernel": "3.0.0-next.16",
"@arkecosystem/crypto": "3.0.0-next.16",
"@arkecosystem/core-api": "^3.0.0-next",
"@arkecosystem/core-kernel": "^3.0.0-next",
"@arkecosystem/crypto": "^3.0.0-next",
"@hapi/boom": "^9.1.0",
"@hapi/hapi": "^20.0.2",
"@hapi/joi": "^17.1.0",
Expand All @@ -52,12 +52,12 @@
"latest-version": "^5.1.0"
},
"devDependencies": {
"@arkecosystem/core-database": "3.0.0-next.16",
"@arkecosystem/core-kernel": "3.0.0-next.16",
"@arkecosystem/core-state": "3.0.0-next.16",
"@arkecosystem/core-test-framework": "3.0.0-next.16",
"@arkecosystem/core-transaction-pool": "3.0.0-next.16",
"@arkecosystem/core-transactions": "3.0.0-next.16",
"@arkecosystem/core-database": "^3.0.0-next",
"@arkecosystem/core-kernel": "^3.0.0-next",
"@arkecosystem/core-state": "^3.0.0-next",
"@arkecosystem/core-test-framework": "^3.0.0-next",
"@arkecosystem/core-transaction-pool": "^3.0.0-next",
"@arkecosystem/core-transactions": "^3.0.0-next",
"@sindresorhus/tsconfig": "^0.8.0",
"@types/eslint": "^7.2.5",
"@types/eslint-plugin-prettier": "^3.1.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/guardian-crypto/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@protokol/guardian-crypto",
"version": "1.0.0-beta.35",
"version": "1.0.0-beta.36",
"description": "Transaction Builders For Guardian Transaction Types",
"license": "CC-BY-NC-SA-4.0",
"homepage": "https://docs.protokol.com/nft/",
Expand Down Expand Up @@ -42,13 +42,13 @@
"publish:beta": "yarn build && yarn npm publish --tag beta --access public --tolerate-republish"
},
"dependencies": {
"@arkecosystem/crypto": "3.0.0-next.16",
"@arkecosystem/crypto": "^3.0.0-next",
"@protokol/utils": "1.0.0-beta.37",
"bytebuffer": "^5.0.1"
},
"devDependencies": {
"@arkecosystem/core-kernel": "3.0.0-next.16",
"@arkecosystem/core-test-framework": "3.0.0-next.16",
"@arkecosystem/core-kernel": "^3.0.0-next",
"@arkecosystem/core-test-framework": "^3.0.0-next",
"@sindresorhus/tsconfig": "~0.8.0",
"@types/jest": "~26.0.15",
"@types/node": "^14.14.8",
Expand Down
4 changes: 1 addition & 3 deletions packages/guardian-crypto/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import * as ARKCrypto from "@arkecosystem/crypto";

import * as Builders from "./builders";
import * as Defaults from "./defaults";
import * as Enums from "./enums";
import * as Interfaces from "./interfaces";
import * as Transactions from "./transactions";

export { ARKCrypto, Builders, Defaults, Enums, Interfaces, Transactions };
export { Builders, Defaults, Enums, Interfaces, Transactions };
9 changes: 4 additions & 5 deletions packages/guardian-transactions/__tests__/unit/permission-resolver.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import "jest-extended";

import { Application, Container, Contracts, Providers } from "@arkecosystem/core-kernel";
import { Application, Container, Contracts, Providers, Utils } from "@arkecosystem/core-kernel";
import { Wallets } from "@arkecosystem/core-state";
import { Mocks, passphrases } from "@arkecosystem/core-test-framework";
import { Interfaces } from "@arkecosystem/crypto";
import { cloneDeep } from "@arkecosystem/utils";
import { Builders, Enums } from "@protokol/guardian-crypto";

import { Identifiers as GuardianIdentifiers, IGroupPermissions } from "../../src/interfaces";
Expand Down Expand Up @@ -249,7 +248,7 @@ describe("Guardian permission resolver tests", () => {
});

it("should allow transaction if it is first block", async () => {
const mockBlock = cloneDeep(defaultMockBlock);
const mockBlock = Utils.cloneDeep(defaultMockBlock);
mockBlock.data!.height = 1;
Mocks.StateStore.setBlock(mockBlock);

Expand All @@ -259,7 +258,7 @@ describe("Guardian permission resolver tests", () => {
});

it("should allow transaction if genesis", async () => {
const mockBlock = cloneDeep(defaultMockBlock);
const mockBlock = Utils.cloneDeep(defaultMockBlock);
mockBlock.transactions![0]!.data.senderPublicKey = senderWallet.publicKey;
Mocks.StateStore.setBlock(mockBlock);

Expand All @@ -269,7 +268,7 @@ describe("Guardian permission resolver tests", () => {
});

it("should use cached genesis publicKey to check permissions", async () => {
const mockBlock = cloneDeep(defaultMockBlock);
const mockBlock = Utils.cloneDeep(defaultMockBlock);
mockBlock.transactions![0]!.data.senderPublicKey = senderWallet.publicKey;
Mocks.StateStore.setBlock(mockBlock);

Expand Down
21 changes: 10 additions & 11 deletions packages/guardian-transactions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@protokol/guardian-transactions",
"version": "1.0.0-beta.35",
"version": "1.0.0-beta.36",
"description": "Transaction Types For Guardian Support",
"license": "CC-BY-NC-SA-4.0",
"homepage": "https://docs.protokol.com/nft/",
Expand Down Expand Up @@ -41,21 +41,20 @@
"publish:beta": "yarn build && yarn npm publish --tag beta --access public --tolerate-republish"
},
"dependencies": {
"@arkecosystem/core-database": "3.0.0-next.16",
"@arkecosystem/core-kernel": "3.0.0-next.16",
"@arkecosystem/core-state": "3.0.0-next.16",
"@arkecosystem/core-transactions": "3.0.0-next.16",
"@arkecosystem/crypto": "3.0.0-next.16",
"@arkecosystem/core-database": "^3.0.0-next",
"@arkecosystem/core-kernel": "^3.0.0-next",
"@arkecosystem/core-state": "^3.0.0-next",
"@arkecosystem/core-transactions": "^3.0.0-next",
"@arkecosystem/crypto": "^3.0.0-next",
"@protokol/guardian-crypto": "workspace:packages/guardian-crypto",
"ajv": "6.12.6",
"delay": "4.4.0"
},
"devDependencies": {
"@arkecosystem/core-kernel": "3.0.0-next.16",
"@arkecosystem/core-state": "3.0.0-next.16",
"@arkecosystem/core-test-framework": "3.0.0-next.16",
"@arkecosystem/core-transaction-pool": "3.0.0-next.16",
"@arkecosystem/utils": "1.2.1",
"@arkecosystem/core-kernel": "^3.0.0-next",
"@arkecosystem/core-state": "^3.0.0-next",
"@arkecosystem/core-test-framework": "^3.0.0-next",
"@arkecosystem/core-transaction-pool": "^3.0.0-next",
"@sindresorhus/tsconfig": "~0.8.0",
"@types/eslint": "^7.2.5",
"@types/eslint-plugin-prettier": "^3.1.0",
Expand Down
Loading