Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
tags:
- "v[0-9]+.[0-9]+.[0-9]+" # Push events to matching v*, i.e. v1.0, v20.15.10
- "v[0-9]+.[0-9]+.[0-9]+-rc*" # Push events to matching v*, i.e. v1.0-rc1, v20.15.10-rc5
- "v[0-9]+.[0-9]+.[0-9]+-rc*" # Push events to matching v*, i.e. v1.0-rc2, v20.15.10-rc5
- "v[0-9]+.[0-9]+.[0-9]+-beta*" # Push events to matching v*, i.e. v1.0.0-beta2

jobs:
Expand Down Expand Up @@ -37,7 +37,7 @@ jobs:
uses: provenance-io/provenance-testing-action@v1.3.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
provenance_version: "v1.26.0-rc1"
provenance_version: "v1.26.0-rc2"
test_script: "./scripts/gh-action-test/tutorial_test.sh"

test_attrs_smart_contract:
Expand All @@ -57,7 +57,7 @@ jobs:
uses: provenance-io/provenance-testing-action@v1.3.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
provenance_version: "v1.26.0-rc1"
provenance_version: "v1.26.0-rc2"
smart_contract_action_version: "latest"
test_script: "./scripts/gh-action-test/attrs_test.sh"

Expand All @@ -78,7 +78,7 @@ jobs:
uses: provenance-io/provenance-testing-action@v1.3.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
provenance_version: "v1.26.0-rc1"
provenance_version: "v1.26.0-rc2"
smart_contract_action_version: "latest"
test_script: "./scripts/gh-action-test/marker_test.sh"

Expand All @@ -99,7 +99,7 @@ jobs:
uses: provenance-io/provenance-testing-action@v1.3.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
provenance_version: "v1.26.0-rc1"
provenance_version: "v1.26.0-rc2"
smart_contract_action_version: "latest"
test_script: "./scripts/gh-action-test/name_test.sh"

Expand All @@ -120,7 +120,7 @@ jobs:
# uses: provenance-io/provenance-testing-action@v1.3.0
# with:
# github_token: ${{ secrets.GITHUB_TOKEN }}
# provenance_version: "v1.26.0-rc1"
# provenance_version: "v1.26.0-rc2"
# smart_contract_action_version: "latest"
# test_script: "./scripts/gh-action-test/scope_test.sh"

Expand All @@ -141,7 +141,7 @@ jobs:
uses: provenance-io/provenance-testing-action@v1.3.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
provenance_version: "v1.26.0-rc1"
provenance_version: "v1.26.0-rc2"
smart_contract_action_version: "latest"
test_script: "./scripts/gh-action-test/trigger_test.sh"

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
uses: provenance-io/provenance-testing-action@v1.3.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
provenance_version: "v1.26.0-rc1"
provenance_version: "v1.26.0-rc2"
test_script: "./scripts/gh-action-test/tutorial_test.sh"

test_attrs_smart_contract:
Expand All @@ -55,7 +55,7 @@ jobs:
uses: provenance-io/provenance-testing-action@v1.3.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
provenance_version: "v1.26.0-rc1"
provenance_version: "v1.26.0-rc2"
smart_contract_action_version: "latest"
test_script: "./scripts/gh-action-test/attrs_test.sh"

Expand All @@ -76,7 +76,7 @@ jobs:
uses: provenance-io/provenance-testing-action@v1.3.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
provenance_version: "v1.26.0-rc1"
provenance_version: "v1.26.0-rc2"
smart_contract_action_version: "latest"
test_script: "./scripts/gh-action-test/marker_test.sh"

Expand All @@ -97,7 +97,7 @@ jobs:
uses: provenance-io/provenance-testing-action@v1.3.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
provenance_version: "v1.26.0-rc1"
provenance_version: "v1.26.0-rc2"
smart_contract_action_version: "latest"
test_script: "./scripts/gh-action-test/name_test.sh"

Expand All @@ -118,7 +118,7 @@ jobs:
uses: provenance-io/provenance-testing-action@v1.3.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
provenance_version: "v1.26.0-rc1"
provenance_version: "v1.26.0-rc2"
smart_contract_action_version: "latest"
test_script: "./scripts/gh-action-test/scope_test.sh"

Expand All @@ -139,6 +139,6 @@ jobs:
uses: provenance-io/provenance-testing-action@v1.3.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
provenance_version: "v1.26.0-rc1"
provenance_version: "v1.26.0-rc2"
smart_contract_action_version: "latest"
test_script: "./scripts/gh-action-test/trigger_test.sh"
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

### [v2.7.0](https://github.com/provenance-io/provwasm/tree/v2.7.0)

