Skip to content

Commit 849c433

Browse files
committed
Update geth to 1.9.24
1 parent bfb05cb commit 849c433

File tree

15 files changed

+1076
-432
lines changed

15 files changed

+1076
-432
lines changed

core/adapters/random_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import (
44
"math/big"
55
"testing"
66

7+
"github.com/ethereum/go-ethereum/accounts/abi"
8+
79
"github.com/smartcontractkit/chainlink/core/adapters"
810
"github.com/smartcontractkit/chainlink/core/internal/cltest"
911
tvrf "github.com/smartcontractkit/chainlink/core/internal/cltest/vrf"
@@ -40,7 +42,8 @@ func TestRandom_Perform(t *testing.T) {
4042
require.NoError(t, result.Error(), "while running random adapter")
4143
proofArg := hexutil.MustDecode(result.Result().String())
4244
var wireProof []byte
43-
err = models.VRFFulfillMethod().Inputs.Unpack(&wireProof, proofArg)
45+
out, err := models.VRFFulfillMethod().Inputs.Unpack(proofArg)
46+
wireProof = abi.ConvertType(out[0], []byte{}).([]byte)
4447
require.NoError(t, err, "failed to unpack VRF proof from random adapter")
4548
var onChainResponse vrf.MarshaledOnChainResponse
4649
require.Equal(t, copy(onChainResponse[:], wireProof),

core/internal/cltest/client.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,11 @@ func (c *SimulatedBackendClient) GetERC20Balance(address common.Address, contrac
160160
return nil, errors.Wrapf(err, "while calling ERC20 balanceOf method on %s "+
161161
"for balance of %s", contractAddress, address)
162162
}
163-
balance = new(big.Int)
164-
return balance, balanceOfABI.Unpack(balance, "balanceOf", b)
163+
err = balanceOfABI.UnpackIntoInterface(balance, "balanceOf", b)
164+
if err != nil {
165+
return nil, errors.New("unable to unpack balance")
166+
}
167+
return balance, nil
165168
}
166169

167170
func (c *SimulatedBackendClient) GetLINKBalance(linkAddress common.Address, address common.Address) (*assets.Link, error) {

core/internal/gethwrappers/generated/flags_wrapper/flags_wrapper.go

Lines changed: 68 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)