feat: apply the wasm module of lbm-sdk #1
Merged
+12,136
−5,948
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
app/app.go
Outdated
Comment on lines
843
to
845
| for acc := range maccPerms { | ||
| blockedAddrs[authtypes.NewModuleAddress(acc).String()] = !allowedReceivingModAcc[acc] | ||
| } |
Check warning
Code scanning / CodeQL
Iteration over map
| @@ -239,9 +306,9 @@ | |||
| } | |||
|
|
|||
| func (k Keeper) instantiate(ctx sdk.Context, codeID uint64, creator, admin sdk.AccAddress, initMsg []byte, label string, deposit sdk.Coins, authZ AuthorizationPolicy) (sdk.AccAddress, []byte, error) { | |||
| defer telemetry.MeasureSince(time.Now(), "wasm", "contract", "instantiate") | |||
| defer func(begin time.Time) { k.metrics.InstantiateElapsedTimes.Observe(time.Since(begin).Seconds()) }(time.Now()) | |||
Check warning
Code scanning / CodeQL
Calling the system time
| @@ -336,13 +404,16 @@ | |||
|
|
|||
| // Execute executes the contract instance | |||
| func (k Keeper) execute(ctx sdk.Context, contractAddress sdk.AccAddress, caller sdk.AccAddress, msg []byte, coins sdk.Coins) ([]byte, error) { | |||
| defer telemetry.MeasureSince(time.Now(), "wasm", "contract", "execute") | |||
| defer func(begin time.Time) { k.metrics.ExecuteElapsedTimes.Observe(time.Since(begin).Seconds()) }(time.Now()) | |||
Check warning
Code scanning / CodeQL
Calling the system time
| @@ -378,14 +450,17 @@ | |||
| } | |||
|
|
|||
| func (k Keeper) migrate(ctx sdk.Context, contractAddress sdk.AccAddress, caller sdk.AccAddress, newCodeID uint64, msg []byte, authZ AuthorizationPolicy) ([]byte, error) { | |||
| defer telemetry.MeasureSince(time.Now(), "wasm", "contract", "migrate") | |||
| migrateSetupCosts := k.gasRegister.InstantiateContractCosts(k.IsPinnedCode(ctx, newCodeID), len(msg)) | |||
| defer func(begin time.Time) { k.metrics.MigrateElapsedTimes.Observe(time.Since(begin).Seconds()) }(time.Now()) | |||
Check warning
Code scanning / CodeQL
Calling the system time
| @@ -451,21 +527,22 @@ | |||
| // another native Go module directly, or on-chain governance (if sudo proposals are enabled). Thus, the keeper doesn't | |||
| // place any access controls on it, that is the responsibility or the app developer (who passes the wasm.Keeper in app.go) | |||
| func (k Keeper) Sudo(ctx sdk.Context, contractAddress sdk.AccAddress, msg []byte) ([]byte, error) { | |||
| defer telemetry.MeasureSince(time.Now(), "wasm", "contract", "sudo") | |||
| defer func(begin time.Time) { k.metrics.SudoElapsedTimes.Observe(time.Since(begin).Seconds()) }(time.Now()) | |||
Check warning
Code scanning / CodeQL
Calling the system time
| @@ -607,7 +688,7 @@ | |||
|
|
|||
| // QuerySmart queries the smart contract itself. | |||
| func (k Keeper) QuerySmart(ctx sdk.Context, contractAddr sdk.AccAddress, req []byte) ([]byte, error) { | |||
| defer telemetry.MeasureSince(time.Now(), "wasm", "contract", "query-smart") | |||
| defer func(begin time.Time) { k.metrics.QuerySmartElapsedTimes.Observe(time.Since(begin).Seconds()) }(time.Now()) | |||
Check warning
Code scanning / CodeQL
Calling the system time
| @@ -661,7 +743,7 @@ | |||
|
|
|||
| // QueryRaw returns the contract's state for give key. Returns `nil` when key is `nil`. | |||
| func (k Keeper) QueryRaw(ctx sdk.Context, contractAddress sdk.AccAddress, key []byte) []byte { | |||
| defer telemetry.MeasureSince(time.Now(), "wasm", "contract", "query-raw") | |||
| defer func(begin time.Time) { k.metrics.QueryRawElapsedTimes.Observe(time.Since(begin).Seconds()) }(time.Now()) | |||
Check warning
Code scanning / CodeQL
Calling the system time
zemyblue
force-pushed
the
apply_lbm_changes
branch
from
ef4308e
to
f26c9ce
Compare
zemyblue
force-pushed
the
apply_lbm_changes
branch
from
70ec1ff
to
485fef4
Compare
5 tasks
loloicci
reviewed
Jan 5, 2023
.github/workflows/lint.yml
Outdated
| version: v1.50.1 | ||
| args: --timeout 10m | ||
| github-token: ${{ secrets.GITHUB_TOKEN }} | ||
| if: env.GIT_DIFF |
.github/workflows/test.yml
Outdated
| run: | | ||
| cd ./benchmarks | ||
| go test -bench . | ||
| if: env.GIT_DIFF |
shiki-tak
reviewed
Jan 5, 2023
shiki-tak
reviewed
Jan 6, 2023
shiki-tak
reviewed
Jan 6, 2023
|
|
||
| message EvidenceList { | ||
| repeated Evidence evidence = 1 [(gogoproto.nullable) = false]; | ||
| } |
loloicci
approved these changes
Jan 10, 2023
da1suk8
approved these changes
Jan 10, 2023
7 tasks
Merged
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Apply all the wasm modules changes of lbm-sdk.
The
x/wasmmodule is copied from the3bdcb6ffe01c81615bedb777ca0e039cc46ef00ccommit hash in lbm-sdk. And some parts is modified to fit properly. The modified part can be seen in the differences below.The difference with lbm-sdk/x/wasm
flagProposalTypeandcli.FlagProposalin gov tx cli (x/wasm/client/cli/gov_tx.go). This flags was added in cosmwasm/wasmd.ProposalStoreCodeCmd()ProposalInstantiateContractCmd()ProposalMigrateContractCmd()ProposalExecuteContractCmd()ProposalSudoContractCmd()ProposalUpdateContractAdminCmd()ProposalClearContractAdminCmd()ProposalPinCodesCmd()ProposalUnpinCodesCmd()ProposalUpdateInstantiateConfigCmd()ReadFileWithSizeLimitfunction of lbm-sdk's internal file underx/wasm/client/cli/osdirectory. This is because functions insideinternaldirectory cannot be imported.Update process
x/wasmin lbm-sdk. This lbm-sdk's PR imports current PR temporary and replaceline/wasmdafter merging current PR.line/wasmdfromzemyblue/lbm-sdktoline/lbm-sdk(via another PR in this repo)