Merge pull request #1 from rmrk-team/master

Sync changes from main repo
rmrk-team · Sep 1, 2022 · e6be598 · e6be598
2 parents c2109c4 + 0b29d56
commit e6be598
Show file tree

Hide file tree

Showing 6 changed files with 393 additions and 511 deletions.
diff --git a/cli/consolidate.ts b/cli/consolidate.ts
@@ -78,8 +78,10 @@ const consolidate = async () => {
   const con = new Consolidator(ss58Format);
 
   const ret = await con.consolidate(remarks);
+  // Optimisation: return last 500 invalid items
+  ret.invalid = ret.invalid.slice(ret.invalid.length - 500);
 
-  //@ts-ignore
+  // @ts-ignore
   BigInt.prototype.toJSON = function () {
     return this.toString();
   };

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rmrk-tools",
-  "version": "2.0.85",
+  "version": "2.0.90",
   "description": "Suite of libraries implementing RMRK.app specs",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "lint": "tsc --noEmit && eslint '*/**/*.{js,ts,tsx}' --quiet",
     "lint:fix": "tsc --noEmit && eslint '*/**/*.{js,ts,tsx}' --quiet --fix",
     "cli:fetch": "ts-node --project tsconfig.cli.json cli/fetch.ts",
-    "cli:consolidate": "ts-node --project tsconfig.cli.json cli/consolidate",
+    "cli:consolidate": "NODE_OPTIONS='--max-old-space-size=8144' ts-node --project tsconfig.cli.json cli/consolidate",
     "cli:seed": "ts-node --project tsconfig.cli.json cli/seed",
     "cli:getevents": "ts-node --project tsconfig.cli.json cli/getevents",
     "cli:validate": "ts-node --project tsconfig.cli.json src/validate",
@@ -55,10 +55,10 @@
     "@babel/preset-env": "^7.13.9",
     "@babel/preset-typescript": "^7.13.0",
     "@pinata/sdk": "^1.1.13",
-    "@polkadot/api": "^8.10.1",
-    "@polkadot/keyring": "^9.6.2",
-    "@polkadot/util-crypto": "^9.6.2",
-    "@polkadot/x-randomvalues": "^9.6.2",
+    "@polkadot/api": "^9.0.1",
+    "@polkadot/keyring": "^10.1.2",
+    "@polkadot/util-crypto": "^10.1.2",
+    "@polkadot/x-randomvalues": "^10.1.2",
     "@rollup/plugin-babel": "^5.3.0",
     "@rollup/plugin-commonjs": "^17.1.0",
     "@rollup/plugin-json": "^4.1.0",
@@ -89,7 +89,7 @@
     "webpack-cli": "^4.5.0"
   },
   "dependencies": {
-    "@polkadot/api-augment": "^8.10.1",
+    "@polkadot/api-augment": "^9.0.1",
     "JSONStream": "^1.3.5",
     "chalk": "^4.1.0",
     "emoji-regex": "^9.2.2",
@@ -102,9 +102,9 @@
     "winston": "^3.3.3"
   },
   "peerDependency": {
-    "@polkadot/api": "^8.x",
-    "@polkadot/keyring": "^9.x",
-    "@polkadot/util-crypto": "^9.x",
-    "@polkadot/util": "^9.x"
+    "@polkadot/api": "^9.x",
+    "@polkadot/keyring": "^10.x",
+    "@polkadot/util-crypto": "^10.x",
+    "@polkadot/util": "^10.x"
   }
 }
diff --git a/src/rmrk2.0.0/tools/consolidator/interactions/list.ts b/src/rmrk2.0.0/tools/consolidator/interactions/list.ts
@@ -44,32 +44,10 @@ export const listForSaleInteraction = async (
       `[${OP_TYPES.LIST}] Attempting to list non-owned NFT ${listEntity.id}, real rootowner: ${rootowner}`
     );
   }
-  
+
   if (listEntity.price !== BigInt(0)) {
     validateTransferability(nft, remark, OP_TYPES.LIST);
   }
