Change genesis preserving contract history #1076

GNaD13 · 2022-11-04T13:25:54Z

Close #878

…ct created date

codecov · 2022-11-04T13:41:43Z

Codecov Report

Merging #1076 (a1b63bf) into main (a9ce273) will increase coverage by 0.15%.
The diff coverage is 91.11%.

@@            Coverage Diff             @@
##             main    #1076      +/-   ##
==========================================
+ Coverage   59.27%   59.42%   +0.15%     
==========================================
  Files          53       53              
  Lines        6758     6783      +25     
==========================================
+ Hits         4006     4031      +25     
+ Misses       2456     2454       -2     
- Partials      296      298       +2

Impacted Files	Coverage Δ
x/wasm/keeper/querier.go	`72.19% <ø> (-0.13%)`	⬇️
x/wasm/types/genesis.go	`87.87% <42.85%> (-5.57%)`	⬇️
x/wasm/keeper/genesis.go	`89.47% <100.00%> (+0.14%)`	⬆️
x/wasm/keeper/keeper.go	`87.40% <100.00%> (-0.02%)`	⬇️
x/wasm/types/test_fixtures.go	`95.04% <100.00%> (-0.58%)`	⬇️
x/wasm/types/types.go	`64.53% <100.00%> (+4.32%)`	⬆️

alpe

Very nice work! Thanks a lot for the changes 👍

You addressed the created date proper. Unfortunately this was only half of the original story. The other part is about the ContractHistory. The history contains all the code changes for a contract. We don't export it but create a new start on import .
if you can add this to this PR, then #878 would be resolved. But also happy to merge this one and have a second to finish the issue. What you prefer.

alpe · 2022-11-04T16:08:18Z

x/wasm/keeper/genesis.go

@@ -107,8 +107,6 @@ func ExportGenesis(ctx sdk.Context, keeper *Keeper) *types.GenesisState {
 			state = append(state, types.Model{Key: key, Value: value})
 			return false
 		})
-		// redact contract info
-		contract.Created = nil


alpe · 2022-11-04T16:13:58Z

app/sim_test.go

