feat: merge 0.14.0-beta1 #86

brew0722 · 2021-03-19T04:51:22Z

Closes: #79

Description

This PR merges CosmWasm/cosmwasm:v0.14.0-beta1 and migrates contracts/token-tester and contracts/collection-tester.

contracts real running test are going to be done after lbm-sdk and wasmvm also merged to v0.14.0-beta1.
After merging this commit, I will make our version and write the CHANGELOG.

Motivation and context

How has this been tested?

Cargo test is passed.
The integration test proceeds after wasmvm and wasmd merge.

Checklist:

I followed the contributing guidelines.
I have updated the documentation accordingly.
I have added tests to cover my changes.

This reverts commit ceba7d95349b502a155f88441d408d477f1a810a.

Add to_u32() helper

Move encode_sections() to own module

One signer / pubkey of multiple msgs / sigs

brew0722 · 2021-03-24T05:35:27Z

I think github action is used in v0.12.0 and later, and should be enabled in our repository. How about it?

Of course I think it's good.
However, as far as I know has not yet been decieded within the dev2 dept. Because of the usage fee and another things.

whylee259 · 2021-03-24T07:33:26Z

I think github action is used in v0.12.0 and later, and should be enabled in our repository. How about it ?

Let's do it on another issue.

brew0722 · 2021-03-31T02:28:57Z

It will be rewritten based on #98.

* tag 'v0.14.0-beta1+contracts1': (904 commits) Add reference to the other InitCallback Fix reflect incompatiblity Format shell script Remove hopelessly outdated building instructions Revert "Add dev branch for testing" Simplify path Use check_contract.sh helper in CI Add `check_contract.sh` helper Run `check_contract` in its own container Revert "Change CI build and release image" Revert "Add ghr (and go) to build and deploy stage" Add dev branch for testing Add ghr (and go) to build and deploy stage Change CI build and release image Format clean scripts Rename workspace clean Add clean_contracts script Make check_contracts work with clean repo Set version: 0.14.0-beta1 Fix benchmarking ...

brew0722 · 2021-03-31T04:45:33Z

I'm done.
12.0 commit was removed from the list of commits.(1359 -> 1037)
And removed fix commit by git bug after squash merge.

PTAL @shiki-tak @whylee259 @loloicci

packages/ext/Cargo.toml

loloicci

Some PR are reverted in this PR. Are these merged again after this PR?

packages/vm/src/testing/mod.rs

packages/vm/src/testing/mock.rs

loloicci

about commits' title:

fix: revert pull request xx (ab0da46, 4b99966): revert -> patch or apply? (revert sounds like cansel in git)
refactor: migrate testing to 0.14.0-beta1 (503707d): looks doing more than refactor. It including fix of our PRs for 0.14.0.

shiki-tak · 2021-03-31T08:22:49Z

.mergify.yml

@@ -1,26 +1,30 @@
 # See https://doc.mergify.io/configuration.html

 pull_request_rules:
-  - name: automerge to master with label automerge
+  - name: automerge to main with label automerge


Will our repository also migrate its name from master to main?

Ok, let's do it ASAP.
I have made it.

brew0722 · 2021-04-01T01:34:13Z

about commits' title:

fix: revert pull request xx (ab0da46, 4b99966): revert -> patch or apply? (revert sounds like cansel in git)
refactor: migrate testing to 0.14.0-beta1 (503707d): looks doing more than refactor. It including fix of our PRs for 0.14.0.

'revert' -> 'repatch' modified that. if is it unsounds, please suggestion again
your suggestion is 'migrate ...' -> 'refactor ...' right? The collection-tester, token-tester, and testing were modified for 0.14.0 migration rather than a structure or interface changes, so they were expressed as 'migrate'.
'mod result;' patch line rebased to 'fix: repatch pull request feat: implement vm::testing::Contract which represents a contract in integration tests #87'

loloicci · 2021-04-01T06:15:49Z

your suggestion is 'migrate ...' -> 'refactor ...' right?

No, my suggestion is 'refactor' -> 'fix'.
My opinion is "this commit changes the behavior of some test, so it is exceeded the refactoring".

brew0722 · 2021-04-01T06:17:59Z

your suggestion is 'migrate ...' -> 'refactor ...' right?

No, my suggestion is 'refactor' -> 'fix'.
My opinion is "this commit changes the behavior of some test, so it is exceeded the refactoring".

I understand, thks good suggestion

remove results during 0.14.0-beta1 merge process

testing code used in line/cosmwasm-simulator

maurolacy and others added 30 commits February 24, 2021 15:07

Add ed25519_batch_verifiy impl / tests

efe6ef5

Update lock files

4c9cb5e

Simplify / re-use var names

3d834fc

Fix clippy warnings

4b81308

Change ed25519_batch_verify signature for convenience

362b95d

Add max batches constant

6b04dc0

Revert "Change ed25519_batch_verify signature for convenience"

881525b

This reverts commit ceba7d95349b502a155f88441d408d477f1a810a.

Rename for clarity / consistency

5b2da18

Add conversions module / errors

fd9ec55

Add to_u32() helper

Add encode_sections() helper

96430c8

Add VM sections module

8395f54

