update workflows with fixed name

Merge pull request #19 from cerc-io/ian_dev
update to get v1.11.5
2023-04-07 14:37:05 -05:00 · 2023-04-03 00:00:52 -05:00 · 2023-04-02 23:37:04 -05:00 · 2023-03-31 08:57:31 -05:00 · 2022-12-21 09:59:07 -06:00
25 changed files with 373 additions and 915 deletions
@@ -17,9 +17,9 @@ jobs:
      - name: Run docker build
        run: make docker-build
      - name: Tag docker image
-        run: docker tag vulcanize/tx_spammer docker.pkg.github.com/vulcanize/tx_spammer/tx_spammer:${{steps.vars.outputs.sha}}
+        run: docker tag cerc-io/tx-spammer git.vdb.to/cerc-io/tx-spammer/tx-spammer:${{steps.vars.outputs.sha}}
      - name: Docker Login
-        run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u vulcanize --password-stdin
+        run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://git.vdb.to -u cerc-io --password-stdin
      - name: Docker Push
-        run: docker push docker.pkg.github.com/vulcanize/tx_spammer/tx_spammer:${{steps.vars.outputs.sha}}
+        run: docker push git.vdb.to/cerc-io/tx-spammer/tx-spammer:${{steps.vars.outputs.sha}}