@@ -211,22 +212,6 @@ func TestAppImportExport(t *testing.T) {
 	dropContractHistory(ctxA.KVStore(app.keys[wasm.StoreKey]), prefixes...)
 	dropContractHistory(ctxB.KVStore(newApp.keys[wasm.StoreKey]), prefixes...)

-	normalizeContractInfo := func(ctx sdk.Context, app *WasmApp) {


GNaD13 · 2022-11-04T16:43:49Z

Very nice work! Thanks a lot for the changes +1

You addressed the created date proper. Unfortunately this was only half of the original story. The other part is about the ContractHistory. The history contains all the code changes for a contract. We don't export it but create a new start on import . if you can add this to this PR, then #878 would be resolved. But also happy to merge this one and have a second to finish the issue. What you prefer.

Got it, I will continue with the Contract History. Tysm :3

alpe

This looks almost perfect now. Thanks a lot for your updates!
I have added some minor notes now but I need to do a deeper review tomorrow.

alpe · 2022-11-08T20:30:29Z

proto/cosmwasm/wasm/v1/genesis.proto

@@ -53,6 +53,7 @@ message Contract {
  string contract_address = 1;
  ContractInfo contract_info = 2 [ (gogoproto.nullable) = false ];
  repeated Model contract_state = 3 [ (gogoproto.nullable) = false ];
+  repeated ContractCodeHistoryEntry contract_code_history = 4 [ (gogoproto.nullable) = false ];


alpe · 2022-11-08T20:33:41Z

x/wasm/keeper/keeper.go

-	k.addToContractCodeSecondaryIndex(ctx, contractAddr, historyEntry)
-	k.addToContractCreatorSecondaryIndex(ctx, creatorAddress, historyEntry.Updated, contractAddr)
+	k.addToContractCodeSecondaryIndex(ctx, contractAddr, entries[len(entries)-1])
+	k.addToContractCreatorSecondaryIndex(ctx, creatorAddress, entries[0].Updated, contractAddr)


Very nice to use the history data to feed the indexes with proper dates! 👍

alpe · 2022-11-08T20:36:08Z

x/wasm/types/ibc.pb.go

 	io "io"
 	math "math"
 	math_bits "math/bits"
-


Please run make proto-all instead that includes the code formatters

alpe · 2022-11-08T20:37:41Z

x/wasm/keeper/genesis.go

@@ -41,7 +41,7 @@ func InitGenesis(ctx sdk.Context, keeper *Keeper, data types.GenesisState, staki
 		if err != nil {
 			return nil, sdkerrors.Wrapf(err, "address in contract number %d", i)
 		}
-		err = keeper.importContract(ctx, contractAddr, &contract.ContractInfo, contract.ContractState)
+		err = keeper.importContract(ctx, contractAddr, &contract.ContractInfo, contract.ContractState, contract.ContractCodeHistory)


Please add some sanity checks for ContractCodeHistory to the ValidateBacis()

GNaD13 · 2022-11-09T16:59:24Z

This looks almost perfect now. Thanks a lot for your updates! I have added some minor notes now but I need to do a deeper review tomorrow.

Thank youuuuuuuuuuu sir :3

alpe

Wonderful! 🌻
Thanks a lot for taking this task and the PR! Very well done! 🥇

I did some manual tests with state export/ import to confirm it is working as expected and it does. Only the wasmd q wasm contract-history query does not return update data but I will provide a fix when this is merged to main.

* Add StoreAndInstantiateContract gov proposal * Add integration tests * Bump github.com/prometheus/client_golang from 1.13.0 to 1.14.0 Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.13.0 to 1.14.0. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](prometheus/client_golang@v1.13.0...v1.14.0) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Remove exposed functions * Add tests * Add Developer's guide and best practices (#1075) * Add Developer's guide and best practices * Fix comments * Change genesis preserving contract history (#1076) * preserve contract created date on genesis import and add query contract created date * add validate created * fix sims test app import export * add preserve contract history * Make proto-all only * Remove ResetFromGenesis * Add validation Co-authored-by: Alex Peters <[email protected]> * Return contract history updates * Bump github.com/spf13/viper from 1.13.0 to 1.14.0 (#1082) Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.13.0 to 1.14.0. - [Release notes](https://github.com/spf13/viper/releases) - [Commits](spf13/viper@v1.13.0...v1.14.0) --- updated-dependencies: - dependency-name: github.com/spf13/viper dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Revert "Bump github.com/spf13/viper from 1.13.0 to 1.14.0 (#1082)" This reverts commit cf81eb8. * Add cli and refactor code * Contract authz - redesign (#1077) * Add contract authz proto * Implement contract autorization * Register contract authz * Add contract-authz tests * Consume gas for contract authz * Add contract authz cli * Update cli usage * Model spike * Add max funds limit * Redesign authz model * Start e2e test * Full e2e test * Test filter and limits * Test accept * Fix description * No linter warning Co-authored-by: Giancarlos Salas <[email protected]> * Add StoreAndInstantiateContract gov proposal * Add integration tests * Remove exposed functions * Add tests * Add cli and refactor code * Fix comments Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: GNaD13 <[email protected]> Co-authored-by: Alex Peters <[email protected]> Co-authored-by: Giancarlos Salas <[email protected]>

* preserve contract created date on genesis import and add query contract created date * add validate created * fix sims test app import export * add preserve contract history * Make proto-all only * Remove ResetFromGenesis * Add validation Co-authored-by: Alex Peters <[email protected]>

* Add StoreAndInstantiateContract gov proposal * Add integration tests * Bump github.com/prometheus/client_golang from 1.13.0 to 1.14.0 Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.13.0 to 1.14.0. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](prometheus/client_golang@v1.13.0...v1.14.0) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Remove exposed functions * Add tests * Add Developer's guide and best practices (CosmWasm#1075) * Add Developer's guide and best practices * Fix comments * Change genesis preserving contract history (CosmWasm#1076) * preserve contract created date on genesis import and add query contract created date * add validate created * fix sims test app import export * add preserve contract history * Make proto-all only * Remove ResetFromGenesis * Add validation Co-authored-by: Alex Peters <[email protected]> * Return contract history updates * Bump github.com/spf13/viper from 1.13.0 to 1.14.0 (CosmWasm#1082) Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.13.0 to 1.14.0. - [Release notes](https://github.com/spf13/viper/releases) - [Commits](spf13/viper@v1.13.0...v1.14.0) --- updated-dependencies: - dependency-name: github.com/spf13/viper dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Revert "Bump github.com/spf13/viper from 1.13.0 to 1.14.0 (CosmWasm#1082)" This reverts commit cf81eb8. * Add cli and refactor code * Contract authz - redesign (CosmWasm#1077) * Add contract authz proto * Implement contract autorization * Register contract authz * Add contract-authz tests * Consume gas for contract authz * Add contract authz cli * Update cli usage * Model spike * Add max funds limit * Redesign authz model * Start e2e test * Full e2e test * Test filter and limits * Test accept * Fix description * No linter warning Co-authored-by: Giancarlos Salas <[email protected]> * Add StoreAndInstantiateContract gov proposal * Add integration tests * Remove exposed functions * Add tests * Add cli and refactor code * Fix comments Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: GNaD13 <[email protected]> Co-authored-by: Alex Peters <[email protected]> Co-authored-by: Giancarlos Salas <[email protected]>

* preserve contract created date on genesis import and add query contract created date * add validate created * fix sims test app import export * add preserve contract history * Make proto-all only * Remove ResetFromGenesis * Add validation Co-authored-by: Alex Peters <[email protected]>

* Add StoreAndInstantiateContract gov proposal * Add integration tests * Bump github.com/prometheus/client_golang from 1.13.0 to 1.14.0 Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.13.0 to 1.14.0. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](prometheus/client_golang@v1.13.0...v1.14.0) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Remove exposed functions * Add tests * Add Developer's guide and best practices (CosmWasm#1075) * Add Developer's guide and best practices * Fix comments * Change genesis preserving contract history (CosmWasm#1076) * preserve contract created date on genesis import and add query contract created date * add validate created * fix sims test app import export * add preserve contract history * Make proto-all only * Remove ResetFromGenesis * Add validation Co-authored-by: Alex Peters <[email protected]> * Return contract history updates * Bump github.com/spf13/viper from 1.13.0 to 1.14.0 (CosmWasm#1082) Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.13.0 to 1.14.0. - [Release notes](https://github.com/spf13/viper/releases) - [Commits](spf13/viper@v1.13.0...v1.14.0) --- updated-dependencies: - dependency-name: github.com/spf13/viper dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Revert "Bump github.com/spf13/viper from 1.13.0 to 1.14.0 (CosmWasm#1082)" This reverts commit cf81eb8. * Add cli and refactor code * Contract authz - redesign (CosmWasm#1077) * Add contract authz proto * Implement contract autorization * Register contract authz * Add contract-authz tests * Consume gas for contract authz * Add contract authz cli * Update cli usage * Model spike * Add max funds limit * Redesign authz model * Start e2e test * Full e2e test * Test filter and limits * Test accept * Fix description * No linter warning Co-authored-by: Giancarlos Salas <[email protected]> * Add StoreAndInstantiateContract gov proposal * Add integration tests * Remove exposed functions * Add tests * Add cli and refactor code * Fix comments Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: GNaD13 <[email protected]> Co-authored-by: Alex Peters <[email protected]> Co-authored-by: Giancarlos Salas <[email protected]>

* preserve contract created date on genesis import and add query contract created date * add validate created * fix sims test app import export * add preserve contract history * Make proto-all only * Remove ResetFromGenesis * Add validation Co-authored-by: Alex Peters <[email protected]>

* Add StoreAndInstantiateContract gov proposal * Add integration tests * Bump github.com/prometheus/client_golang from 1.13.0 to 1.14.0 Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.13.0 to 1.14.0. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](prometheus/client_golang@v1.13.0...v1.14.0) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Remove exposed functions * Add tests * Add Developer's guide and best practices (CosmWasm#1075) * Add Developer's guide and best practices * Fix comments * Change genesis preserving contract history (CosmWasm#1076) * preserve contract created date on genesis import and add query contract created date * add validate created * fix sims test app import export * add preserve contract history * Make proto-all only * Remove ResetFromGenesis * Add validation Co-authored-by: Alex Peters <[email protected]> * Return contract history updates * Bump github.com/spf13/viper from 1.13.0 to 1.14.0 (CosmWasm#1082) Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.13.0 to 1.14.0. - [Release notes](https://github.com/spf13/viper/releases) - [Commits](spf13/viper@v1.13.0...v1.14.0) --- updated-dependencies: - dependency-name: github.com/spf13/viper dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Revert "Bump github.com/spf13/viper from 1.13.0 to 1.14.0 (CosmWasm#1082)" This reverts commit cf81eb8. * Add cli and refactor code * Contract authz - redesign (CosmWasm#1077) * Add contract authz proto * Implement contract autorization * Register contract authz * Add contract-authz tests * Consume gas for contract authz * Add contract authz cli * Update cli usage * Model spike * Add max funds limit * Redesign authz model * Start e2e test * Full e2e test * Test filter and limits * Test accept * Fix description * No linter warning Co-authored-by: Giancarlos Salas <[email protected]> * Add StoreAndInstantiateContract gov proposal * Add integration tests * Remove exposed functions * Add tests * Add cli and refactor code * Fix comments Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: GNaD13 <[email protected]> Co-authored-by: Alex Peters <[email protected]> Co-authored-by: Giancarlos Salas <[email protected]>

GNaD13 added 3 commits November 3, 2022 16:35

preserve contract created date on genesis import and add query contra…

675f08a

…ct created date

add validate created

6c0da1e

fix sims test app import export

5622312

GNaD13 requested a review from alpe as a code owner November 4, 2022 13:25

alpe changed the title ~~change genesis preserving contract history~~ Change genesis preserving contract history Nov 4, 2022

alpe reviewed Nov 4, 2022

View reviewed changes

GNaD13 marked this pull request as draft November 6, 2022 05:54

add preserve contract history

554c776

GNaD13 marked this pull request as ready for review November 6, 2022 15:27

GNaD13 requested a review from alpe November 6, 2022 16:34

alpe reviewed Nov 8, 2022

View reviewed changes

alpe added 3 commits November 9, 2022 10:34

Make proto-all only

0ed5264

Remove ResetFromGenesis

8422d17

Add validation

a1b63bf

alpe mentioned this pull request Nov 9, 2022

[DO NOT MERGE] 1076 feedback #1087

Closed

alpe approved these changes Nov 11, 2022

View reviewed changes

alpe merged commit 4c6afb3 into CosmWasm:main Nov 11, 2022

alpe mentioned this pull request Nov 11, 2022

Return contract history updates on query #1089

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Change genesis preserving contract history #1076

Change genesis preserving contract history #1076

GNaD13 commented Nov 4, 2022

codecov bot commented Nov 4, 2022 •

edited

Loading

alpe left a comment

alpe Nov 4, 2022

alpe Nov 4, 2022

GNaD13 commented Nov 4, 2022

alpe left a comment

alpe Nov 8, 2022

alpe Nov 8, 2022

alpe Nov 8, 2022

alpe Nov 8, 2022

GNaD13 commented Nov 9, 2022

alpe left a comment

Change genesis preserving contract history #1076

Change genesis preserving contract history #1076

Conversation

GNaD13 commented Nov 4, 2022

codecov bot commented Nov 4, 2022 • edited Loading

Codecov Report

alpe left a comment

Choose a reason for hiding this comment

alpe Nov 4, 2022

Choose a reason for hiding this comment

alpe Nov 4, 2022

Choose a reason for hiding this comment

GNaD13 commented Nov 4, 2022

alpe left a comment

Choose a reason for hiding this comment

alpe Nov 8, 2022

Choose a reason for hiding this comment

alpe Nov 8, 2022

Choose a reason for hiding this comment

alpe Nov 8, 2022

Choose a reason for hiding this comment

alpe Nov 8, 2022

Choose a reason for hiding this comment

GNaD13 commented Nov 9, 2022

alpe left a comment

Choose a reason for hiding this comment

codecov bot commented Nov 4, 2022 •

edited

Loading