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

Feature/multitest #61

Open
wants to merge 64 commits into
base: upgrade-cosmwasm-1-0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
6d7c537
Merge pull request #35 from securesecrets/upgrade-cosmwasm-1-0
xucito Sep 27, 2022
304c262
add send snip20
barbel840113 Oct 13, 2022
ba44cb3
fixing multi-test
barbel840113 Oct 16, 2022
cf538d9
adding mock permit query
barbel840113 Oct 17, 2022
55cd013
Merge pull request #42 from securesecrets/upgrade-cosmwasm-1-0
xucito Oct 17, 2022
a6de0fd
Add deploy logic
xucito Oct 17, 2022
3aa4db1
Merge branch 'new_staking_contract_fixes' into main
xucito Oct 17, 2022
571186c
Fix bacon and implement shade admin functionality
xucito Oct 17, 2022
38c03ac
Merge pull request #60 from securesecrets/add_admin
xucito Oct 17, 2022
2fa9a69
add mock query_auth
msivaklumachain Oct 18, 2022
ab7fcb3
fix cli & refactor staking integration test
barbel840113 Oct 19, 2022
a285725
add unit test & clean code
barbel840113 Oct 20, 2022
55498f2
add mock_query
barbel840113 Oct 23, 2022
adb420a
fix storing_reward_token
msivaklumachain Oct 26, 2022
f686722
add stakers
barbel840113 Oct 26, 2022
a6672f9
temp commit
msivaklumachain Oct 26, 2022
61cdec4
mock staking & factory
barbel840113 Oct 26, 2022
e9ffc0b
Add Sub Msgs for Trades
xucito Oct 26, 2022
ce38703
Workaround SubMsg Bug
xucito Oct 26, 2022
b00b84e
add mock amm_pairs
barbel840113 Oct 27, 2022
caea0d2
Add Staking mock
barbel840113 Oct 30, 2022
cdc39b7
workaround for submsg in multi-test
barbel840113 Oct 30, 2022
ddbf653
add native & custom tesT
msivaklumachain Oct 30, 2022
1df581b
rename amm pair test
msivaklumachain Oct 30, 2022
c89a730
fixing warning
msivaklumachain Oct 30, 2022
867996b
clear warnings
msivaklumachain Oct 30, 2022
1c19cba
fixing router contract
msivaklumachain Oct 30, 2022
da735fa
fix route test
msivaklumachain Oct 31, 2022
8f50097
Fix hardcoded valid_to time
xucito Oct 31, 2022
1f77b8c
Merge branch 'fix_audit_2' into feature/multitest
xucito Oct 31, 2022
1f0a67b
[Broken] Resolve Merge Conflicts
xucito Oct 31, 2022
da5a92d
Merge pull request #63 from securesecrets/feature/multitest
xucito Oct 31, 2022
2ee315a
fix factory test
msivaklumachain Oct 31, 2022
d05aab1
fix merging issue
msivaklumachain Oct 31, 2022
4889c48
fix factory test
msivaklumachain Oct 31, 2022
44952db
fixing unit & integration testS
msivaklumachain Oct 31, 2022
fa83883
fix amm_pairs test
msivaklumachain Nov 1, 2022
a569c4c
Add get_reward_tokens
msivaklumachain Nov 1, 2022
32461e2
Merge pull request #64 from securesecrets/feature/multitest
xucito Nov 2, 2022
84e23bd
Linting Fix
xucito Nov 2, 2022
f83ae65
Cargo Fix repairs
xucito Nov 2, 2022
62d3f2e
fix integration test:
msivaklumachain Nov 2, 2022
26ae3e2
add router full implementation
barbel840113 Nov 3, 2022
a124a05
Add registration
xucito Nov 3, 2022
22a1354
Refactor integration tests
xucito Nov 3, 2022
7cab808
Fix Audit 2 Items
xucito Nov 5, 2022
0b9510d
fix add_amm_pairs & add_liquidity for native as first token
barbel840113 Nov 6, 2022
7b79055
merge fix audit 2v
barbel840113 Nov 7, 2022
0f1e099
Clean Up Repo
xucito Nov 7, 2022
6294e7f
fix merge of audit v2
barbel840113 Nov 7, 2022
80c334d
Refactor workflow to remove required callback
xucito Nov 8, 2022
1d2dbc7
add test for invalid pair
barbel840113 Nov 8, 2022
b37a1f5
merge fix audit 2
barbel840113 Nov 8, 2022
2981763
Fix cli_commands
xucito Nov 9, 2022
74f68e7
fix store_staking_contract
barbel840113 Nov 9, 2022
eca8975
fix merge conflict
barbel840113 Nov 9, 2022
30db3c2
build cli
barbel840113 Nov 9, 2022
4434233
fix integration test
barbel840113 Nov 9, 2022
eca57fa
Merge pull request #68 from securesecrets/feature/multitest
xucito Nov 9, 2022
4987856
Fix test results
xucito Nov 9, 2022
206ce89
fix reply in multi-test
barbel840113 Nov 9, 2022
99d3218
Merge branch 'fix_audit_2' into feature/multitest
barbel840113 Nov 9, 2022
9d78635
fix router multi-test
barbel840113 Nov 10, 2022
f1951a6
add swap calculation test
barbel840113 Nov 10, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
265 changes: 184 additions & 81 deletions Cargo.lock

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ members = [
"contracts/lp_token",
"contracts/staking",
"packages/network_integration",
# "packages/multi-test"
# "packages/cosmwasm_math_compat",
"packages/multi_test"
]

