feat: mint_rate_limit added to state with an added check and view func (

#48) * feat: mint_rate_limit added to state with an added check and view func * fix: make total_cost == price * num of tokens * fix: test now price is flat and not extra for storage * fix: pass tests and update types * fix(CI): only test node 16 * fix(CI): switch back to normal workspaces-js * fix(CI): break up testnet into two runners * fix: ensure that linkdrop cost incorporates storage cost
TENK-DAO · Mar 15, 2022 · 89b473e · 89b473e
1 parent e07a2e9
commit 89b473e
Show file tree

Hide file tree

Showing 24 changed files with 2,323 additions and 324 deletions.
diff --git a/.github/workflows/testnet.yml b/.github/workflows/testnet.yml
@@ -4,24 +4,22 @@ jobs:
   tests:
     strategy:
       matrix:
-        platform: [ubuntu-latest]
-        node-version: ['14']
-        toolchain: [stable]
-    runs-on: ${{ matrix.platform }}
+        set: ['"*/linkdrop/succ*"', "*/link*/fail*"]
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: "${{ matrix.toolchain }} with rustfmt, and wasm32"
+      - name: "stable with rustfmt, and wasm32"
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: ${{ matrix.toolchain }}
+          toolchain: stable
           target: wasm32-unknown-unknown
       - uses: Swatinem/rust-cache@v1
       - name: Add wasm32 target
         run: rustup target add wasm32-unknown-unknown
       - name: install node
         uses: actions/setup-node@v2
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: '16'
       - name: Run tests
-        run: npm i && npm run test:linkdrop
+        run: npm i && npm run test:testnet ${{ matrix.set }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -5,7 +5,7 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest, macos-latest]
-        node-version: ['14', '16']
+        node-version: ['16']
         toolchain: [stable]
     runs-on: ${{ matrix.platform }}
     steps:

diff --git a/__test__/allowance.ava.ts b/__test__/allowance.ava.ts
@@ -1,4 +1,4 @@
-import { Workspace } from "near-willem-workspaces-ava";
+import { Workspace } from "near-workspaces-ava";
 import { NEAR } from "near-units";
 import {
   DEFAULT_SALE,

diff --git a/__test__/linkdrop/linkdrop-fail.ava.ts → __test__/linkdrop/fail.ava.ts b/__test__/linkdrop/linkdrop-fail.ava.ts → __test__/linkdrop/fail.ava.ts
@@ -2,10 +2,10 @@ import {
   Workspace,
   NearAccount,
   randomAccountId,
-} from "near-willem-workspaces-ava";
+} from "near-workspaces-ava";
 import {
   ava
-} from "near-willem-workspaces-ava";
+} from "near-workspaces-ava";
 import { NEAR, Gas } from "near-units";
 import { readFile } from "fs/promises";
 import {

diff --git a/__test__/linkdrop/linkdrop-success.ava.ts → __test__/linkdrop/success.ava.ts b/__test__/linkdrop/linkdrop-success.ava.ts → __test__/linkdrop/success.ava.ts
@@ -1,23 +1,12 @@
-import {
-  Workspace,
-  NearAccount,
-  randomAccountId,
-} from "near-willem-workspaces-ava";
-import {
-  ava
-} from "near-willem-workspaces-ava";
-import { NEAR, Gas } from "near-units";
+import { Workspace, randomAccountId } from "near-workspaces-ava";
+import { ava } from "near-workspaces-ava";
+import { NEAR } from "near-units";
 import { readFile } from "fs/promises";
 import {
-  ActualTestnet,
   createLinkdrop,
   getTokens,
   checkKey,
-  BalanceDelta,
   claim,
-  claim_raw,
-  // repeat,
-  // zeroDelta,
   hasDelta,
   getDelta,
   create_account_and_claim,
@@ -29,8 +18,6 @@ import {
 const base_cost = NEAR.parse("1 N");
 const min_cost = NEAR.parse("0.01 N");
 
-
-
 if (Workspace.networkIsTestnet()) {
   const runner = Workspace.init(
     { initialBalance: NEAR.parse("15 N").toString() },
@@ -69,7 +56,6 @@ if (Workspace.networkIsTestnet()) {
         );
       });
       await delta.isGreaterOrEqual(NEAR.from(0));
-      t.log(await delta.toHuman());
       const tokens = await getTokens(tenk, alice);
       t.assert(tokens.length == 1, "should contain only one token");
       t.log(
@@ -114,8 +100,6 @@ if (Workspace.networkIsTestnet()) {
     }
   );
 
-
-
   // runner.test(
   //   "Spam `claim` to send to non-existent account",
   //   async (t, { root, tenk }) => {
@@ -185,7 +169,6 @@ if (Workspace.networkIsTestnet()) {
       // await new_account.delete(root.accountId);
     }
   );
-
 } else {
   ava("skipped on sandbox", (t) => t.assert(true));
 }

diff --git a/__test__/mintbase.ts b/__test__/mintbase.ts
@@ -1,4 +1,4 @@
-import { Workspace, NearAccount, ONE_NEAR } from "near-willem-workspaces-ava";
+import { Workspace, NearAccount, ONE_NEAR } from "near-workspaces-ava";
 import { NEAR, Gas } from "near-units";
 import { nftTokensForOwner } from "./util";
 

diff --git a/__test__/nft.ava.ts b/__test__/nft.ava.ts
@@ -1,4 +1,4 @@
-import { Workspace, NearAccount } from "near-willem-workspaces-ava";
+import { Workspace, NearAccount } from "near-workspaces-ava";
 import { NEAR } from "near-units";
 import {
   costPerToken,
@@ -34,20 +34,9 @@ const runner = Workspace.init(
   }
 );
 
-runner.test("can get cost per token", async (t, { root, tenk }) => {
+runner.test("can get cost per token", async (t, { tenk }) => {
   const cost = await costPerToken(tenk, 1);
-  const storageCost = await tokenStorageCost(tenk);
-  t.log(
-    "One token costs " +
-      cost.toHuman() +
-      "to buy and " +
-      storageCost.toHuman() +
-      " to store"
-  );
-  t.deepEqual(cost.toBigInt(), price.add(storageCost).toBigInt());
-  // if (cost.toBigInt() > 0) {
-  //   t.assert(cost.gt(await costPerToken(tenk, 24)));
-  // }
+  t.deepEqual(cost.toBigInt(), price.toBigInt());
 });
 
 async function assertXTokens(t, root: NearAccount, tenk, num) {

diff --git a/__test__/paras.ava.ts b/__test__/paras.ava.ts
@@ -1,4 +1,4 @@
-import { Workspace, NearAccount, ONE_NEAR } from "near-willem-workspaces-ava";
+import { Workspace, NearAccount, ONE_NEAR } from "near-workspaces-ava";
 import { NEAR, Gas } from "near-units";
 import {
   nftTokensForOwner,

diff --git a/__test__/premint.ava.ts b/__test__/premint.ava.ts
@@ -1,4 +1,4 @@
-import { ONE_NEAR, Workspace } from "near-willem-workspaces-ava";
+import { ONE_NEAR, Workspace } from "near-workspaces-ava";
 import { NEAR } from "near-units";
 import {
   claim,

diff --git a/__test__/royalties.ava.ts b/__test__/royalties.ava.ts
@@ -1,4 +1,4 @@
-import { Workspace, NearAccount } from "near-willem-workspaces-ava";
+import { Workspace, NearAccount } from "near-workspaces-ava";
 import { NEAR } from "near-units";
 import { DEFAULT_SALE, deploy, getDelta, mint, now, totalCost } from "./util";
 import { Royalties, Sale } from "..";

diff --git a/__test__/start_at_one.ts b/__test__/start_at_one.ts
@@ -1,4 +1,4 @@
-// import { Workspace, NearAccount } from "near-willem-workspaces-ava";
+// import { Workspace, NearAccount } from "near-workspaces-ava";
 // import { NEAR } from "near-units";
 // import {
 //   costPerToken,

diff --git a/__test__/util/delta.ts b/__test__/util/delta.ts
@@ -1,4 +1,4 @@
-import { NEAR, NearAccount } from "near-willem-workspaces-ava";
+import { NEAR, NearAccount } from "near-workspaces-ava";
 
 export class NEARDelta {
   static readonly ZERO_NEAR = NEAR.from(0);

diff --git a/__test__/util/index.ts b/__test__/util/index.ts
@@ -9,8 +9,8 @@ import {
   KeyPair,
   PublicKey,
   AccountManager,
-} from "near-willem-workspaces";
-import { ONE_NEAR, TransactionResult } from "near-willem-workspaces-ava";
+} from "near-workspaces";
+import { ONE_NEAR, TransactionResult } from "near-workspaces-ava";
 import { binPath } from "./bin";
 import { BalanceDelta, getDelta } from "./delta";
 import {Contract} from "../..";

diff --git a/ava.config.cjs b/ava.config.cjs
@@ -1 +1 @@
-module.exports = require("near-willem-workspaces-ava/ava.config.cjs")
+module.exports = require("near-workspaces-ava/ava.config.cjs")