upgrade gh action workers

ot
berachain · Sep 4, 2023 · 54bddb3 · 54bddb3
1 parent c4d4f86
commit 54bddb3
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 49 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -26,25 +26,25 @@ on:
     branches:
       - main
 
-jobs: 
+jobs:
   build-base:
     strategy:
       matrix:
         namespace: [cosmos]
         docker-version: [base]
-        os: [ubuntu-latest]
+        os: [polaris-linux-latest]
         go-version: [1.21.0]
         go-arch: [amd64]
-        image-name: ['polard/base:v0.0.0']
+        image-name: ["polard/base:v0.0.0"]
         export-name: [base-image]
-    runs-on: ubuntu-latest
+    runs-on: polaris-linux-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Setup Golang
         uses: actions/setup-go@v3
         with:
-            go-version: ${{ matrix.go-version }}
+          go-version: ${{ matrix.go-version }}
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: Run ${{ matrix.namespace }}:docker ${{ matrix.docker-version }} ${{ matrix.go-arch }}
@@ -68,11 +68,11 @@ jobs:
       matrix:
         namespace: [cosmos]
         docker-version: [localnet]
-        os: [ubuntu-latest]
+        os: [polaris-linux-latest]
         go-version: [1.21.0]
         go-arch: [amd64]
         base-image: [base-image]
-        image-name: ['polard/localnet:v0.0.0']
+        image-name: ["polard/localnet:v0.0.0"]
         export-name: [localnet]
     runs-on: ${{ matrix.os }}
     steps:
@@ -81,7 +81,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v3
         with:
-            go-version: ${{ matrix.go-version }}
+          go-version: ${{ matrix.go-version }}
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: Download image artifact
@@ -111,7 +111,7 @@ jobs:
       matrix:
         simulator: [polaris/rpc, polaris/graphql]
         namespace: [cosmos]
-        os: [ubuntu-latest]
+        os: [polaris-linux-latest]
         go-version: [1.21.0]
         base-image: [base-image]
     runs-on: ${{ matrix.os }}
@@ -151,8 +151,8 @@ jobs:
     needs: build-localnet
     strategy:
       matrix:
-        namespace: ['', 'localnet']
-        os: [ubuntu-latest]
+        namespace: ["", "localnet"]
+        os: [polaris-linux-latest]
         go-version: [1.21.0]
         base-image: [localnet]
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -30,14 +30,8 @@ jobs:
   ci:
     strategy:
       matrix:
-        args:
-          [
-            "build",
-            "lint",
-            "testunitrace",
-            "testunitcover",
-          ]
-        os: [ubuntu-latest]
+        args: ["build", "lint", "testunitrace", "testunitcover"]
+        os: [polaris-linux-latest]
         go-version: [1.21.0]
     runs-on: ${{ matrix.os }}
     steps:
@@ -77,8 +71,8 @@ jobs:
         if: ${{ matrix.args == 'testunitcover' }}
 
   codecov:
-    name: codecov(uploader, ubuntu-latest)
-    runs-on: ubuntu-latest
+    name: codecov(uploader, polaris-linux-latest)
+    runs-on: polaris-linux-latest
     needs: ci
     steps:
       - name: Checkout

