remove allowlist events (#1107)

* remove allowlist events * add signature to topic count
ava-labs · Feb 29, 2024 · 21d79e0 · 21d79e0
1 parent 5b75de4
commit 21d79e0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/accounts/abi/bind/precompilebind/precompile_bind.go b/accounts/abi/bind/precompilebind/precompile_bind.go
@@ -155,6 +155,9 @@ func createPrecompileHook(abifilename string, template string) bind.BindHook {
 			for key := range allowlist.AllowListABI.Methods {
 				delete(funcs, key)
 			}
+			for events := range allowlist.AllowListABI.Events {
+				delete(contract.Events, events)
+			}
 		}
 
 		precompileContract := &tmplPrecompileContract{

diff --git a/accounts/abi/bind/precompilebind/precompile_bind_test.go b/accounts/abi/bind/precompilebind/precompile_bind_test.go
@@ -536,7 +536,7 @@ var bindTests = []struct {
 			require.NoError(t, err)
 			require.Equal(t, testBytes, unpacked.BytesTest)
 			gasCost := GetTestEventGasCost(testEventData)
-			require.Equal(t, contract.LogGas + 2 * contract.LogTopicGas + contract.LogDataGas, gasCost)
+			require.Equal(t, contract.LogGas + 3 * contract.LogTopicGas + contract.LogDataGas, gasCost)
 
 			topics, data, err = PackEmptyEvent()
 			require.NoError(t, err)
@@ -553,7 +553,7 @@ var bindTests = []struct {
 			require.Equal(t, eventID, topics[0])
 			require.Equal(t, testAddr.Hash(), topics[1])
 			require.Equal(t, 0, len(data))
-			require.Equal(t, contract.LogGas + 2 * contract.LogTopicGas, GetIndexedEventGasCost())
+			require.Equal(t, contract.LogGas + 3 * contract.LogTopicGas, GetIndexedEventGasCost())
 
 			testMixedData := MixedEventData{
 				Num: testInt,
@@ -567,7 +567,7 @@ var bindTests = []struct {
 			unpackedMixedData, err := UnpackMixedEventData(data)
 			require.NoError(t, err)
 			require.Equal(t, testMixedData, unpackedMixedData)
-			require.Equal(t, contract.LogGas + contract.LogTopicGas + contract.LogDataGas, GetMixedEventGasCost(testMixedData))
+			require.Equal(t, contract.LogGas + 2 * contract.LogTopicGas + contract.LogDataGas, GetMixedEventGasCost(testMixedData))
 
 			testDynamicData := DynamicEventData{
 				Str:    "test",
@@ -581,15 +581,15 @@ var bindTests = []struct {
 			unpackedDynamicData, err := UnpackDynamicEventData(data)
 			require.NoError(t, err)
 			require.Equal(t, testDynamicData, unpackedDynamicData)
-			require.Equal(t, contract.LogGas + 2 * contract.LogTopicGas + 2 * contract.LogDataGas, GetDynamicEventGasCost(testDynamicData))
+			require.Equal(t, contract.LogGas + 3 * contract.LogTopicGas + 2 * contract.LogDataGas, GetDynamicEventGasCost(testDynamicData))
 
 			topics, data, err = PackUnnamedEvent(testUint, testUint)
 			require.NoError(t, err)
 			eventID = IEventerABI.Events["unnamed"].ID
 			require.Len(t, topics, 3)
 			require.Equal(t, eventID, topics[0])
 			require.Equal(t, 0, len(data))
-			require.Equal(t, contract.LogGas + 2 * contract.LogTopicGas, GetUnnamedEventGasCost())
+			require.Equal(t, contract.LogGas + 3 * contract.LogTopicGas, GetUnnamedEventGasCost())
 	`,
 		"",
 		false,

diff --git a/accounts/abi/bind/precompilebind/precompile_event_template.go b/accounts/abi/bind/precompilebind/precompile_event_template.go
@@ -58,7 +58,7 @@ accessibleState.GetStateDB().AddLog(
 {{range .Contract.Events}}
 	{{$event := .}}
 	{{$createdDataStruct := false}}
-	{{$topicCount := 0}}
+	{{$topicCount := 1}}
 	{{- range .Normalized.Inputs}}
 		{{- if .Indexed}}
 			{{$topicCount = add $topicCount 1}}
@@ -81,8 +81,9 @@ accessibleState.GetStateDB().AddLog(
 	// The gas cost of the non-indexed data depends on the data type and the data size.
 	func Get{{.Normalized.Name}}EventGasCost({{if $createdDataStruct}} data {{.Normalized.Name}}EventData{{end}}) uint64 {
 		gas := contract.LogGas // base gas cost
-		{{if $topicCount | lt 0}}
+		{{if $topicCount | lt 1}}
 		// Add topics gas cost ({{$topicCount}} topics)
+		// Topics always include the signature hash of the event. The rest are the indexed event arguments.
 		gas += contract.LogTopicGas * {{$topicCount}}
 		{{end}}