Skip to content

Commit

Permalink
Merge pull request #27 from schnetzlerjoe/main
Browse files Browse the repository at this point in the history 
Interquery bugs and fund -> token seperation
  • Loading branch information
@schnetzlerjoe
schnetzlerjoe authored Aug 31, 2022
2 parents 359ed32 + 2974ed4 commit fb43118
Show file tree
Hide file tree
Showing 174 changed files with 73,133 additions and 686 deletions.
15 changes: 10 additions & 5 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,14 +233,14 @@ create-conn:
bash ./network/hermes/create-conn.sh

start-rly:
./network/relayer/start.sh
./network/ts-relayer/start.sh

start-hermes:
./network/hermes/start.sh

install-all:
./network/osmosis/osmosis.sh
./network/hermes/install.sh
./network/ts-relayer/install.sh

kill-dev:
@echo "Killing defundd, osmosis and removing previous data"
Expand All @@ -255,18 +255,23 @@ kill-dev:

test-all:
@echo "Running all bash tests......."
test-activate-broker
test-create-fund
test-create-shares
test-redeem-shares

test-activate-broker:
@echo "Running activate broker bash test......."
./tests/broker/activate-broker.sh

test-create-fund:
@echo "Running create fund bash test......."
./test/create-fund.sh
./tests/etf/create-fund.sh

test-create-shares:
@echo "Running create shares bash test......."
./test/create-shares.sh
./tests/etf/create-shares.sh

test-redeem-shares:
@echo "Running redeem shares bash test......."
./test/redeem-shares.sh
./tests/etf/redeem-shares.sh
266 changes: 133 additions & 133 deletions docs/static/openapi.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19240,40 +19240,69 @@ paths:
type: string
tags:
- Query
'/defund-labs/defund/broker/broker/{broker}':
/defund-labs/defund/broker/broker:
get:
summary: QueryBrokerRequest returns the broker based on the broker id requested
operationId: DefundlabsDefundBrokerBroker
summary: QueryBrokersRequest returns all brokers
operationId: DefundlabsDefundBrokerBrokers
responses:
'200':
description: A successful response.
schema:
type: object
properties:
broker:
brokers:
type: array
items:
type: object
properties:
id:
type: string
connection_id:
type: string
pools:
type: array
items:
type: object
properties:
pool_id:
type: string
format: uint64
interquery_id:
type: string
status:
type: string
baseDenom:
type: string
status:
type: string
pagination:
type: object
properties:
id:
type: string
connection_id:
type: string
pools:
type: array
items:
type: object
properties:
pool_id:
type: string
format: uint64
interquery_id:
type: string
status:
type: string
baseDenom:
next_key:
type: string
status:
format: byte
title: |-
next_key is the key to be passed to PageRequest.key to
query the next page most efficiently
total:
type: string
title: QueryBrokerResponse the response type for the Query/Broker RPC
format: uint64
title: >-
total is total number of results available if
PageRequest.count_total

was set, its value is undefined otherwise
description: >-
PageResponse is to be embedded in gRPC response messages where
the

corresponding request message has used PageRequest.

message SomeResponse {
repeated Bar results = 1;
PageResponse page = 2;
}
title: QueryBrokersResponse the response type for the Query/Brokers RPC
default:
description: An unexpected error response.
schema:
Expand Down Expand Up @@ -19460,75 +19489,98 @@ paths:
"value": "1.212s"
}
parameters:
- name: broker
in: path
required: true
- name: pagination.key
description: |-
key is a value returned in PageResponse.next_key to begin
querying the next page most efficiently. Only one of offset or key
should be set.
in: query
required: false
type: string
format: byte
- name: pagination.offset
description: >-
offset is a numeric offset that can be used when key is unavailable.

It is less efficient than using key. Only one of offset or key
should

be set.
in: query
required: false
type: string
format: uint64
- name: pagination.limit
description: >-
limit is the total number of results to be returned in the result
page.

If left empty it will default to a value to be set by each app.
in: query
required: false
type: string
format: uint64
- name: pagination.count_total
description: >-
count_total is set to true to indicate that the result set should
include

a count of the total number of items available for pagination in
UIs.

count_total is only respected when offset is used. It is ignored
when key

is set.
in: query
required: false
type: boolean
- name: pagination.reverse
description: >-
reverse is set to true if results are to be returned in the
descending order.


