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

Support Kujira's tokenfactory fork #816

Merged
merged 1 commit into from
Apr 1, 2024
Merged

Support Kujira's tokenfactory fork #816

merged 1 commit into from
Apr 1, 2024

Conversation

NoahSaso
Copy link
Member

@NoahSaso NoahSaso commented Mar 27, 2024 •
edited
Loading

This adds support for Kujira's tokenfactory fork for the dao-voting-token-staked and cw-tokenfactory-issuer contracts. Eek! Too many forks D:

@codecov Codecov
Copy link

codecov bot commented Mar 27, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 0% with 68 lines in your changes are missing coverage. Please review.

Project coverage is 96.26%. Comparing base (d59c282) to head (0cfe9e9).

Files Patch % Lines
packages/cw-tokenfactory-types/src/msg.rs 0.00% 34 Missing ⚠️
packages/cw-tokenfactory-types/src/kujira.rs 0.00% 24 Missing ⚠️
packages/cw-tokenfactory-types/src/cosmos.rs 0.00% 10 Missing ⚠️
Additional details and impacted files 
@@               Coverage Diff               @@
##           development     #816      +/-   ##
===============================================
- Coverage        96.30%   96.26%   -0.05%     
===============================================
  Files              207      209       +2     
  Lines            53490    53514      +24     
===============================================
  Hits             51513    51513              
- Misses            1977     2001      +24

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@NoahSaso NoahSaso merged commit caea80a into development Apr 1, 2024
7 of 9 checks passed
@NoahSaso NoahSaso deleted the noah/kujira-tf branch April 1, 2024 17:32
ismellike added a commit to Arena-DAO/dao-contracts that referenced this pull request Jul 19, 2024
@ismellike
Squashed commit of the following:
3a3da47 
commit 0c09c62
Author: Gabriel Lopez <glopez11193@gmail.com>
Date:   Thu Jul 18 20:56:03 2024 -0500

    Revert integration_tests.yml

commit c46937a
Author: Gabriel Lopez <glopez11193@gmail.com>
Date:   Wed Jul 17 13:18:11 2024 -0500

    Update basic.yml to cache only cargo deps

    Nightly toolchain is required for integration_tests

commit 7773cb0
Author: Gabriel Lopez <glopez11193@gmail.com>
Date:   Wed Jul 17 12:45:09 2024 -0500

    Set integration_tests toolchain to latest stable

commit 74aea83
Author: Gabriel Lopez <glopez11193@gmail.com>
Date:   Thu Jul 11 02:21:52 2024 -0500

    Cargo schema + fix orch wasm build and tests

commit e8081ac
Author: Gabriel Lopez <glopez11193@gmail.com>
Date:   Thu Jul 11 00:40:32 2024 -0500

    Fix cargo stuff

commit d5a1850
Merge: 87925b2 5918cbe
Author: Gabriel Lopez <glopez11193@gmail.com>
Date:   Wed Jul 10 23:48:52 2024 -0500

    Merge branch 'development' into feature/cw-orch-interface

commit 87925b2
Author: Gabriel Lopez <glopez11193@gmail.com>
Date:   Wed Jul 10 23:47:50 2024 -0500

    Add cache to basic.yml

commit 2951f8c
Author: Gabriel Lopez <glopez11193@gmail.com>
Date:   Wed Jul 10 23:47:40 2024 -0500

    Fix lints

    Also updates just lint to match basic.yml

