Merge branch 'line:main' into patch-1

Finschia · Jan 26, 2023 · a52e8b6 · a52e8b6
2 parents ba3060d + df3df2f
commit a52e8b6
Show file tree

Hide file tree

Showing 744 changed files with 20,627 additions and 227,727 deletions.
diff --git a/.github/workflows/release-sims.yml b/.github/workflows/release-sims.yml
@@ -43,7 +43,7 @@ jobs:
       - name: install runsim
         run: |
           export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/[email protected]
-      - uses: actions/[email protected].2
+      - uses: actions/[email protected].3
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary
@@ -56,7 +56,7 @@ jobs:
       - uses: actions/[email protected]
         with:
           go-version: 1.18
-      - uses: actions/[email protected].2
+      - uses: actions/[email protected].3
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary
@@ -76,7 +76,7 @@ jobs:
       - uses: actions/[email protected]
         with:
           go-version: 1.18
-      - uses: actions/[email protected].2
+      - uses: actions/[email protected].3
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary
@@ -96,7 +96,7 @@ jobs:
       - uses: actions/[email protected]
         with:
           go-version: 1.18
-      - uses: actions/[email protected].2
+      - uses: actions/[email protected].3
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary

diff --git a/.github/workflows/sims.yml b/.github/workflows/sims.yml
@@ -42,7 +42,7 @@ jobs:
         run: go version
       - name: Install runsim
         run: export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/[email protected]