Move encode_sections() to own module

Add decode_sections()

7bd5a9e

Fix features import / selections

fc9f9a7

Fix clippy warning

25eac93

Let encode_sections always succeed

0d8d04d

Fix syntax

5fc78ca

Simplify decode_sections

13e55bb

Add ed25519_batch_verify native

dcc949d

Add ed25519_batch_verify mock

d89e8e0

Add StdError -> VerificationError mapping

e9d1328

Add ed25519_batch_verify extern

71cf7e6

Add ed25519_batch_verify contract tests

d8eac7c

Add ed25519_batch_verify structural / length checks

39c882a

Add ed25519_batch_verify multisig test

ed66524

Adapt to new encode_sections() signature

8c3afa1

Now fix clippy warnings

5edbace

Update schema

10a3557

Add ed25519_batch_verify single signer support

e12ee9f

One signer / pubkey of multiple msgs / sigs

cargo fmt

5895ca2

Add BatchErr

daf33e3

whylee259 mentioned this pull request Mar 24, 2021

Migrate CI to Actions #90

Closed

2 tasks

brew0722 changed the title ~~(WIP) feat: merge 0.14.0-beta1~~ feat: merge 0.14.0-beta1 Mar 31, 2021

brew0722 changed the title ~~feat: merge 0.14.0-beta1~~ (WIP) feat: merge 0.14.0-beta1 Mar 31, 2021

brew0722 linked an issue Mar 31, 2021 that may be closed by this pull request

Adjustment according to migration PR merge policy change #97

Closed

Jiyong Ha added 2 commits March 31, 2021 13:37

fix: bump up cosmwasm-ext to 0.14.0-beta1

4f5ceb8

brew0722 changed the title ~~(WIP) feat: merge 0.14.0-beta1~~ feat: merge 0.14.0-beta1 Mar 31, 2021

whylee259 reviewed Mar 31, 2021

View reviewed changes

packages/ext/Cargo.toml Show resolved Hide resolved

loloicci reviewed Mar 31, 2021

View reviewed changes

packages/vm/src/testing/mod.rs Show resolved Hide resolved

packages/vm/src/testing/mock.rs Show resolved Hide resolved

loloicci reviewed Mar 31, 2021

View reviewed changes

shiki-tak reviewed Mar 31, 2021

View reviewed changes

Jiyong Ha added 7 commits April 1, 2021 15:22

fix: migrate collection-tester to 0.14.0-beta1

5f0d28c

fix: migrate token-tester to 0.14.0-beta1

e8cf52b

fix: repatch pull request #89

33b8ef5

remove results during 0.14.0-beta1 merge process

fix: repatch pull request #87

f9b3a71

remove results during 0.14.0-beta1 merge process

fix: migrate testing to 0.14.0-beta1

7c17989

chore: cargo fmt

5ad1ab6

chore: disable unsued code warning for testing

d559290

testing code used in line/cosmwasm-simulator

whylee259 approved these changes Apr 1, 2021

View reviewed changes

shiki-tak approved these changes Apr 1, 2021

View reviewed changes

brew0722 merged commit 65c2374 into Finschia:develop Apr 1, 2021

brew0722 deleted the merge_0_14_0_beta1 branch April 1, 2021 09:30

loloicci mentioned this pull request Dec 8, 2021

fix: export vm::testing::contract::Contract #147

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: merge 0.14.0-beta1 #86

feat: merge 0.14.0-beta1 #86

brew0722 commented Mar 19, 2021 •

edited

Loading

brew0722 commented Mar 24, 2021 •

edited

Loading

whylee259 commented Mar 24, 2021

brew0722 commented Mar 31, 2021

brew0722 commented Mar 31, 2021 •

edited

Loading

loloicci left a comment

loloicci left a comment

shiki-tak Mar 31, 2021

whylee259 Mar 31, 2021

brew0722 commented Apr 1, 2021 •

edited

Loading

loloicci commented Apr 1, 2021 •

edited

Loading

brew0722 commented Apr 1, 2021

feat: merge 0.14.0-beta1 #86

feat: merge 0.14.0-beta1 #86

Conversation

brew0722 commented Mar 19, 2021 • edited Loading

Description

Motivation and context

How has this been tested?

Checklist:

brew0722 commented Mar 24, 2021 • edited Loading

whylee259 commented Mar 24, 2021

brew0722 commented Mar 31, 2021

brew0722 commented Mar 31, 2021 • edited Loading

loloicci left a comment

Choose a reason for hiding this comment

loloicci left a comment

Choose a reason for hiding this comment

shiki-tak Mar 31, 2021

Choose a reason for hiding this comment

whylee259 Mar 31, 2021

Choose a reason for hiding this comment

brew0722 commented Apr 1, 2021 • edited Loading

loloicci commented Apr 1, 2021 • edited Loading

brew0722 commented Apr 1, 2021

brew0722 commented Mar 19, 2021 •

edited

Loading

brew0722 commented Mar 24, 2021 •

edited

Loading

brew0722 commented Mar 31, 2021 •

edited

Loading

brew0722 commented Apr 1, 2021 •

edited

Loading

loloicci commented Apr 1, 2021 •

edited

Loading