commit 5918cbe
Author: noah <noahsaso@gmail.com>
Date:   Mon Jul 8 18:33:22 2024 -0400

    OmniFlix NFT (x/onft) staked voting module (DA0-DA0#838)

commit ac249f4
Author: noah <noahsaso@gmail.com>
Date:   Sat Jul 6 23:11:22 2024 -0400

    Improve pre-propose proposal creation permission granularity (and bump versions to v2.5.0) (DA0-DA0#843)

commit 8be18d1
Author: bekauz <bekauz@protonmail.com>
Date:   Mon Jun 17 18:05:24 2024 +0200

    staking rewards distribution followup (DA0-DA0#835)

    Co-authored-by: Noah Saso <noahsaso@gmail.com>
    Co-authored-by: Jake Hartnell <jake.hartnell@gmail.com>

commit bb8224e
Author: noah <noahsaso@gmail.com>
Date:   Thu Jun 6 00:32:12 2024 -0400

    moved .cargo/config to .cargo/config.toml (DA0-DA0#837)

commit 87485be
Author: bekauz <bekauz@protonmail.com>
Date:   Wed May 22 18:39:06 2024 +0200

    bump cw-std to 1.5.4 (DA0-DA0#824)

commit 8c945ac
Author: Kayanski <kowalski.kowalskin@gmail.com>
Date:   Fri May 17 09:09:32 2024 +0000

    Added other derives

commit f720001
Author: Kayanski <kowalski.kowalskin@gmail.com>
Date:   Fri May 17 09:06:45 2024 +0000

    Added derive fns

commit 003f87d
Author: Kayanski <kowalski.kowalskin@gmail.com>
Date:   Fri May 17 08:54:07 2024 +0000

    Fix tests

commit 88ec5ed
Author: Kayanski <kowalski.kowalskin@gmail.com>
Date:   Fri May 17 08:52:54 2024 +0000

    Added Queryfns on voting

commit 3440d34
Author: Kayanski <kowalski.kowalskin@gmail.com>
Date:   Fri May 17 08:06:38 2024 +0000

    Finalize test changes

commit 9492e37
Author: Kayanski <kowalski.kowalskin@gmail.com>
Date:   Fri May 17 07:40:35 2024 +0000

    More tests

commit 5883c87
Author: Kayanski <kowalski.kowalskin@gmail.com>
Date:   Thu May 16 17:24:41 2024 +0000

    Added tests with cw-orch

commit b01de1c
Author: Kayanski <kowalski.kowalskin@gmail.com>
Date:   Thu May 16 14:41:02 2024 +0000

    First test modifications

commit 3ab7017
Author: noah <noahsaso@gmail.com>
Date:   Mon Apr 1 20:04:11 2024 +0200

    Update versions to 2.4.2 (DA0-DA0#817)

commit caea80a
Author: noah <noahsaso@gmail.com>
Date:   Mon Apr 1 19:32:50 2024 +0200

    support kujira's /kujira.denom... tokenfactory fork (DA0-DA0#816)
ismellike added a commit to Arena-DAO/dao-contracts that referenced this pull request Jul 19, 2024
@ismellike
Squashed commit of the following:
15f299c 
commit aff2c4e
Author: Gabe <glopez11193@gmail.com>
Date:   Fri Jul 19 12:08:16 2024 -0500

    Revert basic.yml

    i think caching is causing issues with the cargo.lock

commit 6db4637
Author: Gabe <glopez11193@gmail.com>
Date:   Fri Jul 19 12:06:17 2024 -0500

    Lint + not(target_arch = "wasm32") in lib.rs

commit 18241d0
Merge: 761a780 87847fd
Author: Gabe <glopez11193@gmail.com>
Date:   Fri Jul 19 10:58:25 2024 -0500

    Merge branch 'pr/1' into feature/cw-orch-interface

commit 761a780
Author: Gabe <glopez11193@gmail.com>
Date:   Fri Jul 19 02:40:02 2024 -0500

    Update to cw-orch .24.1

commit 0c09c62
Author: Gabriel Lopez <glopez11193@gmail.com>
Date:   Thu Jul 18 20:56:03 2024 -0500

    Revert integration_tests.yml

commit c46937a
Author: Gabriel Lopez <glopez11193@gmail.com>
Date:   Wed Jul 17 13:18:11 2024 -0500

    Update basic.yml to cache only cargo deps

    Nightly toolchain is required for integration_tests

commit 7773cb0
Author: Gabriel Lopez <glopez11193@gmail.com>
Date:   Wed Jul 17 12:45:09 2024 -0500

    Set integration_tests toolchain to latest stable

commit 87847fd
Author: hard-nett <hardnettt@proton.me>
Date:   Sat Jul 13 18:53:38 2024 +0000

    add cw-orch to external contract

commit 74aea83
Author: Gabriel Lopez <glopez11193@gmail.com>
Date:   Thu Jul 11 02:21:52 2024 -0500

    Cargo schema + fix orch wasm build and tests

commit e8081ac
Author: Gabriel Lopez <glopez11193@gmail.com>
Date:   Thu Jul 11 00:40:32 2024 -0500

    Fix cargo stuff

commit d5a1850
Merge: 87925b2 5918cbe
Author: Gabriel Lopez <glopez11193@gmail.com>
Date:   Wed Jul 10 23:48:52 2024 -0500

    Merge branch 'development' into feature/cw-orch-interface

commit 87925b2
Author: Gabriel Lopez <glopez11193@gmail.com>
Date:   Wed Jul 10 23:47:50 2024 -0500

    Add cache to basic.yml

commit 2951f8c
Author: Gabriel Lopez <glopez11193@gmail.com>
Date:   Wed Jul 10 23:47:40 2024 -0500

    Fix lints

    Also updates just lint to match basic.yml

commit 5918cbe
Author: noah <noahsaso@gmail.com>
Date:   Mon Jul 8 18:33:22 2024 -0400

    OmniFlix NFT (x/onft) staked voting module (DA0-DA0#838)

commit ac249f4
Author: noah <noahsaso@gmail.com>
Date:   Sat Jul 6 23:11:22 2024 -0400

    Improve pre-propose proposal creation permission granularity (and bump versions to v2.5.0) (DA0-DA0#843)

commit 8be18d1
Author: bekauz <bekauz@protonmail.com>
Date:   Mon Jun 17 18:05:24 2024 +0200

    staking rewards distribution followup (DA0-DA0#835)

    Co-authored-by: Noah Saso <noahsaso@gmail.com>
    Co-authored-by: Jake Hartnell <jake.hartnell@gmail.com>

commit bb8224e
Author: noah <noahsaso@gmail.com>
Date:   Thu Jun 6 00:32:12 2024 -0400

    moved .cargo/config to .cargo/config.toml (DA0-DA0#837)

commit 87485be
Author: bekauz <bekauz@protonmail.com>
Date:   Wed May 22 18:39:06 2024 +0200

    bump cw-std to 1.5.4 (DA0-DA0#824)

commit 8c945ac
Author: Kayanski <kowalski.kowalskin@gmail.com>
Date:   Fri May 17 09:09:32 2024 +0000

    Added other derives

commit f720001
Author: Kayanski <kowalski.kowalskin@gmail.com>
Date:   Fri May 17 09:06:45 2024 +0000

    Added derive fns

commit 003f87d
Author: Kayanski <kowalski.kowalskin@gmail.com>
Date:   Fri May 17 08:54:07 2024 +0000

    Fix tests

commit 88ec5ed
Author: Kayanski <kowalski.kowalskin@gmail.com>
Date:   Fri May 17 08:52:54 2024 +0000

    Added Queryfns on voting

commit 3440d34
Author: Kayanski <kowalski.kowalskin@gmail.com>
Date:   Fri May 17 08:06:38 2024 +0000

    Finalize test changes

commit 9492e37
Author: Kayanski <kowalski.kowalskin@gmail.com>
Date:   Fri May 17 07:40:35 2024 +0000

    More tests

commit 5883c87
Author: Kayanski <kowalski.kowalskin@gmail.com>
Date:   Thu May 16 17:24:41 2024 +0000

    Added tests with cw-orch

commit b01de1c
Author: Kayanski <kowalski.kowalskin@gmail.com>
Date:   Thu May 16 14:41:02 2024 +0000

    First test modifications

commit 3ab7017
Author: noah <noahsaso@gmail.com>
Date:   Mon Apr 1 20:04:11 2024 +0200

    Update versions to 2.4.2 (DA0-DA0#817)

commit caea80a
Author: noah <noahsaso@gmail.com>
Date:   Mon Apr 1 19:32:50 2024 +0200

    support kujira's /kujira.denom... tokenfactory fork (DA0-DA0#816)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JakeHartnell JakeHartnell JakeHartnell approved these changes

@bekauz bekauz Awaiting requested review from bekauz

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@NoahSaso @JakeHartnell