Merge pull request #17 from alexgo-io/fix/lqstx-mint-endpoint

fix: lqstx-mint-endpoint::get-reward-cycle
2026-01-12 17:23:23 +08:00 · 2024-03-10 06:59:15 +08:00
parent b92e0187a3 0046518dfd
commit e8d35c1336
3 changed files with 129 additions and 21 deletions
--- a/contracts/extensions/lqstx-mint-endpoint.clar
+++ b/contracts/extensions/lqstx-mint-endpoint.clar
@@ -76,15 +76,15 @@

 ;; @dev used for testing only
 (define-read-only (get-reward-cycle (stacks-height uint))
-    ;; (some (contract-call? 'SP000000000000000000002Q6VF78.pox-3 current-pox-reward-cycle)))
-    (if (>= stacks-height (var-get activation-block))
-        (some (/ (- stacks-height (var-get activation-block)) (var-get reward-cycle-length)))
-        none))            
+    (some (contract-call? 'SP000000000000000000002Q6VF78.pox-3 current-pox-reward-cycle)))
+    ;; (if (>= stacks-height (var-get activation-block))
+    ;;     (some (/ (- stacks-height (var-get activation-block)) (var-get reward-cycle-length)))
+    ;;     none))            

 ;; @dev used for testing only
 (define-read-only (get-first-stacks-block-in-reward-cycle (reward-cycle uint))
-    ;; (contract-call? 'SP000000000000000000002Q6VF78.pox-3 reward-cycle-to-burn-height reward-cycle))
-    (+ (var-get activation-block) (* (var-get reward-cycle-length) reward-cycle)))
+    (contract-call? 'SP000000000000000000002Q6VF78.pox-3 reward-cycle-to-burn-height reward-cycle))
+    ;; (+ (var-get activation-block) (* (var-get reward-cycle-length) reward-cycle)))

 (define-read-only (get-mint-delay)
    (var-get mint-delay))
--- a/deployments/default.simnet-plan.yaml
+++ b/deployments/default.simnet-plan.yaml
@@ -39,7 +39,6 @@ genesis:
    - pox
    - pox-2
    - pox-3
-    - pox-4
    - lockup
    - costs-2
    - costs-3
@@ -54,6 +53,9 @@ plan:
            emulated-sender: SP3FBR2AGK5H9QBDH3EEN6DF8EK8JY7RX8QJ5SVTE
            path: "./.cache/requirements/SP3FBR2AGK5H9QBDH3EEN6DF8EK8JY7RX8QJ5SVTE.sip-010-trait-ft-standard.clar"
            clarity-version: 1
+      epoch: "2.0"
+    - id: 1
+      transactions:
        - emulated-contract-publish:
            contract-name: trait-sip-010
            emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
@@ -99,8 +101,8 @@ plan:
            emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
            path: contracts_modules/alex_v1/traits/trait-vault.clar
            clarity-version: 1
-      epoch: "2.1"
-    - id: 1
+      epoch: "2.05"
+    - id: 2
      transactions:
        - emulated-contract-publish:
            contract-name: pox-pools-1-cycle-v2
@@ -228,7 +230,7 @@ plan:
            path: contracts/strategies/public-pools/fastpool-member.clar
            clarity-version: 2
      epoch: "2.4"
-    - id: 2
+    - id: 3
      transactions:
        - emulated-contract-publish:
            contract-name: fastpool-member9
@@ -356,7 +358,7 @@ plan:
            path: contracts/traits/sip-010-extensions-trait.clar
            clarity-version: 2
      epoch: "2.4"
-    - id: 3
+    - id: 4
      transactions:
        - emulated-contract-publish:
            contract-name: sip-010-transferable-trait
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -7,13 +7,16 @@ settings:
 dependencies:
  '@hirosystems/clarinet-sdk':
    specifier: ^1.0.0
-    version: 1.3.0
+    version: 1.3.0(@types/node@20.11.24)
  '@stacks/transactions':
    specifier: ^6.9.0
    version: 6.12.0
  chokidar-cli:
    specifier: ^3.0.0
    version: 3.0.0
+  ts-node:
+    specifier: ^10.9.2
+    version: 10.9.2(@types/node@20.11.24)(typescript@5.3.3)
  typescript:
    specifier: ^5.2.2
    version: 5.3.3
@@ -26,9 +29,19 @@ dependencies:
  vitest-environment-clarinet:
    specifier: ^1.0.0
    version: 1.1.0(@hirosystems/clarinet-sdk@1.3.0)(vitest@0.34.6)
+  yaml:
+    specifier: ^2.4.1
+    version: 2.4.1

 packages:

+  /@cspotcode/source-map-support@0.8.1:
+    resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.9
+    dev: false
+
  /@esbuild/aix-ppc64@0.19.12:
    resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==}
    engines: {node: '>=12'}
@@ -438,7 +451,7 @@ packages:
    resolution: {integrity: sha512-2x5cdnhMrYu5mJrtB0/LCkSX8gLAWFoB8juzjQVoPj+Q3oi+9586COyvqCzqJdFPf1mZhuWYgtWQvk5rm3d4XA==}
    dev: false

-  /@hirosystems/clarinet-sdk@1.3.0:
+  /@hirosystems/clarinet-sdk@1.3.0(@types/node@20.11.24):
    resolution: {integrity: sha512-CB6+E8gcFJp2Q+iYZ74opI+GJBsAEc54SdPdMY8lvz/H7lHonQtyjn0aOPl8Th5jcC3Cq+yqb6APDWbBr07vUA==}
    engines: {node: '>=18.0.0'}
    hasBin: true
@@ -447,7 +460,7 @@ packages:
      '@stacks/transactions': 6.12.0
      kolorist: 1.8.0
      prompts: 2.4.2
-      vitest: 1.3.1
+      vitest: 1.3.1(@types/node@20.11.24)
      yargs: 17.7.2
    transitivePeerDependencies:
      - '@edge-runtime/vm'
@@ -473,10 +486,22 @@ packages:
      '@sinclair/typebox': 0.27.8
    dev: false

+  /@jridgewell/resolve-uri@3.1.2:
+    resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
+    engines: {node: '>=6.0.0'}
+    dev: false
+
  /@jridgewell/sourcemap-codec@1.4.15:
    resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
    dev: false

+  /@jridgewell/trace-mapping@0.3.9:
+    resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
+    dependencies:
+      '@jridgewell/resolve-uri': 3.1.2
+      '@jridgewell/sourcemap-codec': 1.4.15
+    dev: false
+
  /@noble/hashes@1.1.5:
    resolution: {integrity: sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ==}
    dev: false
@@ -622,6 +647,22 @@ packages:
      - encoding
    dev: false

+  /@tsconfig/node10@1.0.9:
+    resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==}
+    dev: false
+
+  /@tsconfig/node12@1.0.11:
+    resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==}
+    dev: false
+
+  /@tsconfig/node14@1.0.3:
+    resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==}
+    dev: false
+
+  /@tsconfig/node16@1.0.4:
+    resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==}
+    dev: false
+
  /@types/bn.js@5.1.5:
    resolution: {integrity: sha512-V46N0zwKRF5Q00AZ6hWtN0T8gGmDUaUzLWQvHFo5yThtVwK/VCenFY3wXVbOvNfajEpsTfQM4IN9k/d6gUVX3A==}
    dependencies:
