Skip to content

Commit

Permalink
Merge branch 'main' into dwedul/1760-fix-cmd-tests
Browse files Browse the repository at this point in the history 
# Conflicts:
#	.github/workflows/test.yml
#	CHANGELOG.md
  • Loading branch information
@SpicyLemon
SpicyLemon committed May 13, 2024
2 parents 2c91887 + 6bda36f commit 09033d6
Show file tree
Hide file tree
Showing 154 changed files with 5,612 additions and 6,737 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,13 @@ jobs:
# TODO[1760]: Re-analyze how long tests tests take and change the splitting back to be based on speed.
run: |
grep -vF \
-e 'github.com/provenance-io/provenance/internal/antewrapper' \
-e 'github.com/provenance-io/provenance/x/ibchooks' \
-e 'github.com/provenance-io/provenance/x/ibcratelimit/module' \
-e 'github.com/provenance-io/provenance/x/ibcratelimit/simulation' \
-e 'github.com/provenance-io/provenance/x/oracle/simulation' \
pkgs.txt > pkgs.txt.tmp
split -d -n l/3 pkgs.txt.tmp pkgs.txt.part.
printf '%s\n' \
'github.com/provenance-io/provenance/internal/antewrapper' \
'github.com/provenance-io/provenance/x/ibchooks' \
'github.com/provenance-io/provenance/x/ibcratelimit/module' \
'github.com/provenance-io/provenance/x/ibcratelimit/simulation' \
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
* Change the default keyring backend to "os", but leave it as "test" for testnets [#1968](https://github.com/provenance-io/provenance/pull/1968).
* Change the default broadcast mode to "sync" [#1968](https://github.com/provenance-io/provenance/pull/1968).
* The pre-upgrade command now updates the client config's broadcast mode to "sync" if it's set to "block" [#1968](https://github.com/provenance-io/provenance/pull/1968).
* Remove all `GetSigners()` methods [#1957](https://github.com/provenance-io/provenance/pull/1957).
* Ensure all `Msg`s have correctly identified `signer` fields [#1957](https://github.com/provenance-io/provenance/pull/1957).
* Clean up all the module codecs [#1957](https://github.com/provenance-io/provenance/pull/1957).
* Switch to auto-generated `String` and `Equal` methods for most proto messages [#1957](https://github.com/provenance-io/provenance/pull/1957).

### Deprecated

Expand Down
2 changes: 1 addition & 1 deletion client/docs/statik/statik.go
View file

Large diffs are not rendered by default.

134 changes: 79 additions & 55 deletions client/docs/swagger-ui/swagger.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69847,43 +69847,50 @@ paths:
properties:
msg_type_url:
type: string
description: >-
msg_type_url is the type-url of the message with the
added fee, e.g. "/cosmos.bank.v1beta1.MsgSend".
additional_fee:
title: >-
additional_fee can pay in any Coin( basically a Denom
and Amount, Amount can be zero)
description: >-
additional_fee is the extra fee that is required for the
given message type (can be in any denom).
type: object
properties:
denom:
type: string
amount:
type: string
description: >-
Coin defines a token with a denomination and an amount.


NOTE: The amount field is an Int which implements the
custom method

signatures required by gogoproto.
recipient:
type: string
description: >-
recipient is an option address that will receive a
portion of the additional fee.

There can only be a recipient if the
recipient_basis_points is not zero.
recipient_basis_points:
type: integer
format: int64
title: >-
MsgFee is the core of what gets stored on the blockchain
description: >-
recipient_basis_points is an optional portion of the
additional fee to be sent to the recipient.

it consists of four parts
Must be between 0 and 10,000 (inclusive).

1. the msg type url, i.e. /cosmos.bank.v1beta1.MsgSend

2. minimum additional fees(can be of any denom)
If there is a recipient, this must not be zero. If there
is not a recipient, this must be zero.

3. optional recipient of fee based on
`recipient_basis_points`

4. if recipient is declared they will recieve the basis
points of the fee (0-10,000)
The recipient will receive additional_fee *
recipient_basis_points / 10,000.

The fee collector will receive the rest, i.e.
additional_fee * (10,000 - recipient_basis_points) /
10,000.
description: >-
MsgFee is the core of what gets stored on the blockchain to
define a msg-based fee.
pagination:
description: pagination defines an optional pagination for the request.
type: object
Expand Down Expand Up @@ -116675,39 +116682,49 @@ definitions:
properties:
msg_type_url:
type: string
description: >-
msg_type_url is the type-url of the message with the added fee, e.g.
"/cosmos.bank.v1beta1.MsgSend".
additional_fee:
title: >-
additional_fee can pay in any Coin( basically a Denom and Amount,
Amount can be zero)
description: >-
additional_fee is the extra fee that is required for the given message
type (can be in any denom).
type: object
properties:
denom:
type: string
amount:
type: string
description: |-
Coin defines a token with a denomination and an amount.

NOTE: The amount field is an Int which implements the custom method
signatures required by gogoproto.
recipient:
type: string
description: >-
recipient is an option address that will receive a portion of the
additional fee.

There can only be a recipient if the recipient_basis_points is not
zero.
recipient_basis_points:
type: integer
format: int64
title: >-
MsgFee is the core of what gets stored on the blockchain
description: >-
recipient_basis_points is an optional portion of the additional fee to
be sent to the recipient.

Must be between 0 and 10,000 (inclusive).

it consists of four parts

1. the msg type url, i.e. /cosmos.bank.v1beta1.MsgSend
If there is a recipient, this must not be zero. If there is not a
recipient, this must be zero.

2. minimum additional fees(can be of any denom)

3. optional recipient of fee based on `recipient_basis_points`
The recipient will receive additional_fee * recipient_basis_points /
10,000.

4. if recipient is declared they will recieve the basis points of the fee
(0-10,000)
The fee collector will receive the rest, i.e. additional_fee * (10,000
- recipient_basis_points) / 10,000.
description: >-
MsgFee is the core of what gets stored on the blockchain to define a
msg-based fee.
provenance.msgfees.v1.Params:
type: object
properties:
Expand Down Expand Up @@ -116750,42 +116767,49 @@ definitions:
properties:
msg_type_url:
type: string
description: >-
msg_type_url is the type-url of the message with the added fee,
e.g. "/cosmos.bank.v1beta1.MsgSend".
additional_fee:
title: >-
additional_fee can pay in any Coin( basically a Denom and
Amount, Amount can be zero)
description: >-
additional_fee is the extra fee that is required for the given
message type (can be in any denom).
type: object
properties:
denom:
type: string
amount:
type: string
description: >-
Coin defines a token with a denomination and an amount.


NOTE: The amount field is an Int which implements the custom
method

signatures required by gogoproto.
recipient:
type: string
description: >-
recipient is an option address that will receive a portion of
the additional fee.

There can only be a recipient if the recipient_basis_points is
not zero.
recipient_basis_points:
type: integer
format: int64
title: >-
MsgFee is the core of what gets stored on the blockchain
description: >-
recipient_basis_points is an optional portion of the additional
fee to be sent to the recipient.

Must be between 0 and 10,000 (inclusive).

it consists of four parts

1. the msg type url, i.e. /cosmos.bank.v1beta1.MsgSend
If there is a recipient, this must not be zero. If there is not
a recipient, this must be zero.

2. minimum additional fees(can be of any denom)

3. optional recipient of fee based on `recipient_basis_points`
The recipient will receive additional_fee *
recipient_basis_points / 10,000.

4. if recipient is declared they will recieve the basis points of
the fee (0-10,000)
The fee collector will receive the rest, i.e. additional_fee *
(10,000 - recipient_basis_points) / 10,000.
description: >-
MsgFee is the core of what gets stored on the blockchain to define a
msg-based fee.
pagination:
description: pagination defines an optional pagination for the request.
type: object
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ require (
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de
google.golang.org/grpc v1.63.2
google.golang.org/protobuf v1.34.1
gopkg.in/yaml.v2 v2.4.0
sigs.k8s.io/yaml v1.4.0
)

require (
Expand Down Expand Up @@ -201,11 +201,11 @@ require (
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gotest.tools/v3 v3.5.1 // indirect
nhooyr.io/websocket v1.8.10 // indirect
pgregory.net/rapid v1.1.0 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace (
Expand Down
Loading

0 comments on commit 09033d6

Please sign in to comment.