diff --git a/eth/core/precompile/factories.go b/eth/core/precompile/factories.go
@@ -111,10 +111,10 @@ func (sf *StatefulFactory) Build(
 // This function matches each Go implementation of the precompile to the ABI's respective function.
 // It searches for the ABI function in the Go precompile contract and performs basic validation on
 // the implemented function.
-func buildIdsToMethods(si StatefulImpl, contractImpl reflect.Value) (map[[4]byte]*method, error) {
+func buildIdsToMethods(si StatefulImpl, contractImpl reflect.Value) (map[string]*method, error) {
 	precompileABI := si.ABIMethods()
 	contractImplType := contractImpl.Type()
-	idsToMethods := make(map[[4]byte]*method)
+	idsToMethods := make(map[string]*method)
 	for m := 0; m < contractImplType.NumMethod(); m++ {
 		implMethod := contractImplType.Method(m)
 
@@ -127,12 +127,12 @@ func buildIdsToMethods(si StatefulImpl, contractImpl reflect.Value) (map[[4]byte
 		}
 
 		method := newMethod(si, precompileABI[methodName], implMethod)
-		idsToMethods[[4]byte(precompileABI[methodName].ID)] = method
+		idsToMethods[utils.UnsafeBytesToStr(precompileABI[methodName].ID)] = method
 	}
 
 	// verify that every abi method has a corresponding precompile implementation
 	for _, abiMethod := range precompileABI {
-		if _, found := idsToMethods[[4]byte(abiMethod.ID)]; !found {
+		if _, found := idsToMethods[utils.UnsafeBytesToStr(abiMethod.ID)]; !found {
 			return nil, errorslib.Wrap(ErrNoPrecompileMethodForABIMethod, abiMethod.Name)
 		}
 	}

diff --git a/eth/core/precompile/method_test.go b/eth/core/precompile/method_test.go
@@ -64,17 +64,6 @@ var _ = Describe("Method", func() {
 	})
 })
 
-var _ = Describe("Test MethoID", func() {
-	It("should work", func() {
-		x := make([]byte, 0)
-		x = append(x, 0x12)
-		x = append(x, 0x34)
-		x = append(x, 0x56)
-		x = append(x, 0x78)
-		Expect([4]byte(x)).To(Equal([4]byte{0x12, 0x34, 0x56, 0x78}))
-	})
-})
-
 // MOCKS BELOW.
 
 type mockStatefulWithMethod struct {

diff --git a/eth/core/precompile/method_validation.go b/eth/core/precompile/method_validation.go
@@ -38,7 +38,8 @@ func validateArg(implMethodVar reflect.Value, abiMethodVar reflect.Value) error
 	implMethodVarType := implMethodVar.Type()
 	abiMethodVarType := abiMethodVar.Type()
 
-	switch implMethodVarType.Kind() { //nolint:exchaustive // todo verify its okay.
+	//nolint:exhaustive // only the ones we need.
+	switch implMethodVarType.Kind() {
 	case reflect.Array, reflect.Slice:
 		if implMethodVarType.Elem() != abiMethodVarType.Elem() {
 			// If the array is not a slice/array of structs, return an error.

diff --git a/eth/core/precompile/stateful_container.go b/eth/core/precompile/stateful_container.go
@@ -26,6 +26,7 @@ import (
 
 	"pkg.berachain.dev/polaris/eth/common"
 	"pkg.berachain.dev/polaris/eth/core/vm"
+	"pkg.berachain.dev/polaris/lib/utils"
 )
 
 // NumBytesMethodID is the number of bytes used to represent a ABI method's ID.
@@ -41,7 +42,7 @@ type statefulContainer struct {
 	// method signatures) to native precompile functions. The signature key is provided by the
 	// precompile creator and must exactly match the signature in the geth abi.Method.Sig field
 	// (geth abi format). Please check core/precompile/container/method.go for more information.
-	idsToMethods map[[4]byte]*method
+	idsToMethods map[string]*method
 	// receive      *Method // TODO: implement
 	// fallback     *Method // TODO: implement
 
@@ -50,7 +51,7 @@ type statefulContainer struct {
 // NewStatefulContainer creates and returns a new `statefulContainer` with the given method ids
 // precompile functions map.
 func NewStatefulContainer(
-	si StatefulImpl, idsToMethods map[[4]byte]*method,
+	si StatefulImpl, idsToMethods map[string]*method,
 ) (vm.PrecompileContainer, error) {
 	if idsToMethods == nil {
 		return nil, ErrContainerHasNoMethods
@@ -77,9 +78,7 @@ func (sc *statefulContainer) Run(
 	}
 
 	// Extract the method ID from the input and load the method.
-
-	methodID := input[:NumBytesMethodID]
-	method, found := sc.idsToMethods[[4]byte(methodID)]
+	method, found := sc.idsToMethods[utils.UnsafeBytesToStr(input[:NumBytesMethodID])]
 	if !found {
 		return nil, ErrMethodNotFound
 	}

diff --git a/eth/core/precompile/stateful_container_test.go b/eth/core/precompile/stateful_container_test.go
@@ -29,6 +29,7 @@ import (
 	"pkg.berachain.dev/polaris/eth/common"
 	"pkg.berachain.dev/polaris/eth/core/vm"
 	vmmock "pkg.berachain.dev/polaris/eth/core/vm/mock"
+	"pkg.berachain.dev/polaris/lib/utils"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -158,33 +159,33 @@ var (
 	contractFuncStrInputFunc, _  = reflect.TypeOf(mockStatefulDummy).MethodByName("ContractFuncStrInput")
 	overloadedFunc, _            = reflect.TypeOf(mockStatefulDummy).MethodByName("OverloadedFunc")
 	overloadedFunc0, _           = reflect.TypeOf(mockStatefulDummy).MethodByName("OverloadedFunc0")
-	mockIdsToMethods             = map[[4]byte]*method{
-		[4]byte(getOutputABI.ID): newMethod(
+	mockIdsToMethods             = map[string]*method{
+		utils.UnsafeBytesToStr(getOutputABI.ID): newMethod(
 			mockStatefulDummy,
 			getOutputABI,
 			getOutputFunc,
 		),
-		[4]byte(getOutputPartialABI.ID): newMethod(
+		utils.UnsafeBytesToStr(getOutputPartialABI.ID): newMethod(
 			mockStatefulDummy,
 			getOutputPartialABI,
 			getOutputPartialFunc,
 		),
-		[4]byte(contractFuncAddrABI.ID): newMethod(
+		utils.UnsafeBytesToStr(contractFuncAddrABI.ID): newMethod(
 			mockStatefulDummy,
 			contractFuncAddrABI,
 			contractFuncAddrInputFunc,
 		),
-		[4]byte(contractFuncStrABI.ID): newMethod(
+		utils.UnsafeBytesToStr(contractFuncStrABI.ID): newMethod(
 			mockStatefulDummy,
 			contractFuncStrABI,
 			contractFuncStrInputFunc,
 		),
-		[4]byte(overloadedFuncABI.ID): newMethod(
+		utils.UnsafeBytesToStr(overloadedFuncABI.ID): newMethod(
 			mockStatefulDummy,
 			overloadedFuncABI,
 			overloadedFunc,
 		),
-		[4]byte(contractFuncStrABI.ID): newMethod(
+		utils.UnsafeBytesToStr(contractFuncStrABI.ID): newMethod(
 			mockStatefulDummy,
 			overloadedFunc0ABI,
 			overloadedFunc0,