Fix 4byte bug (autonity#185)

* restore unmodified 4byte.json file * fix generation of 4bytedb * change ether to auton in cmdline Co-authored-by: Lorenzo Alluminio <[email protected]>
ChorusOne · Sep 13, 2022 · 5ecab93 · 5ecab93
1 parent 1bfd177
commit 5ecab93
Show file tree

Hide file tree

Showing 6 changed files with 293,782 additions and 107 deletions.
diff --git a/Makefile b/Makefile
@@ -106,7 +106,7 @@ $(GENERATED_BYTECODE) $(GENERATED_RAW_ABI) $(GENERATED_ABI): $(AUTONITY_CONTRACT
 	@gofmt -s -w $(GENERATED_UPGRADE_BYTECODE)
 
 	# update 4byte selector for clef
-	go run build/generate_4bytedb.go
+	build/generate_4bytedb.sh $(SOLC_BINARY)
 	cd signer/fourbyte && go generate
 
 $(SOLC_BINARY):

diff --git a/build/generate_4bytedb.go b/build/generate_4bytedb.go
diff --git a/build/generate_4bytedb.sh b/build/generate_4bytedb.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOLC_BIN="$1"
+echo "{" > signer/fourbyte/autonity_4byte.json
+$SOLC_BIN --hashes autonity/solidity/contracts/Autonity.sol 2>/dev/null | grep -E --color=never "^[0-9a-f]{8}: .*" | sed -E 's/^([0-9a-f]{8}): (.*)$/"\1": "\2",/' >> signer/fourbyte/autonity_4byte.json
+LAST_LINE=$(cat signer/fourbyte/autonity_4byte.json | wc -l)
+sed -i "$LAST_LINE s/,$//" signer/fourbyte/autonity_4byte.json
+echo "}" >> signer/fourbyte/autonity_4byte.json
+cat signer/fourbyte/4byte.json signer/fourbyte/autonity_4byte.json | jq -s add > signer/fourbyte/4byte_merged.json
+mv signer/fourbyte/4byte_merged.json signer/fourbyte/4byte.json
+rm signer/fourbyte/autonity_4byte.json
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -20,8 +20,6 @@ package utils
 import (
 	"crypto/ecdsa"
 	"fmt"
-	"github.com/autonity/autonity/eth/ethconfig"
-	"github.com/autonity/autonity/eth/tracers"
 	"io"
 	"io/ioutil"
 	"math"
@@ -35,6 +33,9 @@ import (
 	"text/template"
 	"time"
 
+	"github.com/autonity/autonity/eth/ethconfig"
+	"github.com/autonity/autonity/eth/tracers"
+
 	"github.com/autonity/autonity/accounts"
 	"github.com/autonity/autonity/accounts/keystore"
 	"github.com/autonity/autonity/common"
@@ -459,7 +460,7 @@ var (
 	}
 	RPCGlobalTxFeeCapFlag = cli.Float64Flag{
 		Name:  "rpc.txfeecap",
-		Usage: "Sets a cap on transaction fee (in ether) that can be sent via the RPC APIs (0 = no cap)",
+		Usage: "Sets a cap on transaction fee (in auton) that can be sent via the RPC APIs (0 = no cap)",
 		Value: ethconfig.Defaults.RPCTxFeeCap,
 	}
 	// Logging and debug settings

diff --git a/signer/fourbyte/4byte.go b/signer/fourbyte/4byte.go
diff --git a/signer/fourbyte/4byte.json b/signer/fourbyte/4byte.json