diff --git a/.github/workflows/beekeeper.yml b/.github/workflows/beekeeper.yml index 2c5541599d6..c9ae54dceb1 100644 --- a/.github/workflows/beekeeper.yml +++ b/.github/workflows/beekeeper.yml @@ -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: "2.0.2" BEELOCAL_BRANCH: "main" BEEKEEPER_BRANCH: "master" BEEKEEPER_METRICS_ENABLED: false REACHABILITY_OVERRIDE_PUBLIC: true BATCHFACTOR_OVERRIDE_PUBLIC: 2 - TIMEOUT: 30m + TIMEOUT: 3m 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 }} diff --git a/pkg/settlement/swap/chequebook/factory.go b/pkg/settlement/swap/chequebook/factory.go index e1cb19e8ea6..5117c755d02 100644 --- a/pkg/settlement/swap/chequebook/factory.go +++ b/pkg/settlement/swap/chequebook/factory.go @@ -12,10 +12,12 @@ 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" "github.com/ethersphere/go-sw3-abi/sw3abi" + "github.com/google/go-cmp/cmp" "golang.org/x/net/context" ) @@ -54,7 +56,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{ @@ -114,11 +116,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", "diff", cmp.Diff(code, currentDeployVersion)) if !bytes.Equal(code, currentDeployVersion) { return ErrInvalidFactory }