-      - uses: actions/[email protected].2
+      - uses: actions/[email protected].3
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary
@@ -64,7 +64,7 @@ jobs:
             !**/**_test.go
             go.mod
             go.sum
-      - uses: actions/[email protected].2
+      - uses: actions/[email protected].3
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary
@@ -93,7 +93,7 @@ jobs:
             go.sum
           SET_ENV_NAME_INSERTIONS: 1
           SET_ENV_NAME_LINES: 1
-      - uses: actions/[email protected].2
+      - uses: actions/[email protected].3
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary
@@ -122,7 +122,7 @@ jobs:
             go.sum
           SET_ENV_NAME_INSERTIONS: 1
           SET_ENV_NAME_LINES: 1
-      - uses: actions/[email protected].2
+      - uses: actions/[email protected].3
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary
@@ -151,7 +151,7 @@ jobs:
             go.sum
           SET_ENV_NAME_INSERTIONS: 1
           SET_ENV_NAME_LINES: 1
-      - uses: actions/[email protected].2
+      - uses: actions/[email protected].3
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary

diff --git a/.github/workflows/sims_normal.yml b/.github/workflows/sims_normal.yml
@@ -29,7 +29,7 @@ jobs:
         run: go version
       - name: Install runsim
         run: export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/[email protected]
-      - uses: actions/[email protected].2
+      - uses: actions/[email protected].3
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary
@@ -44,7 +44,7 @@ jobs:
           go-version: 1.18
       - name: Display go version
         run: go version
-      - uses: actions/[email protected].2
+      - uses: actions/[email protected].3
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary
@@ -62,7 +62,7 @@ jobs:
           go-version: 1.18
       - name: Display go version
         run: go version
-      - uses: actions/[email protected].2
+      - uses: actions/[email protected].3
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary
@@ -80,7 +80,7 @@ jobs:
           go-version: 1.18
       - name: Display go version
         run: go version
-      - uses: actions/[email protected].2
+      - uses: actions/[email protected].3
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -29,7 +29,7 @@ jobs:
       - name: install tparse
         run: |
           go install github.com/mfridman/[email protected]
-      - uses: actions/[email protected].2
+      - uses: actions/[email protected].3
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-tparse-binary

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -40,6 +40,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Features
 * (baseapp) [\#840](https://github.com/line/lbm-sdk/pull/840) allow querying the state based on `CheckState`.
 * (x/foundation) [\#848](https://github.com/line/lbm-sdk/pull/848) remove `gov mint` for x/foundation proposal
+* (x/wasm) [\#850](https://github.com/line/lbm-sdk/pull/850) remove `x/wasm` module in lbm-sdk
 
 ### Improvements
 * (cosmovisor) [\#792](https://github.com/line/lbm-sdk/pull/792) Use upstream's cosmovisor
@@ -49,14 +50,18 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (client) [\#817](https://github.com/line/lbm-sdk/pull/817) remove support for composite (BLS) type
 
 * (x/foundation) [#834](https://github.com/line/lbm-sdk/pull/834) Apply foundation audit
+* (x/collection,token) [#849](https://github.com/line/lbm-sdk/pull/849) Introduce codespace into x/collection,token
 
 ### Removed
 * [\#853](https://github.com/line/lbm-sdk/pull/853) remove useless stub BeginBlock, EndBlock methods from modules below
   * ibc, authz, collection, feegrant, ibc, token, wasm
+* (x/ibc) [\#858](https://github.com/line/lbm-sdk/pull/858) detach ibc module(repo: [line/ibc-go](https://github.com/line/ibc-go))
 
 ### Breaking Changes
 * (rest) [\#807](https://github.com/line/lbm-sdk/pull/807) remove legacy REST API
 
+* (codec) [#833](https://github.com/line/lbm-sdk/pull/833) Fix foundation amino codec
+
 ### Build, CI
 * (ci) [\#829](https://github.com/line/lbm-sdk/pull/829) automate release process
 

diff --git a/baseapp/block_gas_test.go b/baseapp/block_gas_test.go
@@ -67,7 +67,7 @@ func TestBaseApp_BlockGas(t *testing.T) {
 			encCfg.InterfaceRegistry.RegisterImplementations((*sdk.Msg)(nil),
 				&testdata.TestMsg{},
 			)
-			app = simapp.NewSimApp(log.NewNopLogger(), dbm.NewMemDB(), nil, true, map[int64]bool{}, "", 0, encCfg, simapp.EmptyAppOptions{}, nil, routerOpt)
+			app = simapp.NewSimApp(log.NewNopLogger(), dbm.NewMemDB(), nil, true, map[int64]bool{}, "", 0, encCfg, simapp.EmptyAppOptions{}, routerOpt)
 			genState := simapp.NewDefaultGenesisState(encCfg.Marshaler)
 			stateBytes, err := json.MarshalIndent(genState, "", " ")
 			require.NoError(t, err)
@@ -101,7 +101,7 @@ func TestBaseApp_BlockGas(t *testing.T) {
 			txBuilder.SetFeeAmount(feeAmount)
 			txBuilder.SetGasLimit(txtypes.MaxGasWanted) // tx validation checks that gasLimit can't be bigger than this
 
-			privs, accNums, accSeqs := []cryptotypes.PrivKey{priv1}, []uint64{7}, []uint64{0}
+			privs, accNums, accSeqs := []cryptotypes.PrivKey{priv1}, []uint64{6}, []uint64{0}
 			_, txBytes, err := createTestTx(encCfg.TxConfig, txBuilder, privs, accNums, accSeqs, ctx.ChainID())
 			require.NoError(t, err)
 

diff --git a/client/docs/config.json b/client/docs/config.json
@@ -101,14 +101,6 @@
         }
       }
     },
-    {
-      "url": "./tmp-swagger-gen/ibc/core/channel/v1/query.swagger.json",
-      "operationIds": {
-        "rename": {
-          "Params": "IBCChannelParams"
-        }
-      }
-    },
     {
       "url": "./tmp-swagger-gen/cosmos/authz/v1beta1/query.swagger.json",
       "operationIds": {
@@ -117,34 +109,6 @@
         }
       }
     },
-    {
-      "url": "./tmp-swagger-gen/ibc/core/client/v1/query.swagger.json",
-      "operationIds": {
-        "rename": {
-          "Params": "IBCClientParams",
-          "UpgradedConsensusState": "IBCUpgradedConsensusState"
-        }
-      }
-    },
-    {
-      "url": "./tmp-swagger-gen/ibc/core/connection/v1/query.swagger.json",
-      "operationIds": {
-        "rename": {
-          "Params": "IBCConnectionParams"
-        }
-      }
-    },
-    {
-      "url": "./tmp-swagger-gen/ibc/applications/transfer/v1/query.swagger.json",
-      "operationIds": {
-        "rename": {
-          "Params": "IBCTransferParams"
-        }
-      }
-    },
-    {
-      "url": "./tmp-swagger-gen/cosmwasm/wasm/v1/query.swagger.json"
-    },
     {
       "url": "./tmp-swagger-gen/lbm/foundation/v1/query.swagger.json",
       "operationIds": {
@@ -196,9 +160,6 @@
         }
       }
     },
-    {
-      "url": "./tmp-swagger-gen/lbm/wasm/v1/query.swagger.json"
-    },
     {
       "url": "./tmp-swagger-gen/cosmos/base/node/v1beta1/query.swagger.json"
     }

diff --git a/client/docs/statik/statik.go b/client/docs/statik/statik.go