Skip to content

Commit

Permalink
chore: lower beekeeper timeout [debug]
Browse files Browse the repository at this point in the history
  • Loading branch information
mrekucci committed Nov 22, 2023
1 parent 2e5ce64 commit d863e58
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/beekeeper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ env:
K3S_VERSION: "v1.22.17+k3s1"
REPLICA: 3
RUN_TYPE: "PR RUN"
SETUP_CONTRACT_IMAGE_TAG: "2.0.1"
SETUP_CONTRACT_IMAGE_TAG: "1.0.5"
BEELOCAL_BRANCH: "main"
BEEKEEPER_BRANCH: "master"
BEEKEEPER_METRICS_ENABLED: false
REACHABILITY_OVERRIDE_PUBLIC: true
BATCHFACTOR_OVERRIDE_PUBLIC: 2
TIMEOUT: 30m
TIMEOUT: 2m
BUCKET_NAME: swarm-beekeeper-artifacts
AWS_ACCESS_KEY_ID: ${{ secrets.DO_AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.DO_AWS_SECRET_ACCESS_KEY }}
Expand Down
5 changes: 4 additions & 1 deletion pkg/settlement/swap/chequebook/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (

"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common"
"github.com/ethersphere/bee/pkg/log"
"github.com/ethersphere/bee/pkg/sctx"
"github.com/ethersphere/bee/pkg/transaction"
"github.com/ethersphere/bee/pkg/util/abiutil"
Expand Down Expand Up @@ -54,7 +55,7 @@ type simpleSwapDeployedEvent struct {
}

// the bytecode of factories which can be used for deployment
var currentDeployVersion []byte = common.FromHex(sw3abi.SimpleSwapFactoryDeployedBinv0_5_4)
var currentDeployVersion = common.FromHex(sw3abi.SimpleSwapFactoryDeployedBinv0_5_4)

// the bytecode of factories from which we accept chequebooks
var supportedVersions = [][]byte{
Expand Down Expand Up @@ -114,11 +115,13 @@ func (c *factory) WaitDeployed(ctx context.Context, txHash common.Hash) (common.

// VerifyBytecode checks that the factory is valid.
func (c *factory) VerifyBytecode(ctx context.Context) (err error) {
logger := log.NewLogger("node").WithName("chequebook-factory").Register()
code, err := c.backend.CodeAt(ctx, c.address, nil)
if err != nil {
return err
}

logger.Info("factory code", "code_len", len(code))
if !bytes.Equal(code, currentDeployVersion) {
return ErrInvalidFactory
}
Expand Down

0 comments on commit d863e58

Please sign in to comment.