Fantom-foundation · wsodsong · Jun 21, 2024 · Jun 12, 2024 · Jun 12, 2024 · Jun 12, 2024
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -69,20 +69,20 @@ pipeline {
             steps {
                 sh "mkdir -p ${TRACEDIR}"
                 sh "rm -rf ${TRACEDIR}/*"
-                catchError(buildResult: 'FAILURE', stageResult: 'FAILURE', message: 'Test Suite had a failure') {
-                    sh "build/aida-sdb record --cpu-profile cpu-profile-0.dat --trace-file ${TRACEDIR}/trace-0.dat ${AIDADB} ${FROMBLOCK} ${FROMBLOCK}+1000"
-                    sh "build/aida-sdb record --cpu-profile cpu-profile-1.dat --trace-file ${TRACEDIR}/trace-1.dat ${AIDADB} ${FROMBLOCK}+1001 ${FROMBLOCK}+2000"
-                    sh "build/aida-sdb record --cpu-profile cpu-profile-2.dat --trace-file ${TRACEDIR}/trace-2.dat ${AIDADB} ${FROMBLOCK}+2001 ${TOBLOCK}"
-                }
+//                catchError(buildResult: 'FAILURE', stageResult: 'FAILURE', message: 'Test Suite had a failure') {
+//                    sh "build/aida-sdb record --cpu-profile cpu-profile-0.dat --trace-file ${TRACEDIR}/trace-0.dat ${AIDADB} ${FROMBLOCK} ${FROMBLOCK}+1000"
+//                    sh "build/aida-sdb record --cpu-profile cpu-profile-1.dat --trace-file ${TRACEDIR}/trace-1.dat ${AIDADB} ${FROMBLOCK}+1001 ${FROMBLOCK}+2000"
+//                    sh "build/aida-sdb record --cpu-profile cpu-profile-2.dat --trace-file ${TRACEDIR}/trace-2.dat ${AIDADB} ${FROMBLOCK}+2001 ${TOBLOCK}"
+//                }
             }
         }
 
         stage('aida-sdb replay') {
             steps {
-                catchError(buildResult: 'FAILURE', stageResult: 'FAILURE', message: 'Test Suite had a failure') {
-                    sh "build/aida-sdb replay ${VM} ${STORAGE} ${TMPDB} ${AIDADB} ${PRIME} --shadow-db --db-shadow-impl geth --cpu-profile cpu-profile.dat --memory-profile mem-profile.dat --memory-breakdown --trace-file ${TRACEDIR}/trace-0.dat ${FROMBLOCK} ${TOBLOCK}"
-                    sh "build/aida-sdb replay ${VM} ${STORAGE} ${TMPDB} ${AIDADB} ${PRIME} --cpu-profile cpu-profile.dat --memory-profile mem-profile.dat --memory-breakdown --trace-dir ${TRACEDIR} ${FROMBLOCK} ${TOBLOCK}"
-                }
+//                catchError(buildResult: 'FAILURE', stageResult: 'FAILURE', message: 'Test Suite had a failure') {
+//                    sh "build/aida-sdb replay ${VM} ${STORAGE} ${TMPDB} ${AIDADB} ${PRIME} --shadow-db --db-shadow-impl geth --cpu-profile cpu-profile.dat --memory-profile mem-profile.dat --memory-breakdown --trace-file ${TRACEDIR}/trace-0.dat ${FROMBLOCK} ${TOBLOCK}"
+//                    sh "build/aida-sdb replay ${VM} ${STORAGE} ${TMPDB} ${AIDADB} ${PRIME} --cpu-profile cpu-profile.dat --memory-profile mem-profile.dat --memory-breakdown --trace-dir ${TRACEDIR} ${FROMBLOCK} ${TOBLOCK}"
+//                }
                 sh "rm -rf ${TRACEDIR}"
             }
         }

diff --git a/Makefile b/Makefile
@@ -41,50 +41,43 @@ tosca:
 
 aida-rpc: carmen tosca
 	GOPROXY=$(GOPROXY) \
-	GOPRIVATE=github.com/Fantom-foundation/Carmen,github.com/Fantom-foundation/Sonic \
 	go build -ldflags "-s -w -X 'github.com/Fantom-foundation/Aida/utils.GitCommit=$(BUILD_COMMIT)'" \
 	-o $(GO_BIN)/aida-rpc \
 	./cmd/aida-rpc
 
 aida-stochastic-sdb: carmen tosca
 	GOPROXY=$(GOPROXY) \
-	GOPRIVATE=github.com/Fantom-foundation/Carmen,github.com/Fantom-foundation/Sonic \
 	go build -ldflags "-s -w -X 'github.com/Fantom-foundation/Aida/utils.GitCommit=$(BUILD_COMMIT)'" \
 	-o $(GO_BIN)/aida-stochastic-sdb \
 	./cmd/aida-stochastic-sdb
 
 aida-vm-adb: carmen tosca
 	GOPROXY=$(GOPROXY) \
