fix: contractsgen script to compile independent bytecode with machine (#154)

* fix: contractsgen script to compile independent bytecode with machine

* contractsgen

* fix tests

---------

Co-authored-by: beer-1 <[email protected]>

Author: djm07073

Diff for: indexer/bloom.go

@@ -2,6 +2,8 @@ package indexer
 
 import (
 	"context"
+	"errors"
+	"math/big"
 
 	"cosmossdk.io/collections"
 	"github.com/ethereum/go-ethereum/core/bloombits"
@@ -45,8 +47,15 @@ func (e *EVMIndexerImpl) bloomIndexing(ctx context.Context, height uint64) error
 	}
 
 	for i := uint64(0); i < evmconfig.SectionSize; i++ {
-		header, err := e.BlockHeaderByNumber(ctx, section*evmconfig.SectionSize+i)
-		if err != nil {
+		height := section*evmconfig.SectionSize + i
+		header, err := e.BlockHeaderByNumber(ctx, height)
+		if err != nil && errors.Is(err, collections.ErrNotFound) {
+			// pruned block, create a dummy header
+			header = &coretypes.Header{
+				Number: new(big.Int).SetUint64(height),
+				Bloom:  coretypes.Bloom{},
+			}
+		} else if err != nil {
 			return err
 		}
 

Diff for: indexer/bloom_test.go

@@ -51,6 +51,18 @@ func Test_BloomIndexing(t *testing.T) {
 		}
 	}
 
+	// create a new block to trigger bloom indexing
+	tests.IncreaseBlockHeight(t, app)
+
+	// wait for bloom indexing
+	for {
+		if indexer.IsBloomIndexingRunning() {
+			time.Sleep(100 * time.Millisecond)
+		} else {
+			break
+		}
+	}
+
 	ctx, err := app.CreateQueryContext(0, false)
 	require.NoError(t, err)
 

Diff for: indexer/prune_test.go

@@ -130,6 +130,18 @@ func Test_PruneIndexer_BloomBits(t *testing.T) {
 		}
 	}
 
+	// create a new block to trigger bloom indexing
+	tests.IncreaseBlockHeight(t, app)
+
+	// wait for bloom indexing
+	for {
+		if indexer.IsBloomIndexingRunning() {
+			time.Sleep(100 * time.Millisecond)
+		} else {
+			break
+		}
+	}
+
 	// wait for pruning
 	for {
 		if indexer.IsPruningRunning() {

Diff for: indexer/reader.go

@@ -2,7 +2,6 @@ package indexer
 
 import (
 	"context"
-	"math/big"
 
 	"cosmossdk.io/collections"
 	"github.com/ethereum/go-ethereum/common"
@@ -12,14 +11,6 @@ import (
 
 // BlockHeaderByNumber implements EVMIndexer.
 func (e *EVMIndexerImpl) BlockHeaderByNumber(ctx context.Context, blockNumber uint64) (*coretypes.Header, error) {
-	if blockNumber == 0 {
-		// this is a special case for genesis block
-		return &coretypes.Header{
-			Number: big.NewInt(0),
-			Bloom:  coretypes.Bloom{},
-		}, nil
-	}
-
 	blockHeader, err := e.BlockHeaderMap.Get(ctx, blockNumber)
 	if err != nil {
 		return nil, err

Diff for: jsonrpc/backend/filters_test.go

@@ -78,6 +78,18 @@ func Test_BloomStatus(t *testing.T) {
 		}
 	}
 
+	// create a new block to trigger bloom indexing
+	tests.IncreaseBlockHeight(t, app)
+
+	// wait for bloom indexing
+	for {
+		if indexer.IsBloomIndexingRunning() {
+			time.Sleep(100 * time.Millisecond)
+		} else {
+			break
+		}
+	}
+
 	tx2, _ := tests.GenerateCreateERC20Tx(t, app, privKeys[1])
 	_, finalizeRes2 := tests.ExecuteTxs(t, app, tx2)
 	tests.CheckTxResult(t, finalizeRes2.TxResults[0], true)

Diff for: scripts/contractsgen.sh

@@ -14,7 +14,7 @@ for CONTRACT_HOME in $CONTRACTS_DIR/*; do
                 echo $CONTRACT_PATH
                 CONTRACT_NAME=$(basename $CONTRACT_PATH .sol)
                 echo $CONTRACT_HOME $PKG_NAME $CONTRACT_PATH $CONTRACT_NAME
-                solc $CONTRACT_PATH --bin --abi -o $BUILD_DIR --overwrite
+                solc $CONTRACT_PATH --metadata-hash none --bin --abi -o $BUILD_DIR --overwrite
                 abigen --pkg $PKG_NAME \
                     --bin=$BUILD_DIR/$CONTRACT_NAME.bin \
                     --abi=$BUILD_DIR/$CONTRACT_NAME.abi \