[profile.release]
Expand Down
11 changes: 0 additions & 11 deletions contracts/amm_pair/.editorconfig

This file was deleted.

17 changes: 0 additions & 17 deletions contracts/amm_pair/.gitignore

This file was deleted.

11 changes: 6 additions & 5 deletions contracts/amm_pair/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@ serde = {version = "1.0.114", default-features = false, features = [
# cw2 = "0.15.0"

shadeswap-shared = {path = "../../packages/shadeswap-shared"}
# staking = {path = "../../contracts/staking"}
# snip20-reference-impl = {path ="../../contracts/snip20"}
# lp-token = {path ="../../contracts/lp_token"}
snafu = {version = "0.7.1"}
secret-multi-test = { git = "https://github.com/securesecrets/secret-plus-utils", version = "0.13.4" }

[dev-dependencies]
cosmwasm-schema = {git = "https://github.com/CosmWasm/cosmwasm"}
cosmwasm-schema = { git = "https://github.com/CosmWasm/cosmwasm"}
snip20-reference-impl = {path ="../../contracts/snip20"}
secret-multi-test = { git = "https://github.com/securesecrets/secret-plus-utils", version = "0.13.4" }
multi_test = {path = "../../packages/multi_test"}
staking = {path = "../../contracts/staking"}
13 changes: 0 additions & 13 deletions contracts/amm_pair/NOTICE

This file was deleted.

14 changes: 7 additions & 7 deletions contracts/amm_pair/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ The Contract to hold Pair Between Swap Tokens.
|-------------------|----------------------------------|----------------------------------------------------------------------------|----------|
| pair | TokenPair | Token Pair to hold two token | no |
| lp_token_contract | ContractInstantiationInfo | ContractInstantiationInfo | no |
| factory_info | ContractLink | The token that will be airdropped | no |
| factory_info | Contract | The token that will be airdropped | no |
| prng_seed | Binary | seed to use for viewing key | no |
| callback | Callback | Callback to AmmPair Contract to register LP Token | yes |
| entropy | Binary | Use to calculate viewing key | no |
Expand Down Expand Up @@ -129,8 +129,8 @@ Get information about the token pair.
##### Response
```json
{
"liquidity_token": "LP Token ContractLink",
"factory": "Factory ContractLink",
"liquidity_token": "LP Token Contract",
"factory": "Factory Contract",
"pair": "Token Pair with two Token Type",
"amount_0": "Balance of Token 0",
"amount_1": "Balance of Token 1",
Expand All @@ -151,8 +151,8 @@ Get Estimated Price for amount.
##### Response
```json
{
"liquidity_token": "LP Token ContractLink",
"factory": "Factory ContractLink",
"liquidity_token": "LP Token Contract",
"factory": "Factory Contract",
"pair": "Token Pair with two Token Type",
"amount_0": "Balance of Token 0",
"amount_1": "Balance of Token 1",
Expand Down Expand Up @@ -324,7 +324,7 @@ Swap Native Token.
| offer | TokenAmount | Amount and Token Type | no |
| expected_return | Uint128 | slippage, amount willing to accept | yes |
| to | HumanAddr | The address to remove from LP | yes |
| router_link | ContractLink | Router Contract Info | yes |
| router_link | Contract | Router Contract Info | yes |
| callback_signature | Binary | signature to verify snip20 | yes |
##### Response
```json
Expand Down Expand Up @@ -368,7 +368,7 @@ Swap Native Token.
|-----------|----------------|--------------------------------------|----------|
| expected_return | Uint128 | slippage, amount willing to accept | yes |
| to | HumanAddr | The address to remove from LP | yes |
| router_link | ContractLink | Router Contract Info | yes |
| router_link | Contract | Router Contract Info | yes |
| callback_signature | Binary | signature to verify snip20 | yes |
##### Response
```json
Expand Down
25 changes: 0 additions & 25 deletions contracts/amm_pair/deploy.sh

This file was deleted.

15 changes: 0 additions & 15 deletions contracts/amm_pair/rustfmt.toml

This file was deleted.

Binary file removed contracts/amm_pair/secretcli
Binary file not shown.
Loading