-	GOPRIVATE=github.com/Fantom-foundation/Carmen,github.com/Fantom-foundation/Sonic \
 	go build -ldflags "-s -w -X 'github.com/Fantom-foundation/Aida/utils.GitCommit=$(BUILD_COMMIT)'" \
 	-o $(GO_BIN)/aida-vm-adb \
 	./cmd/aida-vm-adb
 
 aida-vm-sdb: carmen tosca
 	GOPROXY=$(GOPROXY) \
-	GOPRIVATE=github.com/Fantom-foundation/Carmen,github.com/Fantom-foundation/Sonic \
 	CGO_CFLAGS="-g -O2  -DMDBX_FORCE_ASSERTIONS=1 -Wno-error=strict-prototypes" \
 	go build -ldflags "-s -w -X 'github.com/Fantom-foundation/Aida/utils.GitCommit=$(BUILD_COMMIT)'" \
 	-o $(GO_BIN)/aida-vm-sdb \
 	./cmd/aida-vm-sdb
 
 aida-vm: carmen tosca
 	GOPROXY=$(GOPROXY) \
-	GOPRIVATE=github.com/Fantom-foundation/Carmen,github.com/Fantom-foundation/Sonic \
 	go build -ldflags "-s -w -X 'github.com/Fantom-foundation/Aida/utils.GitCommit=$(BUILD_COMMIT)'" \
 	-o $(GO_BIN)/aida-vm \
 	./cmd/aida-vm
 
 aida-sdb: carmen tosca
 	GOPROXY=$(GOPROXY) \
-	GOPRIVATE=github.com/Fantom-foundation/Carmen,github.com/Fantom-foundation/Sonic \
 	go build -ldflags "-s -w -X 'github.com/Fantom-foundation/Aida/utils.GitCommit=$(BUILD_COMMIT)'" \
 	-o $(GO_BIN)/aida-sdb \
 	./cmd/aida-sdb
 
 aida-profile: carmen tosca
 	GOPROXY=$(GOPROXY) \
-	GOPRIVATE=github.com/Fantom-foundation/Carmen,github.com/Fantom-foundation/Sonic \
 	CGO_CFLAGS="-g -O2  -DMDBX_FORCE_ASSERTIONS=1 -Wno-error=strict-prototypes" \
 	go build -ldflags "-s -w -X 'github.com/Fantom-foundation/Aida/utils.GitCommit=$(BUILD_COMMIT)'" \
 	-o $(GO_BIN)/aida-profile \