@@ -779,6 +820,10 @@ packages:
      picomatch: 2.3.1
    dev: false

+  /arg@4.1.3:
+    resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==}
+    dev: false
+
  /assertion-error@1.1.0:
    resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==}
    dev: false
@@ -900,6 +945,10 @@ packages:
    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
    dev: false

+  /create-require@1.1.1:
+    resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
+    dev: false
+
  /cross-fetch@3.1.8:
    resolution: {integrity: sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==}
    dependencies:
@@ -946,6 +995,11 @@ packages:
    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
    dev: false

+  /diff@4.0.2:
+    resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
+    engines: {node: '>=0.3.1'}
+    dev: false
+
  /emoji-regex@7.0.3:
    resolution: {integrity: sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==}
    dev: false
@@ -1195,6 +1249,10 @@ packages:
      '@jridgewell/sourcemap-codec': 1.4.15
    dev: false

+  /make-error@1.3.6:
+    resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
+    dev: false
+
  /merge-stream@2.0.0:
    resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
    dev: false
@@ -1525,6 +1583,37 @@ packages:
    resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
    dev: false

+  /ts-node@10.9.2(@types/node@20.11.24)(typescript@5.3.3):
+    resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==}
+    hasBin: true
+    peerDependencies:
+      '@swc/core': '>=1.2.50'
+      '@swc/wasm': '>=1.2.50'
+      '@types/node': '*'
+      typescript: '>=2.7'
+    peerDependenciesMeta:
+      '@swc/core':
+        optional: true
+      '@swc/wasm':
+        optional: true
+    dependencies:
+      '@cspotcode/source-map-support': 0.8.1
+      '@tsconfig/node10': 1.0.9
+      '@tsconfig/node12': 1.0.11
+      '@tsconfig/node14': 1.0.3
+      '@tsconfig/node16': 1.0.4
+      '@types/node': 20.11.24
+      acorn: 8.11.3
+      acorn-walk: 8.3.2
+      arg: 4.1.3
+      create-require: 1.1.1
+      diff: 4.0.2
+      make-error: 1.3.6
+      typescript: 5.3.3
+      v8-compile-cache-lib: 3.0.1
+      yn: 3.1.1
+    dev: false
+
  /type-detect@4.0.8:
    resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
    engines: {node: '>=4'}
