mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-28 15:46:43 +00:00
* add l1 config in genesis config (#249) * add l1 config in genesis config * fix lint * Update params/config.go Co-authored-by: Péter Garamvölgyi <th307q@gmail.com> --------- Co-authored-by: Péter Garamvölgyi <th307q@gmail.com> * extend node configuration (#251) * extend node configuration * use block number instead of hash * accept safe, finalized and numbers for L1Confirmations * fix typos --------- Co-authored-by: Péter Garamvölgyi <th307q@gmail.com> Co-authored-by: Péter Garamvölgyi <peter@scroll.io> * Fix/improve node config parsing (#260) * raise error on failed parsing * default value * add l1-message-type, transaction methods (#252) * add l1-message-type, transaction methods * goimports * Update core/types/transaction.go Co-authored-by: Péter Garamvölgyi <th307q@gmail.com> * txpool l1 check, pointer change, marhsal test * draft: start implementing l1message gas behavior * draft: start implementing l1message gas behavior * change to gas usage * error comment typo Co-authored-by: Haichen Shen <shenhaichen@gmail.com> * goimports * update nonce, add hash test (fails), marshal test * goimports * target addr cant be nil * change call msg * comment out test * lint --------- Co-authored-by: Péter Garamvölgyi <th307q@gmail.com> Co-authored-by: Haichen Shen <shenhaichen@gmail.com> * Add L1 message database (#255) * add l1-message-type, transaction methods * goimports * Update core/types/transaction.go Co-authored-by: Péter Garamvölgyi <th307q@gmail.com> * add L1 message store to rawdb * remove comments * rename to l1_message * rename variables and add comments * write l1 msgs in a batch * add more comments * update tests * allow batched and non-batched writes * rename to accessors_l1_message * handle error * add range check * fix tests * update comments * nit * support blocks with 0 l1 messages --------- Co-authored-by: Max Wolff <maxcwolff@gmail.com> Co-authored-by: Max Wolff <max@scroll.io> * Fix L1Message Deep Copy, Complete Bridge Tx Hash test (#269) * deep copy value field, add tx hash test comment * typo * Rename nonce to queueindex, increment sender nonce on L1 message execution (#271) * change nonce to queueindex, increment nonce on L1 message * fix db acccessors * Update core/types/transaction_marshalling.go Co-authored-by: Péter Garamvölgyi <th307q@gmail.com> --------- Co-authored-by: Péter Garamvölgyi <th307q@gmail.com> * Fix db inspect command (#276) fix db inspect command * Add l1 sync service (#256) * extend node configuration * add l1-message-type, transaction methods * goimports * Update core/types/transaction.go Co-authored-by: Péter Garamvölgyi <th307q@gmail.com> * use block number instead of hash * accept safe, finalized and numbers for L1Confirmations * add L1 message store to rawdb * remove comments * fix typos * add L1 message sync service * use l1 contract address and chain ID * use L1DeploymentBlock * add confirmation config * move bridge client to separate file * use uint64 block number * fix bigint comparison * rename constants * add more logs * rename to l1_message * rename variables and add comments * write l1 msgs in a batch * add more comments * update tests * allow batched and non-batched writes * rename to accessors_l1_message * handle error * check if config is provided * improve sync service DB batched writes * add range check * fix tests * update comments * nit * fix flush range and improve comments * solve circular dependency * update stress tests * initialize l1 client for geth * start sync service * add more comments * check nil correctly * address comments * fix merge * fix genesis l1config deserialization * add sync progress logs * initial sync * handle leveldb not found error * use errors.Is * address comments * update DefaultPollInterval --------- Co-authored-by: Nazarii Denha <dengaaa2002@gmail.com> Co-authored-by: Max Wolff <maxcwolff@gmail.com> Co-authored-by: Max Wolff <max@scroll.io> * Add L1 message validation (#272) * add L1 message validation * add comments and better error handling * handle leveldb not found error * update incorrect condition for genesis block * typo * change inclusion index logic * disable L1 message check for legacy tests * set NumL1MessagesPerBlock to 0 in tests * update default genesis config * Add L1 msg validation tests (#303) add L1 msg validation tests * Update miner include l1 messages (#265) * add l1-message-type, transaction methods * goimports * Update core/types/transaction.go Co-authored-by: Péter Garamvölgyi <th307q@gmail.com> * add L1 message store to rawdb * add L1 message sync service * remove comments * use l1 contract address and chain ID * extend node configuration * use block number instead of hash * accept safe, finalized and numbers for L1Confirmations * fix typos * use L1DeploymentBlock * add confirmation config * move bridge client to separate file * use uint64 block number * fix bigint comparison * rename constants * add more logs * Fix/improve node config parsing (#260) * raise error on failed parsing * default value * rename to l1_message * rename variables and add comments * write l1 msgs in a batch * add more comments * update tests * allow batched and non-batched writes * rename to accessors_l1_message * handle error * check if config is provided * improve sync service DB batched writes * include l1 messages in blocks: part 1 * add l1-message-type, transaction methods (#252) * add l1-message-type, transaction methods * goimports * Update core/types/transaction.go Co-authored-by: Péter Garamvölgyi <th307q@gmail.com> * txpool l1 check, pointer change, marhsal test * draft: start implementing l1message gas behavior * draft: start implementing l1message gas behavior * change to gas usage * error comment typo Co-authored-by: Haichen Shen <shenhaichen@gmail.com> * goimports * update nonce, add hash test (fails), marshal test * goimports * target addr cant be nil * change call msg * comment out test * lint --------- Co-authored-by: Péter Garamvölgyi <th307q@gmail.com> Co-authored-by: Haichen Shen <shenhaichen@gmail.com> * Add L1 message database (#255) * add l1-message-type, transaction methods * goimports * Update core/types/transaction.go Co-authored-by: Péter Garamvölgyi <th307q@gmail.com> * add L1 message store to rawdb * remove comments * rename to l1_message * rename variables and add comments * write l1 msgs in a batch * add more comments * update tests * allow batched and non-batched writes * rename to accessors_l1_message * handle error * add range check * fix tests * update comments * nit * support blocks with 0 l1 messages --------- Co-authored-by: Max Wolff <maxcwolff@gmail.com> Co-authored-by: Max Wolff <max@scroll.io> * build(docker): auto docker push when pushing git tags (#258) * build(docker): update docker trigger tag prefix (#259) * Fix L1Message Deep Copy, Complete Bridge Tx Hash test (#269) * deep copy value field, add tx hash test comment * typo * commitl1messages * lint * Revert "add L1 message sync service" This reverts commit 5305e8a5de14766ed249e1a7d64042c7a72cf5c2. * Revert "move bridge client to separate file" This reverts commit 0b220bee37de93c3250545e23430db2c401a2f90. * update branch * use commitMessages for l1Txs * little fix * fix config * fix test * comment fixes * fix * fix config check --------- Co-authored-by: Max Wolff <maxcwolff@gmail.com> Co-authored-by: Max Wolff <max@scroll.io> Co-authored-by: Péter Garamvölgyi <th307q@gmail.com> Co-authored-by: Péter Garamvölgyi <peter@scroll.io> Co-authored-by: Haichen Shen <shenhaichen@gmail.com> Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com> * Add ErrUnknownAncestor tests (#305) add ErrUnknownAncestor tests * worker test include l1 msgs (#306) * worker test include l1 msgs * move L1 message index update next to block insertion --------- Co-authored-by: Péter Garamvölgyi <peter@scroll.io> * exclude l1 messages from transaction count limit in block (#307) * exclude l1 messages from transaction count limit in block * fix comments * trigger ci * nit --------- Co-authored-by: Péter Garamvölgyi <th307q@gmail.com> Co-authored-by: Péter Garamvölgyi <peter@scroll.io> * Expose queueIndex on Transaction (#316) expose queueIndex on Transaction * test that l1msg doesn't count in maxTxPerBlock limit (#312) * test that l1msg doesn't count in maxTxPerBlock limit * fix, comment * retrigger ci * change order inside test --------- Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com> Co-authored-by: Péter Garamvölgyi <th307q@gmail.com> * reuse trace nonce field for queueIndex * expose scroll APIs on the geth console * add L1 message query APIs * Trigger new block on new l1 messages (#343) * trigger new block on new l1 messages * typo * initialize l1MsgCh * fix worker l1msg tests (#345) --------- Co-authored-by: Nazarii Denha <dengaaa2002@gmail.com> * test(worker): ensure that l1 messages are included in the correct order (#346) test that l1msgs added in correct order * rename enqueueIndex --> queueIndex * move QueueIndex into transaction * improve l1 db interface * formatting * bump version * print l1config * add API to query latest included message queue index * clean up tx limit logic * add clarifying comments and todos to ValidateL1Messages * improve db comments and logs * clean up L1MessageTx type handling * format * format * improve L1 message block check * fix missing L1 event handling * fix TestL1MessageValidationFailure * simplify sync height resume logic * make l1Config.l1MessageQueueAddress non-pointer * improve command line flags * remove todo * use abigen tools for log filtering * cache block L1 message count * nit: fix variable name case * improve logs * flush pending writes to DB before shutdown --------- Co-authored-by: Nazarii Denha <dengaaa2002@gmail.com> Co-authored-by: Max Wolff <max@scroll.io> Co-authored-by: Haichen Shen <shenhaichen@gmail.com> Co-authored-by: Max Wolff <maxcwolff@gmail.com> Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com> Co-authored-by: HAOYUatHZ <haoyu@protonmail.com>
342 lines
10 KiB
Go
342 lines
10 KiB
Go
// Copyright 2015 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package console
|
|
|
|
import (
|
|
"bytes"
|
|
"errors"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"os"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/scroll-tech/go-ethereum/common"
|
|
"github.com/scroll-tech/go-ethereum/consensus/ethash"
|
|
"github.com/scroll-tech/go-ethereum/console/prompt"
|
|
"github.com/scroll-tech/go-ethereum/core"
|
|
"github.com/scroll-tech/go-ethereum/eth"
|
|
"github.com/scroll-tech/go-ethereum/eth/ethconfig"
|
|
"github.com/scroll-tech/go-ethereum/internal/jsre"
|
|
"github.com/scroll-tech/go-ethereum/miner"
|
|
"github.com/scroll-tech/go-ethereum/node"
|
|
)
|
|
|
|
const (
|
|
testInstance = "console-tester"
|
|
testAddress = "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182"
|
|
)
|
|
|
|
// hookedPrompter implements UserPrompter to simulate use input via channels.
|
|
type hookedPrompter struct {
|
|
scheduler chan string
|
|
}
|
|
|
|
func (p *hookedPrompter) PromptInput(prompt string) (string, error) {
|
|
// Send the prompt to the tester
|
|
select {
|
|
case p.scheduler <- prompt:
|
|
case <-time.After(time.Second):
|
|
return "", errors.New("prompt timeout")
|
|
}
|
|
// Retrieve the response and feed to the console
|
|
select {
|
|
case input := <-p.scheduler:
|
|
return input, nil
|
|
case <-time.After(time.Second):
|
|
return "", errors.New("input timeout")
|
|
}
|
|
}
|
|
|
|
func (p *hookedPrompter) PromptPassword(prompt string) (string, error) {
|
|
return "", errors.New("not implemented")
|
|
}
|
|
func (p *hookedPrompter) PromptConfirm(prompt string) (bool, error) {
|
|
return false, errors.New("not implemented")
|
|
}
|
|
func (p *hookedPrompter) SetHistory(history []string) {}
|
|
func (p *hookedPrompter) AppendHistory(command string) {}
|
|
func (p *hookedPrompter) ClearHistory() {}
|
|
func (p *hookedPrompter) SetWordCompleter(completer prompt.WordCompleter) {}
|
|
|
|
// tester is a console test environment for the console tests to operate on.
|
|
type tester struct {
|
|
workspace string
|
|
stack *node.Node
|
|
ethereum *eth.Ethereum
|
|
console *Console
|
|
input *hookedPrompter
|
|
output *bytes.Buffer
|
|
}
|
|
|
|
// newTester creates a test environment based on which the console can operate.
|
|
// Please ensure you call Close() on the returned tester to avoid leaks.
|
|
func newTester(t *testing.T, confOverride func(*ethconfig.Config)) *tester {
|
|
// Create a temporary storage for the node keys and initialize it
|
|
workspace, err := ioutil.TempDir("", "console-tester-")
|
|
if err != nil {
|
|
t.Fatalf("failed to create temporary keystore: %v", err)
|
|
}
|
|
|
|
// Create a networkless protocol stack and start an Ethereum service within
|
|
stack, err := node.New(&node.Config{DataDir: workspace, UseLightweightKDF: true, Name: testInstance})
|
|
if err != nil {
|
|
t.Fatalf("failed to create node: %v", err)
|
|
}
|
|
ethConf := ðconfig.Config{
|
|
Genesis: core.DeveloperGenesisBlock(15, 11_500_000, common.Address{}),
|
|
Miner: miner.Config{
|
|
Etherbase: common.HexToAddress(testAddress),
|
|
},
|
|
Ethash: ethash.Config{
|
|
PowMode: ethash.ModeTest,
|
|
},
|
|
}
|
|
if confOverride != nil {
|
|
confOverride(ethConf)
|
|
}
|
|
ethBackend, err := eth.New(stack, ethConf, nil)
|
|
if err != nil {
|
|
t.Fatalf("failed to register Ethereum protocol: %v", err)
|
|
}
|
|
// Start the node and assemble the JavaScript console around it
|
|
if err = stack.Start(); err != nil {
|
|
t.Fatalf("failed to start test stack: %v", err)
|
|
}
|
|
client, err := stack.Attach()
|
|
if err != nil {
|
|
t.Fatalf("failed to attach to node: %v", err)
|
|
}
|
|
prompter := &hookedPrompter{scheduler: make(chan string)}
|
|
printer := new(bytes.Buffer)
|
|
|
|
console, err := New(Config{
|
|
DataDir: stack.DataDir(),
|
|
DocRoot: "testdata",
|
|
Client: client,
|
|
Prompter: prompter,
|
|
Printer: printer,
|
|
Preload: []string{"preload.js"},
|
|
})
|
|
if err != nil {
|
|
t.Fatalf("failed to create JavaScript console: %v", err)
|
|
}
|
|
// Create the final tester and return
|
|
return &tester{
|
|
workspace: workspace,
|
|
stack: stack,
|
|
ethereum: ethBackend,
|
|
console: console,
|
|
input: prompter,
|
|
output: printer,
|
|
}
|
|
}
|
|
|
|
// Close cleans up any temporary data folders and held resources.
|
|
func (env *tester) Close(t *testing.T) {
|
|
if err := env.console.Stop(false); err != nil {
|
|
t.Errorf("failed to stop embedded console: %v", err)
|
|
}
|
|
if err := env.stack.Close(); err != nil {
|
|
t.Errorf("failed to tear down embedded node: %v", err)
|
|
}
|
|
os.RemoveAll(env.workspace)
|
|
}
|
|
|
|
// Tests that the node lists the correct welcome message, notably that it contains
|
|
// the instance name, coinbase account, block number, data directory and supported
|
|
// console modules.
|
|
func TestWelcome(t *testing.T) {
|
|
tester := newTester(t, nil)
|
|
defer tester.Close(t)
|
|
|
|
tester.console.Welcome()
|
|
|
|
output := tester.output.String()
|
|
if want := "Welcome"; !strings.Contains(output, want) {
|
|
t.Fatalf("console output missing welcome message: have\n%s\nwant also %s", output, want)
|
|
}
|
|
if want := fmt.Sprintf("instance: %s", testInstance); !strings.Contains(output, want) {
|
|
t.Fatalf("console output missing instance: have\n%s\nwant also %s", output, want)
|
|
}
|
|
if want := fmt.Sprintf("coinbase: %s", testAddress); !strings.Contains(output, want) {
|
|
t.Fatalf("console output missing coinbase: have\n%s\nwant also %s", output, want)
|
|
}
|
|
if want := "at block: 0"; !strings.Contains(output, want) {
|
|
t.Fatalf("console output missing sync status: have\n%s\nwant also %s", output, want)
|
|
}
|
|
if want := fmt.Sprintf("datadir: %s", tester.workspace); !strings.Contains(output, want) {
|
|
t.Fatalf("console output missing coinbase: have\n%s\nwant also %s", output, want)
|
|
}
|
|
}
|
|
|
|
// Tests that JavaScript statement evaluation works as intended.
|
|
func TestEvaluate(t *testing.T) {
|
|
tester := newTester(t, nil)
|
|
defer tester.Close(t)
|
|
|
|
tester.console.Evaluate("2 + 2")
|
|
if output := tester.output.String(); !strings.Contains(output, "4") {
|
|
t.Fatalf("statement evaluation failed: have %s, want %s", output, "4")
|
|
}
|
|
}
|
|
|
|
// Tests that the console can be used in interactive mode.
|
|
func TestInteractive(t *testing.T) {
|
|
// Create a tester and run an interactive console in the background
|
|
tester := newTester(t, nil)
|
|
defer tester.Close(t)
|
|
|
|
go tester.console.Interactive()
|
|
|
|
// Wait for a prompt and send a statement back
|
|
select {
|
|
case <-tester.input.scheduler:
|
|
case <-time.After(time.Second):
|
|
t.Fatalf("initial prompt timeout")
|
|
}
|
|
select {
|
|
case tester.input.scheduler <- "2+2":
|
|
case <-time.After(time.Second):
|
|
t.Fatalf("input feedback timeout")
|
|
}
|
|
// Wait for the second prompt and ensure first statement was evaluated
|
|
select {
|
|
case <-tester.input.scheduler:
|
|
case <-time.After(time.Second):
|
|
t.Fatalf("secondary prompt timeout")
|
|
}
|
|
if output := tester.output.String(); !strings.Contains(output, "4") {
|
|
t.Fatalf("statement evaluation failed: have %s, want %s", output, "4")
|
|
}
|
|
}
|
|
|
|
// Tests that preloaded JavaScript files have been executed before user is given
|
|
// input.
|
|
func TestPreload(t *testing.T) {
|
|
tester := newTester(t, nil)
|
|
defer tester.Close(t)
|
|
|
|
tester.console.Evaluate("preloaded")
|
|
if output := tester.output.String(); !strings.Contains(output, "some-preloaded-string") {
|
|
t.Fatalf("preloaded variable missing: have %s, want %s", output, "some-preloaded-string")
|
|
}
|
|
}
|
|
|
|
// Tests that JavaScript scripts can be executes from the configured asset path.
|
|
func TestExecute(t *testing.T) {
|
|
tester := newTester(t, nil)
|
|
defer tester.Close(t)
|
|
|
|
tester.console.Execute("exec.js")
|
|
|
|
tester.console.Evaluate("execed")
|
|
if output := tester.output.String(); !strings.Contains(output, "some-executed-string") {
|
|
t.Fatalf("execed variable missing: have %s, want %s", output, "some-executed-string")
|
|
}
|
|
}
|
|
|
|
// Tests that the JavaScript objects returned by statement executions are properly
|
|
// pretty printed instead of just displaying "[object]".
|
|
func TestPrettyPrint(t *testing.T) {
|
|
tester := newTester(t, nil)
|
|
defer tester.Close(t)
|
|
|
|
tester.console.Evaluate("obj = {int: 1, string: 'two', list: [3, 3, 3], obj: {null: null, func: function(){}}}")
|
|
|
|
// Define some specially formatted fields
|
|
var (
|
|
one = jsre.NumberColor("1")
|
|
two = jsre.StringColor("\"two\"")
|
|
three = jsre.NumberColor("3")
|
|
null = jsre.SpecialColor("null")
|
|
fun = jsre.FunctionColor("function()")
|
|
)
|
|
// Assemble the actual output we're after and verify
|
|
want := `{
|
|
int: ` + one + `,
|
|
list: [` + three + `, ` + three + `, ` + three + `],
|
|
obj: {
|
|
null: ` + null + `,
|
|
func: ` + fun + `
|
|
},
|
|
string: ` + two + `
|
|
}
|
|
`
|
|
if output := tester.output.String(); output != want {
|
|
t.Fatalf("pretty print mismatch: have %s, want %s", output, want)
|
|
}
|
|
}
|
|
|
|
// Tests that the JavaScript exceptions are properly formatted and colored.
|
|
func TestPrettyError(t *testing.T) {
|
|
tester := newTester(t, nil)
|
|
defer tester.Close(t)
|
|
tester.console.Evaluate("throw 'hello'")
|
|
|
|
want := jsre.ErrorColor("hello") + "\n\tat <eval>:1:7(1)\n\n"
|
|
if output := tester.output.String(); output != want {
|
|
t.Fatalf("pretty error mismatch: have %s, want %s", output, want)
|
|
}
|
|
}
|
|
|
|
// Tests that tests if the number of indents for JS input is calculated correct.
|
|
func TestIndenting(t *testing.T) {
|
|
testCases := []struct {
|
|
input string
|
|
expectedIndentCount int
|
|
}{
|
|
{`var a = 1;`, 0},
|
|
{`"some string"`, 0},
|
|
{`"some string with (parenthesis`, 0},
|
|
{`"some string with newline
|
|
("`, 0},
|
|
{`function v(a,b) {}`, 0},
|
|
{`function f(a,b) { var str = "asd("; };`, 0},
|
|
{`function f(a) {`, 1},
|
|
{`function f(a, function(b) {`, 2},
|
|
{`function f(a, function(b) {
|
|
var str = "a)}";
|
|
});`, 0},
|
|
{`function f(a,b) {
|
|
var str = "a{b(" + a, ", " + b;
|
|
}`, 0},
|
|
{`var str = "\"{"`, 0},
|
|
{`var str = "'("`, 0},
|
|
{`var str = "\\{"`, 0},
|
|
{`var str = "\\\\{"`, 0},
|
|
{`var str = 'a"{`, 0},
|
|
{`var obj = {`, 1},
|
|
{`var obj = { {a:1`, 2},
|
|
{`var obj = { {a:1}`, 1},
|
|
{`var obj = { {a:1}, b:2}`, 0},
|
|
{`var obj = {}`, 0},
|
|
{`var obj = {
|
|
a: 1, b: 2
|
|
}`, 0},
|
|
{`var test = }`, -1},
|
|
{`var str = "a\""; var obj = {`, 1},
|
|
}
|
|
|
|
for i, tt := range testCases {
|
|
counted := countIndents(tt.input)
|
|
if counted != tt.expectedIndentCount {
|
|
t.Errorf("test %d: invalid indenting: have %d, want %d", i, counted, tt.expectedIndentCount)
|
|
}
|
|
}
|
|
}
|