From b8e79b035bdfd57a5b349e9e7761aa6c905f059f Mon Sep 17 00:00:00 2001 From: MarvinJanssen Date: Sat, 9 Mar 2024 15:37:12 +0100 Subject: [PATCH] chore: rename pool stuff --- Clarinet.toml | 90 +-- contracts/boot.clar | 24 +- ...lar => public-pools-strategy-manager.clar} | 4 +- contracts/rules/rebase-1.clar | 2 +- .../fastpool-member.clar | 2 +- .../public-pools-strategy.clar} | 0 .../xverse-member.clar | 25 +- deployments/default.devnet-plan.yaml | 518 +++++++++++------- deployments/default.simnet-plan.yaml | 116 ++-- 9 files changed, 404 insertions(+), 377 deletions(-) rename contracts/extensions/{stacking-pool-strategy-manager.clar => public-pools-strategy-manager.clar} (78%) rename contracts/strategies/{fastpool => public-pools}/fastpool-member.clar (91%) rename contracts/strategies/{fastpool/stacking-pool-strategy.clar => public-pools/public-pools-strategy.clar} (100%) rename contracts/strategies/{fastpool => public-pools}/xverse-member.clar (57%) diff --git a/Clarinet.toml b/Clarinet.toml index 2d5290b..f40f2a7 100644 --- a/Clarinet.toml +++ b/Clarinet.toml @@ -66,128 +66,88 @@ epoch = 2.4 path = "contracts/proxies/lisa-transfer-proxy.clar" epoch = 2.4 -[contracts.stacking-pool-strategy] -path = "contracts/strategies/fastpool/stacking-pool-strategy.clar" +[contracts.public-pools-strategy] +path = "contracts/strategies/public-pools/public-pools-strategy.clar" epoch = 2.4 [contracts.fastpool-member1] -path = "contracts/strategies/fastpool/fastpool-member.clar" +path = "contracts/strategies/public-pools/fastpool-member.clar" epoch = 2.4 [contracts.fastpool-member2] -path = "contracts/strategies/fastpool/fastpool-member.clar" +path = "contracts/strategies/public-pools/fastpool-member.clar" epoch = 2.4 [contracts.fastpool-member3] -path = "contracts/strategies/fastpool/fastpool-member.clar" +path = "contracts/strategies/public-pools/fastpool-member.clar" epoch = 2.4 [contracts.fastpool-member4] -path = "contracts/strategies/fastpool/fastpool-member.clar" +path = "contracts/strategies/public-pools/fastpool-member.clar" epoch = 2.4 [contracts.fastpool-member5] -path = "contracts/strategies/fastpool/fastpool-member.clar" +path = "contracts/strategies/public-pools/fastpool-member.clar" epoch = 2.4 [contracts.fastpool-member6] -path = "contracts/strategies/fastpool/fastpool-member.clar" +path = "contracts/strategies/public-pools/fastpool-member.clar" epoch = 2.4 [contracts.fastpool-member7] -path = "contracts/strategies/fastpool/fastpool-member.clar" +path = "contracts/strategies/public-pools/fastpool-member.clar" epoch = 2.4 [contracts.fastpool-member8] -path = "contracts/strategies/fastpool/fastpool-member.clar" +path = "contracts/strategies/public-pools/fastpool-member.clar" epoch = 2.4 [contracts.fastpool-member9] -path = "contracts/strategies/fastpool/fastpool-member.clar" +path = "contracts/strategies/public-pools/fastpool-member.clar" epoch = 2.4 [contracts.fastpool-member10] -path = "contracts/strategies/fastpool/fastpool-member.clar" -epoch = 2.4 - -[contracts.fastpool-member11] -path = "contracts/strategies/fastpool/fastpool-member.clar" -epoch = 2.4 - -[contracts.fastpool-member12] -path = "contracts/strategies/fastpool/fastpool-member.clar" -epoch = 2.4 - -[contracts.fastpool-member13] -path = "contracts/strategies/fastpool/fastpool-member.clar" -epoch = 2.4 - -[contracts.fastpool-member14] -path = "contracts/strategies/fastpool/fastpool-member.clar" -epoch = 2.4 - -[contracts.fastpool-member15] -path = "contracts/strategies/fastpool/fastpool-member.clar" -epoch = 2.4 - -[contracts.fastpool-member16] -path = "contracts/strategies/fastpool/fastpool-member.clar" -epoch = 2.4 - -[contracts.fastpool-member17] -path = "contracts/strategies/fastpool/fastpool-member.clar" -epoch = 2.4 - -[contracts.fastpool-member18] -path = "contracts/strategies/fastpool/fastpool-member.clar" -epoch = 2.4 - -[contracts.fastpool-member19] -path = "contracts/strategies/fastpool/fastpool-member.clar" -epoch = 2.4 - -[contracts.fastpool-member20] -path = "contracts/strategies/fastpool/fastpool-member.clar" +path = "contracts/strategies/public-pools/fastpool-member.clar" epoch = 2.4 [contracts.xverse-member1] -path = "contracts/strategies/fastpool/xverse-member.clar" +path = "contracts/strategies/public-pools/xverse-member.clar" epoch = 2.4 [contracts.xverse-member2] -path = "contracts/strategies/fastpool/xverse-member.clar" +path = "contracts/strategies/public-pools/xverse-member.clar" epoch = 2.4 [contracts.xverse-member3] -path = "contracts/strategies/fastpool/xverse-member.clar" +path = "contracts/strategies/public-pools/xverse-member.clar" epoch = 2.4 [contracts.xverse-member4] -path = "contracts/strategies/fastpool/xverse-member.clar" +path = "contracts/strategies/public-pools/xverse-member.clar" epoch = 2.4 [contracts.xverse-member5] -path = "contracts/strategies/fastpool/xverse-member.clar" +path = "contracts/strategies/public-pools/xverse-member.clar" epoch = 2.4 [contracts.xverse-member6] -path = "contracts/strategies/fastpool/xverse-member.clar" +path = "contracts/strategies/public-pools/xverse-member.clar" epoch = 2.4 [contracts.xverse-member7] -path = "contracts/strategies/fastpool/xverse-member.clar" +path = "contracts/strategies/public-pools/xverse-member.clar" epoch = 2.4 [contracts.xverse-member8] -path = "contracts/strategies/fastpool/xverse-member.clar" +path = "contracts/strategies/public-pools/xverse-member.clar" epoch = 2.4 [contracts.xverse-member9] -path = "contracts/strategies/fastpool/xverse-member.clar" +path = "contracts/strategies/public-pools/xverse-member.clar" epoch = 2.4 [contracts.xverse-member10] -path = "contracts/strategies/fastpool/xverse-member.clar" +path = "contracts/strategies/public-pools/xverse-member.clar" epoch = 2.4 [contracts.sip-010-trait] @@ -206,8 +166,8 @@ epoch = 2.4 path = "contracts/traits/sip-010-extensions-trait.clar" epoch = 2.4 -[contracts.stacking-pool-strategy-manager] -path = "contracts/extensions/stacking-pool-strategy-manager.clar" +[contracts.public-pools-strategy-manager] +path = "contracts/extensions/public-pools-strategy-manager.clar" epoch = 2.4 [contracts.lqstx-mint-endpoint] @@ -215,7 +175,7 @@ path = "contracts/extensions/lqstx-mint-endpoint.clar" epoch = 2.4 [contracts.lqstx-mint-registry] -path = "contracts/extensions/lqstx-mint-registry.clar" +path = "contracts/aux/lqstx-mint-registry.clar" epoch = 2.4 [contracts.token-lqstx] diff --git a/contracts/boot.clar b/contracts/boot.clar index 0920ba3..06f9832 100644 --- a/contracts/boot.clar +++ b/contracts/boot.clar @@ -3,14 +3,14 @@ (define-public (execute (sender principal)) (begin (try! (contract-call? .lisa-dao set-extensions (list - {extension: .lqstx-mint-endpoint, enabled: true} - {extension: .lqstx-vault, enabled: true} - {extension: .treasury, enabled: true} - {extension: .token-vesting, enabled: true} - {extension: .stacking-pool-strategy-manager, enabled: true} - {extension: .lisa-rebase, enabled: true} - {extension: .rebase-1, enabled: true} - {extension: .operators, enabled: true} + { extension: .lqstx-mint-endpoint, enabled: true } + { extension: .lqstx-vault, enabled: true } + { extension: .treasury, enabled: true } + { extension: .token-vesting, enabled: true } + { extension: .public-pools-strategy-manager, enabled: true } + { extension: .lisa-rebase, enabled: true } + { extension: .rebase-1, enabled: true } + { extension: .operators, enabled: true } ))) ;; Set initial operators @@ -28,7 +28,7 @@ (try! (contract-call? .operators set-proposal-threshold 4)) ;; Set initial strategy managers, sender is the deployer - (try! (contract-call? .stacking-pool-strategy-manager set-authorised-manager sender true)) + (try! (contract-call? .public-pools-strategy-manager set-authorised-manager sender true)) ;; Mint max LISA token supply (1bn) (try! (contract-call? .token-lisa dao-mint-many (list @@ -43,10 +43,14 @@ 'SP2VZBR9GCVM33BN0WXA05VJP6QV7CJ3Z3SQKJ5HH 'SP12BFYTH3NJ6N63KE0S50GHSYV0M91NGQND2B704 'SPGAB1P3YV109E22KXFJYM63GK0G21BYX50CQ80B - ) + 'SPFJVM9Y1A4KJ31T8ZBDESZH36YGPDAZ9WXEFC53 + ) (list true true + true + true + true ))) (ok true) diff --git a/contracts/extensions/stacking-pool-strategy-manager.clar b/contracts/extensions/public-pools-strategy-manager.clar similarity index 78% rename from contracts/extensions/stacking-pool-strategy-manager.clar rename to contracts/extensions/public-pools-strategy-manager.clar index f357599..493fe91 100644 --- a/contracts/extensions/stacking-pool-strategy-manager.clar +++ b/contracts/extensions/public-pools-strategy-manager.clar @@ -14,14 +14,14 @@ (define-public (fund-strategy (amounts (list 20 uint))) (begin (asserts! (is-authorised-manager tx-sender) err-unauthorised) - (contract-call? .lqstx-vault fund-strategy .stacking-pool-strategy (unwrap-panic (to-consensus-buff? amounts))) + (contract-call? .lqstx-vault fund-strategy .public-pools-strategy (unwrap-panic (to-consensus-buff? amounts))) ) ) (define-public (refund-strategy (selection (list 20 bool))) (begin (asserts! (is-authorised-manager tx-sender) err-unauthorised) - (contract-call? .lqstx-vault refund-strategy .stacking-pool-strategy (unwrap-panic (to-consensus-buff? selection))) + (contract-call? .lqstx-vault refund-strategy .public-pools-strategy (unwrap-panic (to-consensus-buff? selection))) ) ) diff --git a/contracts/rules/rebase-1.clar b/contracts/rules/rebase-1.clar index 1180c90..cf891b7 100644 --- a/contracts/rules/rebase-1.clar +++ b/contracts/rules/rebase-1.clar @@ -1,3 +1,3 @@ (define-public (rebase) - (contract-call? .lisa-rebase rebase (list .stacking-pool-strategy)) + (contract-call? .lisa-rebase rebase (list .public-pools-strategy)) ) diff --git a/contracts/strategies/fastpool/fastpool-member.clar b/contracts/strategies/public-pools/fastpool-member.clar similarity index 91% rename from contracts/strategies/fastpool/fastpool-member.clar rename to contracts/strategies/public-pools/fastpool-member.clar index 3729129..ae74e6e 100644 --- a/contracts/strategies/fastpool/fastpool-member.clar +++ b/contracts/strategies/public-pools/fastpool-member.clar @@ -3,7 +3,7 @@ (as-contract (contract-call? 'SP000000000000000000002Q6VF78.pox-3 allow-contract-caller 'SP21YTSM60CAY6D011EZVEVNKXVW8FVZE198XEFFP.pox-fast-pool-v2 none)) (define-read-only (is-strategy-caller) - (ok (asserts! (is-eq contract-caller .stacking-pool-strategy) err-unauthorised)) + (ok (asserts! (is-eq contract-caller .public-pools-strategy) err-unauthorised)) ) (define-public (delegate-stx (amount uint)) diff --git a/contracts/strategies/fastpool/stacking-pool-strategy.clar b/contracts/strategies/public-pools/public-pools-strategy.clar similarity index 100% rename from contracts/strategies/fastpool/stacking-pool-strategy.clar rename to contracts/strategies/public-pools/public-pools-strategy.clar diff --git a/contracts/strategies/fastpool/xverse-member.clar b/contracts/strategies/public-pools/xverse-member.clar similarity index 57% rename from contracts/strategies/fastpool/xverse-member.clar rename to contracts/strategies/public-pools/xverse-member.clar index f7a397b..4d919c2 100644 --- a/contracts/strategies/fastpool/xverse-member.clar +++ b/contracts/strategies/public-pools/xverse-member.clar @@ -1,19 +1,32 @@ (define-constant err-unauthorised (err u5000)) -(define-constant pool-reward-pox-addr (tuple (hashbytes 0x) (version 0x))) + +(define-data-var pool-reward-pox-addr + { hashbytes: (buff 32), version: (buff 1) } + { hashbytes: 0x827a04335a9eb22cb46979f180670c8e7ba453b5, version: 0x04 } +) + (as-contract (contract-call? 'SP000000000000000000002Q6VF78.pox-3 allow-contract-caller 'SP001SFSMC2ZY76PD4M68P3WGX154XCH7NE3TYMX.pox-pools-1-cycle-v2 none)) +(define-read-only (is-dao-or-extension) + (ok (asserts! (or (is-eq tx-sender .lisa-dao) (contract-call? .lisa-dao is-extension contract-caller)) err-unauthorised)) +) + +(define-public (set-pool-reward-pox-addr (new-address { hashbytes: (buff 32), version: (buff 1) })) + (begin + (try! (is-dao-or-extension)) + (ok (var-set pool-reward-pox-addr new-address)) + ) +) + (define-read-only (is-strategy-caller) - (ok (asserts! (is-eq contract-caller .stacking-pool-strategy) err-unauthorised)) + (ok (asserts! (is-eq contract-caller .public-pools-strategy) err-unauthorised)) ) (define-public (delegate-stx (amount uint)) (begin (try! (is-strategy-caller)) (try! (as-contract (contract-call? 'SP001SFSMC2ZY76PD4M68P3WGX154XCH7NE3TYMX.pox-pools-1-cycle-v2 delegate-stx - amount - 'SPXVRSEH2BKSXAEJ00F1BY562P45D5ERPSKR4Q33 none (some (tuple (hashbytes 0xdb14133a9dbb1d0e16b60513453e48b6ff2847a9) (version 0x04))) - pool-reward-pox-addr - none))) + amount 'SPXVRSEH2BKSXAEJ00F1BY562P45D5ERPSKR4Q33 none none (var-get pool-reward-pox-addr) none))) (ok true) ) ) diff --git a/deployments/default.devnet-plan.yaml b/deployments/default.devnet-plan.yaml index 5d6b4a7..aae7e68 100644 --- a/deployments/default.devnet-plan.yaml +++ b/deployments/default.devnet-plan.yaml @@ -85,168 +85,24 @@ plan: epoch: "2.05" - id: 2 transactions: + - requirement-publish: + contract-id: SP001SFSMC2ZY76PD4M68P3WGX154XCH7NE3TYMX.pox-pools-1-cycle-v2 + remap-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + remap-principals: + SP001SFSMC2ZY76PD4M68P3WGX154XCH7NE3TYMX: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + SP000000000000000000002Q6VF78: ST000000000000000000002AMW42H + cost: 198950 + path: "./.cache/requirements/SP001SFSMC2ZY76PD4M68P3WGX154XCH7NE3TYMX.pox-pools-1-cycle-v2.clar" + clarity-version: 2 - requirement-publish: contract-id: SP21YTSM60CAY6D011EZVEVNKXVW8FVZE198XEFFP.pox-fast-pool-v2 remap-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM remap-principals: SP21YTSM60CAY6D011EZVEVNKXVW8FVZE198XEFFP: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + SP000000000000000000002Q6VF78: ST000000000000000000002AMW42H cost: 180760 path: "./.cache/requirements/SP21YTSM60CAY6D011EZVEVNKXVW8FVZE198XEFFP.pox-fast-pool-v2.clar" clarity-version: 2 - - contract-publish: - contract-name: fastpool-member1 - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10160 - path: contracts/strategies/fastpool/fastpool-member.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: fastpool-member10 - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10160 - path: contracts/strategies/fastpool/fastpool-member.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: fastpool-member11 - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10160 - path: contracts/strategies/fastpool/fastpool-member.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: fastpool-member12 - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10160 - path: contracts/strategies/fastpool/fastpool-member.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: fastpool-member13 - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10160 - path: contracts/strategies/fastpool/fastpool-member.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: fastpool-member14 - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10160 - path: contracts/strategies/fastpool/fastpool-member.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: fastpool-member15 - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10160 - path: contracts/strategies/fastpool/fastpool-member.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: fastpool-member16 - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10160 - path: contracts/strategies/fastpool/fastpool-member.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: fastpool-member17 - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10160 - path: contracts/strategies/fastpool/fastpool-member.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: fastpool-member18 - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10160 - path: contracts/strategies/fastpool/fastpool-member.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: fastpool-member19 - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10160 - path: contracts/strategies/fastpool/fastpool-member.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: fastpool-member2 - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10160 - path: contracts/strategies/fastpool/fastpool-member.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: fastpool-member20 - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10160 - path: contracts/strategies/fastpool/fastpool-member.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: fastpool-member3 - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10160 - path: contracts/strategies/fastpool/fastpool-member.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: fastpool-member4 - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10160 - path: contracts/strategies/fastpool/fastpool-member.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: fastpool-member5 - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10160 - path: contracts/strategies/fastpool/fastpool-member.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: fastpool-member6 - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10160 - path: contracts/strategies/fastpool/fastpool-member.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: fastpool-member7 - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10160 - path: contracts/strategies/fastpool/fastpool-member.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: fastpool-member8 - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10160 - path: contracts/strategies/fastpool/fastpool-member.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: fastpool-member9 - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10160 - path: contracts/strategies/fastpool/fastpool-member.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: strategy-trait - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 1820 - path: contracts/traits/strategy-trait.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: fastpool-strategy - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 33860 - path: contracts/strategies/fastpool/fastpool-strategy.clar - anchor-block-only: true - clarity-version: 2 - contract-publish: contract-name: extension-trait expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM @@ -261,9 +117,6 @@ plan: path: contracts/traits/proposal-trait.clar anchor-block-only: true clarity-version: 2 - epoch: "2.4" - - id: 3 - transactions: - contract-publish: contract-name: lisa-dao expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM @@ -271,34 +124,6 @@ plan: path: contracts/lisa-dao.clar anchor-block-only: true clarity-version: 2 - - contract-publish: - contract-name: proxy-trait - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 790 - path: contracts/traits/proxy-trait.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: lqstx-vault - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 9320 - path: contracts/extensions/lqstx-vault.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: fastpool-strategy-manager - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10830 - path: contracts/extensions/fastpool-strategy-manager.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: operators - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 33060 - path: contracts/extensions/operators.clar - anchor-block-only: true - clarity-version: 2 - contract-publish: contract-name: sip-010-trait expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM @@ -306,25 +131,32 @@ plan: path: contracts/traits/sip-010-trait.clar anchor-block-only: true clarity-version: 2 - - contract-publish: - contract-name: token-lisa - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 28900 - path: contracts/token-lisa.clar - anchor-block-only: true - clarity-version: 2 - - contract-publish: - contract-name: boot - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 12620 - path: contracts/boot.clar - anchor-block-only: true - clarity-version: 2 - contract-publish: contract-name: lqstx-mint-registry expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM cost: 36450 - path: contracts/lqstx-mint-registry.clar + path: contracts/aux/lqstx-mint-registry.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: proxy-trait + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 790 + path: contracts/traits/proxy-trait.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: strategy-trait + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 1820 + path: contracts/traits/strategy-trait.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: lqstx-vault + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 9320 + path: contracts/extensions/lqstx-vault.clar anchor-block-only: true clarity-version: 2 - contract-publish: @@ -344,7 +176,7 @@ plan: - contract-publish: contract-name: token-lqstx expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 39130 + cost: 38230 path: contracts/token-lqstx.clar anchor-block-only: true clarity-version: 2 @@ -358,10 +190,261 @@ plan: - contract-publish: contract-name: lqstx-mint-endpoint expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 124190 + cost: 134940 path: contracts/extensions/lqstx-mint-endpoint.clar anchor-block-only: true clarity-version: 2 + - contract-publish: + contract-name: operators + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 33360 + path: contracts/extensions/operators.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: fastpool-member1 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 10150 + path: contracts/strategies/fastpool/fastpool-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: fastpool-member10 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 10150 + path: contracts/strategies/fastpool/fastpool-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: fastpool-member2 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 10150 + path: contracts/strategies/fastpool/fastpool-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: fastpool-member3 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 10150 + path: contracts/strategies/fastpool/fastpool-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: fastpool-member4 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 10150 + path: contracts/strategies/fastpool/fastpool-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: fastpool-member5 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 10150 + path: contracts/strategies/fastpool/fastpool-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: fastpool-member6 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 10150 + path: contracts/strategies/fastpool/fastpool-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: fastpool-member7 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 10150 + path: contracts/strategies/fastpool/fastpool-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: fastpool-member8 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 10150 + path: contracts/strategies/fastpool/fastpool-member.clar + anchor-block-only: true + clarity-version: 2 + epoch: "2.4" + - id: 3 + transactions: + - contract-publish: + contract-name: fastpool-member9 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 10150 + path: contracts/strategies/fastpool/fastpool-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: xverse-member1 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 12670 + path: contracts/strategies/fastpool/xverse-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: xverse-member10 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 12670 + path: contracts/strategies/fastpool/xverse-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: xverse-member2 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 12670 + path: contracts/strategies/fastpool/xverse-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: xverse-member3 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 12670 + path: contracts/strategies/fastpool/xverse-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: xverse-member4 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 12670 + path: contracts/strategies/fastpool/xverse-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: xverse-member5 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 12670 + path: contracts/strategies/fastpool/xverse-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: xverse-member6 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 12670 + path: contracts/strategies/fastpool/xverse-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: xverse-member7 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 12670 + path: contracts/strategies/fastpool/xverse-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: xverse-member8 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 12670 + path: contracts/strategies/fastpool/xverse-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: xverse-member9 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 12670 + path: contracts/strategies/fastpool/xverse-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: public-pools-strategy + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 33570 + path: contracts/strategies/fastpool/public-pools-strategy.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: public-pools-strategy-manager + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 10930 + path: contracts/extensions/public-pools-strategy-manager.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: token-lisa + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 28900 + path: contracts/token-lisa.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: boot + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 19750 + path: contracts/boot.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: fastpool-member11 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 10150 + path: contracts/strategies/fastpool/fastpool-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: fastpool-member12 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 10150 + path: contracts/strategies/fastpool/fastpool-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: fastpool-member13 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 10150 + path: contracts/strategies/fastpool/fastpool-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: fastpool-member14 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 10150 + path: contracts/strategies/fastpool/fastpool-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: fastpool-member15 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 10150 + path: contracts/strategies/fastpool/fastpool-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: fastpool-member16 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 10150 + path: contracts/strategies/fastpool/fastpool-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: fastpool-member17 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 10150 + path: contracts/strategies/fastpool/fastpool-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: fastpool-member18 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 10150 + path: contracts/strategies/fastpool/fastpool-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: fastpool-member19 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 10150 + path: contracts/strategies/fastpool/fastpool-member.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: fastpool-member20 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 10150 + path: contracts/strategies/fastpool/fastpool-member.clar + anchor-block-only: true + clarity-version: 2 + epoch: "2.4" + - id: 4 + transactions: - contract-publish: contract-name: lisa-rebase expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM @@ -383,6 +466,13 @@ plan: path: contracts/proxies/lqstx-transfer-proxy.clar anchor-block-only: true clarity-version: 2 + - contract-publish: + contract-name: mock-proposal + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 2510 + path: contracts/mocks/mock-proposal.clar + anchor-block-only: true + clarity-version: 2 - contract-publish: contract-name: mock-strategy expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM @@ -400,7 +490,7 @@ plan: - contract-publish: contract-name: rebase-1 expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 900 + cost: 950 path: contracts/rules/rebase-1.clar anchor-block-only: true clarity-version: 2 @@ -414,7 +504,7 @@ plan: - contract-publish: contract-name: regtest-boot expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 8580 + cost: 12450 path: contracts/regtest-boot.clar anchor-block-only: true clarity-version: 2 @@ -439,21 +529,29 @@ plan: path: contracts/proxies/stx-transfer-many-proxy.clar anchor-block-only: true clarity-version: 2 - epoch: "2.4" - - id: 4 - transactions: + - contract-publish: + contract-name: token-vesting + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 39230 + path: contracts/extensions/token-vesting.clar + anchor-block-only: true + clarity-version: 2 - contract-publish: contract-name: token-wlqstx expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 53570 - path: contracts/wrapped-tokens/token-wlqstx.clar + cost: 56200 + path: contracts/mocks/token-wlqstx.clar anchor-block-only: true clarity-version: 2 - contract-publish: contract-name: treasury expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM cost: 10790 - path: contracts/treasury.clar + path: contracts/extensions/treasury.clar anchor-block-only: true clarity-version: 2 + # - stx-transfer: + # amount: 10000000 + # from: + # to: SN3V8VHJH9XZ52EARC2XHYAKPFBZRY78VQD3N9GJM epoch: "2.4" diff --git a/deployments/default.simnet-plan.yaml b/deployments/default.simnet-plan.yaml index 61e38e6..95df709 100644 --- 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 @@ -135,7 +137,7 @@ plan: - emulated-contract-publish: contract-name: lqstx-mint-registry emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/extensions/lqstx-mint-registry.clar + path: contracts/aux/lqstx-mint-registry.clar clarity-version: 2 - emulated-contract-publish: contract-name: proxy-trait @@ -185,115 +187,115 @@ plan: - emulated-contract-publish: contract-name: fastpool-member1 emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/fastpool-member.clar + path: contracts/strategies/public-pools/fastpool-member.clar clarity-version: 2 - emulated-contract-publish: contract-name: fastpool-member10 emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/fastpool-member.clar + path: contracts/strategies/public-pools/fastpool-member.clar clarity-version: 2 - emulated-contract-publish: contract-name: fastpool-member2 emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/fastpool-member.clar + path: contracts/strategies/public-pools/fastpool-member.clar clarity-version: 2 - emulated-contract-publish: contract-name: fastpool-member3 emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/fastpool-member.clar + path: contracts/strategies/public-pools/fastpool-member.clar clarity-version: 2 - emulated-contract-publish: contract-name: fastpool-member4 emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/fastpool-member.clar + path: contracts/strategies/public-pools/fastpool-member.clar clarity-version: 2 - emulated-contract-publish: contract-name: fastpool-member5 emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/fastpool-member.clar + path: contracts/strategies/public-pools/fastpool-member.clar clarity-version: 2 - emulated-contract-publish: contract-name: fastpool-member6 emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/fastpool-member.clar + path: contracts/strategies/public-pools/fastpool-member.clar clarity-version: 2 - emulated-contract-publish: contract-name: fastpool-member7 emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/fastpool-member.clar + path: contracts/strategies/public-pools/fastpool-member.clar clarity-version: 2 - emulated-contract-publish: contract-name: fastpool-member8 emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/fastpool-member.clar + 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 emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/fastpool-member.clar + path: contracts/strategies/public-pools/fastpool-member.clar clarity-version: 2 - emulated-contract-publish: contract-name: xverse-member1 emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/xverse-member.clar + path: contracts/strategies/public-pools/xverse-member.clar clarity-version: 2 - emulated-contract-publish: contract-name: xverse-member10 emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/xverse-member.clar + path: contracts/strategies/public-pools/xverse-member.clar clarity-version: 2 - emulated-contract-publish: contract-name: xverse-member2 emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/xverse-member.clar + path: contracts/strategies/public-pools/xverse-member.clar clarity-version: 2 - emulated-contract-publish: contract-name: xverse-member3 emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/xverse-member.clar + path: contracts/strategies/public-pools/xverse-member.clar clarity-version: 2 - emulated-contract-publish: contract-name: xverse-member4 emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/xverse-member.clar + path: contracts/strategies/public-pools/xverse-member.clar clarity-version: 2 - emulated-contract-publish: contract-name: xverse-member5 emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/xverse-member.clar + path: contracts/strategies/public-pools/xverse-member.clar clarity-version: 2 - emulated-contract-publish: contract-name: xverse-member6 emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/xverse-member.clar + path: contracts/strategies/public-pools/xverse-member.clar clarity-version: 2 - emulated-contract-publish: contract-name: xverse-member7 emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/xverse-member.clar + path: contracts/strategies/public-pools/xverse-member.clar clarity-version: 2 - emulated-contract-publish: contract-name: xverse-member8 emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/xverse-member.clar + path: contracts/strategies/public-pools/xverse-member.clar clarity-version: 2 - emulated-contract-publish: contract-name: xverse-member9 emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/xverse-member.clar + path: contracts/strategies/public-pools/xverse-member.clar clarity-version: 2 - emulated-contract-publish: - contract-name: stacking-pool-strategy + contract-name: public-pools-strategy emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/stacking-pool-strategy.clar + path: contracts/strategies/public-pools/public-pools-strategy.clar clarity-version: 2 - emulated-contract-publish: - contract-name: stacking-pool-strategy-manager + contract-name: public-pools-strategy-manager emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/extensions/stacking-pool-strategy-manager.clar + path: contracts/extensions/public-pools-strategy-manager.clar clarity-version: 2 - emulated-contract-publish: contract-name: token-lisa @@ -305,59 +307,6 @@ plan: emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM path: contracts/boot.clar clarity-version: 2 - - emulated-contract-publish: - contract-name: fastpool-member11 - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/fastpool-member.clar - clarity-version: 2 - - emulated-contract-publish: - contract-name: fastpool-member12 - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/fastpool-member.clar - clarity-version: 2 - - emulated-contract-publish: - contract-name: fastpool-member13 - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/fastpool-member.clar - clarity-version: 2 - - emulated-contract-publish: - contract-name: fastpool-member14 - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/fastpool-member.clar - clarity-version: 2 - - emulated-contract-publish: - contract-name: fastpool-member15 - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/fastpool-member.clar - clarity-version: 2 - - emulated-contract-publish: - contract-name: fastpool-member16 - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/fastpool-member.clar - clarity-version: 2 - - emulated-contract-publish: - contract-name: fastpool-member17 - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/fastpool-member.clar - clarity-version: 2 - - emulated-contract-publish: - contract-name: fastpool-member18 - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/fastpool-member.clar - clarity-version: 2 - - emulated-contract-publish: - contract-name: fastpool-member19 - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/fastpool-member.clar - clarity-version: 2 - - emulated-contract-publish: - contract-name: fastpool-member20 - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/strategies/fastpool/fastpool-member.clar - clarity-version: 2 - epoch: "2.4" - - id: 3 - transactions: - emulated-contract-publish: contract-name: lisa-rebase emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM @@ -408,6 +357,9 @@ plan: emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM path: contracts/traits/sip-010-extensions-trait.clar clarity-version: 2 + epoch: "2.4" + - id: 4 + transactions: - emulated-contract-publish: contract-name: sip-010-transferable-trait emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM