Merge branch 'main' into murali/quick-fix

chain id
2023-01-11 10:37:25 +05:30 · 2023-01-04 11:53:28 +05:30
10 changed files with 23 additions and 241 deletions
@@ -15,14 +15,6 @@ The Source of Proof. Laconic is a next generation data availability & verifiabil
 make install
 ```

-## Usage
-
-To quickly get started with a single node fixture, run:
-
-```bash
-./init.sh
-```
-
 ## Community

 The following chat channels and forums are a great spot to ask questions about Ethermint:
@@ -18,7 +18,6 @@ require (
 	github.com/deckarep/golang-set v1.8.0
 	github.com/ethereum/go-ethereum v1.10.26
 	github.com/gibson042/canonicaljson-go v1.0.3
-	github.com/go-chi/chi/v5 v5.0.7
 	github.com/gogo/protobuf v1.3.3
 	github.com/golang/protobuf v1.5.2
 	github.com/gorilla/mux v1.8.0
@@ -367,8 +367,6 @@ github.com/gin-gonic/gin v1.7.0/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjX
 github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
 github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24=
 github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs=
-github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8=
-github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -1,165 +0,0 @@
-package gql
-
-import (
-	"html/template"
-	"net/http"
-)
-
-// GraphiQL is an in-browser IDE for exploring GraphiQL APIs.
-// This handler returns GraphiQL when requested.
-//
-// For more information, see https://github.com/graphql/graphiql.
-
-func PlaygroundHandler(apiURL string) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		if r.Method != "GET" {
-			http.Error(w, "only GET requests are supported", http.StatusMethodNotAllowed)
-			return
-		}
-		w.Header().Set("Content-Type", "text/html")
-		err := page.Execute(w, map[string]interface{}{
-			"apiURL": apiURL,
-		})
-		if err != nil {
-			panic(err)
-		}
-	}
-}
-
-// https://github.com/graphql/graphiql/blob/main/examples/graphiql-cdn/index.html
-var page = template.Must(template.New("graphiql").Parse(`
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title>GraphiQL</title>
-    <style>
-      body {
-        height: 100%;
-        margin: 0;
-        width: 100%;
-        overflow: hidden;
-      }
-
-      #graphiql {
-        height: 100vh;
-      }
-    </style>
-
-    <!--
-      This GraphiQL example depends on Promise and fetch, which are available in
-      modern browsers, but can be "polyfilled" for older browsers.
-      GraphiQL itself depends on React DOM.
-      If you do not want to rely on a CDN, you can host these files locally or
-      include them directly in your favored resource bundler.
-    -->
-    <script
-      src="https://unpkg.com/react@17/umd/react.development.js"
-      integrity="sha512-Vf2xGDzpqUOEIKO+X2rgTLWPY+65++WPwCHkX2nFMu9IcstumPsf/uKKRd5prX3wOu8Q0GBylRpsDB26R6ExOg=="
-      crossorigin="anonymous"
-    ></script>
-    <script
-      src="https://unpkg.com/react-dom@17/umd/react-dom.development.js"
-      integrity="sha512-Wr9OKCTtq1anK0hq5bY3X/AvDI5EflDSAh0mE9gma+4hl+kXdTJPKZ3TwLMBcrgUeoY0s3dq9JjhCQc7vddtFg=="
-      crossorigin="anonymous"
-    ></script>
-
-    <!--
-      These two files can be found in the npm module, however you may wish to
-      copy them directly into your environment, or perhaps include them in your
-      favored resource bundler.
-     -->
-    <link rel="stylesheet" href="https://unpkg.com/graphiql/graphiql.min.css" />
-  </head>
-
-  <body>
-    <div id="graphiql">Loading...</div>
-    <script
-      src="https://unpkg.com/graphiql/graphiql.min.js"
-      type="application/javascript"
-    ></script>
-    <script>
-      // https://github.com/graphql/graphiql/blob/main/packages/graphiql/resources/renderExample.js
-      
-      // Parse the search string to get url parameters.
-      var search = window.location.search;
-      var parameters = {};
-      search
-        .substr(1)
-        .split('&')
-        .forEach(function (entry) {
-          var eq = entry.indexOf('=');
-          if (eq >= 0) {
-            parameters[decodeURIComponent(entry.slice(0, eq))] = decodeURIComponent(
-              entry.slice(eq + 1),
-            );
-          }
-        });
-      
-      // When the query and variables string is edited, update the URL bar so
-      // that it can be easily shared.
-      function onEditQuery(newQuery) {
-        parameters.query = newQuery;
-        updateURL();
-      }
-      
-      function onEditVariables(newVariables) {
-        parameters.variables = newVariables;
-        updateURL();
-      }
-      
-      function onEditHeaders(newHeaders) {
-        parameters.headers = newHeaders;
-        updateURL();
-      }
-      
-      function onTabChange(tabsState) {
-        const activeTab = tabsState.tabs[tabsState.activeTabIndex];
-        parameters.query = activeTab.query;
-        parameters.variables = activeTab.variables;
-        parameters.headers = activeTab.headers;
-        updateURL();
-      }
-      
-      function updateURL() {
-        var newSearch =
-          '?' +
-          Object.keys(parameters)
-            .filter(function (key) {
-              return Boolean(parameters[key]);
-            })
-            .map(function (key) {
-              return (
-                encodeURIComponent(key) + '=' + encodeURIComponent(parameters[key])
-              );
-            })
-            .join('&');
-        history.replaceState(null, null, newSearch);
-      }
-      
-      // Render <GraphiQL /> into the body.
-      // See the README in the top level of this module to learn more about
-      // how you can customize GraphiQL by providing different values or
-      // additional child elements.
-      ReactDOM.render(
-        React.createElement(GraphiQL, {
-          fetcher: GraphiQL.createFetcher({
-            url: {{.apiURL}}
-          }),
-          query: parameters.query,
-          variables: parameters.variables,
-          headers: parameters.headers,
-          defaultHeaders: parameters.defaultHeaders,
-          onEditQuery: onEditQuery,
-          onEditVariables: onEditVariables,
-          onEditHeaders: onEditHeaders,
-          defaultEditorToolsVisibility: true,
-          isHeadersEditorEnabled: true,
-          shouldPersistHeaders: true,
-          onTabChange,
-        }),
-        document.getElementById('graphiql'),
-      );
-    </script>
-  </body>
-</html>
-`))
@@ -5,10 +5,9 @@ import (
 	"net/http"

 	"github.com/99designs/gqlgen/graphql/handler"
+	"github.com/99designs/gqlgen/graphql/playground"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/ethereum/go-ethereum/log"
-	"github.com/go-chi/chi/v5"
-	"github.com/rs/cors"
 	"github.com/spf13/viper"
 )

@@ -17,16 +16,6 @@ func Server(ctx client.Context) {
 	if !viper.GetBool("gql-server") {
 		return
 	}
-
-	router := chi.NewRouter()
-
-	// Add CORS middleware around every request
-	// See https://github.com/rs/cors for full option listing
-	router.Use(cors.New(cors.Options{
-		AllowedOrigins: []string{"*"},
-		Debug:          false,
-	}).Handler)
-
 	logFile := viper.GetString("log-file")

 	port := viper.GetString("gql-port")
@@ -36,20 +25,20 @@ func Server(ctx client.Context) {
 		logFile: logFile,
 	}}))

-	router.Handle("/", PlaygroundHandler("/api"))
+	http.Handle("/", playground.Handler("GraphQL playground", "/api"))

 	if viper.GetBool("gql-playground") {
 		apiBase := viper.GetString("gql-playground-api-base")

-		router.Handle("/webui", PlaygroundHandler(apiBase+"/api"))
-		router.Handle("/console", PlaygroundHandler(apiBase+"/graphql"))
+		http.Handle("/webui", playground.Handler("GraphQL playground", apiBase+"/api"))
+		http.Handle("/console", playground.Handler("GraphQL playground", apiBase+"/graphql"))
 	}

-	router.Handle("/api", srv)
-	router.Handle("/graphql", srv)
+	http.Handle("/api", srv)
+	http.Handle("/graphql", srv)

 	log.Info("Connect to GraphQL playground", "url", fmt.Sprintf("http://localhost:%s", port))
-	err := http.ListenAndServe(":"+port, router) //nolint: all
+	err := http.ListenAndServe(":"+port, nil) //nolint: all
 	if err != nil {
 		panic(err)
 	}
@@ -3,7 +3,7 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
    set -x
 fi
 # Get the key from laconicd
-laconicd_key=$( docker compose exec laconicd echo y | docker compose exec laconicd laconicd keys export mykey --unarmored-hex --unsafe )
+laconicd_key=$( docker compose exec laconicd echo y | laconicd keys export mykey --unarmored-hex --unsafe )
 # Set parameters for the test suite
 cosmos_chain_id=laconic_9000-1
 laconicd_rest_endpoint=http://laconicd:1317
@@ -8,16 +8,17 @@ import (
 	"bytes"
 	"errors"

-	canonicalJson "github.com/gibson042/canonicaljson-go"
-	"github.com/ipfs/go-cid"
-	cbor "github.com/ipfs/go-ipld-cbor"
 	"github.com/ipld/go-ipld-prime/codec/dagcbor"
-	"github.com/ipld/go-ipld-prime/codec/dagjson"
+	"github.com/ipld/go-ipld-prime/fluent"
 	"github.com/ipld/go-ipld-prime/linking"
 	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
 	"github.com/ipld/go-ipld-prime/multicodec"
-	basicnode "github.com/ipld/go-ipld-prime/node/basic"
 	"github.com/ipld/go-ipld-prime/storage/memstore"
+
+	canonicalJson "github.com/gibson042/canonicaljson-go"
+	"github.com/ipfs/go-cid"
+	cbor "github.com/ipfs/go-ipld-cbor"
+	basicnode "github.com/ipld/go-ipld-prime/node/basic"
 	mh "github.com/multiformats/go-multihash"
 )

@@ -67,17 +68,7 @@ func GetAttributeAsString(obj map[string]interface{}, attr string) (string, erro
 }

 // CIDFromJSONBytesUsingIpldPrime returns CID (dagcbor) for json (as bytes).
-// This is combination of samples for unmarshalling and linking
-// see: https://pkg.go.dev/github.com/ipld/go-ipld-prime
 func CIDFromJSONBytesUsingIpldPrime(content []byte) (string, error) {
-	np := basicnode.Prototype.Any                       // Pick a stle for the in-memory data.
-	nb := np.NewBuilder()                               // Create a builder.
-	err := dagjson.Decode(nb, bytes.NewReader(content)) // Hand the builder to decoding -- decoding will fill it in!
-	if err != nil {
-		return "", err
-	}
-	n := nb.Build() // Call 'Build' to get the resulting Node.  (It's immutable!)
-
 	lsys := cidlink.DefaultLinkSystem()

 	// We want to store the serialized data somewhere.
@@ -96,6 +87,14 @@ func CIDFromJSONBytesUsingIpldPrime(content []byte) (string, error) {
 		MhLength: 32,   // sha2-256 hash has a 32-byte sum.
 	}}

+	// And we need some data to link to!  Here's a quick piece of example data:
+	n, err := fluent.Build(basicnode.Prototype.Any, func(na fluent.NodeAssembler) {
+		na.AssignBytes(content)
+	})
+	if err != nil {
+		return "", err
+	}
+
 	// Now: time to apply the LinkSystem, and do the actual store operation!
 	lnk, err := lsys.Store(
 		linking.LinkContext{}, // The zero value is fine.  Configure it it you want cancellability or other features.
@@ -1,30 +0,0 @@
-package utils
-
-import (
-	"github.com/stretchr/testify/require"
-	"testing"
-)
-
-func TestAndValidateCIDGeneration(t *testing.T) {
-	testCases := []struct {
-		name    string
-		content string
-	}{
-		{
-			"empty string", "",
-		},
-		{
-			"empty json", "{}",
-		},
-
-		{
-			"test record", "\\xa6curlohttps://cerc.iodtypex\\x19WebsiteRegistrationRecordgversione0.0.1ltls_cert_cidx.QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnRrbuild_artifact_cidx.QmP8jTG1m9GSDJLCbeWhVSVgEzCPPwXRdCRuJtQ5Tz9Kc9x\\x1crepo_registration_record_cidx.QmSnuWmxptJZdLJpKRarxBMS2Ju2oANVrgbr2xWbie9b2D",
-		},
-	}
-
-	for _, tc := range testCases {
-		deprecatedAndCorrect, _ := CIDFromJSONBytes([]byte(tc.content))
-		newImpl, _ := CIDFromJSONBytesUsingIpldPrime([]byte(tc.content))
-		require.Equal(t, deprecatedAndCorrect, newImpl, tc.name)
-	}
-}
@@ -111,7 +111,7 @@ func (k Keeper) GetRecord(ctx sdk.Context, id string) (record types.Record) {
 	store := ctx.KVStore(k.storeKey)
 	result := store.Get(GetRecordIndexKey(id))
 	k.cdc.MustUnmarshal(result, &record)
-	return recordObjToRecord(store, record)
+	return record
 }

 // ListRecords - get all records.
Author	SHA1	Message	Date
Murali Krishna Komatireddy	4a0314e41e	Merge branch 'main' into murali/quick-fix	2023-01-11 10:37:25 +05:30
0xmuralik	732a1cef60	chain id	2023-01-04 11:53:28 +05:30