From 0d9df8c3f8b8ee616be10e09c283b08ae8b64a23 Mon Sep 17 00:00:00 2001 From: samricotta <37125168+samricotta@users.noreply.github.com> Date: Mon, 18 Dec 2023 14:33:17 +0100 Subject: [PATCH 1/6] docs: add index page for learn section (#18777) (cherry picked from commit 1a496057ac2cef7f29654fbe5b0e2e7d002a5d64) # Conflicts: # docs/docs/basics/_category_.json # docs/docs/core/_category_.json # docs/docs/learn.md --- docs/docs/basics/_category_.json | 5 +++++ docs/docs/core/_category_.json | 5 +++++ docs/docs/intro/_category_.json | 2 +- docs/docs/learn.md | 11 +++++++++++ 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 docs/docs/learn.md diff --git a/docs/docs/basics/_category_.json b/docs/docs/basics/_category_.json index 1f2b57293f6d..32f3c95a19f8 100644 --- a/docs/docs/basics/_category_.json +++ b/docs/docs/basics/_category_.json @@ -1,5 +1,10 @@ { +<<<<<<< HEAD:docs/docs/basics/_category_.json "label": "Basics", "position": 1, +======= + "label": "Beginner", + "position": 2, +>>>>>>> 1a496057a (docs: add index page for learn section (#18777)):docs/learn/beginner/_category_.json "link": null } \ No newline at end of file diff --git a/docs/docs/core/_category_.json b/docs/docs/core/_category_.json index 2a5703c287b9..46a1069b593c 100644 --- a/docs/docs/core/_category_.json +++ b/docs/docs/core/_category_.json @@ -1,5 +1,10 @@ { +<<<<<<< HEAD:docs/docs/core/_category_.json "label": "Core Concepts", "position": 2, +======= + "label": "Advanced", + "position": 3, +>>>>>>> 1a496057a (docs: add index page for learn section (#18777)):docs/learn/advanced/_category_.json "link": null } \ No newline at end of file diff --git a/docs/docs/intro/_category_.json b/docs/docs/intro/_category_.json index b218fe9be4aa..bb0bcd14af39 100644 --- a/docs/docs/intro/_category_.json +++ b/docs/docs/intro/_category_.json @@ -1,5 +1,5 @@ { "label": "Introduction", - "position": 0, + "position": 1, "link": null } \ No newline at end of file diff --git a/docs/docs/learn.md b/docs/docs/learn.md new file mode 100644 index 000000000000..9012759c6619 --- /dev/null +++ b/docs/docs/learn.md @@ -0,0 +1,11 @@ +--- +sidebar_position: 0 +--- +# Learn + +* [Introduction](intro/00-overview.md) - Dive into the fundamentals of Cosmos SDK with an insightful introduction, +laying the groundwork for understanding blockchain development. In this section we provide a High-Level Overview of the SDK, then dive deeper into Core concepts such as Application-Specific Blockchains, Blockchain Architecture, and finally we begin to explore what are the main components of the SDK. +* [Beginner](beginner/00-app-anatomy.md) - Start your journey with beginner-friendly resources in the Cosmos SDK's "Learn" +section, providing a gentle entry point for newcomers to blockchain development. Here we focus on a little more detail, covering the Anatomy of a Cosmos SDK Application, Transaction Lifecycles, Accounts and lastly, Gas and Fees. +* [Advanced](advanced/00-baseapp.md) - Level up your Cosmos SDK expertise with advanced topics, tailored for experienced +developers diving into intricate blockchain application development. We cover the Cosmos SDK on a lower level as we dive into the core of the SDK with BaseApp, Transactions, Context, Node Client (Daemon), Store, Encoding, gRPC, REST, and CometBFT Endpoints, CLI, Events, Telementry, Object-Capability Model, RunTx recovery middleware, Cosmos Blockchain Simulator, Protobuf Documentation, In-Place Store Migrations, Configuration and AutoCLI. From 371744b8f703f04e7931788acf3334df98fb1bea Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 11:45:17 +0530 Subject: [PATCH 2/6] fix(x/auth): remove misleading gas wanted value from tx simulation failure response (backport #18772) (#18776) Co-authored-by: yihuang Co-authored-by: Julien Robert --- CHANGELOG.md | 1 + x/auth/tx/service.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9195332f0f9a..5662dea0653e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (x/gov) [#18707](https://github.com/cosmos/cosmos-sdk/pull/18707) Improve genesis validation. * (server) [#18478](https://github.com/cosmos/cosmos-sdk/pull/18478) Add command flag to disable colored logs. +* (x/auth/tx) [#18772](https://github.com/cosmos/cosmos-sdk/pull/18772) Remove misleading gas wanted from tx simulation failure log. ### Bug Fixes diff --git a/x/auth/tx/service.go b/x/auth/tx/service.go index 5b5f0bf5cc4e..cdb145461c0d 100644 --- a/x/auth/tx/service.go +++ b/x/auth/tx/service.go @@ -131,7 +131,7 @@ func (s txServer) Simulate(ctx context.Context, req *txtypes.SimulateRequest) (* gasInfo, result, err := s.simulate(txBytes) if err != nil { - return nil, status.Errorf(codes.Unknown, "%v With gas wanted: '%d' and gas used: '%d' ", err, gasInfo.GasWanted, gasInfo.GasUsed) + return nil, status.Errorf(codes.Unknown, "%v with gas used: '%d'", err, gasInfo.GasUsed) } return &txtypes.SimulateResponse{ From 0ae5d068a228975591ac3cdba99b93a7474ca68c Mon Sep 17 00:00:00 2001 From: samricotta Date: Tue, 19 Dec 2023 13:53:12 +0100 Subject: [PATCH 3/6] Update positions --- docs/docs/core/_category_.json | 4 ++-- docs/docs/intro/_category_.json | 2 +- docs/docs/learn.md | 11 +++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 docs/docs/learn.md diff --git a/docs/docs/core/_category_.json b/docs/docs/core/_category_.json index 2a5703c287b9..a49201e64e97 100644 --- a/docs/docs/core/_category_.json +++ b/docs/docs/core/_category_.json @@ -1,5 +1,5 @@ { - "label": "Core Concepts", - "position": 2, + "label": "Advanced", + "position": 3, "link": null } \ No newline at end of file diff --git a/docs/docs/intro/_category_.json b/docs/docs/intro/_category_.json index b218fe9be4aa..bb0bcd14af39 100644 --- a/docs/docs/intro/_category_.json +++ b/docs/docs/intro/_category_.json @@ -1,5 +1,5 @@ { "label": "Introduction", - "position": 0, + "position": 1, "link": null } \ No newline at end of file diff --git a/docs/docs/learn.md b/docs/docs/learn.md new file mode 100644 index 000000000000..9012759c6619 --- /dev/null +++ b/docs/docs/learn.md @@ -0,0 +1,11 @@ +--- +sidebar_position: 0 +--- +# Learn + +* [Introduction](intro/00-overview.md) - Dive into the fundamentals of Cosmos SDK with an insightful introduction, +laying the groundwork for understanding blockchain development. In this section we provide a High-Level Overview of the SDK, then dive deeper into Core concepts such as Application-Specific Blockchains, Blockchain Architecture, and finally we begin to explore what are the main components of the SDK. +* [Beginner](beginner/00-app-anatomy.md) - Start your journey with beginner-friendly resources in the Cosmos SDK's "Learn" +section, providing a gentle entry point for newcomers to blockchain development. Here we focus on a little more detail, covering the Anatomy of a Cosmos SDK Application, Transaction Lifecycles, Accounts and lastly, Gas and Fees. +* [Advanced](advanced/00-baseapp.md) - Level up your Cosmos SDK expertise with advanced topics, tailored for experienced +developers diving into intricate blockchain application development. We cover the Cosmos SDK on a lower level as we dive into the core of the SDK with BaseApp, Transactions, Context, Node Client (Daemon), Store, Encoding, gRPC, REST, and CometBFT Endpoints, CLI, Events, Telementry, Object-Capability Model, RunTx recovery middleware, Cosmos Blockchain Simulator, Protobuf Documentation, In-Place Store Migrations, Configuration and AutoCLI. From 0706615ae1cb9183fc1b71bc2608a05f17352ad2 Mon Sep 17 00:00:00 2001 From: samricotta Date: Tue, 19 Dec 2023 13:53:16 +0100 Subject: [PATCH 4/6] Update _category_.json --- docs/docs/basics/_category_.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/docs/basics/_category_.json b/docs/docs/basics/_category_.json index 1f2b57293f6d..d09097faee58 100644 --- a/docs/docs/basics/_category_.json +++ b/docs/docs/basics/_category_.json @@ -1,5 +1,5 @@ { - "label": "Basics", - "position": 1, + "label": "Beginner", + "position": 2, "link": null } \ No newline at end of file From 2e1e4f462071f8cbfad6dae3c30287757ebcac5e Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Tue, 19 Dec 2023 15:15:10 +0100 Subject: [PATCH 5/6] revert --- x/auth/tx/service.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/auth/tx/service.go b/x/auth/tx/service.go index cdb145461c0d..5b5f0bf5cc4e 100644 --- a/x/auth/tx/service.go +++ b/x/auth/tx/service.go @@ -131,7 +131,7 @@ func (s txServer) Simulate(ctx context.Context, req *txtypes.SimulateRequest) (* gasInfo, result, err := s.simulate(txBytes) if err != nil { - return nil, status.Errorf(codes.Unknown, "%v with gas used: '%d'", err, gasInfo.GasUsed) + return nil, status.Errorf(codes.Unknown, "%v With gas wanted: '%d' and gas used: '%d' ", err, gasInfo.GasWanted, gasInfo.GasUsed) } return &txtypes.SimulateResponse{ From 2eab7817b61a4f2a3a4d5c2b56d9c537db871b99 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Tue, 19 Dec 2023 15:15:35 +0100 Subject: [PATCH 6/6] revert --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5662dea0653e..9195332f0f9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,7 +41,6 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (x/gov) [#18707](https://github.com/cosmos/cosmos-sdk/pull/18707) Improve genesis validation. * (server) [#18478](https://github.com/cosmos/cosmos-sdk/pull/18478) Add command flag to disable colored logs. -* (x/auth/tx) [#18772](https://github.com/cosmos/cosmos-sdk/pull/18772) Remove misleading gas wanted from tx simulation failure log. ### Bug Fixes