Since: cosmos-sdk 0.43
in: query
required: false
type: boolean
tags:
- Query
/defund-labs/defund/broker/brokers:
'/defund-labs/defund/broker/broker/{broker}':
get:
summary: QueryBrokersRequest returns all brokers
operationId: DefundlabsDefundBrokerBrokers
summary: QueryBrokerRequest returns the broker based on the broker id requested
operationId: DefundlabsDefundBrokerBroker
responses:
'200':
description: A successful response.
schema:
type: object
properties:
brokers:
type: array
items:
type: object
properties:
id:
type: string
connection_id:
type: string
pools:
type: array
items:
type: object
properties:
pool_id:
type: string
format: uint64
interquery_id:
type: string
status:
type: string
baseDenom:
type: string
status:
type: string
pagination:
broker:
type: object
properties:
next_key:
id:
type: string
format: byte
title: |-
next_key is the key to be passed to PageRequest.key to
query the next page most efficiently
total:
connection_id:
type: string
format: uint64
title: >-
total is total number of results available if
PageRequest.count_total

was set, its value is undefined otherwise
description: >-
PageResponse is to be embedded in gRPC response messages where
the

corresponding request message has used PageRequest.

message SomeResponse {
repeated Bar results = 1;
PageResponse page = 2;
}
title: QueryBrokersResponse the response type for the Query/Brokers RPC
pools:
type: array
items:
type: object
properties:
pool_id:
type: string
format: uint64
interquery_id:
type: string
status:
type: string
baseDenom:
type: string
status:
type: string
title: QueryBrokerResponse the response type for the Query/Broker RPC
default:
description: An unexpected error response.
schema:
Expand Down Expand Up @@ -19715,62 +19767,10 @@ paths:
"value": "1.212s"
}
parameters:
- name: pagination.key
description: |-
key is a value returned in PageResponse.next_key to begin
querying the next page most efficiently. Only one of offset or key
should be set.
in: query
required: false
type: string
format: byte
- name: pagination.offset
description: >-
offset is a numeric offset that can be used when key is unavailable.

It is less efficient than using key. Only one of offset or key
should

be set.
in: query
required: false
type: string
format: uint64
- name: pagination.limit
description: >-
limit is the total number of results to be returned in the result
page.

If left empty it will default to a value to be set by each app.
in: query
required: false
- name: broker
in: path
required: true
type: string
format: uint64
- name: pagination.count_total
description: >-
count_total is set to true to indicate that the result set should
include

a count of the total number of items available for pagination in
UIs.

count_total is only respected when offset is used. It is ignored
when key

is set.
in: query
required: false
type: boolean
- name: pagination.reverse
description: >-
reverse is set to true if results are to be returned in the
descending order.


Since: cosmos-sdk 0.43
in: query
required: false
type: boolean
tags:
- Query
/defund-labs/defund/etf/fund:
Expand Down
8 changes: 4 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/defund-labs/defund
go 1.17

require (
github.com/cosmos/cosmos-sdk v0.45.6
github.com/cosmos/cosmos-sdk v0.45.7
github.com/cosmos/ibc-go/v3 v3.1.0
github.com/gogo/protobuf v1.3.3
github.com/golang/protobuf v1.5.2
Expand All @@ -18,7 +18,7 @@ require (
github.com/tendermint/spm v0.1.9
github.com/tendermint/tendermint v0.34.20
github.com/tendermint/tm-db v0.6.7
google.golang.org/genproto v0.0.0-20220728213248-dd149ef739b9
google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc
google.golang.org/grpc v1.48.0
)

Expand All @@ -40,7 +40,7 @@ require (
github.com/cosmos/btcutil v1.0.4 // indirect
github.com/cosmos/go-bip39 v1.0.0 // indirect
github.com/cosmos/gorocksdb v1.2.0 // indirect
github.com/cosmos/iavl v0.17.3 // indirect
github.com/cosmos/iavl v0.19.0 // indirect
github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect
github.com/cosmos/ledger-go v0.9.2 // indirect
github.com/danieljoos/wincred v1.0.2 // indirect
Expand All @@ -66,7 +66,7 @@ require (
github.com/gorilla/handlers v1.5.1 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
github.com/gtank/merlin v0.1.1 // indirect
github.com/gtank/ristretto255 v0.1.2 // indirect
Expand Down
Loading

0 comments on commit fb43118

Please sign in to comment.