Merge branch 'CosmWasm:main' into multiwasm

oraichain · Dec 13, 2022 · 1166d74 · 1166d74
2 parents f428454 + effe21c
commit 1166d74
Show file tree

Hide file tree

Showing 24 changed files with 781 additions and 2,572 deletions.
diff --git a/.github/workflows/codeql-analizer.yml b/.github/workflows/codeql-analizer.yml
@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3.2.0
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

diff --git a/.github/workflows/proto-buf-publisher.yml b/.github/workflows/proto-buf-publisher.yml
@@ -16,7 +16,7 @@ jobs:
   push:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v3.2.0
       - uses: bufbuild/[email protected]
 
       # lint checks

diff --git a/app/params/weights.go b/app/params/weights.go
@@ -28,9 +28,15 @@ const (
 	DefaultWeightMsgClearAdmin          int = 10
 	DefaultWeightMsgMigrateContract     int = 50
 
-	DefaultWeightStoreCodeProposal           int = 5
-	DefaultWeightInstantiateContractProposal int = 5
-	DefaultWeightUpdateAdminProposal         int = 5
-	DefaultWeightExecuteContractProposal     int = 5
-	DefaultWeightClearAdminProposal          int = 5
+	DefaultWeightStoreCodeProposal                   int = 5
+	DefaultWeightInstantiateContractProposal         int = 5
+	DefaultWeightUpdateAdminProposal                 int = 5
+	DefaultWeightExecuteContractProposal             int = 5
+	DefaultWeightClearAdminProposal                  int = 5
+	DefaultWeightMigrateContractProposal             int = 5
+	DefaultWeightSudoContractProposal                int = 5
+	DefaultWeightPinCodesProposal                    int = 5
+	DefaultWeightUnpinCodesProposal                  int = 5
+	DefaultWeightUpdateInstantiateConfigProposal     int = 5
+	DefaultWeightStoreAndInstantiateContractProposal int = 5
 )
diff --git a/cmd/wasmd/genwasm.go b/cmd/wasmd/genwasm.go
diff --git a/cmd/wasmd/root.go b/cmd/wasmd/root.go
@@ -99,7 +99,6 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) {
 		genutilcli.GenTxCmd(app.ModuleBasics, encodingConfig.TxConfig, banktypes.GenesisBalancesIterator{}, app.DefaultNodeHome),
 		genutilcli.ValidateGenesisCmd(app.ModuleBasics),
 		AddGenesisAccountCmd(app.DefaultNodeHome),
-		AddGenesisWasmMsgCmd(app.DefaultNodeHome),
 		tmcli.NewCompletionCmd(rootCmd, true),
 		// testnetCmd(app.ModuleBasics, banktypes.GenesisBalancesIterator{}),
 		debug.Cmd(),