diff --git a/pkg/fill/fill_suite_test.go b/pkg/fill/fill_suite_test.go
index a5c3a4c3..4b5a9103 100644
--- a/pkg/fill/fill_suite_test.go
+++ b/pkg/fill/fill_suite_test.go
@@ -1,3 +1,19 @@
+// VulcanizeDB
+// Copyright © 2022 Vulcanize
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
+
package fill_test
import (
diff --git a/pkg/fill/service.go b/pkg/fill/service.go
index 26ab2ae6..3f425e34 100644
--- a/pkg/fill/service.go
+++ b/pkg/fill/service.go
@@ -1,3 +1,19 @@
+// VulcanizeDB
+// Copyright © 2022 Vulcanize
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
+
package fill
import (
@@ -44,6 +60,7 @@ func New(config *serve.Config) *Service {
// Start is used to begin the service
func (s *Service) Start() {
for {
+ // Wait for specified interval duration
time.Sleep(time.Duration(s.interval) * time.Second)
// Get watched addresses from the db
@@ -98,8 +115,8 @@ func (s *Service) GetFillAddresses(rows []WatchedAddress) ([]WatchedAddress, uin
continue
}
- var startBlock uint64 = 0
- var endBlock uint64 = 0
+ startBlock := uint64(0)
+ endBlock := uint64(0)
// Check if some of the gap was filled earlier
if row.LastFilledAt > 0 {
@@ -133,7 +150,7 @@ func (s *Service) GetFillAddresses(rows []WatchedAddress) ([]WatchedAddress, uin
// UpdateLastFilledAt updates the fill status for the provided addresses in the db
func (s *Service) UpdateLastFilledAt(blockNumber uint64, fillAddresses []interface{}) {
// Prepare the query
- query := "UPDATE eth.watched_addresses SET last_filled_at=? WHERE address IN (?" + strings.Repeat(",?", len(fillAddresses)-1) + ")"
+ query := "UPDATE eth_meta.watched_addresses SET last_filled_at=? WHERE address IN (?" + strings.Repeat(",?", len(fillAddresses)-1) + ")"
query = s.db.Rebind(query)
args := []interface{}{blockNumber}
@@ -149,7 +166,7 @@ func (s *Service) UpdateLastFilledAt(blockNumber uint64, fillAddresses []interfa
// fetchWatchedAddresses fetches watched addresses from the db
func (s *Service) fetchWatchedAddresses() []WatchedAddress {
rows := []WatchedAddress{}
- pgStr := "SELECT * FROM eth.watched_addresses"
+ pgStr := "SELECT * FROM eth_meta.watched_addresses"
err := s.db.Select(&rows, pgStr)
if err != nil {
diff --git a/pkg/fill/service_test.go b/pkg/fill/service_test.go
index bfd4070a..f5178702 100644
--- a/pkg/fill/service_test.go
+++ b/pkg/fill/service_test.go
@@ -1,3 +1,19 @@
+// VulcanizeDB
+// Copyright © 2022 Vulcanize
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
+
package fill_test
import (
@@ -286,7 +302,7 @@ var _ = Describe("Service", func() {
})
Describe("UpdateLastFilledAt", func() {
- pgStr := "SELECT * FROM eth.watched_addresses"
+ pgStr := "SELECT * FROM eth_meta.watched_addresses"
BeforeEach(func() {
shared.TearDownDB(db)
diff --git a/pkg/serve/api.go b/pkg/serve/api.go
index ad80bec1..557f05c6 100644
--- a/pkg/serve/api.go
+++ b/pkg/serve/api.go
@@ -18,7 +18,6 @@ package serve
import (
"context"
- "encoding/json"
"github.com/ethereum/go-ethereum/rpc"
"github.com/ethereum/go-ethereum/statediff"
@@ -95,8 +94,7 @@ func (api *PublicServerAPI) Chain() shared.ChainType {
// WatchAddress makes a geth WatchAddress API call with the given operation and args
func (api *PublicServerAPI) WatchAddress(operation statediff.OperationType, args []sdtypes.WatchAddressArg) error {
- var data json.RawMessage
- err := api.rpc.Call(&data, "statediff_watchAddress", operation, args)
+ err := api.rpc.Call(nil, "statediff_watchAddress", operation, args)
if err != nil {
return err
}
diff --git a/pkg/shared/test_helpers.go b/pkg/shared/test_helpers.go
index e2ee9d58..20326efe 100644
--- a/pkg/shared/test_helpers.go
+++ b/pkg/shared/test_helpers.go
@@ -70,7 +70,7 @@ func TearDownDB(db *postgres.DB) {
Expect(err).NotTo(HaveOccurred())
_, err = tx.Exec(`DELETE FROM eth.log_cids`)
Expect(err).NotTo(HaveOccurred())
- _, err = tx.Exec(`DELETE FROM eth.watched_addresses`)
+ _, err = tx.Exec(`DELETE FROM eth_meta.watched_addresses`)
Expect(err).NotTo(HaveOccurred())
err = tx.Commit()
diff --git a/test/contract/src/index.js b/test/contract/src/index.js
index 9ff8f177..35048d98 100644
--- a/test/contract/src/index.js
+++ b/test/contract/src/index.js
@@ -13,7 +13,7 @@ fastify.get('/v1/healthz', async (req, reply) => {
fastify.get('/v1/deployContract', async (req, reply) => {
const GLDToken = await hre.ethers.getContractFactory("GLDToken");
- let token = await GLDToken.deploy();
+ const token = await GLDToken.deploy();
await token.deployed();
return {
diff --git a/test/contract/src/utils.js b/test/contract/src/utils.js
index 42e45cac..ecfa9e2e 100644
--- a/test/contract/src/utils.js
+++ b/test/contract/src/utils.js
@@ -1,4 +1,3 @@
-// import { artifacts } from 'hardhat';
const { artifacts } = require("hardhat")
const { utils, BigNumber } = require("ethers")