@@ -1544,6 +1633,10 @@ packages:
    resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
    dev: false

+  /v8-compile-cache-lib@3.0.1:
+    resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
+    dev: false
+
  /vite-node@0.34.6(@types/node@20.11.24):
    resolution: {integrity: sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==}
    engines: {node: '>=v14.18.0'}
@@ -1566,7 +1659,7 @@ packages:
      - terser
    dev: false

-  /vite-node@1.3.1:
+  /vite-node@1.3.1(@types/node@20.11.24):
    resolution: {integrity: sha512-azbRrqRxlWTJEVbzInZCTchx0X69M/XPTCz4H+TLvlTcR/xH/3hkRqhOakT41fMJCMzXTu4UvegkZiEoJAWvng==}
    engines: {node: ^18.0.0 || >=20.0.0}
    hasBin: true
@@ -1575,7 +1668,7 @@ packages:
      debug: 4.3.4
      pathe: 1.1.2
      picocolors: 1.0.0
-      vite: 5.1.4
+      vite: 5.1.4(@types/node@20.11.24)
    transitivePeerDependencies:
      - '@types/node'
      - less
@@ -1623,7 +1716,7 @@ packages:
      fsevents: 2.3.3
    dev: false

-  /vite@5.1.4:
+  /vite@5.1.4(@types/node@20.11.24):
    resolution: {integrity: sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==}
    engines: {node: ^18.0.0 || >=20.0.0}
    hasBin: true
@@ -1651,6 +1744,7 @@ packages:
      terser:
        optional: true
    dependencies:
+      '@types/node': 20.11.24
      esbuild: 0.19.12
      postcss: 8.4.35
      rollup: 4.12.0
@@ -1664,7 +1758,7 @@ packages:
      '@hirosystems/clarinet-sdk': '1'
      vitest: '1'
    dependencies:
-      '@hirosystems/clarinet-sdk': 1.3.0
+      '@hirosystems/clarinet-sdk': 1.3.0(@types/node@20.11.24)
      vitest: 0.34.6
    dev: false

@@ -1733,7 +1827,7 @@ packages:
      - terser
    dev: false

-  /vitest@1.3.1:
+  /vitest@1.3.1(@types/node@20.11.24):
    resolution: {integrity: sha512-/1QJqXs8YbCrfv/GPQ05wAZf2eakUPLPa18vkJAKE7RXOKfVHqMZZ1WlTjiwl6Gcn65M5vpNUB6EFLnEdRdEXQ==}
    engines: {node: ^18.0.0 || >=20.0.0}
    hasBin: true
@@ -1758,6 +1852,7 @@ packages:
      jsdom:
        optional: true
    dependencies:
+      '@types/node': 20.11.24
      '@vitest/expect': 1.3.1
      '@vitest/runner': 1.3.1
      '@vitest/snapshot': 1.3.1
@@ -1775,8 +1870,8 @@ packages:
      strip-literal: 2.0.0
      tinybench: 2.6.0
      tinypool: 0.8.2
-      vite: 5.1.4
-      vite-node: 1.3.1
+      vite: 5.1.4(@types/node@20.11.24)
+      vite-node: 1.3.1(@types/node@20.11.24)
      why-is-node-running: 2.2.2
    transitivePeerDependencies:
      - less
@@ -1847,6 +1942,12 @@ packages:
    engines: {node: '>=10'}
    dev: false

+  /yaml@2.4.1:
+    resolution: {integrity: sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==}
+    engines: {node: '>= 14'}
+    hasBin: true
+    dev: false
+
  /yargs-parser@13.1.2:
    resolution: {integrity: sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==}
    dependencies:
@@ -1887,6 +1988,11 @@ packages:
      yargs-parser: 21.1.1
    dev: false

+  /yn@3.1.1:
+    resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
+    engines: {node: '>=6'}
+    dev: false
+
  /yocto-queue@1.0.0:
    resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==}
    engines: {node: '>=12.20'}