feat: make gnovm wasm-friendly (gnolang#1012)

Co-authored-by: İlker G. Öztürk <ilkergoktugozturk@gmail.com> Co-authored-by: İlker G. Öztürk <ilker@ilgooz.com>
Doozers · Aug 31, 2023 · 4dc3071 · 4dc3071
1 parent 0d74330
commit 4dc3071
Show file tree

Hide file tree

Showing 17 changed files with 96 additions and 72 deletions.
diff --git a/.github/workflows/gnovm.yml b/.github/workflows/gnovm.yml
@@ -23,10 +23,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [ "1.19.x", "1.20.x" ]
-        goarch: [ "amd64" ]
-        goos: [ "linux" ]
-        program: [ "gno" ]
+        go-version: # two latest versions
+          - "1.19.x"
+          - "1.20.x"
+        goenv: # TODO: replace with pairs, so it's easier to read in the GH interface.
+          - "GOARCH=amd64 GOOS=linux"
+          - "GOARCH=wasm GOOS=js"
+        program:
+          - "gno"
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
@@ -36,7 +40,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: go install
         working-directory: gnovm
-        run: GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} go install ./cmd/${{ matrix.program }}
+        run: ${{ matrix.goenv }} go install ./cmd/${{ matrix.program }}
 
   test:
     strategy:

diff --git a/go.mod b/go.mod
@@ -12,6 +12,7 @@ require (
 	github.com/fortytw2/leaktest v1.3.0
 	github.com/gdamore/tcell/v2 v2.1.0
 	github.com/gnolang/cors v1.8.1
+	github.com/gnolang/goleveldb v0.0.9
 	github.com/gnolang/overflow v0.0.0-20170615021017-4d914c927216
 	github.com/golang/protobuf v1.5.3
 	github.com/google/gofuzz v1.2.0
@@ -27,7 +28,6 @@ require (
 	github.com/peterbourgon/ff/v3 v3.4.0
 	github.com/pmezard/go-difflib v1.0.0
 	github.com/stretchr/testify v1.8.4
-	github.com/syndtr/goleveldb v1.0.0
 	github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c
 	go.etcd.io/bbolt v1.3.7
 	go.uber.org/multierr v1.9.0
@@ -52,7 +52,7 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
 	github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
-	github.com/golang/snappy v0.0.3 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/flatbuffers v1.12.1 // indirect
 	github.com/gorilla/securecookie v1.1.1 // indirect
 	github.com/gorilla/sessions v1.2.1 // indirect

diff --git a/go.sum b/go.sum
diff --git a/misc/deployments/staging.gno.land/overlay/config.toml b/misc/deployments/staging.gno.land/overlay/config.toml
@@ -16,7 +16,7 @@ moniker = "45-79-178-97"
 fast_sync = true
 
 # Database backend: goleveldb | cleveldb | boltdb
-# * goleveldb (github.com/syndtr/goleveldb - most popular implementation)
+# * goleveldb (github.com/gnolang/goleveldb, fork of github.com/syndtr/goleveldb) - most popular implementation)
 #   - pure go
 #   - stable
 # * cleveldb (uses levigo wrapper)

diff --git a/misc/deployments/test2.gno.land/overlay/config.toml b/misc/deployments/test2.gno.land/overlay/config.toml
@@ -16,7 +16,7 @@ moniker = "45-79-178-97"
 fast_sync = true
 
 # Database backend: goleveldb | cleveldb | boltdb
-# * goleveldb (github.com/syndtr/goleveldb - most popular implementation)
+# * goleveldb (github.com/gnolang/goleveldb - most popular implementation)
 #   - pure go
 #   - stable
 # * cleveldb (uses levigo wrapper)

diff --git a/misc/deployments/test3.gno.land/overlay/config.toml b/misc/deployments/test3.gno.land/overlay/config.toml
@@ -16,7 +16,7 @@ moniker = "45-79-178-97"
 fast_sync = true
 
 # Database backend: goleveldb | cleveldb | boltdb
-# * goleveldb (github.com/syndtr/goleveldb - most popular implementation)
+# * goleveldb (github.com/gnolang/goleveldb - most popular implementation)
 #   - pure go
 #   - stable
 # * cleveldb (uses levigo wrapper)

diff --git a/tm2/pkg/autofile/autofile.go b/tm2/pkg/autofile/autofile.go
@@ -2,9 +2,7 @@ package autofile
 
 import (
 	"os"
-	"os/signal"
 	"sync"
-	"syscall"
 	"time"
 
 	"github.com/gnolang/gno/tm2/pkg/random"
@@ -63,19 +61,16 @@ func OpenAutoFile(path string) (*AutoFile, error) {
 		closeTicker:      time.NewTicker(autoFileClosePeriod),
 		closeTickerStopc: make(chan struct{}),
 	}
+
 	if err := af.openFile(); err != nil {
 		af.Close()
 		return nil, err
 	}
 
-	// Close file on SIGHUP.
-	af.hupc = make(chan os.Signal, 1)
-	signal.Notify(af.hupc, syscall.SIGHUP)
-	go func() {
-		for range af.hupc {
-			af.closeFile()
-		}
-	}()
+	// see autofile_*.go implementations, following different build constraints.
+	if err := af.setupCloseHandler(); err != nil {
+		return nil, err
+	}
 
 	go af.closeFileRoutine()
 
@@ -158,10 +153,10 @@ func (af *AutoFile) openFile() error {
 	}
 	// fileInfo, err := file.Stat()
 	// if err != nil {
-	// 	return err
+	//	return err
 	// }
 	// if fileInfo.Mode() != autoFilePerms {
-	// 	return errors.NewErrPermissionsChanged(file.Name(), fileInfo.Mode(), autoFilePerms)
+	//	return errors.NewErrPermissionsChanged(file.Name(), fileInfo.Mode(), autoFilePerms)
 	// }
 	af.file = file
 	return nil

diff --git a/tm2/pkg/autofile/autofile_unix.go b/tm2/pkg/autofile/autofile_unix.go
@@ -0,0 +1,22 @@
+//go:build !js && !wasm
+// +build !js,!wasm
+
+package autofile
+
+import (
+	"os"
+	"os/signal"
+	"syscall"
+)
+
+func (af *AutoFile) setupCloseHandler() error {
+	// Close file on SIGHUP.
+	af.hupc = make(chan os.Signal, 1)
+	signal.Notify(af.hupc, syscall.SIGHUP)
+	go func() {
+		for range af.hupc {
+			af.closeFile()
+		}
+	}()
+	return nil
+}
diff --git a/tm2/pkg/autofile/autofile_wasm.go b/tm2/pkg/autofile/autofile_wasm.go
@@ -0,0 +1,8 @@
+//go:build js && wasm
+// +build js,wasm
+
+package autofile
+
+func (af *AutoFile) setupCloseHandler() error {
+	return nil
+}
diff --git a/tm2/pkg/bft/abci/example/kvstore/persistent_kvstore.go b/tm2/pkg/bft/abci/example/kvstore/persistent_kvstore.go
@@ -10,7 +10,7 @@ import (
 	"github.com/gnolang/gno/tm2/pkg/bft/abci/example/errors"
 	abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types"
 	"github.com/gnolang/gno/tm2/pkg/crypto"
-	dbm "github.com/gnolang/gno/tm2/pkg/db"
+	"github.com/gnolang/gno/tm2/pkg/db"
 	"github.com/gnolang/gno/tm2/pkg/log"
 )
 
@@ -19,6 +19,8 @@ const (
 	ValidatorKeyPrefix    string = "/val/"
 )
 
+const dbBackend = db.GoLevelDBBackend
+
 // -----------------------------------------
 
 var _ abci.Application = (*PersistentKVStoreApplication)(nil)
@@ -34,7 +36,7 @@ type PersistentKVStoreApplication struct {
 
 func NewPersistentKVStoreApplication(dbDir string) *PersistentKVStoreApplication {
 	name := "kvstore"
-	db, err := dbm.NewGoLevelDB(name, dbDir)
+	db, err := db.NewDB(name, dbBackend, dbDir)
 	if err != nil {
 		panic(err)
 	}

diff --git a/tm2/pkg/bft/config/config.go b/tm2/pkg/bft/config/config.go
@@ -174,7 +174,7 @@ type BaseConfig struct {
 	FastSyncMode bool `toml:"fast_sync"`
 
 	// Database backend: goleveldb | cleveldb | boltdb
-	// * goleveldb (github.com/syndtr/goleveldb - most popular implementation)
+	// * goleveldb (github.com/gnolang/goleveldb - most popular implementation)
 	//   - pure go
 	//   - stable
 	// * cleveldb (uses levigo wrapper)

diff --git a/tm2/pkg/bft/config/toml.go b/tm2/pkg/bft/config/toml.go
@@ -70,7 +70,7 @@ moniker = "{{ .BaseConfig.Moniker }}"
 fast_sync = {{ .BaseConfig.FastSyncMode }}
 
 # Database backend: goleveldb | cleveldb | boltdb
-# * goleveldb (github.com/syndtr/goleveldb - most popular implementation)
+# * goleveldb (github.com/gnolang/goleveldb - most popular implementation)
 #   - pure go
 #   - stable
 # * cleveldb (uses levigo wrapper)