@@ -13,13 +13,13 @@ jobs:
          echo ::set-output name=sha::$(echo ${GITHUB_SHA:0:7})
          echo ::set-output name=tag::$(echo ${GITHUB_REF#refs/tags/})
      - name: Docker Login to Github Registry
-        run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u vulcanize --password-stdin
+        run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://git.vdb.to -u vulcanize --password-stdin
      - name: Docker Pull
-        run: docker pull docker.pkg.github.com/vulcanize/tx_spammer/tx_spammer:${{steps.vars.outputs.sha}}
+        run: docker pull git.vdb.to/cerc-io/tx-spammer/tx-spammer:${{steps.vars.outputs.sha}}
      - name: Docker Login to Docker Registry
        run: echo ${{ secrets.VULCANIZEJENKINS_PAT }} | docker login -u vulcanizejenkins --password-stdin
      - name: Tag docker image
-        run: docker tag docker.pkg.github.com/vulcanize/tx_spammer/tx_spammer:${{steps.vars.outputs.sha}} vulcanize/tx_spammer:${{steps.vars.outputs.tag}}
+        run: docker tag git.vdb.to/cerc-io/tx-spammer/tx-spammer:${{steps.vars.outputs.sha}} cerc-io/tx-spammer:${{steps.vars.outputs.tag}}
      - name: Docker Push to Docker Hub
-        run: docker push vulcanize/tx_spammer:${{steps.vars.outputs.tag}}
+        run: docker push cerc-io/tx-spammer:${{steps.vars.outputs.tag}}

@@ -14,4 +14,4 @@
 # Dependency directories (remove the comment below to include it)
 # vendor/
 .idea/
-tx_spammer
+tx-spammer
@@ -4,10 +4,10 @@ RUN apk --update --no-cache add make git g++ linux-headers
 # DEBUG
 RUN apk add busybox-extras

-# Get and build tx_spammer
-ADD . /go/src/github.com/vulcanize/tx_spammer
-WORKDIR /go/src/github.com/vulcanize/tx_spammer
-RUN GO111MODULE=on GCO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o tx_spammer .
+# Get and build tx-spammer
+ADD . /go/src/github.com/cerc-io/tx-spammer
+WORKDIR /go/src/github.com/cerc-io/tx-spammer
+RUN GO111MODULE=on GCO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o tx-spammer .

 # app container
 FROM alpine
@@ -22,11 +22,12 @@ USER $USER

 # chown first so dir is writable
 # note: using $USER is merged, but not in the stable release yet
-COPY --chown=5000:5000 --from=builder /go/src/github.com/vulcanize/tx_spammer/$CONFIG_FILE config.toml
-COPY --chown=5000:5000 --from=builder /go/src/github.com/vulcanize/tx_spammer/startup_script.sh .
+COPY --chown=5000:5000 --from=builder /go/src/github.com/cerc-io/tx-spammer/$CONFIG_FILE config.toml
+COPY --chown=5000:5000 --from=builder /go/src/github.com/cerc-io/tx-spammer/startup_script.sh .

 # keep binaries immutable
-COPY --from=builder /go/src/github.com/vulcanize/tx_spammer/tx_spammer tx_spammer
-COPY --from=builder /go/src/github.com/vulcanize/tx_spammer/environments environments
+COPY --from=builder /go/src/github.com/cerc-io/tx-spammer/tx-spammer tx-spammer
+COPY --from=builder /go/src/github.com/cerc-io/tx-spammer/environments environments
+COPY --from=builder /go/src/github.com/cerc-io/tx-spammer/sol sol

 ENTRYPOINT ["/app/startup_script.sh"]
@@ -1,11 +1,11 @@
 ## Build docker image
 .PHONY: docker-build
 docker-build:
-	docker build -t vulcanize/tx_spammer -f Dockerfile .
+	docker build -t cerc/tx-spammer -f Dockerfile .

 .PHONY: build
 build:
-	 GO111MODULE=on go build -o tx_spammer .
+	 GO111MODULE=on go build -o tx-spammer .

 .PHONY: contract
 contract:
@@ -1,9 +1,9 @@
-# tx_spammer
+# tx-spammer
 Tools to enable the semi-reproducible growth of a large and complex chain over RPC, for testing and benchmarking purposes

 Usage:

-`./tx_spammer autoSend --config=./environments/gen.toml`
+`./tx-spammer autoSend --config=./environments/gen.toml`

 The `autoSend` command takes as input a .toml config of the below format, the fields can be overridden with the env variables in the comments.
 It uses the provided key pairs and configuraiton parameters to generate and deploy a number of contracts with a simple interface for `Put`ing to a dynamic data structure.
@@ -21,7 +21,7 @@ import (

 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	"github.com/vulcanize/tx_spammer/pkg/auto"
+	"github.com/cerc-io/tx-spammer/pkg/auto"
 )

 // autoSendCmd represents the autoSend command
@@ -33,7 +33,7 @@ var (
 )

 var rootCmd = &cobra.Command{
-	Use:              "tx_spammer",
+	Use:              "tx-spammer",
 	PersistentPreRun: initFuncs,
 }

@@ -22,7 +22,7 @@ import (
 	"github.com/sirupsen/logrus"

 	"github.com/spf13/cobra"
-	"github.com/vulcanize/tx_spammer/pkg/manual"
+	"github.com/cerc-io/tx-spammer/pkg/manual"
 )

 // sendTxsCmd represents the sendTxs command
@@ -1,65 +1,30 @@
 [eth]
-    txs = ["L2ContractDeployment", "L2ContractPutCall", "L2ContractGetCall"] # $ETH_TX_LIST
-    addrLogPath = "" # ETH_ADDR_LOG
+    keyDirPath = "./keys/" # path to the directory with all of the key pairs to use - env: $ETH_KEY_DIR_PATH
+    httpPath = "http://localhost:8545" # http url for the node we wish to send all our transactions to - env: $ETH_HTTP_PATH

-[L2ContractDeployment]
-    type = "L2"
-    httpPath = ""
-    chainID = 420
-    to = ""
-    amount = "0"
-    gasLimit = 0
-    gasPrice = "0"
-    data = ""
-    senderKeyPath = ""
-    writeSenderPath = ""
-    writeDeploymentAddrPath = ""
-    frequency = 1
-    totalNumber = 1
-    delay = 0
-    l1Sender = ""
-    l1RollupTxId = 0
-    sigHashType = 0
-    queueOrigin = 0
+[deployment]
+    number = 1 # number of contracts we will deploy for each key at keyPath - env: $ETH_DEPLOYMENT_NUMBER
+    binPath = "sol/build/Test.bin" # hex data for the contracts we will deploy - env: $ETH_DEPLOYMENT_BIN_PATH
+    gasLimit = 100000 # gasLimit to use for the deployment txs - env: $ETH_DEPLOYMENT_GAS_LIMIT
+    gasTipCap = "1000000000" # gasTipCap to use for the deployment txs - env: $ETH_DEPLOYMENT_GAS_TIP_CAP
+    gasFeeCap = "1000000007" # gasFeeCap to use for the deployment txs - env: $ETH_DEPLOYMENT_GAS_FEE_CAP

-[L2ContractPutCall]
-    type = "L2"
-    httpPath = ""
-    chainID = 420
-    to = ""
-    amount = "0"
-    gasLimit = 0
-    gasPrice = "0"
-    data = ""
-    senderKeyPath = ""
-    writeSenderPath = ""
-    frequency = 15
-    totalNumber = 1
-    delay = 60
-    l1Sender = ""
-    l1RollupTxId = 0
-    sigHashType = 0
-    queueOrigin = 0
+[contractSpammer]
+    frequency = -1 # how often to send a transaction (in milliseconds, -1 for no delay) - env: $ETH_CALL_FREQ
+    totalNumber = -1 # total number of transactions to send (per sender, -1 for unlimited) - env: $ETH_CALL_TOTAL_NUMBER
+    abiPath = "sol/build/Test.abi" # path to the abi file for the contract we are calling - env: $ETH_CALL_ABI_PATH
+    # NOTE: we expect to be calling a method such as Put(address addr, uint256 val) where the first argument is an
+    # integer than we can increment to store values at new locations in the contract trie (to grow it) and
+    # the second argument is an integer value that we store at these positions
+    methodName = "Put" # the method name we are calling - env: $ETH_CALL_METHOD_NAME
+    gasLimit = 42000 # gasLimit to use for the eth call txs - env: $ETH_CALL_GAS_LIMIT
+    gasTipCap = "1000000000" # gasTipCap to use for the eth call txs - env: $ETH_CALL_GAS_TIP_CAP
+    gasFeeCap = "1000000007" # gasFeeCap to use for the eth call txs - env: $ETH_CALL_GAS_FEE_CAP

-[L2ContractGetCall]
-    type = "L2"
-    httpPath = ""
-    chainID = 420
-    to = ""
-    amount = "0"
-    gasLimit = 0
-    gasPrice = "0"
-    data = ""
-    senderKeyPath = ""
-    writeSenderPath = ""
-    frequency = 60
-    totalNumber = 2
-    delay = 30
-    l1Sender = ""
-    l1RollupTxId = 0
-    sigHashType = 0
-    queueOrigin = 0
-
-[log]
-    level = "info"
-    file = ""
+[sendSpammer]
+    frequency = -1 # how often to send a transaction (in milliseconds, -1 for no delay) - env: $ETH_SEND_FREQ
+    totalNumber = -1 # total number of transactions to send (per sender, -1 for unlimited) - env: $ETH_SEND_TOTAL_NUMBER
+    amount = "10000" # amount of wei (1x10^-18 ETH) to send in each tx (be mindful of the genesis allocations) - env: $ETH_SEND_AMOUNT
+    gasLimit = 21000 # gasLimit to use for the eth transfer txs - env: $ETH_SEND_GAS_LIMIT
+    gasTipCap = "1000000000" # gasTipCap to use for the eth transfer txs - env: $ETH_SEND_GAS_TIP_CAP
+    gasFeeCap = "1000000007" # gasFeeCap to use for the eth transfer txs - env: $ETH_SEND_GAS_FEE_CAP
@@ -1,30 +0,0 @@
-[eth]
-    keyDirPath = "./keys/" # path to the directory with all of the key pairs to use - env: $ETH_KEY_DIR_PATH
-    httpPath = "http://localhost:8545" # http url for the node we wish to send all our transactions to - env: $ETH_HTTP_PATH
-
-[deployment]
-    number = 1 # number of contracts we will deploy for each key at keyPath - env: $ETH_DEPLOYMENT_NUMBER
-    binPath = "sol/build/Test.bin" # hex data for the contracts we will deploy - env: $ETH_DEPLOYMENT_BIN_PATH
-    gasLimit = 100000 # gasLimit to use for the deployment txs - env: $ETH_DEPLOYMENT_GAS_LIMIT
-    gasTipCap = "1000000000" # gasTipCap to use for the deployment txs - env: $ETH_DEPLOYMENT_GAS_TIP_CAP
-    gasFeeCap = "1000000007" # gasFeeCap to use for the deployment txs - env: $ETH_DEPLOYMENT_GAS_FEE_CAP
-
-[contractSpammer]
-    frequency = -1 # how often to send a transaction (in milliseconds, -1 for no delay) - env: $ETH_CALL_FREQ
-    totalNumber = -1 # total number of transactions to send (per sender, -1 for unlimited) - env: $ETH_CALL_TOTAL_NUMBER
-    abiPath = "sol/build/Test.abi" # path to the abi file for the contract we are calling - env: $ETH_CALL_ABI_PATH
-    # NOTE: we expect to be calling a method such as Put(address addr, uint256 val) where the first argument is an
-    # integer than we can increment to store values at new locations in the contract trie (to grow it) and
-    # the second argument is an integer value that we store at these positions
-    methodName = "Put" # the method name we are calling - env: $ETH_CALL_METHOD_NAME
-    gasLimit = 42000 # gasLimit to use for the eth call txs - env: $ETH_CALL_GAS_LIMIT
-    gasTipCap = "1000000000" # gasTipCap to use for the eth call txs - env: $ETH_CALL_GAS_TIP_CAP
-    gasFeeCap = "1000000007" # gasFeeCap to use for the eth call txs - env: $ETH_CALL_GAS_FEE_CAP
-
-[sendSpammer]
-    frequency = -1 # how often to send a transaction (in milliseconds, -1 for no delay) - env: $ETH_SEND_FREQ
-    totalNumber = -1 # total number of transactions to send (per sender, -1 for unlimited) - env: $ETH_SEND_TOTAL_NUMBER
-    amount = "10000" # amount of wei (1x10^-18 ETH) to send in each tx (be mindful of the genesis allocations) - env: $ETH_SEND_AMOUNT
-    gasLimit = 21000 # gasLimit to use for the eth transfer txs - env: $ETH_SEND_GAS_LIMIT
-    gasTipCap = "1000000000" # gasTipCap to use for the eth transfer txs - env: $ETH_SEND_GAS_TIP_CAP
-    gasFeeCap = "1000000007" # gasFeeCap to use for the eth transfer txs - env: $ETH_SEND_GAS_FEE_CAP
@@ -1,57 +1,73 @@
-module github.com/vulcanize/tx_spammer
+module github.com/cerc-io/tx-spammer

-go 1.13
+go 1.19

 require (
-	github.com/Azure/azure-pipeline-go v0.2.2 // indirect
-	github.com/Azure/azure-storage-blob-go v0.7.0 // indirect
-	github.com/Azure/go-autorest/autorest/adal v0.8.0 // indirect
-	github.com/StackExchange/wmi v1.2.1 // indirect
-	github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847 // indirect
-	github.com/aws/aws-sdk-go v1.25.48 // indirect
-	github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c // indirect
-	github.com/btcsuite/btcd v0.0.0-20171128150713-2e60448ffcc6 // indirect
-	github.com/btcsuite/btcd/btcec/v2 v2.2.1 // indirect
-	github.com/coreos/bbolt v1.3.2 // indirect
-	github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e // indirect
-	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
-	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
-	github.com/elastic/gosigar v0.8.1-0.20180330100440-37f05ff46ffa // indirect
-	github.com/ethereum/go-ethereum v1.10.25
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/go-stack/stack v1.8.1 // indirect
-	github.com/gorilla/websocket v1.5.0 // indirect
-	github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 // indirect
-	github.com/jmoiron/sqlx v1.2.0 // indirect
-	github.com/jonboulle/clockwork v0.1.0 // indirect
-	github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222 // indirect
-	github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff // indirect
-	github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521 // indirect
-	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
+	github.com/ethereum/go-ethereum v1.11.5
 	github.com/sirupsen/logrus v1.9.0
-	github.com/soheilhy/cmux v0.1.4 // indirect
-	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/cobra v1.6.0
 	github.com/spf13/viper v1.13.0
-	github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570 // indirect
-	github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3 // indirect
-	github.com/tklauser/go-sysconf v0.3.10 // indirect
-	github.com/tklauser/numcpus v0.5.0 // indirect
-	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
-	github.com/urfave/cli v1.22.1 // indirect
-	github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208 // indirect
-	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
-	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	go.etcd.io/bbolt v1.3.2 // indirect
-	golang.org/x/crypto v0.0.0-20221012134737-56aed061732a // indirect
-	golang.org/x/sys v0.1.0 // indirect
-	golang.org/x/text v0.4.0 // indirect
-	gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200316214253-d7b0ff38cac9 // indirect
-	gopkg.in/resty.v1 v1.12.0 // indirect
-	gopkg.in/sourcemap.v1 v1.0.5 // indirect
-	gopkg.in/urfave/cli.v1 v1.20.0 // indirect
-	gotest.tools v2.2.0+incompatible // indirect
 )

-replace github.com/ethereum/go-ethereum v1.9.10 => github.com/vulcanize/go-ethereum v1.9.10-optimism-0.0.2
+require (
+	github.com/DataDog/zstd v1.5.2 // indirect
+	github.com/VictoriaMetrics/fastcache v1.6.0 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/btcsuite/btcd v0.0.0-20171128150713-2e60448ffcc6 // indirect
+	github.com/btcsuite/btcd/btcec/v2 v2.2.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cockroachdb/errors v1.9.1 // indirect
+	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
+	github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811 // indirect
+	github.com/cockroachdb/redact v1.1.3 // indirect
+	github.com/deckarep/golang-set/v2 v2.1.0 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/getsentry/sentry-go v0.18.0 // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/go-stack/stack v1.8.1 // indirect
+	github.com/gofrs/flock v0.8.1 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
+	github.com/holiman/uint256 v1.2.0 // indirect
+	github.com/inconshreveable/mousetrap v1.0.1 // indirect
+	github.com/klauspost/compress v1.15.15 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/magiconair/properties v1.8.6 // indirect
+	github.com/mattn/go-runewidth v0.0.9 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/olekukonko/tablewriter v0.0.5 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.5 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.14.0 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.39.0 // indirect
+	github.com/prometheus/procfs v0.9.0 // indirect
+	github.com/rogpeppe/go-internal v1.9.0 // indirect
+	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
+	github.com/spf13/afero v1.9.2 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/subosito/gotenv v1.4.1 // indirect
+	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
+	github.com/tklauser/go-sysconf v0.3.10 // indirect
+	github.com/tklauser/numcpus v0.5.0 // indirect
+	github.com/yusufpapurcu/wmi v1.2.2 // indirect
+	golang.org/x/crypto v0.1.0 // indirect
+	golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
+	golang.org/x/sys v0.5.0 // indirect
+	golang.org/x/text v0.7.0 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)
@@ -15,7 +15,7 @@

 package main

-import "github.com/vulcanize/tx_spammer/cmd"
+import "github.com/cerc-io/tx-spammer/cmd"

 func main() {
 	cmd.Execute()
@@ -21,7 +21,6 @@ import (
 	"context"
 	"crypto/ecdsa"
 	"fmt"
-	"github.com/ethereum/go-ethereum/ethclient"
 	"io/ioutil"
 	"math"
 	"math/big"
@@ -29,13 +28,15 @@ import (
 	"strings"
 	"time"

+	"github.com/ethereum/go-ethereum/ethclient"
+
+	"github.com/cerc-io/tx-spammer/pkg/shared"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/spf13/viper"
-	"github.com/vulcanize/tx_spammer/pkg/shared"
 )

 var (
@@ -18,12 +18,13 @@ package auto

 import (
 	"crypto/ecdsa"
-	"github.com/sirupsen/logrus"
 	"time"

+	"github.com/sirupsen/logrus"
+
+	"github.com/cerc-io/tx-spammer/pkg/shared"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/rpc"
-	"github.com/vulcanize/tx_spammer/pkg/shared"
 )

 const (
@@ -17,10 +17,10 @@
 package auto

 import (
+	"github.com/cerc-io/tx-spammer/pkg/shared"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/sirupsen/logrus"
-	"github.com/vulcanize/tx_spammer/pkg/shared"
 )

 // EthSender sends eth value transfer txs
@@ -19,8 +19,8 @@ package auto
 import (
 	"fmt"

+	"github.com/cerc-io/tx-spammer/pkg/shared"
 	"github.com/sirupsen/logrus"
-	"github.com/vulcanize/tx_spammer/pkg/shared"
 )

 // Spammer underlying struct type for spamming service
@@ -19,16 +19,17 @@ package auto
 import (
 	"context"
 	"crypto/ecdsa"
-	"github.com/ethereum/go-ethereum/crypto"
-	log "github.com/sirupsen/logrus"
 	"math/big"
 	"math/rand"
 	"sync"
 	"time"

+	"github.com/ethereum/go-ethereum/crypto"
+	log "github.com/sirupsen/logrus"
+
+	"github.com/cerc-io/tx-spammer/pkg/shared"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/vulcanize/tx_spammer/pkg/shared"
 )

 // TxGenerator generates and signs txs
@@ -2,10 +2,11 @@ package auto

 import (
 	"context"
+	"time"
+
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/sirupsen/logrus"
-	"time"
 )

 type TxWatcher struct {
@@ -23,7 +23,7 @@ import (

 	"github.com/sirupsen/logrus"

-	"github.com/vulcanize/tx_spammer/pkg/shared"
+	"github.com/cerc-io/tx-spammer/pkg/shared"
 )

 // TxSender type for
@@ -17,8 +17,8 @@
 package manual

 import (
+	"github.com/cerc-io/tx-spammer/pkg/shared"
 	"github.com/sirupsen/logrus"
-	"github.com/vulcanize/tx_spammer/pkg/shared"
 )

 type Spammer struct {
@@ -19,10 +19,10 @@ package manual
 import (
 	"sync/atomic"

+	"github.com/cerc-io/tx-spammer/pkg/shared"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/vulcanize/tx_spammer/pkg/shared"
 )

 // TxGenerator generates and signs txs
@@ -18,35 +18,36 @@ package shared

 import (
 	"context"
-	"github.com/sirupsen/logrus"
 	"math/big"
 	"os"

-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/sirupsen/logrus"

+	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/rpc"
 )

-// ChainConfig returns the appropriate ethereum chain config for the provided chain id
+// TxSigner returns the London signer at the provided block height
 func TxSigner(chainID *big.Int) types.Signer {
 	return types.NewLondonSigner(chainID)
 }

 // SendTransaction sends a signed tx using the provided client
 func SendTransaction(rpcClient *rpc.Client, tx *types.Transaction) error {
-	msg, _ := tx.AsMessage(TxSigner(tx.ChainId()), big.NewInt(1))
+	msg, _ := core.TransactionToMessage(tx, TxSigner(tx.ChainId()), big.NewInt(1))
 	if nil == tx.To() {
 		logrus.Debugf("TX %s to create contract %s (sender %s)",
-			tx.Hash().Hex(), crypto.CreateAddress(msg.From(), tx.Nonce()), msg.From().Hex())
+			tx.Hash().Hex(), crypto.CreateAddress(msg.From, tx.Nonce()), msg.From.Hex())
 	} else if nil == tx.Data() || len(tx.Data()) == 0 {
 		logrus.Debugf("TX %s sending %s Wei to %s (sender %s)",
-			tx.Hash().Hex(), tx.Value().String(), msg.To().Hex(), msg.From().Hex())
+			tx.Hash().Hex(), tx.Value().String(), tx.To().Hex(), msg.From.Hex())
 	} else {
 		logrus.Debugf("TX %s calling contract %s (sender %s)",
-			tx.Hash().Hex(), msg.To().Hex(), msg.From().Hex())
+			tx.Hash().Hex(), tx.To().Hex(), msg.From.Hex())
 	}

 	data, err := tx.MarshalBinary()
@@ -1,16 +1,35 @@
 #!/bin/sh

-set -e
-set +x
-test $SPAMMER_COMMAND
 set +e
+if [ -z "$SPAMMER_COMMAND" ]; then
+  echo "SPAMMER_COMMAND env value is required!"
+  exit 2
+fi
+
+if [ -z "$LOG_LEVEL" ]; then
+  LOG_LEVEL="debug"
+fi
+
+if [ ! -z "$ACCOUNTS_CSV_URL" ] && [ ! -d "keys" ]; then
+  mkdir keys
+  wget -O accounts.csv $ACCOUNTS_CSV_URL
+  i=0
+  for line in `cat accounts.csv`; do
+    echo $line | cut -d',' -f3 | sed 's/^0x//' > keys/$i.key
+    i=$((i + 1))
+  done
+fi
+
+if [ ! -d "accounts/addresses" ]; then
+  mkdir -p "accounts/addresses"
+fi

 echo "Running tx spammer"
-./tx_spammer ${SPAMMER_COMMAND} --config=config.toml --log-file=${LOG_FILE} --log-level=${LOG_LEVEL}
+./tx-spammer ${SPAMMER_COMMAND} --config=config.toml --log-level=${LOG_LEVEL}

 if [ $? -eq 0 ]; then
    echo "tx spammer ran successfully"
 else
    echo "tx spammer ran with error. Is the config file correct?"
    exit 1
-fi
+fi
Author	SHA1	Message	Date
i-norden	01cb9fb46c	update workflows with fixed name	2023-04-07 14:37:05 -05:00
Ian Norden	18518e7cb5	Merge pull request #19 from cerc-io/ian_dev update to get v1.11.5	2023-04-03 00:00:52 -05:00
i-norden	d1455a9cbd	use core.TransactionToMessage	2023-04-02 23:37:04 -05:00
i-norden	b699663536	update dep	2023-03-31 08:57:31 -05:00
telackey	e09975d0c8	Rebrand to cerc-io/tx-spammer (#15 )	2022-12-21 09:59:07 -06:00