diff --git a/carmen b/carmen
diff --git a/cmd/aida-rpc/rpc_test.go b/cmd/aida-rpc/rpc_test.go
@@ -18,7 +18,6 @@ package main
 
 import (
 	"encoding/json"
-	"math/big"
 	"strings"
 	"testing"
 
@@ -28,6 +27,7 @@ import (
 	"github.com/Fantom-foundation/Aida/utils"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/holiman/uint256"
 	"go.uber.org/mock/gomock"
 )
 
@@ -70,13 +70,13 @@ func TestRpc_AllDbEventsAreIssuedInOrder_Sequential(t *testing.T) {
 		// Req 1
 		db.EXPECT().GetArchiveState(uint64(2)).Return(archiveOne, nil),
 		archiveOne.EXPECT().BeginTransaction(uint32(1)),
-		archiveOne.EXPECT().GetBalance(common.HexToAddress(testingAddress)).Return(new(big.Int).SetInt64(1)),
+		archiveOne.EXPECT().GetBalance(common.HexToAddress(testingAddress)).Return(new(uint256.Int).SetUint64(1)),
 		archiveOne.EXPECT().EndTransaction(),
 		archiveOne.EXPECT().Release(),
 		// Req 2
 		db.EXPECT().GetArchiveState(uint64(2)).Return(archiveTwo, nil),
 		archiveTwo.EXPECT().BeginTransaction(uint32(2)),
-		archiveTwo.EXPECT().GetBalance(common.HexToAddress(testingAddress)).Return(new(big.Int).SetInt64(1)),
+		archiveTwo.EXPECT().GetBalance(common.HexToAddress(testingAddress)).Return(new(uint256.Int).SetUint64(1)),
 		archiveTwo.EXPECT().EndTransaction(),
 		archiveTwo.EXPECT().Release(),
 		// Req 3
@@ -133,7 +133,7 @@ func TestRpc_AllDbEventsAreIssuedInOrder_Parallel(t *testing.T) {
 		// Req 1
 		db.EXPECT().GetArchiveState(uint64(2)).Return(archiveOne, nil),
 		archiveOne.EXPECT().BeginTransaction(uint32(1)),
-		archiveOne.EXPECT().GetBalance(common.HexToAddress(testingAddress)).Return(new(big.Int).SetInt64(1)),
+		archiveOne.EXPECT().GetBalance(common.HexToAddress(testingAddress)).Return(new(uint256.Int).SetUint64(1)),
 		archiveOne.EXPECT().EndTransaction(),
 		archiveOne.EXPECT().Release(),
 	)
@@ -354,7 +354,7 @@ func TestRpc_ValidationDoesNotFailOnValidTransaction_Sequential(t *testing.T) {
 	gomock.InOrder(
 		db.EXPECT().GetArchiveState(uint64(2)).Return(archive, nil),
 		archive.EXPECT().BeginTransaction(uint32(1)),
-		archive.EXPECT().GetBalance(common.HexToAddress(testingAddress)).Return(new(big.Int).SetInt64(1)),
+		archive.EXPECT().GetBalance(common.HexToAddress(testingAddress)).Return(new(uint256.Int).SetUint64(1)),
 		archive.EXPECT().EndTransaction(),
 		archive.EXPECT().Release(),
 	)
@@ -396,7 +396,7 @@ func TestRpc_ValidationDoesNotFailOnValidTransaction_Parallel(t *testing.T) {
 	gomock.InOrder(
 		db.EXPECT().GetArchiveState(uint64(2)).Return(archive, nil),
 		archive.EXPECT().BeginTransaction(uint32(1)),
-		archive.EXPECT().GetBalance(common.HexToAddress(testingAddress)).Return(new(big.Int).SetInt64(1)),
+		archive.EXPECT().GetBalance(common.HexToAddress(testingAddress)).Return(new(uint256.Int).SetUint64(1)),
 		archive.EXPECT().EndTransaction(),
 		archive.EXPECT().Release(),
 	)
@@ -438,7 +438,7 @@ func TestRpc_ValidationFailsOnValidTransaction_Sequential(t *testing.T) {
 	gomock.InOrder(
 		db.EXPECT().GetArchiveState(uint64(2)).Return(archive, nil),
 		archive.EXPECT().BeginTransaction(uint32(1)),
-		archive.EXPECT().GetBalance(common.HexToAddress(testingAddress)).Return(new(big.Int).SetInt64(2)),
+		archive.EXPECT().GetBalance(common.HexToAddress(testingAddress)).Return(new(uint256.Int).SetUint64(2)),
 		archive.EXPECT().EndTransaction(),
 		archive.EXPECT().Release(),
 	)
@@ -484,7 +484,7 @@ func TestRpc_ValidationFailsOnValidTransaction_Parallel(t *testing.T) {
 	gomock.InOrder(
 		db.EXPECT().GetArchiveState(uint64(2)).Return(archive, nil),
 		archive.EXPECT().BeginTransaction(uint32(1)),
-		archive.EXPECT().GetBalance(common.HexToAddress(testingAddress)).Return(new(big.Int).SetInt64(2)),
+		archive.EXPECT().GetBalance(common.HexToAddress(testingAddress)).Return(new(uint256.Int).SetUint64(2)),
 		archive.EXPECT().EndTransaction(),
 		archive.EXPECT().Release(),
 	)

diff --git a/cmd/aida-sdb/record.go b/cmd/aida-sdb/record.go
@@ -28,7 +28,6 @@ import (
 	"github.com/Fantom-foundation/Aida/txcontext"
 	"github.com/Fantom-foundation/Aida/utils"
 	"github.com/Fantom-foundation/Substate/db"
-	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/urfave/cli/v2"
 )
 
@@ -66,7 +65,6 @@ func RecordStateDbTrace(ctx *cli.Context) error {
 	// force enable transaction validation
 	cfg.ValidateTxState = true
 
-	state.EnableRecordReplay()
 	aidaDb, err := db.NewReadOnlyBaseDB(cfg.AidaDb)
 	if err != nil {
 		return fmt.Errorf("cannot open aida-db; %w", err)

diff --git a/cmd/aida-stochastic-sdb/stochastic/record.go b/cmd/aida-stochastic-sdb/stochastic/record.go
@@ -29,7 +29,6 @@ import (
 	substatecontext "github.com/Fantom-foundation/Aida/txcontext/substate"
 	"github.com/Fantom-foundation/Aida/utils"
 	"github.com/Fantom-foundation/Substate/db"
-	gethstate "github.com/ethereum/go-ethereum/core/state"
 	"github.com/urfave/cli/v2"
 )
 
@@ -58,7 +57,6 @@ last block for recording events.`,
 
 // stochasticRecordAction implements recording of events.
 func stochasticRecordAction(ctx *cli.Context) error {
-	gethstate.EnableRecordReplay()
 	var err error
 
 	cfg, err := utils.NewConfig(ctx, utils.BlockRangeArgs)
+0 −96		go/carmen/amount.go
+0 −136		go/carmen/amount_test.go
+3 −2		go/carmen/bulk.go
+5 −5		go/carmen/bulk_test.go
+7 −17		go/carmen/carmen.go
+97 −72		go/carmen/carmen_mock.go
+5 −4		go/carmen/database_test.go
+12 −11		go/carmen/example_test.go
+5 −4		go/carmen/query.go
+4 −4		go/carmen/query_test.go
+8 −25		go/carmen/transaction.go
+6 −12		go/carmen/transaction_test.go
+23 −23		go/database/mpt/hasher.go
+10 −5		go/database/mpt/hasher_test.go
+2 −138		go/database/mpt/rlp/rlp.go
+89 −244		go/database/mpt/rlp/rlp_test.go
+0 −1		go/go.mod
+0 −2		go/go.sum
+0 −29		go/state/state_db.go
+0 −78		go/state/state_db_mock.go
+4 −159		go/state/state_db_test.go