Skip to content

Commit

Permalink
chore(smart-contracts): merge release/v2_contracts branch into feat/s…
Browse files Browse the repository at this point in the history
…tableswap-case-for-lp
  • Loading branch information
nseguias committed May 31, 2024
2 parents 59e034a + ee0f33c commit 6c661bd
Show file tree
Hide file tree
Showing 112 changed files with 6,800 additions and 4,384 deletions.
15 changes: 9 additions & 6 deletions .github/ISSUE_TEMPLATE/1_bug.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Bug on migaloo-core contracts
about: You are interacting with White Whale's contracts, and you are getting an unexpected behavior, an exception, or something looks wrong.
title: ''
labels: 'bug'
assignees: ''

title: ""
labels: "bug"
assignees: ""
---

<!-- Thank you for using White Whale Migaloo!
Expand All @@ -22,6 +21,7 @@ assignees: ''
If you want to report a security issue, please follow our security policy: `https://github.com/White-Whale-Defi-Platform/migaloo-core/blob/main/SECURITY.md`

---

## Steps to Reproduce

<!-- Please include full steps to reproduce so that we can reproduce the problem. -->
Expand All @@ -37,17 +37,19 @@ If you want to report a security issue, please follow our security policy: `http
---

### Additional context

Add any other context about the problem here, code snippets, json responses and so on.

<details>
<summary>Code sample</summary>

<!--
If case you are working on a smart contract, please attach a minimal reproducible
If case you are working on a smart contract, please attach a minimal reproducible
sample that shows the problem and attach it below between the lines with the backticks.
-->

```rust

```

</details>
Expand All @@ -56,14 +58,15 @@ Add any other context about the problem here, code snippets, json responses and
<summary>Logs</summary>

<!--
Paste the log output below between the lines with the backticks, whether it is
Paste the log output below between the lines with the backticks, whether it is
from compilation or executing a query on chain.
Please see if the error message includes enough information
to explain how to solve the issue.
-->

```
```

</details>
Expand Down
18 changes: 11 additions & 7 deletions .github/ISSUE_TEMPLATE/2_improvement.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Improvement proposal
about: General improvements to the protocol. Anything that exists on Migaloo, is working well but could be enhanced or optimized.
title: ''
labels: 'enhancement'
assignees: ''

title: ""
labels: "enhancement"
assignees: ""
---

<!-- Thank you for using White Whale Migaloo!
Expand All @@ -22,6 +21,7 @@ assignees: ''
If you want to report a security issue, please follow our security policy: `https://github.com/White-Whale-Defi-Platform/migaloo-core/blob/main/SECURITY.md`

---

## Improvement description

<!--
Expand All @@ -32,17 +32,19 @@ If you want to report a security issue, please follow our security policy: `http
---

### Additional context

Add any other context here, code snippets, json responses, screenshots and so on.

<details>
<summary>Code sample</summary>

<!--
If case you are working on a smart contract, please attach a minimal reproducible
If case you are working on a smart contract, please attach a minimal reproducible
sample that shows the problem and attach it below between the lines with the backticks.
-->

```rust

```

</details>
Expand All @@ -51,14 +53,15 @@ Add any other context here, code snippets, json responses, screenshots and so on
<summary>Logs</summary>

<!--
Paste the log output below between the lines with the backticks, whether it is
Paste the log output below between the lines with the backticks, whether it is
from compilation or executing a query on chain.
Please see if the error message includes enough information
to explain how to solve the issue.
-->

```
```

</details>
Expand All @@ -75,10 +78,11 @@ Add any other context here, code snippets, json responses, screenshots and so on
-->

```
```

</details>

<!--
Include any additional resource that doesn't fit the categories previously listed.
-->
-->
9 changes: 4 additions & 5 deletions .github/ISSUE_TEMPLATE/3_feature_request.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Feature request
about: Suggest a new idea for White Whale Migaloo. This is something that doesn't exist currently, and you want to see.
title: ''
labels: 'enhancement'
assignees: ''

title: ""
labels: "enhancement"
assignees: ""
---

<!-- Thank you for using White Whale Migaloo!
Expand Down Expand Up @@ -46,4 +45,4 @@ assignees: ''
Does this have to be provided by White Whale directly, or can it be provided
by a third-party contract? If so, maybe consider implementing and
share it with the community rather than filing a bug.
-->
-->
7 changes: 3 additions & 4 deletions .github/ISSUE_TEMPLATE/4_infrastructure.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: The CI infrastructure used by Migaloo has a problem
about: As a contributor, you want to file an issue about the build/test infra, e.g. Github actions etc.
title: ''
labels: 'infra'
assignees: ''

title: ""
labels: "infra"
assignees: ""
---

<!-- Thank you for using White Whale Migaloo!
Expand Down
9 changes: 4 additions & 5 deletions .github/ISSUE_TEMPLATE/5_protocol.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Migaloo's architecture has an issue or can be improved
about: You found an issue with the protocol's architecture, or have ideas on how to make further improvements.
title: ''
labels: 'protocol architecture'
assignees: ''

title: ""
labels: "protocol architecture"
assignees: ""
---

<!-- Thank you for using White Whale Migaloo!
Expand All @@ -23,7 +22,7 @@ assignees: ''

<!--
Please tell us what issue you found, explain how is that a problem to the
Please tell us what issue you found, explain how is that a problem to the
protocol.
Alternatively, what do you think can be improved in the current architecture?
Expand Down
25 changes: 15 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ publish = false
authors = ["White Whale Defi"]

[workspace.dependencies]
cosmwasm-schema = { version = "1.5.3" }
cosmwasm-std = { version = "1.1.4", features = [
cosmwasm-schema = { version = "1.5.4" }
cosmwasm-std = { version = "1.5.4", features = [
"iterator",
"cosmwasm_1_2",
"stargate",
Expand Down Expand Up @@ -71,6 +71,7 @@ incentive-factory = { path = "./contracts/liquidity_hub/pool-network/incentive_f
terraswap-token = { path = "./contracts/liquidity_hub/pool-network/terraswap_token" }
terraswap-pair = { path = "./contracts/liquidity_hub/pool-network/terraswap_pair" }
incentive-manager = { path = "./contracts/liquidity_hub/incentive-manager" }
bonding-manager = { path = "./contracts/liquidity_hub/bonding-manager" }

[workspace.metadata.dylint]
libraries = [{ git = "https://github.com/0xFable/cw-lint" }]
Expand Down
Loading

0 comments on commit 6c661bd

Please sign in to comment.