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.

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

Development -> Main #713

Closed
wants to merge 28 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
5cfb3bf
Dao voting cw4 cleanup (#691)
JakeHartnell Jul 9, 2023
a2985ab
chore: rename arg on counting pass (#703)
Mehrbod2002 Jun 14, 2023
0367c84
Roles & NFT Voting Module cleanup (#692)
JakeHartnell Jul 9, 2023
29bea8d
Update lib versions (#718)
taitruong Jul 10, 2023
ec13a79
Final CW4 cleanup (#723)
NoahSaso Aug 2, 2023
61dcd63
chore(ci): action release-contracts (#640)
albttx Aug 19, 2023
7756251
Support different NFT contracts with `dao-voting-cw721-staked` (#726)
JakeHartnell Aug 20, 2023
3712508
Token Factory DAOs (#731)
JakeHartnell Aug 23, 2023
bf3ef9c
shields.io docs.rs badges (#740)
poroburu Sep 2, 2023
3518a28
Audit Fixes and Improvements (#742)
JakeHartnell Sep 15, 2023
7776858
Add error to FailedProposalExecution response (#749)
ismellike Sep 15, 2023
0ba671c
Remaining Audit Fixes & Factory Pattern (#750)
JakeHartnell Oct 18, 2023
963ebde
Bump version to 2.3.0
JakeHartnell Oct 18, 2023
1607d0b
Add cw-tokenfactory-issuer to publish script
JakeHartnell Oct 18, 2023
c030a72
Fix publishing script
JakeHartnell Oct 18, 2023
0b94255
Update schema
JakeHartnell Oct 18, 2023
fe72b2f
Document audits, final publish script
JakeHartnell Oct 18, 2023
95e4f73
Fix ci (#755)
JakeHartnell Oct 18, 2023
db42d45
Fix naming for dao_proposal_single (#757)
0xJayak Nov 7, 2023
690bc57
Add missing query to dao-pre-propose-approver (#766)
NoahSaso Nov 16, 2023
e54d447
Added missing completed proposal queries to approval-single (#767)
NoahSaso Nov 16, 2023
1187dba
Switch order of approval-single list queries (#772)
NoahSaso Nov 16, 2023
b554357
Removed requirement that vesting payments are created with same owner…
NoahSaso Nov 20, 2023
8f52914
Fix Test-Tube CI (#771)
poroburu Nov 20, 2023
329b59a
Upgrade osmosis-std and osmosis-test-tube packages to latest versions…
NoahSaso Nov 20, 2023
30337ad
Add another missing approver query to query the approver proposal ID …
NoahSaso Nov 20, 2023
6ca751c
Update deprecated functions (#764)
JakeHartnell Nov 21, 2023
4cc8cc4
Single Choice and Multiple Choice Veto (#752)
JakeHartnell Dec 4, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 6 additions & 2 deletions .cargo/config
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
[alias]
wasm = "build --release --lib --target wasm32-unknown-unknown"
wasm-debug = "build --lib --target wasm32-unknown-unknown"
t = "test --workspace"
unit-test = "test --workspace"
all-test = "test --workspace"
unit-test = "test --lib"
integration-test = "test --package integration-tests -- --ignored --test-threads 1 -Z unstable-options --report-time"
test-tube = "test --features test-tube"

[env]
RUSTFLAGS = "-C link-arg=-s"
2 changes: 1 addition & 1 deletion .github/workflows/basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
uses: actions-rs/cargo@v1
with:
toolchain: stable
command: unit-test
command: all-test
args: --locked
env:
RUST_BACKTRACE: 1
Expand Down
47 changes: 31 additions & 16 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,35 @@
name: coverage
'on':
# From: https://github.com/codecov/example-rust/blob/main/.github/workflows/rust.yml
name: Coverage

on:
- push

env:
CARGO_TERM_COLOR: always

jobs:
test:
name: coverage
build:

runs-on: ubuntu-latest
container:
image: 'xd009642/tarpaulin:develop-nightly'
options: '--security-opt seccomp=unconfined'

steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Generate code coverage
run: >
cargo +nightly tarpaulin --verbose --workspace --out Xml --exclude-files test-contracts/* *test*.rs packages/dao-dao-macros/* packages/dao-testing/* ci/*
- name: Upload to codecov.io
uses: codecov/codecov-action@v3
with:
fail_ci_if_error: false
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
components: llvm-tools-preview
- name: cargo install cargo-llvm-cov
run: cargo install cargo-llvm-cov
- name: cargo llvm-cov
run: cargo llvm-cov --workspace --lcov --output-path lcov.info
- name: Codecov
# You may pin to the exact commit or the version.
# uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378
uses: codecov/codecov-action@v3
with:
# Repository upload token - get it from codecov.io. Required only for private repositories
# token: # optional
# Specify whether the Codecov output should be verbose
verbose: true
fail_ci_if_error: true
2 changes: 1 addition & 1 deletion .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly
toolchain: nightly-2023-02-02
target: wasm32-unknown-unknown
override: true

Expand Down
51 changes: 51 additions & 0 deletions .github/workflows/release-contracts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Release contracts

permissions:
contents: write

on:
push:
tags:
- 'v*'
branches:
- main
- ci/release-contracts

jobs:
release:
runs-on: ubuntu-latest
container: cosmwasm/workspace-optimizer:0.12.13
steps:
- uses: actions/checkout@v3

# tar is required for cargo cache
- run: apk add --no-cache tar

- name: Set up cargo cache
uses: actions/cache@v3
with:
path: |
~/.cargo/bin/
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}

- name: Compile contracts
timeout-minutes: 30
run: optimize_workspace.sh .

- name: Upload contracts
uses: actions/upload-artifact@v3
with:
name: contracts
path: artifacts/

- name: release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
files: artifacts/*
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
71 changes: 71 additions & 0 deletions .github/workflows/test_tube.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
name: Test Tube Tests

on:
pull_request:
push:
branches:
- main

jobs:
test:
name: Integration tests
runs-on: ubuntu-latest
env:
GAS_OUT_DIR: gas_reports
GAS_LIMIT: 100000000
steps:
- name: Checkout sources
uses: actions/checkout@v3

- name: Install latest nightly toolchain
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly-2023-02-02
target: wasm32-unknown-unknown
override: true

- name: Setup Go
uses: actions/setup-go@v4

- name: Clone libwasmv (needed for test-tube)
uses: actions/checkout@v2
with:
repository: CosmWasm/wasmvm
path: ./wasmvm
ref: v1.4.1

- name: Install libwasmv
run: cd ./wasmvm && make build-rust && cd ../

- name: Rust Dependencies Cache
uses: actions/cache@v3
with:
path: |
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
artifacts/
key: ${{ runner.os }}-cargo-with-artifacts-${{ hashFiles('**/Cargo.lock') }}

- name: Set latest just version
run: echo "JUST_VERSION=$(cargo search just -q | sed -n -e '/^just[[:space:]]/p' | cut -d '"' -f 2)" >> $GITHUB_ENV

- name: Get cached just
uses: actions/cache@v3
with:
path: ~/.cargo/bin/just
key: ${{ runner.os }}-just-${{ env.JUST_VERSION }}

- name: Install just
run: cargo install just || true

- name: Run download deps
run: just download-deps

- name: Run workspace optimize
run: just workspace-optimize

- name: Run Test Tube Integration Tests
run: just test-tube
Loading
Loading