-
-  if (nft.children && nft.children.length > 0) {
-    const promises = nft.children.map(async (child) => {
-      const childNftConsolidated = await dbAdapter.getNFTById(child.id);
-      const childNft = consolidatedNFTtoInstance(childNftConsolidated);
-      if (childNft?.forsale && childNftConsolidated) {
-        childNft.addChange({
-          field: "forsale",
-          old: childNft.forsale,
-          new: BigInt(0),
-          caller: remark.caller,
-          block: remark.block,
-          opType: OP_TYPES.LIST,
-        } as Change);
-        childNft.forsale = BigInt(0);
-        await dbAdapter.updateNFTList(childNft, childNftConsolidated);
-      }
-      return childNft;
-    });
-
-    await Promise.all(promises);
-  }
 
   if (listEntity.price !== nft.forsale) {
     nft.addChange({

diff --git a/test/2.0.0/consolidator/__snapshots__/list.test.ts.snap b/test/2.0.0/consolidator/__snapshots__/list.test.ts.snap
diff --git a/test/2.0.0/consolidator/list.test.ts b/test/2.0.0/consolidator/list.test.ts
@@ -40,17 +40,6 @@ describe("rmrk2.0.0 Consolidator: LIST", () => {
     expect(await consolidator.consolidate(remarks)).toMatchSnapshot();
   });
 
-  it("Should update children to forsale 0", async () => {
-    const remarks = getRemarksFromBlocksMock([
-      ...getSetupRemarks(),
-      ...getBlockCallsMock(mintNftMock2().mint(mintNftMock(3).getId())),
-      ...getBlockCallsMock(mintNftMock2(4).list(BigInt(1e12))),
-      ...getBlockCallsMock(mintNftMock(3).list(BigInt(1e12))),
-    ]);
-    const consolidator = new Consolidator();
-    expect(await consolidator.consolidate(remarks)).toMatchSnapshot();
-  });
-
   it("Should prevent to LIST non-existent NFT", async () => {
     const remarks = getRemarksFromBlocksMock([
       ...getBlockCallsMock(mintNftMock(3).list(BigInt(1e12))),
@@ -100,7 +89,7 @@ describe("rmrk2.0.0 Consolidator: LIST", () => {
     const consolidator = new Consolidator();
     expect(await consolidator.consolidate(remarks)).toMatchSnapshot();
   });
-  
+
   it("Should invalidate LIST after transferable block number passed with negative transfer value", async () => {
     const remarks = getRemarksFromBlocksMock([
       ...getBlockCallsMock(createCollectionMock().create()),
@@ -114,7 +103,7 @@ describe("rmrk2.0.0 Consolidator: LIST", () => {
       "[LIST] Attempting to LIST non-transferable NFT 3-d43593c715a56da27d-KANARIABIRDS-KANR-00000777. It was transferable until block 4 but tx made at block 5"
     );
   });
-  
+
   it("Should allow DE-LIST after transferable block number passed with negative transfer value", async () => {
     const remarks = getRemarksFromBlocksMock([
       ...getBlockCallsMock(createCollectionMock().create()),
@@ -131,7 +120,7 @@ describe("rmrk2.0.0 Consolidator: LIST", () => {
     const consolidator = new Consolidator();
     expect(await consolidator.consolidate(remarks)).toMatchSnapshot();
   });
-  
+
   it("Should allow LIST until transferable block number reached with negative transfer value", async () => {
     const remarks = getRemarksFromBlocksMock([
       ...getBlockCallsMock(createCollectionMock().create()),
@@ -141,7 +130,7 @@ describe("rmrk2.0.0 Consolidator: LIST", () => {
     const consolidator = new Consolidator();
     expect(await consolidator.consolidate(remarks)).toMatchSnapshot();
   });
-  
+
   it("Should allow DE-LIST before transferable block number reached with negative transfer value", async () => {
     const remarks = getRemarksFromBlocksMock([
       ...getBlockCallsMock(createCollectionMock().create()),
@@ -158,7 +147,7 @@ describe("rmrk2.0.0 Consolidator: LIST", () => {
     const consolidator = new Consolidator();
     expect(await consolidator.consolidate(remarks)).toMatchSnapshot();
   });
-  
+
   it("Should invalidate LIST before transferable block number reached with positive transfer value", async () => {
     const remarks = getRemarksFromBlocksMock([
       ...getBlockCallsMock(createCollectionMock().create()),
@@ -171,7 +160,7 @@ describe("rmrk2.0.0 Consolidator: LIST", () => {
       "[LIST] Attempting to LIST non-transferable NFT 3-d43593c715a56da27d-KANARIABIRDS-KANR-00000777. It will become transferable after block 8 but tx made at block 4"
     );
   });
-  
+
   it("Should allow LIST after transferable block number reached with positive transfer value", async () => {
     const remarks = getRemarksFromBlocksMock([
       ...getBlockCallsMock(createCollectionMock().create()),
@@ -181,7 +170,7 @@ describe("rmrk2.0.0 Consolidator: LIST", () => {
     const consolidator = new Consolidator();
     expect(await consolidator.consolidate(remarks)).toMatchSnapshot();
   });
-  
+
   it("Should allow DE-LIST after transferable block number reached with positive transfer value", async () => {
     const remarks = getRemarksFromBlocksMock([
       ...getBlockCallsMock(createCollectionMock().create()),