From 004ced6a04f01703dd2bcde7e4c28161e359a9f1 Mon Sep 17 00:00:00 2001 From: Louis Thibault Date: Wed, 31 Jan 2024 17:15:08 -0500 Subject: [PATCH 1/7] Use flashbots/suave-execution-geth:lastest for suave-enabled chain. Use latest image for flashbots/suave-geth. --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a4a0264..553aee4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.8" services: suave-mevm: - image: flashbots/suave-geth:v0.1.0 + image: flashbots/suave-geth:latest command: - --suave.dev - --http.addr=0.0.0.0 @@ -15,7 +15,7 @@ services: networks: - suave-net suave-enabled-chain: - image: flashbots/suave-geth:v0.1.0 + image: flashbots/suave-execution-geth:latest command: - --dev - --dev.gaslimit=30000000 From 3da126f1560afe00f8f4b9c4996803171794afae Mon Sep 17 00:00:00 2001 From: Louis Thibault Date: Wed, 31 Jan 2024 19:49:48 -0500 Subject: [PATCH 2/7] Allow insucure unlock. --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 553aee4..9d3ef17 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,6 +26,7 @@ services: - --keystore=/keystore/keystore - --unlock=0xB5fEAfbDD752ad52Afb7e1bD2E40432A485bBB7F - --password=/keystore/password.txt + - --allow-insecure-unlock volumes: - ./suave-enabled-node-keystore:/keystore ports: From 362cf27ac5636f8204a347c3fc36df72972ce23a Mon Sep 17 00:00:00 2001 From: Louis Thibault Date: Thu, 1 Feb 2024 15:31:23 -0500 Subject: [PATCH 3/7] Add debug panics. Comment out unused NewClient() method. --- framework/framework.go | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/framework/framework.go b/framework/framework.go index 9abb5bf..c51770b 100644 --- a/framework/framework.go +++ b/framework/framework.go @@ -202,7 +202,10 @@ func New() *Framework { log.Fatal(err) } - kettleRPC, _ := rpc.Dial(config.KettleRPC) + kettleRPC, err := rpc.Dial(config.KettleRPC) + if err != nil { + panic(err) + } var accounts []common.Address if err := kettleRPC.Call(&accounts, "eth_kettleAddress"); err != nil { @@ -211,7 +214,10 @@ func New() *Framework { suaveClt := sdk.NewClient(kettleRPC, config.FundedAccount.Priv, accounts[0]) - l1RPC, _ := rpc.Dial(config.L1RPC) + l1RPC, err := rpc.Dial(config.L1RPC) + if err != nil { + panic(err) + } l1Clt := sdk.NewClient(l1RPC, config.FundedAccountL1.Priv, common.Address{}) return &Framework{ @@ -265,10 +271,14 @@ func (c *Contract) Ref(acct *PrivKey) *Contract { return cc } -func (f *Framework) NewClient(acct *PrivKey) *sdk.Client { - rpc, _ := rpc.Dial(f.config.KettleRPC) - return sdk.NewClient(rpc, acct.Priv, f.kettleAddress) -} +// func (f *Framework) NewClient(acct *PrivKey) *sdk.Client { +// rpc, err := rpc.Dial(f.config.KettleRPC) +// if err != nil { +// panic(err) +// } + +// return sdk.NewClient(rpc, acct.Priv, f.kettleAddress) +// } func (c *Chain) SignTx(priv *PrivKey, tx *types.LegacyTx) (*types.Transaction, error) { cltAcct1 := sdk.NewClient(c.rpc, priv.Priv, common.Address{}) From f3c27fe542adcf28f355714f5a5cebffaae5caa0 Mon Sep 17 00:00:00 2001 From: Louis Thibault Date: Thu, 1 Feb 2024 15:31:40 -0500 Subject: [PATCH 4/7] Set environment for suave-mevm host in docker-compose. --- docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 9d3ef17..2858f0c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,9 @@ version: "3.8" services: suave-mevm: image: flashbots/suave-geth:latest + environment: + - KETTLE_RPC=http://localhost:8545 + - L1_RPC=http://suave-enabled-chain:8555 command: - --suave.dev - --http.addr=0.0.0.0 From fe14b65b6a9e1923569cab8a9a28310d044ecee6 Mon Sep 17 00:00:00 2001 From: Louis Thibault Date: Thu, 1 Feb 2024 15:36:24 -0500 Subject: [PATCH 5/7] Remove environment vars from docker-compose. --- docker-compose.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2858f0c..9d3ef17 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,9 +3,6 @@ version: "3.8" services: suave-mevm: image: flashbots/suave-geth:latest - environment: - - KETTLE_RPC=http://localhost:8545 - - L1_RPC=http://suave-enabled-chain:8555 command: - --suave.dev - --http.addr=0.0.0.0 From 58443306cfd1d8ae205f82a7769b76586d84f52f Mon Sep 17 00:00:00 2001 From: Louis Thibault Date: Thu, 1 Feb 2024 15:51:44 -0500 Subject: [PATCH 6/7] Disable flaky OFA test. --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 4514372..3a93ef5 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,6 @@ lt: lint test .PHONY: run-integration run-integration: - go run examples/app-ofa-private/main.go go run examples/mevm-confidential-store/main.go go run examples/mevm-is-confidential/main.go go run examples/onchain-callback/main.go From 63f1b260efd85de804e1b488237f9b5bc7b09fd4 Mon Sep 17 00:00:00 2001 From: Louis Thibault Date: Thu, 1 Feb 2024 15:52:23 -0500 Subject: [PATCH 7/7] Remove dead code. --- framework/framework.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/framework/framework.go b/framework/framework.go index c51770b..c867e33 100644 --- a/framework/framework.go +++ b/framework/framework.go @@ -271,15 +271,6 @@ func (c *Contract) Ref(acct *PrivKey) *Contract { return cc } -// func (f *Framework) NewClient(acct *PrivKey) *sdk.Client { -// rpc, err := rpc.Dial(f.config.KettleRPC) -// if err != nil { -// panic(err) -// } - -// return sdk.NewClient(rpc, acct.Priv, f.kettleAddress) -// } - func (c *Chain) SignTx(priv *PrivKey, tx *types.LegacyTx) (*types.Transaction, error) { cltAcct1 := sdk.NewClient(c.rpc, priv.Priv, common.Address{}) signedTxn, err := cltAcct1.SignTxn(tx)