* Update to Provenance v1.26.0-rc2 [[#169]]([#167](https://github.com/provenance-io/provwasm/pull/169))
* Update to Provenance v1.26.0-rc1 [[#167]]([#167](https://github.com/provenance-io/provwasm/pull/167))

### [v2.6.0](https://github.com/provenance-io/provwasm/tree/v2.6.0)
Expand Down
1 change: 1 addition & 0 deletions RELEASE_CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
### [v2.7.0](https://github.com/provenance-io/provwasm/tree/v2.7.0)

* Update to Provenance v1.26.0-rc2 [[#169]]([#167](https://github.com/provenance-io/provwasm/pull/169))
* Update to Provenance v1.26.0-rc1 [[#167]]([#167](https://github.com/provenance-io/provwasm/pull/167))
2 changes: 1 addition & 1 deletion dependencies/provenance
Submodule provenance updated 55 files
+1 −0 .changelog/v1.26.0-rc2/bug-fixes/2523-deprecated-msgfees-protos.md
+1 −0 .changelog/v1.26.0-rc2/bug-fixes/2524-fix-data.md
+1 −0 .changelog/v1.26.0-rc2/dependencies/2525-vault-v1-0-12.md
+1 −0 .changelog/v1.26.0-rc2/improvements/2517-prevent-9525-gas-prices.md
+1 −0 .changelog/v1.26.0-rc2/improvements/2518-bulk-charge-change.md
+1 −0 .changelog/v1.26.0-rc2/improvements/2522-more-ledger-events.md
+1 −0 .changelog/v1.26.0-rc2/improvements/2528-ledger-not-defined-values.md
+13 −0 .changelog/v1.26.0-rc2/summary.md
+25 −0 CHANGELOG.md
+39 −0 RELEASE_CHANGELOG.md
+ app/upgrade_data/bouvardia_ledger_genesis_00.json.gz
+ app/upgrade_data/bouvardia_ledger_genesis_01.json.gz
+ app/upgrade_data/bouvardia_ledger_genesis_02.json.gz
+ app/upgrade_data/bouvardia_ledger_genesis_03.json.gz
+ app/upgrade_data/bouvardia_ledger_genesis_04.json.gz
+ app/upgrade_data/bouvardia_ledger_genesis_05.json.gz
+ app/upgrade_data/bouvardia_ledger_genesis_06.json.gz
+ app/upgrade_data/bouvardia_ledger_genesis_07.json.gz
+ app/upgrade_data/bouvardia_ledger_genesis_08.json.gz
+ app/upgrade_data/bouvardia_ledger_genesis_09.json.gz
+ app/upgrade_data/bouvardia_ledger_genesis_10.json.gz
+ app/upgrade_data/bouvardia_ledger_genesis_11.json.gz
+ app/upgrade_data/bouvardia_ledger_genesis_12.json.gz
+ app/upgrade_data/bouvardia_registry_genesis_00.json.gz
+90 −0 app/upgrades.go
+23 −1 app/upgrades_test.go
+132 −3 client/docs/swagger-ui/swagger.yaml
+221 −9 docs/proto-docs.md
+1 −1 go.mod
+2 −2 go.sum
+4 −1 internal/antewrapper/utils.go
+21 −13 internal/antewrapper/utils_test.go
+22 −0 internal/provutils/enums.go
+28 −0 internal/provutils/enums_test.go
+2 −2 proto/buf.lock
+62 −1 proto/provenance/ledger/v1/events.proto
+54 −0 proto/provenance/ledger/v1/ledger.proto
+10 −0 proto/provenance/ledger/v1/tx.proto
+21 −0 proto/provenance/msgfees/v1/genesis.proto
+73 −0 proto/provenance/msgfees/v1/msgfees.proto
+33 −0 third_party/proto/provlabs/vault/v1/events.proto
+24 −0 third_party/proto/provlabs/vault/v1/tx.proto
+4 −0 x/ledger/keeper/entries.go
+32 −7 x/ledger/keeper/ledger.go
+4 −2 x/ledger/keeper/ledger_bulk.go
+45 −0 x/ledger/types/events.go
+965 −44 x/ledger/types/events.pb.go
+23 −8 x/ledger/types/ledger.go
+157 −99 x/ledger/types/ledger.pb.go
+201 −52 x/ledger/types/ledger_test.go
+8 −1 x/ledger/types/msgs.go
+3 −0 x/ledger/types/msgs_test.go
+10 −0 x/ledger/types/tx.pb.go
+394 −0 x/msgfees/types/genesis.pb.go
+1,280 −0 x/msgfees/types/msgfees.pb.go
2 changes: 1 addition & 1 deletion docs/tutorial/10-instantiate.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ provenanced tx wasm instantiate 1 \
--chain-id testing \
--gas auto \
--gas-prices="1nhash" \
--gas-adjustment=1 \
--gas-adjustment=1 \
--yes \
--testnet \
--output json | jq
Expand Down
2 changes: 1 addition & 1 deletion packages/proto-build/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use proto_build::{
};

/// The provenance commit or tag to be cloned and used to build the proto files
const PROVENANCE_REV: &str = "v1.26.0-rc1";
const PROVENANCE_REV: &str = "v1.26.0-rc2";

// All paths must end with a / and either be absolute or include a ./ to reference the current
// working directory.
Expand Down
2 changes: 1 addition & 1 deletion packages/provwasm-std/src/types/PROVENANCE_COMMIT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.26.0-rc1
v1.26.0-rc2
Loading