Skip to content

Commit

Permalink
try out build
Browse files Browse the repository at this point in the history
  • Loading branch information
otherview committed Feb 2, 2024
1 parent 3ae6429 commit 8e9c62c
Show file tree
Hide file tree
Showing 64 changed files with 14,334 additions and 343 deletions.
20 changes: 9 additions & 11 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ replace github.com/docker/docker => github.com/docker/docker v20.10.3-0.20220224
require (
github.com/allegro/bigcache/v3 v3.1.0
github.com/andybalholm/brotli v1.0.5
github.com/docker/docker v1.6.2
github.com/docker/docker v24.0.5+incompatible
github.com/docker/go-connections v0.4.0
github.com/edgelesssys/ego v1.1.0
github.com/eko/gocache/lib/v4 v4.1.2
github.com/eko/gocache/store/bigcache/v4 v4.1.2
github.com/ethereum/go-ethereum v1.12.2
github.com/ethereum/go-ethereum v1.13.1
github.com/gin-contrib/cors v1.4.0
github.com/gin-gonic/gin v1.9.1
github.com/go-kit/kit v0.10.0
Expand Down Expand Up @@ -40,7 +40,7 @@ require (
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/DataDog/zstd v1.5.2 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/VictoriaMetrics/fastcache v1.6.0 // indirect
github.com/allegro/bigcache v1.2.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
Expand All @@ -52,7 +52,7 @@ require (
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
github.com/cockroachdb/errors v1.9.1 // indirect
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811 // indirect
github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 // indirect
github.com/cockroachdb/redact v1.1.3 // indirect
github.com/consensys/bavard v0.1.13 // indirect
github.com/consensys/gnark-crypto v0.10.0 // indirect
Expand All @@ -72,7 +72,7 @@ require (
github.com/getsentry/sentry-go v0.18.0 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/go-ole/go-ole v1.2.1 // indirect
github.com/go-ole/go-ole v1.2.5 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.14.0 // indirect
Expand All @@ -88,7 +88,7 @@ require (
github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 // indirect
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
github.com/holiman/uint256 v1.2.3 // indirect
github.com/huin/goupnp v1.0.3 // indirect
github.com/huin/goupnp v1.3.0 // indirect
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.16.3 // indirect
Expand Down Expand Up @@ -126,12 +126,12 @@ require (
github.com/supranational/blst v0.3.11 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
github.com/tklauser/go-sysconf v0.3.5 // indirect
github.com/tklauser/numcpus v0.2.2 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
github.com/ugorji/go/codec v1.2.11 // indirect
github.com/urfave/cli/v2 v2.24.1 // indirect
github.com/urfave/cli/v2 v2.25.7 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
golang.org/x/arch v0.3.0 // indirect
Expand All @@ -143,9 +143,7 @@ require (
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gotest.tools/v3 v3.5.0 // indirect
rsc.io/tmplfunc v0.0.3 // indirect
)
344 changes: 21 additions & 323 deletions go.sum

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions go/enclave/l2chain/l1_blockchain.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ func NewL1Blockchain(genesisJSON []byte, logger gethlog.Logger) *core.BlockChain

func createTrie(db ethdb.Database, cacheConfig *core.CacheConfig) *trie.Database {
// Open trie database with provided config
return trie.NewDatabaseWithConfig(db, &trie.Config{
Cache: cacheConfig.TrieCleanLimit,
return trie.NewDatabase(db, &trie.Config{
Preimages: cacheConfig.Preimages,
})
}
Expand Down
4 changes: 2 additions & 2 deletions go/enclave/nodetype/sequencer.go
Original file line number Diff line number Diff line change
Expand Up @@ -221,15 +221,15 @@ func (s *sequencer) createNewHeadBatch(l1HeadBlock *common.L1Block, skipBatchIfE
// lazily resolve transactions until the batch runs out of space
for _, lazyTx := range group {
if tx := lazyTx.Resolve(); tx != nil {
err = limiter.AcceptTransaction(tx.Tx)
err = limiter.AcceptTransaction(tx)
if err != nil {
if errors.Is(err, limiters.ErrInsufficientSpace) { // Batch ran out of space
break
}
// Limiter encountered unexpected error
return fmt.Errorf("limiter encountered unexpected error - %w", err)
}
transactions = append(transactions, tx.Tx)
transactions = append(transactions, tx)
}
}
}
Expand Down
1 change: 0 additions & 1 deletion go/enclave/storage/storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ func NewStorage(backingDB enclavedb.EnclaveDB, chainConfig *params.ChainConfig,
return &storageImpl{
db: backingDB,
stateDB: state.NewDatabaseWithConfig(backingDB, &trie.Config{
Cache: cacheConfig.TrieCleanLimit,
Preimages: cacheConfig.Preimages,
}),
chainConfig: chainConfig,
Expand Down
3 changes: 2 additions & 1 deletion go/enclave/txpool/txpool.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
gethcommon "github.com/ethereum/go-ethereum/common"
gethtxpool "github.com/ethereum/go-ethereum/core/txpool"
"github.com/ethereum/go-ethereum/core/txpool/legacypool"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ten-protocol/go-ten/go/common"
"github.com/ten-protocol/go-ten/go/enclave/evm/ethchainadapter"
)
Expand Down Expand Up @@ -60,7 +61,7 @@ func (t *TxPool) PendingTransactions() map[gethcommon.Address][]*gethtxpool.Lazy
// Add adds a new transactions to the pool
func (t *TxPool) Add(transaction *common.L2Tx) error {
var strErrors []string
for _, err := range t.pool.Add([]*gethtxpool.Transaction{{Tx: transaction}}, false, false) {
for _, err := range t.pool.Add([]*types.Transaction{transaction}, false, false) {
if err != nil {
strErrors = append(strErrors, err.Error())
}
Expand Down
4 changes: 1 addition & 3 deletions go/enclave/txpool/txpool_mock_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,7 @@ type mockStorage struct {
}

func newMockStorage() *mockStorage {
db := state.NewDatabaseWithConfig(rawdb.NewMemoryDatabase(), &trie.Config{
Cache: 1_000_000,
})
db := state.NewDatabaseWithConfig(rawdb.NewMemoryDatabase(), &trie.Config{})
stateDB, err := state.New(types.EmptyRootHash, db, nil)
if err != nil {
panic(err)
Expand Down
3 changes: 3 additions & 0 deletions tenscan_logs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
INFO [01-10|17:16:38.878] Created Obscuro Scan with the following: component=tenscan args="&{NodeHostAddress:http://erpc.dev-testnet.ten.xyz:80 ServerAddress:0.0.0.0:80 LogPath:tenscan_logs.txt}"
INFO [01-10|17:16:38.881] Starting server on 0.0.0.0:80 component=tenscan
ERROR[01-10|17:26:29.586] unable to execute request Post "http://erpc.dev-testnet.ten.xyz:80": read tcp 192.168.1.104:50252->51.11.135.65:80: read: operation timed out component=tenscan
42 changes: 42 additions & 0 deletions tools/tenscan/frontend/.next/build-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"polyfillFiles": [
"static/chunks/polyfills.js"
],
"devFiles": [
"static/chunks/react-refresh.js"
],
"ampDevFiles": [],
"lowPriorityFiles": [
"static/development/_buildManifest.js",
"static/development/_ssgManifest.js"
],
"rootMainFiles": [],
"pages": {
"/": [
"static/chunks/webpack.js",
"static/chunks/main.js",
"static/chunks/pages/index.js"
],
"/404": [
"static/chunks/webpack.js",
"static/chunks/main.js",
"static/chunks/pages/404.js"
],
"/_app": [
"static/chunks/webpack.js",
"static/chunks/main.js",
"static/chunks/pages/_app.js"
],
"/_error": [
"static/chunks/webpack.js",
"static/chunks/main.js",
"static/chunks/pages/_error.js"
],
"/transactions": [
"static/chunks/webpack.js",
"static/chunks/main.js",
"static/chunks/pages/transactions.js"
]
},
"ampFirstPages": []
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions tools/tenscan/frontend/.next/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type": "commonjs"}
8 changes: 8 additions & 0 deletions tools/tenscan/frontend/.next/react-loadable-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"../node_modules/@tanstack/query-devtools/build/dev.js -> ./Devtools/VZTWBJH5.js": {
"id": "../node_modules/@tanstack/query-devtools/build/dev.js -> ./Devtools/VZTWBJH5.js",
"files": [
"static/chunks/node_modules_tanstack_query-devtools_build_Devtools_VZTWBJH5_js.js"
]
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions tools/tenscan/frontend/.next/server/middleware-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sortedMiddleware": [],
"middleware": {},
"functions": {},
"version": 2
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions tools/tenscan/frontend/.next/server/next-font-manifest.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"pages":{"/_app":[]},"app":{},"appUsingSizeAdjust":false,"pagesUsingSizeAdjust":false}
8 changes: 8 additions & 0 deletions tools/tenscan/frontend/.next/server/pages-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"/_app": "pages/_app.js",
"/_error": "pages/_error.js",
"/_document": "pages/_document.js",
"/": "pages/index.js",
"/404": "pages/404.js",
"/transactions": "pages/transactions.js"
}
Loading

0 comments on commit 8e9c62c

Please sign in to comment.