Merge branch 'master' into dzmitryhil/dex-with-ft-blocked-smart-contract

CoreumFoundation · Nov 4, 2024 · ffd8649 · ffd8649
2 parents c0fd629 + c5b82a8
commit ffd8649
Show file tree

Hide file tree

Showing 54 changed files with 3,005 additions and 929 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,6 +12,7 @@ concurrency:
 
 jobs:
   ci:
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
@@ -72,4 +73,3 @@ jobs:
         if: failure()
         uses: jwalton/gh-docker-logs@v2
 
-
diff --git a/build/coreum/build.go b/build/coreum/build.go
@@ -195,7 +195,7 @@ func Lint(ctx context.Context, deps types.DepsFunc) error {
 		CompileAllSmartContracts,
 		formatProto,
 		lintProto,
-		breakingProto,
+		// breakingProto, // TODO: uncomment in next PR
 	)
 	return golang.Lint(ctx, deps)
 }

diff --git a/build/coreum/generate-proto-breaking.go b/build/coreum/generate-proto-breaking.go
@@ -1,3 +1,4 @@
+//nolint:unused
 package coreum
 
 import (
@@ -21,8 +22,10 @@ import (
 )
 
 //go:embed proto-breaking.tmpl.json
+//nolint:unused // TODO: uncomment in next PR
 var configBreakingTmpl string
 
+//nolint:deadcode
 func breakingProto(ctx context.Context, deps types.DepsFunc) error {
 	deps(golang.Tidy, tools.EnsureProtoc, tools.EnsureProtocGenBufBreaking)
 

diff --git a/build/go.mod b/build/go.mod
@@ -28,7 +28,7 @@ replace (
 require (
 	github.com/CoreumFoundation/coreum-tools v0.4.1-0.20240321120602-0a9c50facc68
 	github.com/CoreumFoundation/coreum/v5 v5.0.0-20241022051641-b49ec5faa621
-	github.com/CoreumFoundation/crust v0.0.0-20241023120411-b54970b4922c
+	github.com/CoreumFoundation/crust v0.0.0-20241029185440-e352dde6f2b2
 	github.com/iancoleman/strcase v0.3.0
 	github.com/pkg/errors v0.9.1
 	github.com/samber/lo v1.39.0

diff --git a/build/go.sum b/build/go.sum
@@ -231,8 +231,8 @@ github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/CoreumFoundation/coreum-tools v0.4.1-0.20240321120602-0a9c50facc68 h1:Tb9avuSQW3smVGrUnDh/Y+ML4eK802UsvJNZHsBgOGg=
 github.com/CoreumFoundation/coreum-tools v0.4.1-0.20240321120602-0a9c50facc68/go.mod h1:VD93vCHkxYaT/RhOesXTFgd/GQDW54tr0BqGi5JU1c0=
-github.com/CoreumFoundation/crust v0.0.0-20241023120411-b54970b4922c h1:vtNl0+pQ8p6rogxWD4yx+Qp4r9IK8qwyo32Qki21ltg=
-github.com/CoreumFoundation/crust v0.0.0-20241023120411-b54970b4922c/go.mod h1:95ZdELt65yNef7qty4vvRBcBgkgw0L0+td2tNa/JKTM=
+github.com/CoreumFoundation/crust v0.0.0-20241029185440-e352dde6f2b2 h1:YCaird/0FrYgMAajomVBJ/aClatBcorVi1vAmYNjH2w=
+github.com/CoreumFoundation/crust v0.0.0-20241029185440-e352dde6f2b2/go.mod h1:95ZdELt65yNef7qty4vvRBcBgkgw0L0+td2tNa/JKTM=
 github.com/CosmWasm/wasmd v0.53.0 h1:kdaoAi20bIb4VCsxw9pRaT2g5PpIp82Wqrr9DRVN9ao=
 github.com/CosmWasm/wasmd v0.53.0/go.mod h1:FJl/aWjdpGof3usAMFQpDe07Rkx77PUzp0cygFMOvtw=
 github.com/CosmWasm/wasmvm/v2 v2.1.2 h1:GkJ5bAsRlLHfIQVg/FY1VHwLyBwlCjAhDea0B8L+e20=

diff --git a/docs/api.md b/docs/api.md
@@ -2564,7 +2564,7 @@ the source code for the extension.
 | `code_id` | [uint64](#uint64) |  |  `code_id is the reference to the stored WASM code`  |
 | `label` | [string](#string) |  |  `label is optional metadata to be stored with a contract instance.`  |
 | `funds` | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | repeated |  `funds coins that are transferred to the contract on instantiation`  |
-| `issuanceMsg` | [bytes](#bytes) |  |  `optional json encoded data to pass to WASM on instantiation by the ft issuer`  |
+| `issuance_msg` | [bytes](#bytes) |  |  `optional json encoded data to pass to WASM on instantiation by the ft issuer`  |
 
 
 
@@ -5184,7 +5184,7 @@ Query defines the gRPC query service.
 | `Order` | [QueryOrderRequest](#coreum.dex.v1.QueryOrderRequest) | [QueryOrderResponse](#coreum.dex.v1.QueryOrderResponse) | `Order queries order by creator and ID.` | GET|/coreum/dex/v1/orders/{creator}/{id} |
 | `Orders` | [QueryOrdersRequest](#coreum.dex.v1.QueryOrdersRequest) | [QueryOrdersResponse](#coreum.dex.v1.QueryOrdersResponse) | `Orders queries creator orders.` | GET|/coreum/dex/v1/orders/{creator} |
 | `OrderBooks` | [QueryOrderBooksRequest](#coreum.dex.v1.QueryOrderBooksRequest) | [QueryOrderBooksResponse](#coreum.dex.v1.QueryOrderBooksResponse) | `OrderBooks queries order books.` | GET|/coreum/dex/v1/order-books |
-| `OrdersBookOrders` | [QueryOrderBookOrdersRequest](#coreum.dex.v1.QueryOrderBookOrdersRequest) | [QueryOrderBookOrdersResponse](#coreum.dex.v1.QueryOrderBookOrdersResponse) | `OrdersBookOrders queries order book orders.` | GET|/coreum/dex/v1/order-books/{base_denom}/{quote_denom}/orders |
+| `OrderBookOrders` | [QueryOrderBookOrdersRequest](#coreum.dex.v1.QueryOrderBookOrdersRequest) | [QueryOrderBookOrdersResponse](#coreum.dex.v1.QueryOrderBookOrdersResponse) | `OrderBookOrders queries order book orders.` | GET|/coreum/dex/v1/order-books/{base_denom}/{quote_denom}/orders |
 | `AccountDenomOrdersCount` | [QueryAccountDenomOrdersCountRequest](#coreum.dex.v1.QueryAccountDenomOrdersCountRequest) | [QueryAccountDenomOrdersCountResponse](#coreum.dex.v1.QueryAccountDenomOrdersCountResponse) | `AccountDenomOrdersCount queries account denom orders count.` | GET|/coreum/dex/v1/accounts/{account}/denoms/{denom}/orders-count |
 
  <!-- end services -->

diff --git a/docs/static/openapi.json b/docs/static/openapi.json
@@ -1139,7 +1139,7 @@
     },
     "/coreum/dex/v1/order-books/{base_denom}/{quote_denom}/orders": {
       "get": {
-        "operationId": "GithubComCoreumFoundationCoreumV5XDexTypesOrdersBookOrders",
+        "operationId": "GithubComCoreumFoundationCoreumV5XDexTypesOrderBookOrders",
         "parameters": [
           {
             "name": "base_denom",
@@ -1221,7 +1221,7 @@
             }
           }
         },
-        "summary": "OrdersBookOrders queries order book orders.",
+        "summary": "OrderBookOrders queries order book orders.",
         "tags": [
           "Query"
         ]

diff --git a/integration-tests/contracts/modules/authz-nft-trade/Cargo.lock b/integration-tests/contracts/modules/authz-nft-trade/Cargo.lock
diff --git a/integration-tests/contracts/modules/authz-nft-trade/Cargo.toml b/integration-tests/contracts/modules/authz-nft-trade/Cargo.toml
@@ -29,6 +29,6 @@ cosmwasm-std = { version = "2.1.4", features = ["cosmwasm_2_0"] }
 cw2 = "2.0.0"
 cw-storage-plus = "2.0.0"
 cosmwasm-schema = "2.1.4"
-coreum-wasm-sdk = {git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git", branch = "upgrade-cosmwasm-std"}
+coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git" }
 cw-utils = "2.0.0"
 prost = "0.12.6"
diff --git a/integration-tests/contracts/modules/authz-stargate/Cargo.lock b/integration-tests/contracts/modules/authz-stargate/Cargo.lock
diff --git a/integration-tests/contracts/modules/authz-stargate/Cargo.toml b/integration-tests/contracts/modules/authz-stargate/Cargo.toml
@@ -28,4 +28,4 @@ thiserror = "1.0.56"
 cosmwasm-std = { version = "2.1.4", features = ["stargate", "cosmwasm_2_0"] }
 cw2 = "2.0.0"
 cosmwasm-schema = "2.1.4"
-coreum-wasm-sdk = {git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git", branch = "upgrade-cosmwasm-std"}
+coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git" }