diff --git a/core/adapters/eth_tx.go b/core/adapters/eth_tx.go index c1aabeb6ec4..e88cf321a31 100644 --- a/core/adapters/eth_tx.go +++ b/core/adapters/eth_tx.go @@ -52,9 +52,8 @@ func (e *EthTx) TaskType() models.TaskType { func (e *EthTx) Perform(input models.RunInput, store *strpkg.Store) models.RunOutput { if store.Config.EnableBulletproofTxManager() { return e.perform(input, store) - } else { - return e.legacyPerform(input, store) } + return e.legacyPerform(input, store) } // TODO(sam): https://www.pivotaltracker.com/story/show/173280188 diff --git a/core/adapters/eth_tx_abi_encode.go b/core/adapters/eth_tx_abi_encode.go index f7300a9f053..45fcc7461db 100644 --- a/core/adapters/eth_tx_abi_encode.go +++ b/core/adapters/eth_tx_abi_encode.go @@ -7,6 +7,7 @@ import ( "fmt" "math/big" "regexp" + "strings" "github.com/pkg/errors" @@ -143,7 +144,7 @@ func abiEncode(fnABI *abi.Method, args map[string]interface{}) ([]byte, error) { panic("unexpected size of static part") } - result := fnABI.ID() + result := functionSelector(fnABI) result = append(result, encodedStaticPart...) result = append(result, encodedDynamicPart...) return result, nil @@ -457,3 +458,12 @@ func assertPadded(b []byte) { panic("ABI encoded data isn't padded properly") } } + +func functionSelector(fnABI *abi.Method) []byte { + types := []string{} + for _, input := range fnABI.Inputs { + types = append(types, input.Type.String()) + } + signature := fmt.Sprintf("%v(%v)", fnABI.Name, strings.Join(types, ",")) + return utils.MustHash(signature).Bytes()[:4] +} diff --git a/core/adapters/eth_tx_abi_encode_test.go b/core/adapters/eth_tx_abi_encode_test.go index c69ae07b545..156b1568b3d 100644 --- a/core/adapters/eth_tx_abi_encode_test.go +++ b/core/adapters/eth_tx_abi_encode_test.go @@ -71,22 +71,10 @@ func TestEthTxABIEncodeAdapter_Perform_ConfirmedWithJSON(t *testing.T) { Name: "verifyVRFProof", RawName: "verifyVRFProof", Inputs: []abi.Argument{ - abi.Argument{ - Name: "gammaX", - Type: uint256Type, - }, - abi.Argument{ - Name: "gammaY", - Type: uint256Type, - }, - abi.Argument{ - Name: "c", - Type: uint256Type, - }, - abi.Argument{ - Name: "s", - Type: uint256Type, - }, + {Name: "gammaX", Type: uint256Type}, + {Name: "gammaY", Type: uint256Type}, + {Name: "c", Type: uint256Type}, + {Name: "s", Type: uint256Type}, }, Outputs: []abi.Argument{}, }, diff --git a/core/eth/contracts.go b/core/eth/contracts.go index 4836b2df8c5..dc3e4d0ac27 100644 --- a/core/eth/contracts.go +++ b/core/eth/contracts.go @@ -87,7 +87,7 @@ func (cc *contractCodec) GetMethodID(method string) ([]byte, error) { if !found { return []byte{}, errors.New("unable to find contract method " + method) } - return mabi.ID(), nil + return mabi.ID, nil } // MustGetV6ContractEventID finds the event for the given contract by searching @@ -102,7 +102,7 @@ func MustGetV6ContractEventID(name, eventName string) common.Hash { if !found { logger.Panic(fmt.Errorf("unable to find event %s for contract %s", eventName, name)) } - return event.ID() + return event.ID } func (cc *contractCodec) UnpackLog(out interface{}, event string, log Log) error { diff --git a/core/internal/gethwrappers/generated/flux_aggregator_wrapper/flux_aggregator_wrapper.go b/core/internal/gethwrappers/generated/flux_aggregator_wrapper/flux_aggregator_wrapper.go index d2b04d7d859..016f0f320d2 100644 --- a/core/internal/gethwrappers/generated/flux_aggregator_wrapper/flux_aggregator_wrapper.go +++ b/core/internal/gethwrappers/generated/flux_aggregator_wrapper/flux_aggregator_wrapper.go @@ -20,7 +20,6 @@ var ( _ = big.NewInt _ = strings.NewReader _ = ethereum.NotFound - _ = abi.U256 _ = bind.Bind _ = common.Big1 _ = types.BloomLookup @@ -191,7 +190,7 @@ func (_FluxAggregator *FluxAggregatorTransactorRaw) Transact(opts *bind.Transact // AllocatedFunds is a free data retrieval call binding the contract method 0xd4cc54e4. // -// Solidity: function allocatedFunds() constant returns(uint128) +// Solidity: function allocatedFunds() view returns(uint128) func (_FluxAggregator *FluxAggregatorCaller) AllocatedFunds(opts *bind.CallOpts) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -203,21 +202,21 @@ func (_FluxAggregator *FluxAggregatorCaller) AllocatedFunds(opts *bind.CallOpts) // AllocatedFunds is a free data retrieval call binding the contract method 0xd4cc54e4. // -// Solidity: function allocatedFunds() constant returns(uint128) +// Solidity: function allocatedFunds() view returns(uint128) func (_FluxAggregator *FluxAggregatorSession) AllocatedFunds() (*big.Int, error) { return _FluxAggregator.Contract.AllocatedFunds(&_FluxAggregator.CallOpts) } // AllocatedFunds is a free data retrieval call binding the contract method 0xd4cc54e4. // -// Solidity: function allocatedFunds() constant returns(uint128) +// Solidity: function allocatedFunds() view returns(uint128) func (_FluxAggregator *FluxAggregatorCallerSession) AllocatedFunds() (*big.Int, error) { return _FluxAggregator.Contract.AllocatedFunds(&_FluxAggregator.CallOpts) } // AvailableFunds is a free data retrieval call binding the contract method 0x46fcff4c. // -// Solidity: function availableFunds() constant returns(uint128) +// Solidity: function availableFunds() view returns(uint128) func (_FluxAggregator *FluxAggregatorCaller) AvailableFunds(opts *bind.CallOpts) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -229,21 +228,21 @@ func (_FluxAggregator *FluxAggregatorCaller) AvailableFunds(opts *bind.CallOpts) // AvailableFunds is a free data retrieval call binding the contract method 0x46fcff4c. // -// Solidity: function availableFunds() constant returns(uint128) +// Solidity: function availableFunds() view returns(uint128) func (_FluxAggregator *FluxAggregatorSession) AvailableFunds() (*big.Int, error) { return _FluxAggregator.Contract.AvailableFunds(&_FluxAggregator.CallOpts) } // AvailableFunds is a free data retrieval call binding the contract method 0x46fcff4c. // -// Solidity: function availableFunds() constant returns(uint128) +// Solidity: function availableFunds() view returns(uint128) func (_FluxAggregator *FluxAggregatorCallerSession) AvailableFunds() (*big.Int, error) { return _FluxAggregator.Contract.AvailableFunds(&_FluxAggregator.CallOpts) } // Decimals is a free data retrieval call binding the contract method 0x313ce567. // -// Solidity: function decimals() constant returns(uint8) +// Solidity: function decimals() view returns(uint8) func (_FluxAggregator *FluxAggregatorCaller) Decimals(opts *bind.CallOpts) (uint8, error) { var ( ret0 = new(uint8) @@ -255,21 +254,21 @@ func (_FluxAggregator *FluxAggregatorCaller) Decimals(opts *bind.CallOpts) (uint // Decimals is a free data retrieval call binding the contract method 0x313ce567. // -// Solidity: function decimals() constant returns(uint8) +// Solidity: function decimals() view returns(uint8) func (_FluxAggregator *FluxAggregatorSession) Decimals() (uint8, error) { return _FluxAggregator.Contract.Decimals(&_FluxAggregator.CallOpts) } // Decimals is a free data retrieval call binding the contract method 0x313ce567. // -// Solidity: function decimals() constant returns(uint8) +// Solidity: function decimals() view returns(uint8) func (_FluxAggregator *FluxAggregatorCallerSession) Decimals() (uint8, error) { return _FluxAggregator.Contract.Decimals(&_FluxAggregator.CallOpts) } // Description is a free data retrieval call binding the contract method 0x7284e416. // -// Solidity: function description() constant returns(string) +// Solidity: function description() view returns(string) func (_FluxAggregator *FluxAggregatorCaller) Description(opts *bind.CallOpts) (string, error) { var ( ret0 = new(string) @@ -281,21 +280,21 @@ func (_FluxAggregator *FluxAggregatorCaller) Description(opts *bind.CallOpts) (s // Description is a free data retrieval call binding the contract method 0x7284e416. // -// Solidity: function description() constant returns(string) +// Solidity: function description() view returns(string) func (_FluxAggregator *FluxAggregatorSession) Description() (string, error) { return _FluxAggregator.Contract.Description(&_FluxAggregator.CallOpts) } // Description is a free data retrieval call binding the contract method 0x7284e416. // -// Solidity: function description() constant returns(string) +// Solidity: function description() view returns(string) func (_FluxAggregator *FluxAggregatorCallerSession) Description() (string, error) { return _FluxAggregator.Contract.Description(&_FluxAggregator.CallOpts) } // GetAdmin is a free data retrieval call binding the contract method 0x64efb22b. // -// Solidity: function getAdmin(address _oracle) constant returns(address) +// Solidity: function getAdmin(address _oracle) view returns(address) func (_FluxAggregator *FluxAggregatorCaller) GetAdmin(opts *bind.CallOpts, _oracle common.Address) (common.Address, error) { var ( ret0 = new(common.Address) @@ -307,21 +306,21 @@ func (_FluxAggregator *FluxAggregatorCaller) GetAdmin(opts *bind.CallOpts, _orac // GetAdmin is a free data retrieval call binding the contract method 0x64efb22b. // -// Solidity: function getAdmin(address _oracle) constant returns(address) +// Solidity: function getAdmin(address _oracle) view returns(address) func (_FluxAggregator *FluxAggregatorSession) GetAdmin(_oracle common.Address) (common.Address, error) { return _FluxAggregator.Contract.GetAdmin(&_FluxAggregator.CallOpts, _oracle) } // GetAdmin is a free data retrieval call binding the contract method 0x64efb22b. // -// Solidity: function getAdmin(address _oracle) constant returns(address) +// Solidity: function getAdmin(address _oracle) view returns(address) func (_FluxAggregator *FluxAggregatorCallerSession) GetAdmin(_oracle common.Address) (common.Address, error) { return _FluxAggregator.Contract.GetAdmin(&_FluxAggregator.CallOpts, _oracle) } // GetAnswer is a free data retrieval call binding the contract method 0xb5ab58dc. // -// Solidity: function getAnswer(uint256 _roundId) constant returns(int256) +// Solidity: function getAnswer(uint256 _roundId) view returns(int256) func (_FluxAggregator *FluxAggregatorCaller) GetAnswer(opts *bind.CallOpts, _roundId *big.Int) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -333,21 +332,21 @@ func (_FluxAggregator *FluxAggregatorCaller) GetAnswer(opts *bind.CallOpts, _rou // GetAnswer is a free data retrieval call binding the contract method 0xb5ab58dc. // -// Solidity: function getAnswer(uint256 _roundId) constant returns(int256) +// Solidity: function getAnswer(uint256 _roundId) view returns(int256) func (_FluxAggregator *FluxAggregatorSession) GetAnswer(_roundId *big.Int) (*big.Int, error) { return _FluxAggregator.Contract.GetAnswer(&_FluxAggregator.CallOpts, _roundId) } // GetAnswer is a free data retrieval call binding the contract method 0xb5ab58dc. // -// Solidity: function getAnswer(uint256 _roundId) constant returns(int256) +// Solidity: function getAnswer(uint256 _roundId) view returns(int256) func (_FluxAggregator *FluxAggregatorCallerSession) GetAnswer(_roundId *big.Int) (*big.Int, error) { return _FluxAggregator.Contract.GetAnswer(&_FluxAggregator.CallOpts, _roundId) } // GetOracles is a free data retrieval call binding the contract method 0x40884c52. // -// Solidity: function getOracles() constant returns(address[]) +// Solidity: function getOracles() view returns(address[]) func (_FluxAggregator *FluxAggregatorCaller) GetOracles(opts *bind.CallOpts) ([]common.Address, error) { var ( ret0 = new([]common.Address) @@ -359,21 +358,21 @@ func (_FluxAggregator *FluxAggregatorCaller) GetOracles(opts *bind.CallOpts) ([] // GetOracles is a free data retrieval call binding the contract method 0x40884c52. // -// Solidity: function getOracles() constant returns(address[]) +// Solidity: function getOracles() view returns(address[]) func (_FluxAggregator *FluxAggregatorSession) GetOracles() ([]common.Address, error) { return _FluxAggregator.Contract.GetOracles(&_FluxAggregator.CallOpts) } // GetOracles is a free data retrieval call binding the contract method 0x40884c52. // -// Solidity: function getOracles() constant returns(address[]) +// Solidity: function getOracles() view returns(address[]) func (_FluxAggregator *FluxAggregatorCallerSession) GetOracles() ([]common.Address, error) { return _FluxAggregator.Contract.GetOracles(&_FluxAggregator.CallOpts) } // GetRoundData is a free data retrieval call binding the contract method 0x0720da52. // -// Solidity: function getRoundData(uint256 _roundId) constant returns(uint256 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint256 answeredInRound) +// Solidity: function getRoundData(uint256 _roundId) view returns(uint256 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint256 answeredInRound) func (_FluxAggregator *FluxAggregatorCaller) GetRoundData(opts *bind.CallOpts, _roundId *big.Int) (struct { RoundId *big.Int Answer *big.Int @@ -395,7 +394,7 @@ func (_FluxAggregator *FluxAggregatorCaller) GetRoundData(opts *bind.CallOpts, _ // GetRoundData is a free data retrieval call binding the contract method 0x0720da52. // -// Solidity: function getRoundData(uint256 _roundId) constant returns(uint256 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint256 answeredInRound) +// Solidity: function getRoundData(uint256 _roundId) view returns(uint256 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint256 answeredInRound) func (_FluxAggregator *FluxAggregatorSession) GetRoundData(_roundId *big.Int) (struct { RoundId *big.Int Answer *big.Int @@ -408,7 +407,7 @@ func (_FluxAggregator *FluxAggregatorSession) GetRoundData(_roundId *big.Int) (s // GetRoundData is a free data retrieval call binding the contract method 0x0720da52. // -// Solidity: function getRoundData(uint256 _roundId) constant returns(uint256 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint256 answeredInRound) +// Solidity: function getRoundData(uint256 _roundId) view returns(uint256 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint256 answeredInRound) func (_FluxAggregator *FluxAggregatorCallerSession) GetRoundData(_roundId *big.Int) (struct { RoundId *big.Int Answer *big.Int @@ -421,7 +420,7 @@ func (_FluxAggregator *FluxAggregatorCallerSession) GetRoundData(_roundId *big.I // GetTimestamp is a free data retrieval call binding the contract method 0xb633620c. // -// Solidity: function getTimestamp(uint256 _roundId) constant returns(uint256) +// Solidity: function getTimestamp(uint256 _roundId) view returns(uint256) func (_FluxAggregator *FluxAggregatorCaller) GetTimestamp(opts *bind.CallOpts, _roundId *big.Int) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -433,21 +432,21 @@ func (_FluxAggregator *FluxAggregatorCaller) GetTimestamp(opts *bind.CallOpts, _ // GetTimestamp is a free data retrieval call binding the contract method 0xb633620c. // -// Solidity: function getTimestamp(uint256 _roundId) constant returns(uint256) +// Solidity: function getTimestamp(uint256 _roundId) view returns(uint256) func (_FluxAggregator *FluxAggregatorSession) GetTimestamp(_roundId *big.Int) (*big.Int, error) { return _FluxAggregator.Contract.GetTimestamp(&_FluxAggregator.CallOpts, _roundId) } // GetTimestamp is a free data retrieval call binding the contract method 0xb633620c. // -// Solidity: function getTimestamp(uint256 _roundId) constant returns(uint256) +// Solidity: function getTimestamp(uint256 _roundId) view returns(uint256) func (_FluxAggregator *FluxAggregatorCallerSession) GetTimestamp(_roundId *big.Int) (*big.Int, error) { return _FluxAggregator.Contract.GetTimestamp(&_FluxAggregator.CallOpts, _roundId) } // LatestAnswer is a free data retrieval call binding the contract method 0x50d25bcd. // -// Solidity: function latestAnswer() constant returns(int256) +// Solidity: function latestAnswer() view returns(int256) func (_FluxAggregator *FluxAggregatorCaller) LatestAnswer(opts *bind.CallOpts) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -459,21 +458,21 @@ func (_FluxAggregator *FluxAggregatorCaller) LatestAnswer(opts *bind.CallOpts) ( // LatestAnswer is a free data retrieval call binding the contract method 0x50d25bcd. // -// Solidity: function latestAnswer() constant returns(int256) +// Solidity: function latestAnswer() view returns(int256) func (_FluxAggregator *FluxAggregatorSession) LatestAnswer() (*big.Int, error) { return _FluxAggregator.Contract.LatestAnswer(&_FluxAggregator.CallOpts) } // LatestAnswer is a free data retrieval call binding the contract method 0x50d25bcd. // -// Solidity: function latestAnswer() constant returns(int256) +// Solidity: function latestAnswer() view returns(int256) func (_FluxAggregator *FluxAggregatorCallerSession) LatestAnswer() (*big.Int, error) { return _FluxAggregator.Contract.LatestAnswer(&_FluxAggregator.CallOpts) } // LatestRound is a free data retrieval call binding the contract method 0x668a0f02. // -// Solidity: function latestRound() constant returns(uint256) +// Solidity: function latestRound() view returns(uint256) func (_FluxAggregator *FluxAggregatorCaller) LatestRound(opts *bind.CallOpts) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -485,21 +484,21 @@ func (_FluxAggregator *FluxAggregatorCaller) LatestRound(opts *bind.CallOpts) (* // LatestRound is a free data retrieval call binding the contract method 0x668a0f02. // -// Solidity: function latestRound() constant returns(uint256) +// Solidity: function latestRound() view returns(uint256) func (_FluxAggregator *FluxAggregatorSession) LatestRound() (*big.Int, error) { return _FluxAggregator.Contract.LatestRound(&_FluxAggregator.CallOpts) } // LatestRound is a free data retrieval call binding the contract method 0x668a0f02. // -// Solidity: function latestRound() constant returns(uint256) +// Solidity: function latestRound() view returns(uint256) func (_FluxAggregator *FluxAggregatorCallerSession) LatestRound() (*big.Int, error) { return _FluxAggregator.Contract.LatestRound(&_FluxAggregator.CallOpts) } // LatestRoundData is a free data retrieval call binding the contract method 0xfeaf968c. // -// Solidity: function latestRoundData() constant returns(uint256 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint256 answeredInRound) +// Solidity: function latestRoundData() view returns(uint256 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint256 answeredInRound) func (_FluxAggregator *FluxAggregatorCaller) LatestRoundData(opts *bind.CallOpts) (struct { RoundId *big.Int Answer *big.Int @@ -521,7 +520,7 @@ func (_FluxAggregator *FluxAggregatorCaller) LatestRoundData(opts *bind.CallOpts // LatestRoundData is a free data retrieval call binding the contract method 0xfeaf968c. // -// Solidity: function latestRoundData() constant returns(uint256 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint256 answeredInRound) +// Solidity: function latestRoundData() view returns(uint256 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint256 answeredInRound) func (_FluxAggregator *FluxAggregatorSession) LatestRoundData() (struct { RoundId *big.Int Answer *big.Int @@ -534,7 +533,7 @@ func (_FluxAggregator *FluxAggregatorSession) LatestRoundData() (struct { // LatestRoundData is a free data retrieval call binding the contract method 0xfeaf968c. // -// Solidity: function latestRoundData() constant returns(uint256 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint256 answeredInRound) +// Solidity: function latestRoundData() view returns(uint256 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint256 answeredInRound) func (_FluxAggregator *FluxAggregatorCallerSession) LatestRoundData() (struct { RoundId *big.Int Answer *big.Int @@ -547,7 +546,7 @@ func (_FluxAggregator *FluxAggregatorCallerSession) LatestRoundData() (struct { // LatestSubmission is a free data retrieval call binding the contract method 0xbb07bacd. // -// Solidity: function latestSubmission(address _oracle) constant returns(int256, uint256) +// Solidity: function latestSubmission(address _oracle) view returns(int256, uint256) func (_FluxAggregator *FluxAggregatorCaller) LatestSubmission(opts *bind.CallOpts, _oracle common.Address) (*big.Int, *big.Int, error) { var ( ret0 = new(*big.Int) @@ -563,21 +562,21 @@ func (_FluxAggregator *FluxAggregatorCaller) LatestSubmission(opts *bind.CallOpt // LatestSubmission is a free data retrieval call binding the contract method 0xbb07bacd. // -// Solidity: function latestSubmission(address _oracle) constant returns(int256, uint256) +// Solidity: function latestSubmission(address _oracle) view returns(int256, uint256) func (_FluxAggregator *FluxAggregatorSession) LatestSubmission(_oracle common.Address) (*big.Int, *big.Int, error) { return _FluxAggregator.Contract.LatestSubmission(&_FluxAggregator.CallOpts, _oracle) } // LatestSubmission is a free data retrieval call binding the contract method 0xbb07bacd. // -// Solidity: function latestSubmission(address _oracle) constant returns(int256, uint256) +// Solidity: function latestSubmission(address _oracle) view returns(int256, uint256) func (_FluxAggregator *FluxAggregatorCallerSession) LatestSubmission(_oracle common.Address) (*big.Int, *big.Int, error) { return _FluxAggregator.Contract.LatestSubmission(&_FluxAggregator.CallOpts, _oracle) } // LatestTimestamp is a free data retrieval call binding the contract method 0x8205bf6a. // -// Solidity: function latestTimestamp() constant returns(uint256) +// Solidity: function latestTimestamp() view returns(uint256) func (_FluxAggregator *FluxAggregatorCaller) LatestTimestamp(opts *bind.CallOpts) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -589,21 +588,21 @@ func (_FluxAggregator *FluxAggregatorCaller) LatestTimestamp(opts *bind.CallOpts // LatestTimestamp is a free data retrieval call binding the contract method 0x8205bf6a. // -// Solidity: function latestTimestamp() constant returns(uint256) +// Solidity: function latestTimestamp() view returns(uint256) func (_FluxAggregator *FluxAggregatorSession) LatestTimestamp() (*big.Int, error) { return _FluxAggregator.Contract.LatestTimestamp(&_FluxAggregator.CallOpts) } // LatestTimestamp is a free data retrieval call binding the contract method 0x8205bf6a. // -// Solidity: function latestTimestamp() constant returns(uint256) +// Solidity: function latestTimestamp() view returns(uint256) func (_FluxAggregator *FluxAggregatorCallerSession) LatestTimestamp() (*big.Int, error) { return _FluxAggregator.Contract.LatestTimestamp(&_FluxAggregator.CallOpts) } // LinkToken is a free data retrieval call binding the contract method 0x57970e93. // -// Solidity: function linkToken() constant returns(address) +// Solidity: function linkToken() view returns(address) func (_FluxAggregator *FluxAggregatorCaller) LinkToken(opts *bind.CallOpts) (common.Address, error) { var ( ret0 = new(common.Address) @@ -615,21 +614,21 @@ func (_FluxAggregator *FluxAggregatorCaller) LinkToken(opts *bind.CallOpts) (com // LinkToken is a free data retrieval call binding the contract method 0x57970e93. // -// Solidity: function linkToken() constant returns(address) +// Solidity: function linkToken() view returns(address) func (_FluxAggregator *FluxAggregatorSession) LinkToken() (common.Address, error) { return _FluxAggregator.Contract.LinkToken(&_FluxAggregator.CallOpts) } // LinkToken is a free data retrieval call binding the contract method 0x57970e93. // -// Solidity: function linkToken() constant returns(address) +// Solidity: function linkToken() view returns(address) func (_FluxAggregator *FluxAggregatorCallerSession) LinkToken() (common.Address, error) { return _FluxAggregator.Contract.LinkToken(&_FluxAggregator.CallOpts) } // MaxSubmissionCount is a free data retrieval call binding the contract method 0x58609e44. // -// Solidity: function maxSubmissionCount() constant returns(uint32) +// Solidity: function maxSubmissionCount() view returns(uint32) func (_FluxAggregator *FluxAggregatorCaller) MaxSubmissionCount(opts *bind.CallOpts) (uint32, error) { var ( ret0 = new(uint32) @@ -641,21 +640,21 @@ func (_FluxAggregator *FluxAggregatorCaller) MaxSubmissionCount(opts *bind.CallO // MaxSubmissionCount is a free data retrieval call binding the contract method 0x58609e44. // -// Solidity: function maxSubmissionCount() constant returns(uint32) +// Solidity: function maxSubmissionCount() view returns(uint32) func (_FluxAggregator *FluxAggregatorSession) MaxSubmissionCount() (uint32, error) { return _FluxAggregator.Contract.MaxSubmissionCount(&_FluxAggregator.CallOpts) } // MaxSubmissionCount is a free data retrieval call binding the contract method 0x58609e44. // -// Solidity: function maxSubmissionCount() constant returns(uint32) +// Solidity: function maxSubmissionCount() view returns(uint32) func (_FluxAggregator *FluxAggregatorCallerSession) MaxSubmissionCount() (uint32, error) { return _FluxAggregator.Contract.MaxSubmissionCount(&_FluxAggregator.CallOpts) } // MinSubmissionCount is a free data retrieval call binding the contract method 0xc9374500. // -// Solidity: function minSubmissionCount() constant returns(uint32) +// Solidity: function minSubmissionCount() view returns(uint32) func (_FluxAggregator *FluxAggregatorCaller) MinSubmissionCount(opts *bind.CallOpts) (uint32, error) { var ( ret0 = new(uint32) @@ -667,21 +666,21 @@ func (_FluxAggregator *FluxAggregatorCaller) MinSubmissionCount(opts *bind.CallO // MinSubmissionCount is a free data retrieval call binding the contract method 0xc9374500. // -// Solidity: function minSubmissionCount() constant returns(uint32) +// Solidity: function minSubmissionCount() view returns(uint32) func (_FluxAggregator *FluxAggregatorSession) MinSubmissionCount() (uint32, error) { return _FluxAggregator.Contract.MinSubmissionCount(&_FluxAggregator.CallOpts) } // MinSubmissionCount is a free data retrieval call binding the contract method 0xc9374500. // -// Solidity: function minSubmissionCount() constant returns(uint32) +// Solidity: function minSubmissionCount() view returns(uint32) func (_FluxAggregator *FluxAggregatorCallerSession) MinSubmissionCount() (uint32, error) { return _FluxAggregator.Contract.MinSubmissionCount(&_FluxAggregator.CallOpts) } // OracleCount is a free data retrieval call binding the contract method 0x613d8fcc. // -// Solidity: function oracleCount() constant returns(uint32) +// Solidity: function oracleCount() view returns(uint32) func (_FluxAggregator *FluxAggregatorCaller) OracleCount(opts *bind.CallOpts) (uint32, error) { var ( ret0 = new(uint32) @@ -693,21 +692,21 @@ func (_FluxAggregator *FluxAggregatorCaller) OracleCount(opts *bind.CallOpts) (u // OracleCount is a free data retrieval call binding the contract method 0x613d8fcc. // -// Solidity: function oracleCount() constant returns(uint32) +// Solidity: function oracleCount() view returns(uint32) func (_FluxAggregator *FluxAggregatorSession) OracleCount() (uint32, error) { return _FluxAggregator.Contract.OracleCount(&_FluxAggregator.CallOpts) } // OracleCount is a free data retrieval call binding the contract method 0x613d8fcc. // -// Solidity: function oracleCount() constant returns(uint32) +// Solidity: function oracleCount() view returns(uint32) func (_FluxAggregator *FluxAggregatorCallerSession) OracleCount() (uint32, error) { return _FluxAggregator.Contract.OracleCount(&_FluxAggregator.CallOpts) } // OracleRoundState is a free data retrieval call binding the contract method 0x88aa80e7. // -// Solidity: function oracleRoundState(address _oracle, uint32 _queriedRoundId) constant returns(bool _eligibleToSubmit, uint32 _roundId, int256 _latestSubmission, uint64 _startedAt, uint64 _timeout, uint128 _availableFunds, uint32 _oracleCount, uint128 _paymentAmount) +// Solidity: function oracleRoundState(address _oracle, uint32 _queriedRoundId) view returns(bool _eligibleToSubmit, uint32 _roundId, int256 _latestSubmission, uint64 _startedAt, uint64 _timeout, uint128 _availableFunds, uint32 _oracleCount, uint128 _paymentAmount) func (_FluxAggregator *FluxAggregatorCaller) OracleRoundState(opts *bind.CallOpts, _oracle common.Address, _queriedRoundId uint32) (struct { EligibleToSubmit bool RoundId uint32 @@ -735,7 +734,7 @@ func (_FluxAggregator *FluxAggregatorCaller) OracleRoundState(opts *bind.CallOpt // OracleRoundState is a free data retrieval call binding the contract method 0x88aa80e7. // -// Solidity: function oracleRoundState(address _oracle, uint32 _queriedRoundId) constant returns(bool _eligibleToSubmit, uint32 _roundId, int256 _latestSubmission, uint64 _startedAt, uint64 _timeout, uint128 _availableFunds, uint32 _oracleCount, uint128 _paymentAmount) +// Solidity: function oracleRoundState(address _oracle, uint32 _queriedRoundId) view returns(bool _eligibleToSubmit, uint32 _roundId, int256 _latestSubmission, uint64 _startedAt, uint64 _timeout, uint128 _availableFunds, uint32 _oracleCount, uint128 _paymentAmount) func (_FluxAggregator *FluxAggregatorSession) OracleRoundState(_oracle common.Address, _queriedRoundId uint32) (struct { EligibleToSubmit bool RoundId uint32 @@ -751,7 +750,7 @@ func (_FluxAggregator *FluxAggregatorSession) OracleRoundState(_oracle common.Ad // OracleRoundState is a free data retrieval call binding the contract method 0x88aa80e7. // -// Solidity: function oracleRoundState(address _oracle, uint32 _queriedRoundId) constant returns(bool _eligibleToSubmit, uint32 _roundId, int256 _latestSubmission, uint64 _startedAt, uint64 _timeout, uint128 _availableFunds, uint32 _oracleCount, uint128 _paymentAmount) +// Solidity: function oracleRoundState(address _oracle, uint32 _queriedRoundId) view returns(bool _eligibleToSubmit, uint32 _roundId, int256 _latestSubmission, uint64 _startedAt, uint64 _timeout, uint128 _availableFunds, uint32 _oracleCount, uint128 _paymentAmount) func (_FluxAggregator *FluxAggregatorCallerSession) OracleRoundState(_oracle common.Address, _queriedRoundId uint32) (struct { EligibleToSubmit bool RoundId uint32 @@ -767,7 +766,7 @@ func (_FluxAggregator *FluxAggregatorCallerSession) OracleRoundState(_oracle com // Owner is a free data retrieval call binding the contract method 0x8da5cb5b. // -// Solidity: function owner() constant returns(address) +// Solidity: function owner() view returns(address) func (_FluxAggregator *FluxAggregatorCaller) Owner(opts *bind.CallOpts) (common.Address, error) { var ( ret0 = new(common.Address) @@ -779,21 +778,21 @@ func (_FluxAggregator *FluxAggregatorCaller) Owner(opts *bind.CallOpts) (common. // Owner is a free data retrieval call binding the contract method 0x8da5cb5b. // -// Solidity: function owner() constant returns(address) +// Solidity: function owner() view returns(address) func (_FluxAggregator *FluxAggregatorSession) Owner() (common.Address, error) { return _FluxAggregator.Contract.Owner(&_FluxAggregator.CallOpts) } // Owner is a free data retrieval call binding the contract method 0x8da5cb5b. // -// Solidity: function owner() constant returns(address) +// Solidity: function owner() view returns(address) func (_FluxAggregator *FluxAggregatorCallerSession) Owner() (common.Address, error) { return _FluxAggregator.Contract.Owner(&_FluxAggregator.CallOpts) } // PaymentAmount is a free data retrieval call binding the contract method 0xc35905c6. // -// Solidity: function paymentAmount() constant returns(uint128) +// Solidity: function paymentAmount() view returns(uint128) func (_FluxAggregator *FluxAggregatorCaller) PaymentAmount(opts *bind.CallOpts) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -805,21 +804,21 @@ func (_FluxAggregator *FluxAggregatorCaller) PaymentAmount(opts *bind.CallOpts) // PaymentAmount is a free data retrieval call binding the contract method 0xc35905c6. // -// Solidity: function paymentAmount() constant returns(uint128) +// Solidity: function paymentAmount() view returns(uint128) func (_FluxAggregator *FluxAggregatorSession) PaymentAmount() (*big.Int, error) { return _FluxAggregator.Contract.PaymentAmount(&_FluxAggregator.CallOpts) } // PaymentAmount is a free data retrieval call binding the contract method 0xc35905c6. // -// Solidity: function paymentAmount() constant returns(uint128) +// Solidity: function paymentAmount() view returns(uint128) func (_FluxAggregator *FluxAggregatorCallerSession) PaymentAmount() (*big.Int, error) { return _FluxAggregator.Contract.PaymentAmount(&_FluxAggregator.CallOpts) } // ReportingRound is a free data retrieval call binding the contract method 0x6fb4bb4e. // -// Solidity: function reportingRound() constant returns(uint256) +// Solidity: function reportingRound() view returns(uint256) func (_FluxAggregator *FluxAggregatorCaller) ReportingRound(opts *bind.CallOpts) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -831,21 +830,21 @@ func (_FluxAggregator *FluxAggregatorCaller) ReportingRound(opts *bind.CallOpts) // ReportingRound is a free data retrieval call binding the contract method 0x6fb4bb4e. // -// Solidity: function reportingRound() constant returns(uint256) +// Solidity: function reportingRound() view returns(uint256) func (_FluxAggregator *FluxAggregatorSession) ReportingRound() (*big.Int, error) { return _FluxAggregator.Contract.ReportingRound(&_FluxAggregator.CallOpts) } // ReportingRound is a free data retrieval call binding the contract method 0x6fb4bb4e. // -// Solidity: function reportingRound() constant returns(uint256) +// Solidity: function reportingRound() view returns(uint256) func (_FluxAggregator *FluxAggregatorCallerSession) ReportingRound() (*big.Int, error) { return _FluxAggregator.Contract.ReportingRound(&_FluxAggregator.CallOpts) } // RestartDelay is a free data retrieval call binding the contract method 0x357ebb02. // -// Solidity: function restartDelay() constant returns(uint32) +// Solidity: function restartDelay() view returns(uint32) func (_FluxAggregator *FluxAggregatorCaller) RestartDelay(opts *bind.CallOpts) (uint32, error) { var ( ret0 = new(uint32) @@ -857,21 +856,21 @@ func (_FluxAggregator *FluxAggregatorCaller) RestartDelay(opts *bind.CallOpts) ( // RestartDelay is a free data retrieval call binding the contract method 0x357ebb02. // -// Solidity: function restartDelay() constant returns(uint32) +// Solidity: function restartDelay() view returns(uint32) func (_FluxAggregator *FluxAggregatorSession) RestartDelay() (uint32, error) { return _FluxAggregator.Contract.RestartDelay(&_FluxAggregator.CallOpts) } // RestartDelay is a free data retrieval call binding the contract method 0x357ebb02. // -// Solidity: function restartDelay() constant returns(uint32) +// Solidity: function restartDelay() view returns(uint32) func (_FluxAggregator *FluxAggregatorCallerSession) RestartDelay() (uint32, error) { return _FluxAggregator.Contract.RestartDelay(&_FluxAggregator.CallOpts) } // Timeout is a free data retrieval call binding the contract method 0x70dea79a. // -// Solidity: function timeout() constant returns(uint32) +// Solidity: function timeout() view returns(uint32) func (_FluxAggregator *FluxAggregatorCaller) Timeout(opts *bind.CallOpts) (uint32, error) { var ( ret0 = new(uint32) @@ -883,21 +882,21 @@ func (_FluxAggregator *FluxAggregatorCaller) Timeout(opts *bind.CallOpts) (uint3 // Timeout is a free data retrieval call binding the contract method 0x70dea79a. // -// Solidity: function timeout() constant returns(uint32) +// Solidity: function timeout() view returns(uint32) func (_FluxAggregator *FluxAggregatorSession) Timeout() (uint32, error) { return _FluxAggregator.Contract.Timeout(&_FluxAggregator.CallOpts) } // Timeout is a free data retrieval call binding the contract method 0x70dea79a. // -// Solidity: function timeout() constant returns(uint32) +// Solidity: function timeout() view returns(uint32) func (_FluxAggregator *FluxAggregatorCallerSession) Timeout() (uint32, error) { return _FluxAggregator.Contract.Timeout(&_FluxAggregator.CallOpts) } // Version is a free data retrieval call binding the contract method 0x54fd4d50. // -// Solidity: function version() constant returns(uint256) +// Solidity: function version() view returns(uint256) func (_FluxAggregator *FluxAggregatorCaller) Version(opts *bind.CallOpts) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -909,21 +908,21 @@ func (_FluxAggregator *FluxAggregatorCaller) Version(opts *bind.CallOpts) (*big. // Version is a free data retrieval call binding the contract method 0x54fd4d50. // -// Solidity: function version() constant returns(uint256) +// Solidity: function version() view returns(uint256) func (_FluxAggregator *FluxAggregatorSession) Version() (*big.Int, error) { return _FluxAggregator.Contract.Version(&_FluxAggregator.CallOpts) } // Version is a free data retrieval call binding the contract method 0x54fd4d50. // -// Solidity: function version() constant returns(uint256) +// Solidity: function version() view returns(uint256) func (_FluxAggregator *FluxAggregatorCallerSession) Version() (*big.Int, error) { return _FluxAggregator.Contract.Version(&_FluxAggregator.CallOpts) } // WithdrawablePayment is a free data retrieval call binding the contract method 0xe2e40317. // -// Solidity: function withdrawablePayment(address _oracle) constant returns(uint256) +// Solidity: function withdrawablePayment(address _oracle) view returns(uint256) func (_FluxAggregator *FluxAggregatorCaller) WithdrawablePayment(opts *bind.CallOpts, _oracle common.Address) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -935,14 +934,14 @@ func (_FluxAggregator *FluxAggregatorCaller) WithdrawablePayment(opts *bind.Call // WithdrawablePayment is a free data retrieval call binding the contract method 0xe2e40317. // -// Solidity: function withdrawablePayment(address _oracle) constant returns(uint256) +// Solidity: function withdrawablePayment(address _oracle) view returns(uint256) func (_FluxAggregator *FluxAggregatorSession) WithdrawablePayment(_oracle common.Address) (*big.Int, error) { return _FluxAggregator.Contract.WithdrawablePayment(&_FluxAggregator.CallOpts, _oracle) } // WithdrawablePayment is a free data retrieval call binding the contract method 0xe2e40317. // -// Solidity: function withdrawablePayment(address _oracle) constant returns(uint256) +// Solidity: function withdrawablePayment(address _oracle) view returns(uint256) func (_FluxAggregator *FluxAggregatorCallerSession) WithdrawablePayment(_oracle common.Address) (*big.Int, error) { return _FluxAggregator.Contract.WithdrawablePayment(&_FluxAggregator.CallOpts, _oracle) } diff --git a/core/internal/gethwrappers/generated/link_token_interface/link_token_interface.go b/core/internal/gethwrappers/generated/link_token_interface/link_token_interface.go index 9604f170ab8..8741a87509b 100644 --- a/core/internal/gethwrappers/generated/link_token_interface/link_token_interface.go +++ b/core/internal/gethwrappers/generated/link_token_interface/link_token_interface.go @@ -20,7 +20,6 @@ var ( _ = big.NewInt _ = strings.NewReader _ = ethereum.NotFound - _ = abi.U256 _ = bind.Bind _ = common.Big1 _ = types.BloomLookup @@ -191,7 +190,7 @@ func (_LinkToken *LinkTokenTransactorRaw) Transact(opts *bind.TransactOpts, meth // Allowance is a free data retrieval call binding the contract method 0xdd62ed3e. // -// Solidity: function allowance(address _owner, address _spender) constant returns(uint256 remaining) +// Solidity: function allowance(address _owner, address _spender) view returns(uint256 remaining) func (_LinkToken *LinkTokenCaller) Allowance(opts *bind.CallOpts, _owner common.Address, _spender common.Address) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -203,21 +202,21 @@ func (_LinkToken *LinkTokenCaller) Allowance(opts *bind.CallOpts, _owner common. // Allowance is a free data retrieval call binding the contract method 0xdd62ed3e. // -// Solidity: function allowance(address _owner, address _spender) constant returns(uint256 remaining) +// Solidity: function allowance(address _owner, address _spender) view returns(uint256 remaining) func (_LinkToken *LinkTokenSession) Allowance(_owner common.Address, _spender common.Address) (*big.Int, error) { return _LinkToken.Contract.Allowance(&_LinkToken.CallOpts, _owner, _spender) } // Allowance is a free data retrieval call binding the contract method 0xdd62ed3e. // -// Solidity: function allowance(address _owner, address _spender) constant returns(uint256 remaining) +// Solidity: function allowance(address _owner, address _spender) view returns(uint256 remaining) func (_LinkToken *LinkTokenCallerSession) Allowance(_owner common.Address, _spender common.Address) (*big.Int, error) { return _LinkToken.Contract.Allowance(&_LinkToken.CallOpts, _owner, _spender) } // BalanceOf is a free data retrieval call binding the contract method 0x70a08231. // -// Solidity: function balanceOf(address _owner) constant returns(uint256 balance) +// Solidity: function balanceOf(address _owner) view returns(uint256 balance) func (_LinkToken *LinkTokenCaller) BalanceOf(opts *bind.CallOpts, _owner common.Address) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -229,21 +228,21 @@ func (_LinkToken *LinkTokenCaller) BalanceOf(opts *bind.CallOpts, _owner common. // BalanceOf is a free data retrieval call binding the contract method 0x70a08231. // -// Solidity: function balanceOf(address _owner) constant returns(uint256 balance) +// Solidity: function balanceOf(address _owner) view returns(uint256 balance) func (_LinkToken *LinkTokenSession) BalanceOf(_owner common.Address) (*big.Int, error) { return _LinkToken.Contract.BalanceOf(&_LinkToken.CallOpts, _owner) } // BalanceOf is a free data retrieval call binding the contract method 0x70a08231. // -// Solidity: function balanceOf(address _owner) constant returns(uint256 balance) +// Solidity: function balanceOf(address _owner) view returns(uint256 balance) func (_LinkToken *LinkTokenCallerSession) BalanceOf(_owner common.Address) (*big.Int, error) { return _LinkToken.Contract.BalanceOf(&_LinkToken.CallOpts, _owner) } // Decimals is a free data retrieval call binding the contract method 0x313ce567. // -// Solidity: function decimals() constant returns(uint8) +// Solidity: function decimals() view returns(uint8) func (_LinkToken *LinkTokenCaller) Decimals(opts *bind.CallOpts) (uint8, error) { var ( ret0 = new(uint8) @@ -255,21 +254,21 @@ func (_LinkToken *LinkTokenCaller) Decimals(opts *bind.CallOpts) (uint8, error) // Decimals is a free data retrieval call binding the contract method 0x313ce567. // -// Solidity: function decimals() constant returns(uint8) +// Solidity: function decimals() view returns(uint8) func (_LinkToken *LinkTokenSession) Decimals() (uint8, error) { return _LinkToken.Contract.Decimals(&_LinkToken.CallOpts) } // Decimals is a free data retrieval call binding the contract method 0x313ce567. // -// Solidity: function decimals() constant returns(uint8) +// Solidity: function decimals() view returns(uint8) func (_LinkToken *LinkTokenCallerSession) Decimals() (uint8, error) { return _LinkToken.Contract.Decimals(&_LinkToken.CallOpts) } // Name is a free data retrieval call binding the contract method 0x06fdde03. // -// Solidity: function name() constant returns(string) +// Solidity: function name() view returns(string) func (_LinkToken *LinkTokenCaller) Name(opts *bind.CallOpts) (string, error) { var ( ret0 = new(string) @@ -281,21 +280,21 @@ func (_LinkToken *LinkTokenCaller) Name(opts *bind.CallOpts) (string, error) { // Name is a free data retrieval call binding the contract method 0x06fdde03. // -// Solidity: function name() constant returns(string) +// Solidity: function name() view returns(string) func (_LinkToken *LinkTokenSession) Name() (string, error) { return _LinkToken.Contract.Name(&_LinkToken.CallOpts) } // Name is a free data retrieval call binding the contract method 0x06fdde03. // -// Solidity: function name() constant returns(string) +// Solidity: function name() view returns(string) func (_LinkToken *LinkTokenCallerSession) Name() (string, error) { return _LinkToken.Contract.Name(&_LinkToken.CallOpts) } // Symbol is a free data retrieval call binding the contract method 0x95d89b41. // -// Solidity: function symbol() constant returns(string) +// Solidity: function symbol() view returns(string) func (_LinkToken *LinkTokenCaller) Symbol(opts *bind.CallOpts) (string, error) { var ( ret0 = new(string) @@ -307,21 +306,21 @@ func (_LinkToken *LinkTokenCaller) Symbol(opts *bind.CallOpts) (string, error) { // Symbol is a free data retrieval call binding the contract method 0x95d89b41. // -// Solidity: function symbol() constant returns(string) +// Solidity: function symbol() view returns(string) func (_LinkToken *LinkTokenSession) Symbol() (string, error) { return _LinkToken.Contract.Symbol(&_LinkToken.CallOpts) } // Symbol is a free data retrieval call binding the contract method 0x95d89b41. // -// Solidity: function symbol() constant returns(string) +// Solidity: function symbol() view returns(string) func (_LinkToken *LinkTokenCallerSession) Symbol() (string, error) { return _LinkToken.Contract.Symbol(&_LinkToken.CallOpts) } // TotalSupply is a free data retrieval call binding the contract method 0x18160ddd. // -// Solidity: function totalSupply() constant returns(uint256) +// Solidity: function totalSupply() view returns(uint256) func (_LinkToken *LinkTokenCaller) TotalSupply(opts *bind.CallOpts) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -333,14 +332,14 @@ func (_LinkToken *LinkTokenCaller) TotalSupply(opts *bind.CallOpts) (*big.Int, e // TotalSupply is a free data retrieval call binding the contract method 0x18160ddd. // -// Solidity: function totalSupply() constant returns(uint256) +// Solidity: function totalSupply() view returns(uint256) func (_LinkToken *LinkTokenSession) TotalSupply() (*big.Int, error) { return _LinkToken.Contract.TotalSupply(&_LinkToken.CallOpts) } // TotalSupply is a free data retrieval call binding the contract method 0x18160ddd. // -// Solidity: function totalSupply() constant returns(uint256) +// Solidity: function totalSupply() view returns(uint256) func (_LinkToken *LinkTokenCallerSession) TotalSupply() (*big.Int, error) { return _LinkToken.Contract.TotalSupply(&_LinkToken.CallOpts) } diff --git a/core/internal/gethwrappers/generated/solidity_request_id/solidity_request_id.go b/core/internal/gethwrappers/generated/solidity_request_id/solidity_request_id.go index c7a97c5d196..dfcc788cc08 100644 --- a/core/internal/gethwrappers/generated/solidity_request_id/solidity_request_id.go +++ b/core/internal/gethwrappers/generated/solidity_request_id/solidity_request_id.go @@ -20,7 +20,6 @@ var ( _ = big.NewInt _ = strings.NewReader _ = ethereum.NotFound - _ = abi.U256 _ = bind.Bind _ = common.Big1 _ = types.BloomLookup @@ -191,7 +190,7 @@ func (_VRFRequestIDBaseTestHelper *VRFRequestIDBaseTestHelperTransactorRaw) Tran // MakeRequestId is a free data retrieval call binding the contract method 0xbda087ae. // -// Solidity: function makeRequestId_(bytes32 _keyHash, uint256 _vRFInputSeed) constant returns(bytes32) +// Solidity: function makeRequestId_(bytes32 _keyHash, uint256 _vRFInputSeed) pure returns(bytes32) func (_VRFRequestIDBaseTestHelper *VRFRequestIDBaseTestHelperCaller) MakeRequestId(opts *bind.CallOpts, _keyHash [32]byte, _vRFInputSeed *big.Int) ([32]byte, error) { var ( ret0 = new([32]byte) @@ -203,21 +202,21 @@ func (_VRFRequestIDBaseTestHelper *VRFRequestIDBaseTestHelperCaller) MakeRequest // MakeRequestId is a free data retrieval call binding the contract method 0xbda087ae. // -// Solidity: function makeRequestId_(bytes32 _keyHash, uint256 _vRFInputSeed) constant returns(bytes32) +// Solidity: function makeRequestId_(bytes32 _keyHash, uint256 _vRFInputSeed) pure returns(bytes32) func (_VRFRequestIDBaseTestHelper *VRFRequestIDBaseTestHelperSession) MakeRequestId(_keyHash [32]byte, _vRFInputSeed *big.Int) ([32]byte, error) { return _VRFRequestIDBaseTestHelper.Contract.MakeRequestId(&_VRFRequestIDBaseTestHelper.CallOpts, _keyHash, _vRFInputSeed) } // MakeRequestId is a free data retrieval call binding the contract method 0xbda087ae. // -// Solidity: function makeRequestId_(bytes32 _keyHash, uint256 _vRFInputSeed) constant returns(bytes32) +// Solidity: function makeRequestId_(bytes32 _keyHash, uint256 _vRFInputSeed) pure returns(bytes32) func (_VRFRequestIDBaseTestHelper *VRFRequestIDBaseTestHelperCallerSession) MakeRequestId(_keyHash [32]byte, _vRFInputSeed *big.Int) ([32]byte, error) { return _VRFRequestIDBaseTestHelper.Contract.MakeRequestId(&_VRFRequestIDBaseTestHelper.CallOpts, _keyHash, _vRFInputSeed) } // MakeVRFInputSeed is a free data retrieval call binding the contract method 0x37ab429a. // -// Solidity: function makeVRFInputSeed_(bytes32 _keyHash, uint256 _userSeed, address _requester, uint256 _nonce) constant returns(uint256) +// Solidity: function makeVRFInputSeed_(bytes32 _keyHash, uint256 _userSeed, address _requester, uint256 _nonce) pure returns(uint256) func (_VRFRequestIDBaseTestHelper *VRFRequestIDBaseTestHelperCaller) MakeVRFInputSeed(opts *bind.CallOpts, _keyHash [32]byte, _userSeed *big.Int, _requester common.Address, _nonce *big.Int) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -229,14 +228,14 @@ func (_VRFRequestIDBaseTestHelper *VRFRequestIDBaseTestHelperCaller) MakeVRFInpu // MakeVRFInputSeed is a free data retrieval call binding the contract method 0x37ab429a. // -// Solidity: function makeVRFInputSeed_(bytes32 _keyHash, uint256 _userSeed, address _requester, uint256 _nonce) constant returns(uint256) +// Solidity: function makeVRFInputSeed_(bytes32 _keyHash, uint256 _userSeed, address _requester, uint256 _nonce) pure returns(uint256) func (_VRFRequestIDBaseTestHelper *VRFRequestIDBaseTestHelperSession) MakeVRFInputSeed(_keyHash [32]byte, _userSeed *big.Int, _requester common.Address, _nonce *big.Int) (*big.Int, error) { return _VRFRequestIDBaseTestHelper.Contract.MakeVRFInputSeed(&_VRFRequestIDBaseTestHelper.CallOpts, _keyHash, _userSeed, _requester, _nonce) } // MakeVRFInputSeed is a free data retrieval call binding the contract method 0x37ab429a. // -// Solidity: function makeVRFInputSeed_(bytes32 _keyHash, uint256 _userSeed, address _requester, uint256 _nonce) constant returns(uint256) +// Solidity: function makeVRFInputSeed_(bytes32 _keyHash, uint256 _userSeed, address _requester, uint256 _nonce) pure returns(uint256) func (_VRFRequestIDBaseTestHelper *VRFRequestIDBaseTestHelperCallerSession) MakeVRFInputSeed(_keyHash [32]byte, _userSeed *big.Int, _requester common.Address, _nonce *big.Int) (*big.Int, error) { return _VRFRequestIDBaseTestHelper.Contract.MakeVRFInputSeed(&_VRFRequestIDBaseTestHelper.CallOpts, _keyHash, _userSeed, _requester, _nonce) } diff --git a/core/internal/gethwrappers/generated/solidity_verifier_wrapper/solidity_verifier_wrapper.go b/core/internal/gethwrappers/generated/solidity_verifier_wrapper/solidity_verifier_wrapper.go index 234b25d2c4a..5d03b2cd726 100644 --- a/core/internal/gethwrappers/generated/solidity_verifier_wrapper/solidity_verifier_wrapper.go +++ b/core/internal/gethwrappers/generated/solidity_verifier_wrapper/solidity_verifier_wrapper.go @@ -20,7 +20,6 @@ var ( _ = big.NewInt _ = strings.NewReader _ = ethereum.NotFound - _ = abi.U256 _ = bind.Bind _ = common.Big1 _ = types.BloomLookup @@ -191,7 +190,7 @@ func (_VRFTestHelper *VRFTestHelperTransactorRaw) Transact(opts *bind.TransactOp // AffineECAdd is a free data retrieval call binding the contract method 0x244f896d. // -// Solidity: function affineECAdd_(uint256[2] p1, uint256[2] p2, uint256 invZ) constant returns(uint256[2]) +// Solidity: function affineECAdd_(uint256[2] p1, uint256[2] p2, uint256 invZ) pure returns(uint256[2]) func (_VRFTestHelper *VRFTestHelperCaller) AffineECAdd(opts *bind.CallOpts, p1 [2]*big.Int, p2 [2]*big.Int, invZ *big.Int) ([2]*big.Int, error) { var ( ret0 = new([2]*big.Int) @@ -203,21 +202,21 @@ func (_VRFTestHelper *VRFTestHelperCaller) AffineECAdd(opts *bind.CallOpts, p1 [ // AffineECAdd is a free data retrieval call binding the contract method 0x244f896d. // -// Solidity: function affineECAdd_(uint256[2] p1, uint256[2] p2, uint256 invZ) constant returns(uint256[2]) +// Solidity: function affineECAdd_(uint256[2] p1, uint256[2] p2, uint256 invZ) pure returns(uint256[2]) func (_VRFTestHelper *VRFTestHelperSession) AffineECAdd(p1 [2]*big.Int, p2 [2]*big.Int, invZ *big.Int) ([2]*big.Int, error) { return _VRFTestHelper.Contract.AffineECAdd(&_VRFTestHelper.CallOpts, p1, p2, invZ) } // AffineECAdd is a free data retrieval call binding the contract method 0x244f896d. // -// Solidity: function affineECAdd_(uint256[2] p1, uint256[2] p2, uint256 invZ) constant returns(uint256[2]) +// Solidity: function affineECAdd_(uint256[2] p1, uint256[2] p2, uint256 invZ) pure returns(uint256[2]) func (_VRFTestHelper *VRFTestHelperCallerSession) AffineECAdd(p1 [2]*big.Int, p2 [2]*big.Int, invZ *big.Int) ([2]*big.Int, error) { return _VRFTestHelper.Contract.AffineECAdd(&_VRFTestHelper.CallOpts, p1, p2, invZ) } // BigModExp is a free data retrieval call binding the contract method 0x5de60042. // -// Solidity: function bigModExp_(uint256 base, uint256 exponent) constant returns(uint256) +// Solidity: function bigModExp_(uint256 base, uint256 exponent) view returns(uint256) func (_VRFTestHelper *VRFTestHelperCaller) BigModExp(opts *bind.CallOpts, base *big.Int, exponent *big.Int) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -229,21 +228,21 @@ func (_VRFTestHelper *VRFTestHelperCaller) BigModExp(opts *bind.CallOpts, base * // BigModExp is a free data retrieval call binding the contract method 0x5de60042. // -// Solidity: function bigModExp_(uint256 base, uint256 exponent) constant returns(uint256) +// Solidity: function bigModExp_(uint256 base, uint256 exponent) view returns(uint256) func (_VRFTestHelper *VRFTestHelperSession) BigModExp(base *big.Int, exponent *big.Int) (*big.Int, error) { return _VRFTestHelper.Contract.BigModExp(&_VRFTestHelper.CallOpts, base, exponent) } // BigModExp is a free data retrieval call binding the contract method 0x5de60042. // -// Solidity: function bigModExp_(uint256 base, uint256 exponent) constant returns(uint256) +// Solidity: function bigModExp_(uint256 base, uint256 exponent) view returns(uint256) func (_VRFTestHelper *VRFTestHelperCallerSession) BigModExp(base *big.Int, exponent *big.Int) (*big.Int, error) { return _VRFTestHelper.Contract.BigModExp(&_VRFTestHelper.CallOpts, base, exponent) } // EcmulVerify is a free data retrieval call binding the contract method 0xaa7b2fbb. // -// Solidity: function ecmulVerify_(uint256[2] x, uint256 scalar, uint256[2] q) constant returns(bool) +// Solidity: function ecmulVerify_(uint256[2] x, uint256 scalar, uint256[2] q) pure returns(bool) func (_VRFTestHelper *VRFTestHelperCaller) EcmulVerify(opts *bind.CallOpts, x [2]*big.Int, scalar *big.Int, q [2]*big.Int) (bool, error) { var ( ret0 = new(bool) @@ -255,21 +254,21 @@ func (_VRFTestHelper *VRFTestHelperCaller) EcmulVerify(opts *bind.CallOpts, x [2 // EcmulVerify is a free data retrieval call binding the contract method 0xaa7b2fbb. // -// Solidity: function ecmulVerify_(uint256[2] x, uint256 scalar, uint256[2] q) constant returns(bool) +// Solidity: function ecmulVerify_(uint256[2] x, uint256 scalar, uint256[2] q) pure returns(bool) func (_VRFTestHelper *VRFTestHelperSession) EcmulVerify(x [2]*big.Int, scalar *big.Int, q [2]*big.Int) (bool, error) { return _VRFTestHelper.Contract.EcmulVerify(&_VRFTestHelper.CallOpts, x, scalar, q) } // EcmulVerify is a free data retrieval call binding the contract method 0xaa7b2fbb. // -// Solidity: function ecmulVerify_(uint256[2] x, uint256 scalar, uint256[2] q) constant returns(bool) +// Solidity: function ecmulVerify_(uint256[2] x, uint256 scalar, uint256[2] q) pure returns(bool) func (_VRFTestHelper *VRFTestHelperCallerSession) EcmulVerify(x [2]*big.Int, scalar *big.Int, q [2]*big.Int) (bool, error) { return _VRFTestHelper.Contract.EcmulVerify(&_VRFTestHelper.CallOpts, x, scalar, q) } // FieldHash is a free data retrieval call binding the contract method 0xb481e260. // -// Solidity: function fieldHash_(bytes b) constant returns(uint256) +// Solidity: function fieldHash_(bytes b) pure returns(uint256) func (_VRFTestHelper *VRFTestHelperCaller) FieldHash(opts *bind.CallOpts, b []byte) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -281,21 +280,21 @@ func (_VRFTestHelper *VRFTestHelperCaller) FieldHash(opts *bind.CallOpts, b []by // FieldHash is a free data retrieval call binding the contract method 0xb481e260. // -// Solidity: function fieldHash_(bytes b) constant returns(uint256) +// Solidity: function fieldHash_(bytes b) pure returns(uint256) func (_VRFTestHelper *VRFTestHelperSession) FieldHash(b []byte) (*big.Int, error) { return _VRFTestHelper.Contract.FieldHash(&_VRFTestHelper.CallOpts, b) } // FieldHash is a free data retrieval call binding the contract method 0xb481e260. // -// Solidity: function fieldHash_(bytes b) constant returns(uint256) +// Solidity: function fieldHash_(bytes b) pure returns(uint256) func (_VRFTestHelper *VRFTestHelperCallerSession) FieldHash(b []byte) (*big.Int, error) { return _VRFTestHelper.Contract.FieldHash(&_VRFTestHelper.CallOpts, b) } // HashToCurve is a free data retrieval call binding the contract method 0x35452450. // -// Solidity: function hashToCurve_(uint256[2] pk, uint256 x) constant returns(uint256[2]) +// Solidity: function hashToCurve_(uint256[2] pk, uint256 x) view returns(uint256[2]) func (_VRFTestHelper *VRFTestHelperCaller) HashToCurve(opts *bind.CallOpts, pk [2]*big.Int, x *big.Int) ([2]*big.Int, error) { var ( ret0 = new([2]*big.Int) @@ -307,21 +306,21 @@ func (_VRFTestHelper *VRFTestHelperCaller) HashToCurve(opts *bind.CallOpts, pk [ // HashToCurve is a free data retrieval call binding the contract method 0x35452450. // -// Solidity: function hashToCurve_(uint256[2] pk, uint256 x) constant returns(uint256[2]) +// Solidity: function hashToCurve_(uint256[2] pk, uint256 x) view returns(uint256[2]) func (_VRFTestHelper *VRFTestHelperSession) HashToCurve(pk [2]*big.Int, x *big.Int) ([2]*big.Int, error) { return _VRFTestHelper.Contract.HashToCurve(&_VRFTestHelper.CallOpts, pk, x) } // HashToCurve is a free data retrieval call binding the contract method 0x35452450. // -// Solidity: function hashToCurve_(uint256[2] pk, uint256 x) constant returns(uint256[2]) +// Solidity: function hashToCurve_(uint256[2] pk, uint256 x) view returns(uint256[2]) func (_VRFTestHelper *VRFTestHelperCallerSession) HashToCurve(pk [2]*big.Int, x *big.Int) ([2]*big.Int, error) { return _VRFTestHelper.Contract.HashToCurve(&_VRFTestHelper.CallOpts, pk, x) } // LinearCombination is a free data retrieval call binding the contract method 0xfe54f2a2. // -// Solidity: function linearCombination_(uint256 c, uint256[2] p1, uint256[2] cp1Witness, uint256 s, uint256[2] p2, uint256[2] sp2Witness, uint256 zInv) constant returns(uint256[2]) +// Solidity: function linearCombination_(uint256 c, uint256[2] p1, uint256[2] cp1Witness, uint256 s, uint256[2] p2, uint256[2] sp2Witness, uint256 zInv) pure returns(uint256[2]) func (_VRFTestHelper *VRFTestHelperCaller) LinearCombination(opts *bind.CallOpts, c *big.Int, p1 [2]*big.Int, cp1Witness [2]*big.Int, s *big.Int, p2 [2]*big.Int, sp2Witness [2]*big.Int, zInv *big.Int) ([2]*big.Int, error) { var ( ret0 = new([2]*big.Int) @@ -333,21 +332,21 @@ func (_VRFTestHelper *VRFTestHelperCaller) LinearCombination(opts *bind.CallOpts // LinearCombination is a free data retrieval call binding the contract method 0xfe54f2a2. // -// Solidity: function linearCombination_(uint256 c, uint256[2] p1, uint256[2] cp1Witness, uint256 s, uint256[2] p2, uint256[2] sp2Witness, uint256 zInv) constant returns(uint256[2]) +// Solidity: function linearCombination_(uint256 c, uint256[2] p1, uint256[2] cp1Witness, uint256 s, uint256[2] p2, uint256[2] sp2Witness, uint256 zInv) pure returns(uint256[2]) func (_VRFTestHelper *VRFTestHelperSession) LinearCombination(c *big.Int, p1 [2]*big.Int, cp1Witness [2]*big.Int, s *big.Int, p2 [2]*big.Int, sp2Witness [2]*big.Int, zInv *big.Int) ([2]*big.Int, error) { return _VRFTestHelper.Contract.LinearCombination(&_VRFTestHelper.CallOpts, c, p1, cp1Witness, s, p2, sp2Witness, zInv) } // LinearCombination is a free data retrieval call binding the contract method 0xfe54f2a2. // -// Solidity: function linearCombination_(uint256 c, uint256[2] p1, uint256[2] cp1Witness, uint256 s, uint256[2] p2, uint256[2] sp2Witness, uint256 zInv) constant returns(uint256[2]) +// Solidity: function linearCombination_(uint256 c, uint256[2] p1, uint256[2] cp1Witness, uint256 s, uint256[2] p2, uint256[2] sp2Witness, uint256 zInv) pure returns(uint256[2]) func (_VRFTestHelper *VRFTestHelperCallerSession) LinearCombination(c *big.Int, p1 [2]*big.Int, cp1Witness [2]*big.Int, s *big.Int, p2 [2]*big.Int, sp2Witness [2]*big.Int, zInv *big.Int) ([2]*big.Int, error) { return _VRFTestHelper.Contract.LinearCombination(&_VRFTestHelper.CallOpts, c, p1, cp1Witness, s, p2, sp2Witness, zInv) } // ProjectiveECAdd is a free data retrieval call binding the contract method 0x95e6ee92. // -// Solidity: function projectiveECAdd_(uint256 px, uint256 py, uint256 qx, uint256 qy) constant returns(uint256, uint256, uint256) +// Solidity: function projectiveECAdd_(uint256 px, uint256 py, uint256 qx, uint256 qy) pure returns(uint256, uint256, uint256) func (_VRFTestHelper *VRFTestHelperCaller) ProjectiveECAdd(opts *bind.CallOpts, px *big.Int, py *big.Int, qx *big.Int, qy *big.Int) (*big.Int, *big.Int, *big.Int, error) { var ( ret0 = new(*big.Int) @@ -365,21 +364,21 @@ func (_VRFTestHelper *VRFTestHelperCaller) ProjectiveECAdd(opts *bind.CallOpts, // ProjectiveECAdd is a free data retrieval call binding the contract method 0x95e6ee92. // -// Solidity: function projectiveECAdd_(uint256 px, uint256 py, uint256 qx, uint256 qy) constant returns(uint256, uint256, uint256) +// Solidity: function projectiveECAdd_(uint256 px, uint256 py, uint256 qx, uint256 qy) pure returns(uint256, uint256, uint256) func (_VRFTestHelper *VRFTestHelperSession) ProjectiveECAdd(px *big.Int, py *big.Int, qx *big.Int, qy *big.Int) (*big.Int, *big.Int, *big.Int, error) { return _VRFTestHelper.Contract.ProjectiveECAdd(&_VRFTestHelper.CallOpts, px, py, qx, qy) } // ProjectiveECAdd is a free data retrieval call binding the contract method 0x95e6ee92. // -// Solidity: function projectiveECAdd_(uint256 px, uint256 py, uint256 qx, uint256 qy) constant returns(uint256, uint256, uint256) +// Solidity: function projectiveECAdd_(uint256 px, uint256 py, uint256 qx, uint256 qy) pure returns(uint256, uint256, uint256) func (_VRFTestHelper *VRFTestHelperCallerSession) ProjectiveECAdd(px *big.Int, py *big.Int, qx *big.Int, qy *big.Int) (*big.Int, *big.Int, *big.Int, error) { return _VRFTestHelper.Contract.ProjectiveECAdd(&_VRFTestHelper.CallOpts, px, py, qx, qy) } // RandomValueFromVRFProof is a free data retrieval call binding the contract method 0xcefda0c5. // -// Solidity: function randomValueFromVRFProof_(bytes proof) constant returns(uint256 output) +// Solidity: function randomValueFromVRFProof_(bytes proof) view returns(uint256 output) func (_VRFTestHelper *VRFTestHelperCaller) RandomValueFromVRFProof(opts *bind.CallOpts, proof []byte) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -391,21 +390,21 @@ func (_VRFTestHelper *VRFTestHelperCaller) RandomValueFromVRFProof(opts *bind.Ca // RandomValueFromVRFProof is a free data retrieval call binding the contract method 0xcefda0c5. // -// Solidity: function randomValueFromVRFProof_(bytes proof) constant returns(uint256 output) +// Solidity: function randomValueFromVRFProof_(bytes proof) view returns(uint256 output) func (_VRFTestHelper *VRFTestHelperSession) RandomValueFromVRFProof(proof []byte) (*big.Int, error) { return _VRFTestHelper.Contract.RandomValueFromVRFProof(&_VRFTestHelper.CallOpts, proof) } // RandomValueFromVRFProof is a free data retrieval call binding the contract method 0xcefda0c5. // -// Solidity: function randomValueFromVRFProof_(bytes proof) constant returns(uint256 output) +// Solidity: function randomValueFromVRFProof_(bytes proof) view returns(uint256 output) func (_VRFTestHelper *VRFTestHelperCallerSession) RandomValueFromVRFProof(proof []byte) (*big.Int, error) { return _VRFTestHelper.Contract.RandomValueFromVRFProof(&_VRFTestHelper.CallOpts, proof) } // ScalarFromCurvePoints is a free data retrieval call binding the contract method 0x7f8f50a8. // -// Solidity: function scalarFromCurvePoints_(uint256[2] hash, uint256[2] pk, uint256[2] gamma, address uWitness, uint256[2] v) constant returns(uint256) +// Solidity: function scalarFromCurvePoints_(uint256[2] hash, uint256[2] pk, uint256[2] gamma, address uWitness, uint256[2] v) pure returns(uint256) func (_VRFTestHelper *VRFTestHelperCaller) ScalarFromCurvePoints(opts *bind.CallOpts, hash [2]*big.Int, pk [2]*big.Int, gamma [2]*big.Int, uWitness common.Address, v [2]*big.Int) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -417,21 +416,21 @@ func (_VRFTestHelper *VRFTestHelperCaller) ScalarFromCurvePoints(opts *bind.Call // ScalarFromCurvePoints is a free data retrieval call binding the contract method 0x7f8f50a8. // -// Solidity: function scalarFromCurvePoints_(uint256[2] hash, uint256[2] pk, uint256[2] gamma, address uWitness, uint256[2] v) constant returns(uint256) +// Solidity: function scalarFromCurvePoints_(uint256[2] hash, uint256[2] pk, uint256[2] gamma, address uWitness, uint256[2] v) pure returns(uint256) func (_VRFTestHelper *VRFTestHelperSession) ScalarFromCurvePoints(hash [2]*big.Int, pk [2]*big.Int, gamma [2]*big.Int, uWitness common.Address, v [2]*big.Int) (*big.Int, error) { return _VRFTestHelper.Contract.ScalarFromCurvePoints(&_VRFTestHelper.CallOpts, hash, pk, gamma, uWitness, v) } // ScalarFromCurvePoints is a free data retrieval call binding the contract method 0x7f8f50a8. // -// Solidity: function scalarFromCurvePoints_(uint256[2] hash, uint256[2] pk, uint256[2] gamma, address uWitness, uint256[2] v) constant returns(uint256) +// Solidity: function scalarFromCurvePoints_(uint256[2] hash, uint256[2] pk, uint256[2] gamma, address uWitness, uint256[2] v) pure returns(uint256) func (_VRFTestHelper *VRFTestHelperCallerSession) ScalarFromCurvePoints(hash [2]*big.Int, pk [2]*big.Int, gamma [2]*big.Int, uWitness common.Address, v [2]*big.Int) (*big.Int, error) { return _VRFTestHelper.Contract.ScalarFromCurvePoints(&_VRFTestHelper.CallOpts, hash, pk, gamma, uWitness, v) } // SquareRoot is a free data retrieval call binding the contract method 0x8af046ea. // -// Solidity: function squareRoot_(uint256 x) constant returns(uint256) +// Solidity: function squareRoot_(uint256 x) view returns(uint256) func (_VRFTestHelper *VRFTestHelperCaller) SquareRoot(opts *bind.CallOpts, x *big.Int) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -443,21 +442,21 @@ func (_VRFTestHelper *VRFTestHelperCaller) SquareRoot(opts *bind.CallOpts, x *bi // SquareRoot is a free data retrieval call binding the contract method 0x8af046ea. // -// Solidity: function squareRoot_(uint256 x) constant returns(uint256) +// Solidity: function squareRoot_(uint256 x) view returns(uint256) func (_VRFTestHelper *VRFTestHelperSession) SquareRoot(x *big.Int) (*big.Int, error) { return _VRFTestHelper.Contract.SquareRoot(&_VRFTestHelper.CallOpts, x) } // SquareRoot is a free data retrieval call binding the contract method 0x8af046ea. // -// Solidity: function squareRoot_(uint256 x) constant returns(uint256) +// Solidity: function squareRoot_(uint256 x) view returns(uint256) func (_VRFTestHelper *VRFTestHelperCallerSession) SquareRoot(x *big.Int) (*big.Int, error) { return _VRFTestHelper.Contract.SquareRoot(&_VRFTestHelper.CallOpts, x) } // VerifyLinearCombinationWithGenerator is a free data retrieval call binding the contract method 0x91d5f691. // -// Solidity: function verifyLinearCombinationWithGenerator_(uint256 c, uint256[2] p, uint256 s, address lcWitness) constant returns(bool) +// Solidity: function verifyLinearCombinationWithGenerator_(uint256 c, uint256[2] p, uint256 s, address lcWitness) pure returns(bool) func (_VRFTestHelper *VRFTestHelperCaller) VerifyLinearCombinationWithGenerator(opts *bind.CallOpts, c *big.Int, p [2]*big.Int, s *big.Int, lcWitness common.Address) (bool, error) { var ( ret0 = new(bool) @@ -469,21 +468,21 @@ func (_VRFTestHelper *VRFTestHelperCaller) VerifyLinearCombinationWithGenerator( // VerifyLinearCombinationWithGenerator is a free data retrieval call binding the contract method 0x91d5f691. // -// Solidity: function verifyLinearCombinationWithGenerator_(uint256 c, uint256[2] p, uint256 s, address lcWitness) constant returns(bool) +// Solidity: function verifyLinearCombinationWithGenerator_(uint256 c, uint256[2] p, uint256 s, address lcWitness) pure returns(bool) func (_VRFTestHelper *VRFTestHelperSession) VerifyLinearCombinationWithGenerator(c *big.Int, p [2]*big.Int, s *big.Int, lcWitness common.Address) (bool, error) { return _VRFTestHelper.Contract.VerifyLinearCombinationWithGenerator(&_VRFTestHelper.CallOpts, c, p, s, lcWitness) } // VerifyLinearCombinationWithGenerator is a free data retrieval call binding the contract method 0x91d5f691. // -// Solidity: function verifyLinearCombinationWithGenerator_(uint256 c, uint256[2] p, uint256 s, address lcWitness) constant returns(bool) +// Solidity: function verifyLinearCombinationWithGenerator_(uint256 c, uint256[2] p, uint256 s, address lcWitness) pure returns(bool) func (_VRFTestHelper *VRFTestHelperCallerSession) VerifyLinearCombinationWithGenerator(c *big.Int, p [2]*big.Int, s *big.Int, lcWitness common.Address) (bool, error) { return _VRFTestHelper.Contract.VerifyLinearCombinationWithGenerator(&_VRFTestHelper.CallOpts, c, p, s, lcWitness) } // VerifyVRFProof is a free data retrieval call binding the contract method 0xef3b10ec. // -// Solidity: function verifyVRFProof_(uint256[2] pk, uint256[2] gamma, uint256 c, uint256 s, uint256 seed, address uWitness, uint256[2] cGammaWitness, uint256[2] sHashWitness, uint256 zInv) constant returns() +// Solidity: function verifyVRFProof_(uint256[2] pk, uint256[2] gamma, uint256 c, uint256 s, uint256 seed, address uWitness, uint256[2] cGammaWitness, uint256[2] sHashWitness, uint256 zInv) view returns() func (_VRFTestHelper *VRFTestHelperCaller) VerifyVRFProof(opts *bind.CallOpts, pk [2]*big.Int, gamma [2]*big.Int, c *big.Int, s *big.Int, seed *big.Int, uWitness common.Address, cGammaWitness [2]*big.Int, sHashWitness [2]*big.Int, zInv *big.Int) error { var () out := &[]interface{}{} @@ -493,21 +492,21 @@ func (_VRFTestHelper *VRFTestHelperCaller) VerifyVRFProof(opts *bind.CallOpts, p // VerifyVRFProof is a free data retrieval call binding the contract method 0xef3b10ec. // -// Solidity: function verifyVRFProof_(uint256[2] pk, uint256[2] gamma, uint256 c, uint256 s, uint256 seed, address uWitness, uint256[2] cGammaWitness, uint256[2] sHashWitness, uint256 zInv) constant returns() +// Solidity: function verifyVRFProof_(uint256[2] pk, uint256[2] gamma, uint256 c, uint256 s, uint256 seed, address uWitness, uint256[2] cGammaWitness, uint256[2] sHashWitness, uint256 zInv) view returns() func (_VRFTestHelper *VRFTestHelperSession) VerifyVRFProof(pk [2]*big.Int, gamma [2]*big.Int, c *big.Int, s *big.Int, seed *big.Int, uWitness common.Address, cGammaWitness [2]*big.Int, sHashWitness [2]*big.Int, zInv *big.Int) error { return _VRFTestHelper.Contract.VerifyVRFProof(&_VRFTestHelper.CallOpts, pk, gamma, c, s, seed, uWitness, cGammaWitness, sHashWitness, zInv) } // VerifyVRFProof is a free data retrieval call binding the contract method 0xef3b10ec. // -// Solidity: function verifyVRFProof_(uint256[2] pk, uint256[2] gamma, uint256 c, uint256 s, uint256 seed, address uWitness, uint256[2] cGammaWitness, uint256[2] sHashWitness, uint256 zInv) constant returns() +// Solidity: function verifyVRFProof_(uint256[2] pk, uint256[2] gamma, uint256 c, uint256 s, uint256 seed, address uWitness, uint256[2] cGammaWitness, uint256[2] sHashWitness, uint256 zInv) view returns() func (_VRFTestHelper *VRFTestHelperCallerSession) VerifyVRFProof(pk [2]*big.Int, gamma [2]*big.Int, c *big.Int, s *big.Int, seed *big.Int, uWitness common.Address, cGammaWitness [2]*big.Int, sHashWitness [2]*big.Int, zInv *big.Int) error { return _VRFTestHelper.Contract.VerifyVRFProof(&_VRFTestHelper.CallOpts, pk, gamma, c, s, seed, uWitness, cGammaWitness, sHashWitness, zInv) } // YSquared is a free data retrieval call binding the contract method 0x9d6f0337. // -// Solidity: function ySquared_(uint256 x) constant returns(uint256) +// Solidity: function ySquared_(uint256 x) pure returns(uint256) func (_VRFTestHelper *VRFTestHelperCaller) YSquared(opts *bind.CallOpts, x *big.Int) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -519,14 +518,14 @@ func (_VRFTestHelper *VRFTestHelperCaller) YSquared(opts *bind.CallOpts, x *big. // YSquared is a free data retrieval call binding the contract method 0x9d6f0337. // -// Solidity: function ySquared_(uint256 x) constant returns(uint256) +// Solidity: function ySquared_(uint256 x) pure returns(uint256) func (_VRFTestHelper *VRFTestHelperSession) YSquared(x *big.Int) (*big.Int, error) { return _VRFTestHelper.Contract.YSquared(&_VRFTestHelper.CallOpts, x) } // YSquared is a free data retrieval call binding the contract method 0x9d6f0337. // -// Solidity: function ySquared_(uint256 x) constant returns(uint256) +// Solidity: function ySquared_(uint256 x) pure returns(uint256) func (_VRFTestHelper *VRFTestHelperCallerSession) YSquared(x *big.Int) (*big.Int, error) { return _VRFTestHelper.Contract.YSquared(&_VRFTestHelper.CallOpts, x) } diff --git a/core/internal/gethwrappers/generated/solidity_vrf_consumer_interface/solidity_vrf_consumer_interface.go b/core/internal/gethwrappers/generated/solidity_vrf_consumer_interface/solidity_vrf_consumer_interface.go index b57472cfe05..710e6e9ca98 100644 --- a/core/internal/gethwrappers/generated/solidity_vrf_consumer_interface/solidity_vrf_consumer_interface.go +++ b/core/internal/gethwrappers/generated/solidity_vrf_consumer_interface/solidity_vrf_consumer_interface.go @@ -20,7 +20,6 @@ var ( _ = big.NewInt _ = strings.NewReader _ = ethereum.NotFound - _ = abi.U256 _ = bind.Bind _ = common.Big1 _ = types.BloomLookup @@ -191,7 +190,7 @@ func (_VRFConsumer *VRFConsumerTransactorRaw) Transact(opts *bind.TransactOpts, // Nonces is a free data retrieval call binding the contract method 0x9e317f12. // -// Solidity: function nonces(bytes32 ) constant returns(uint256) +// Solidity: function nonces(bytes32 ) view returns(uint256) func (_VRFConsumer *VRFConsumerCaller) Nonces(opts *bind.CallOpts, arg0 [32]byte) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -203,21 +202,21 @@ func (_VRFConsumer *VRFConsumerCaller) Nonces(opts *bind.CallOpts, arg0 [32]byte // Nonces is a free data retrieval call binding the contract method 0x9e317f12. // -// Solidity: function nonces(bytes32 ) constant returns(uint256) +// Solidity: function nonces(bytes32 ) view returns(uint256) func (_VRFConsumer *VRFConsumerSession) Nonces(arg0 [32]byte) (*big.Int, error) { return _VRFConsumer.Contract.Nonces(&_VRFConsumer.CallOpts, arg0) } // Nonces is a free data retrieval call binding the contract method 0x9e317f12. // -// Solidity: function nonces(bytes32 ) constant returns(uint256) +// Solidity: function nonces(bytes32 ) view returns(uint256) func (_VRFConsumer *VRFConsumerCallerSession) Nonces(arg0 [32]byte) (*big.Int, error) { return _VRFConsumer.Contract.Nonces(&_VRFConsumer.CallOpts, arg0) } // RandomnessOutput is a free data retrieval call binding the contract method 0x2f47fd86. // -// Solidity: function randomnessOutput() constant returns(uint256) +// Solidity: function randomnessOutput() view returns(uint256) func (_VRFConsumer *VRFConsumerCaller) RandomnessOutput(opts *bind.CallOpts) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -229,21 +228,21 @@ func (_VRFConsumer *VRFConsumerCaller) RandomnessOutput(opts *bind.CallOpts) (*b // RandomnessOutput is a free data retrieval call binding the contract method 0x2f47fd86. // -// Solidity: function randomnessOutput() constant returns(uint256) +// Solidity: function randomnessOutput() view returns(uint256) func (_VRFConsumer *VRFConsumerSession) RandomnessOutput() (*big.Int, error) { return _VRFConsumer.Contract.RandomnessOutput(&_VRFConsumer.CallOpts) } // RandomnessOutput is a free data retrieval call binding the contract method 0x2f47fd86. // -// Solidity: function randomnessOutput() constant returns(uint256) +// Solidity: function randomnessOutput() view returns(uint256) func (_VRFConsumer *VRFConsumerCallerSession) RandomnessOutput() (*big.Int, error) { return _VRFConsumer.Contract.RandomnessOutput(&_VRFConsumer.CallOpts) } // RequestId is a free data retrieval call binding the contract method 0x006d6cae. // -// Solidity: function requestId() constant returns(bytes32) +// Solidity: function requestId() view returns(bytes32) func (_VRFConsumer *VRFConsumerCaller) RequestId(opts *bind.CallOpts) ([32]byte, error) { var ( ret0 = new([32]byte) @@ -255,14 +254,14 @@ func (_VRFConsumer *VRFConsumerCaller) RequestId(opts *bind.CallOpts) ([32]byte, // RequestId is a free data retrieval call binding the contract method 0x006d6cae. // -// Solidity: function requestId() constant returns(bytes32) +// Solidity: function requestId() view returns(bytes32) func (_VRFConsumer *VRFConsumerSession) RequestId() ([32]byte, error) { return _VRFConsumer.Contract.RequestId(&_VRFConsumer.CallOpts) } // RequestId is a free data retrieval call binding the contract method 0x006d6cae. // -// Solidity: function requestId() constant returns(bytes32) +// Solidity: function requestId() view returns(bytes32) func (_VRFConsumer *VRFConsumerCallerSession) RequestId() ([32]byte, error) { return _VRFConsumer.Contract.RequestId(&_VRFConsumer.CallOpts) } diff --git a/core/internal/gethwrappers/generated/solidity_vrf_coordinator_interface/solidity_vrf_coordinator_interface.go b/core/internal/gethwrappers/generated/solidity_vrf_coordinator_interface/solidity_vrf_coordinator_interface.go index 5cd5923410d..84377a3cc1d 100644 --- a/core/internal/gethwrappers/generated/solidity_vrf_coordinator_interface/solidity_vrf_coordinator_interface.go +++ b/core/internal/gethwrappers/generated/solidity_vrf_coordinator_interface/solidity_vrf_coordinator_interface.go @@ -20,7 +20,6 @@ var ( _ = big.NewInt _ = strings.NewReader _ = ethereum.NotFound - _ = abi.U256 _ = bind.Bind _ = common.Big1 _ = types.BloomLookup @@ -191,7 +190,7 @@ func (_VRFCoordinator *VRFCoordinatorTransactorRaw) Transact(opts *bind.Transact // Callbacks is a free data retrieval call binding the contract method 0x21f36509. // -// Solidity: function callbacks(bytes32 ) constant returns(address callbackContract, uint256 randomnessFee, uint256 seed) +// Solidity: function callbacks(bytes32 ) view returns(address callbackContract, uint256 randomnessFee, uint256 seed) func (_VRFCoordinator *VRFCoordinatorCaller) Callbacks(opts *bind.CallOpts, arg0 [32]byte) (struct { CallbackContract common.Address RandomnessFee *big.Int @@ -209,7 +208,7 @@ func (_VRFCoordinator *VRFCoordinatorCaller) Callbacks(opts *bind.CallOpts, arg0 // Callbacks is a free data retrieval call binding the contract method 0x21f36509. // -// Solidity: function callbacks(bytes32 ) constant returns(address callbackContract, uint256 randomnessFee, uint256 seed) +// Solidity: function callbacks(bytes32 ) view returns(address callbackContract, uint256 randomnessFee, uint256 seed) func (_VRFCoordinator *VRFCoordinatorSession) Callbacks(arg0 [32]byte) (struct { CallbackContract common.Address RandomnessFee *big.Int @@ -220,7 +219,7 @@ func (_VRFCoordinator *VRFCoordinatorSession) Callbacks(arg0 [32]byte) (struct { // Callbacks is a free data retrieval call binding the contract method 0x21f36509. // -// Solidity: function callbacks(bytes32 ) constant returns(address callbackContract, uint256 randomnessFee, uint256 seed) +// Solidity: function callbacks(bytes32 ) view returns(address callbackContract, uint256 randomnessFee, uint256 seed) func (_VRFCoordinator *VRFCoordinatorCallerSession) Callbacks(arg0 [32]byte) (struct { CallbackContract common.Address RandomnessFee *big.Int @@ -231,7 +230,7 @@ func (_VRFCoordinator *VRFCoordinatorCallerSession) Callbacks(arg0 [32]byte) (st // HashOfKey is a free data retrieval call binding the contract method 0xcaf70c4a. // -// Solidity: function hashOfKey(uint256[2] _publicKey) constant returns(bytes32) +// Solidity: function hashOfKey(uint256[2] _publicKey) pure returns(bytes32) func (_VRFCoordinator *VRFCoordinatorCaller) HashOfKey(opts *bind.CallOpts, _publicKey [2]*big.Int) ([32]byte, error) { var ( ret0 = new([32]byte) @@ -243,21 +242,21 @@ func (_VRFCoordinator *VRFCoordinatorCaller) HashOfKey(opts *bind.CallOpts, _pub // HashOfKey is a free data retrieval call binding the contract method 0xcaf70c4a. // -// Solidity: function hashOfKey(uint256[2] _publicKey) constant returns(bytes32) +// Solidity: function hashOfKey(uint256[2] _publicKey) pure returns(bytes32) func (_VRFCoordinator *VRFCoordinatorSession) HashOfKey(_publicKey [2]*big.Int) ([32]byte, error) { return _VRFCoordinator.Contract.HashOfKey(&_VRFCoordinator.CallOpts, _publicKey) } // HashOfKey is a free data retrieval call binding the contract method 0xcaf70c4a. // -// Solidity: function hashOfKey(uint256[2] _publicKey) constant returns(bytes32) +// Solidity: function hashOfKey(uint256[2] _publicKey) pure returns(bytes32) func (_VRFCoordinator *VRFCoordinatorCallerSession) HashOfKey(_publicKey [2]*big.Int) ([32]byte, error) { return _VRFCoordinator.Contract.HashOfKey(&_VRFCoordinator.CallOpts, _publicKey) } // ServiceAgreements is a free data retrieval call binding the contract method 0x75d35070. // -// Solidity: function serviceAgreements(bytes32 ) constant returns(address vRFOracle, bytes32 jobID, uint256 fee) +// Solidity: function serviceAgreements(bytes32 ) view returns(address vRFOracle, bytes32 jobID, uint256 fee) func (_VRFCoordinator *VRFCoordinatorCaller) ServiceAgreements(opts *bind.CallOpts, arg0 [32]byte) (struct { VRFOracle common.Address JobID [32]byte @@ -275,7 +274,7 @@ func (_VRFCoordinator *VRFCoordinatorCaller) ServiceAgreements(opts *bind.CallOp // ServiceAgreements is a free data retrieval call binding the contract method 0x75d35070. // -// Solidity: function serviceAgreements(bytes32 ) constant returns(address vRFOracle, bytes32 jobID, uint256 fee) +// Solidity: function serviceAgreements(bytes32 ) view returns(address vRFOracle, bytes32 jobID, uint256 fee) func (_VRFCoordinator *VRFCoordinatorSession) ServiceAgreements(arg0 [32]byte) (struct { VRFOracle common.Address JobID [32]byte @@ -286,7 +285,7 @@ func (_VRFCoordinator *VRFCoordinatorSession) ServiceAgreements(arg0 [32]byte) ( // ServiceAgreements is a free data retrieval call binding the contract method 0x75d35070. // -// Solidity: function serviceAgreements(bytes32 ) constant returns(address vRFOracle, bytes32 jobID, uint256 fee) +// Solidity: function serviceAgreements(bytes32 ) view returns(address vRFOracle, bytes32 jobID, uint256 fee) func (_VRFCoordinator *VRFCoordinatorCallerSession) ServiceAgreements(arg0 [32]byte) (struct { VRFOracle common.Address JobID [32]byte @@ -297,7 +296,7 @@ func (_VRFCoordinator *VRFCoordinatorCallerSession) ServiceAgreements(arg0 [32]b // WithdrawableTokens is a free data retrieval call binding the contract method 0x006f6ad0. // -// Solidity: function withdrawableTokens(address ) constant returns(uint256) +// Solidity: function withdrawableTokens(address ) view returns(uint256) func (_VRFCoordinator *VRFCoordinatorCaller) WithdrawableTokens(opts *bind.CallOpts, arg0 common.Address) (*big.Int, error) { var ( ret0 = new(*big.Int) @@ -309,14 +308,14 @@ func (_VRFCoordinator *VRFCoordinatorCaller) WithdrawableTokens(opts *bind.CallO // WithdrawableTokens is a free data retrieval call binding the contract method 0x006f6ad0. // -// Solidity: function withdrawableTokens(address ) constant returns(uint256) +// Solidity: function withdrawableTokens(address ) view returns(uint256) func (_VRFCoordinator *VRFCoordinatorSession) WithdrawableTokens(arg0 common.Address) (*big.Int, error) { return _VRFCoordinator.Contract.WithdrawableTokens(&_VRFCoordinator.CallOpts, arg0) } // WithdrawableTokens is a free data retrieval call binding the contract method 0x006f6ad0. // -// Solidity: function withdrawableTokens(address ) constant returns(uint256) +// Solidity: function withdrawableTokens(address ) view returns(uint256) func (_VRFCoordinator *VRFCoordinatorCallerSession) WithdrawableTokens(arg0 common.Address) (*big.Int, error) { return _VRFCoordinator.Contract.WithdrawableTokens(&_VRFCoordinator.CallOpts, arg0) } diff --git a/core/internal/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt b/core/internal/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt index aafad3a2802..95cb99e36c2 100644 --- a/core/internal/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt +++ b/core/internal/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt @@ -1,4 +1,4 @@ -GETH_VERSION: 1.9.12 +GETH_VERSION: 1.9.15 flux_aggregator_wrapper: ../../../evm-contracts/abi/v0.6/FluxAggregator.json c2cab4ae2163bf3d1bc1714710a103724a84da8685c8de9d7d73fe3575423bdb solidity_request_id: ../../../evm-contracts/abi/v0.6/VRFRequestIDBaseTestHelper.json 4cd458d90afeb98d83b11fb1a2e9bf9d3665fe2b95661d2244e94697a6b09d32 solidity_verifier_wrapper: ../../../evm-contracts/abi/v0.6/VRFTestHelper.json b92b01c57853f370451387dcb7f73c14718bc3a4fe958f11852ccd5fd09d22a8 diff --git a/core/services/bulletprooftxmanager/bulletprooftxmanager.go b/core/services/bulletprooftxmanager/bulletprooftxmanager.go index 0e850a38fa3..aa32b590b4f 100644 --- a/core/services/bulletprooftxmanager/bulletprooftxmanager.go +++ b/core/services/bulletprooftxmanager/bulletprooftxmanager.go @@ -105,11 +105,11 @@ func withAdvisoryLock(s *strpkg.Store, classID int32, objectID int32, f func() e if err != nil { return errors.Wrap(err, "withAdvisoryLock failed") } - defer conn.Close() + defer logger.ErrorIfCalling(conn.Close) if err := tryAdvisoryLock(ctx, conn, classID, objectID); err != nil { return err } - defer advisoryUnlock(ctx, conn, classID, objectID) + defer logger.ErrorIfCalling(func() error { return advisoryUnlock(ctx, conn, classID, objectID) }) return f() } @@ -119,7 +119,7 @@ func tryAdvisoryLock(ctx context.Context, conn *sql.Conn, classID int32, objectI if err != nil { return errors.Wrap(err, "tryAdvisoryLock failed") } - defer rows.Close() + defer logger.ErrorIfCalling(rows.Close) gotRow := rows.Next() if !gotRow { return errors.New("query unexpectedly returned 0 rows") diff --git a/core/services/vrf/vrf_coordinator_abi_values.go b/core/services/vrf/vrf_coordinator_abi_values.go index 7e677d1c36c..0aa45c9a02b 100644 --- a/core/services/vrf/vrf_coordinator_abi_values.go +++ b/core/services/vrf/vrf_coordinator_abi_values.go @@ -76,9 +76,9 @@ func readCoordinatorABI() { panic(fmt.Errorf("could not find method %s in VRFCoordinator ABI", fulfillMethodName)) } - v.fulfillSelector = hexutil.Encode(v.fulfillMethod.ID()) + v.fulfillSelector = hexutil.Encode(v.fulfillMethod.ID) randomnessRequestABI := v.coordinatorABI.Events["RandomnessRequest"] - v.randomnessRequestLogTopic = randomnessRequestABI.ID() + v.randomnessRequestLogTopic = randomnessRequestABI.ID for _, arg := range randomnessRequestABI.Inputs { if !arg.Indexed { v.randomnessRequestRawDataArgs = append(v.randomnessRequestRawDataArgs, arg) diff --git a/core/store/models/eth.go b/core/store/models/eth.go index e8c3cc36972..ea6b2f3e28c 100755 --- a/core/store/models/eth.go +++ b/core/store/models/eth.go @@ -261,34 +261,34 @@ func NewHead(number *big.Int, blockHash common.Hash, parentHash common.Hash, tim } // String returns a string representation of this number. -func (l *Head) String() string { - return l.ToInt().String() +func (h *Head) String() string { + return h.ToInt().String() } // ToInt return the height as a *big.Int. Also handles nil by returning nil. -func (l *Head) ToInt() *big.Int { - if l == nil { +func (h *Head) ToInt() *big.Int { + if h == nil { return nil } - return big.NewInt(l.Number) + return big.NewInt(h.Number) } // GreaterThan compares BlockNumbers and returns true if the receiver BlockNumber is greater than // the supplied BlockNumber -func (l *Head) GreaterThan(r *Head) bool { - if l == nil { +func (h *Head) GreaterThan(r *Head) bool { + if h == nil { return false } - if l != nil && r == nil { + if h != nil && r == nil { return true } - return l.Number > r.Number + return h.Number > r.Number } // NextInt returns the next BlockNumber as big.int, or nil if nil to represent latest. -func (l *Head) NextInt() *big.Int { - if l == nil { +func (h *Head) NextInt() *big.Int { + if h == nil { return nil } - return new(big.Int).Add(l.ToInt(), big.NewInt(1)) + return new(big.Int).Add(h.ToInt(), big.NewInt(1)) } diff --git a/core/store/store.go b/core/store/store.go index 698d59153fc..5b693683f2e 100644 --- a/core/store/store.go +++ b/core/store/store.go @@ -110,7 +110,7 @@ func (wrapper *lazyRPCWrapper) GethClient(callback func(gethClient eth.GethClien } ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) defer cancel() - wrapper.limiter.Wait(ctx) + logger.ErrorIf(wrapper.limiter.Wait(ctx)) client := gethClient.NewClient(wrapper.client) diff --git a/go.mod b/go.mod index 2b07743af07..f86ebecd9a0 100644 --- a/go.mod +++ b/go.mod @@ -17,8 +17,7 @@ require ( github.com/codegangsta/negroni v1.0.0 // indirect github.com/danielkov/gin-helmet v0.0.0-20171108135313-1387e224435e github.com/deckarep/golang-set v1.7.1 // indirect - github.com/elastic/gosigar v0.10.4 // indirect - github.com/ethereum/go-ethereum v1.9.12 + github.com/ethereum/go-ethereum v1.9.15 github.com/fatih/color v1.9.0 github.com/fxamacker/cbor/v2 v2.2.0 github.com/garyburd/redigo v1.6.0 // indirect diff --git a/go.sum b/go.sum index 61aa621fda6..8b7171c2521 100644 --- a/go.sum +++ b/go.sum @@ -36,12 +36,12 @@ github.com/DATA-DOG/go-txdb v0.1.3/go.mod h1:DhAhxMXZpUJVGnT+p9IbzJoRKvlArO2pkHj github.com/Depado/ginprom v1.2.1-0.20200115153638-53bbba851bd8 h1:Ic3MehOyypWF/AW91Z/6FA2R2vnBzaDjRzoLmkP1DW8= github.com/Depado/ginprom v1.2.1-0.20200115153638-53bbba851bd8/go.mod h1:VHRucFf/9saDXsYg6uzQ8Oo8gUwngtWec9ZJ00H+ZCc= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/OneOfOne/xxhash v1.2.5/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIOA6tDi6QXUemppXK3P9BI7mr2hd6gx8= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= -github.com/VictoriaMetrics/fastcache v1.5.3 h1:2odJnXLbFZcoV9KYtQ+7TH1UOq3dn3AssMgieaezkR4= -github.com/VictoriaMetrics/fastcache v1.5.3/go.mod h1:+jv9Ckb+za/P1ZRg/sulP5Ni1v49daAVERr0H3CuscE= +github.com/VictoriaMetrics/fastcache v1.5.7 h1:4y6y0G8PRzszQUYIQHHssv/jgPHAb5qQuuDNdCbyAgw= +github.com/VictoriaMetrics/fastcache v1.5.7/go.mod h1:ptDBkNMQI4RtmVo8VS/XwRY6RoTu1dAWCbrk+6WsEM8= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -96,7 +96,6 @@ github.com/cespare/cp v1.1.1 h1:nCb6ZLdB7NRaqsm91JtQTAme2SKJzXVsdPIPkyJr1MU= github.com/cespare/cp v1.1.1/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.0.1-0.20190104013014-3767db7a7e18/go.mod h1:HD5P3vAIAh+Y2GAxg0PrPN1P8WkepXGpjbUPDHJqqKM= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= @@ -137,13 +136,10 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c h1:JHHhtb9XWJrGNMcrVP6vyzO4dusgi/HnceHTgxSejUM= github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/elastic/gosigar v0.8.1-0.20180330100440-37f05ff46ffa/go.mod h1:cdorVVzy1fhmEqmtgqkoE3bYtCfSCkVyjTyCIo22xvs= -github.com/elastic/gosigar v0.10.4 h1:6jfw75dsoflhBMRdO6QPzQUgLqUYTsQQQRkkcsHsuPo= -github.com/elastic/gosigar v0.10.4/go.mod h1:cdorVVzy1fhmEqmtgqkoE3bYtCfSCkVyjTyCIo22xvs= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= -github.com/ethereum/go-ethereum v1.9.12 h1:EPtimwsp/KGDSiXcNunzsI4kefdsMHZGJntKx3fvbaI= -github.com/ethereum/go-ethereum v1.9.12/go.mod h1:PvsVkQmhZFx92Y+h2ylythYlheEDt/uBgFbl61Js/jo= +github.com/ethereum/go-ethereum v1.9.15 h1:wrWl+QrtutRUJ9LZXdUqBoGoo2b1tOCYRDrAOQhCY3A= +github.com/ethereum/go-ethereum v1.9.15/go.mod h1:slT8bPPRhXsyNTwHQxrOnjuTZ1sDXRajW11EkJ84QJ0= github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= @@ -190,6 +186,7 @@ github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80nA= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-ole/go-ole v1.2.1 h1:2lOsA72HgjxAuMlKpFiCbHTvu44PIVkZ5hqm3RSdI/E= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= @@ -306,11 +303,12 @@ github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= -github.com/hashicorp/golang-lru v0.0.0-20160813221303-0a025b7e63ad/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= @@ -319,8 +317,9 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/huin/goupnp v0.0.0-20161224104101-679507af18f3 h1:DqD8eigqlUm0+znmx7zhL0xvTW3+e1jCekJMfBUADWI= -github.com/huin/goupnp v0.0.0-20161224104101-679507af18f3/go.mod h1:MZ2ZmwcBpvOoJ22IJsc7va19ZwoheaBk43rKg12SKag= +github.com/huin/goupnp v1.0.0 h1:wg75sLpL6DZqwHQN6E1Cfk6mtfzS45z8OV+ic+DtHRo= +github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc= +github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/influxdb v1.2.3-0.20180221223340-01288bdb0883/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= @@ -479,6 +478,7 @@ github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709 h1:zNBQb37RGLmJybyMcs github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 h1:oYW+YCJ1pachXTQmzR3rNLYGGz4g/UgFcjb28p/viDM= github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -537,6 +537,8 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/shirou/gopsutil v2.20.5-0.20200531151128-663af789c085+incompatible h1:+gAR1bMhuoQnZMTWFIvp7ukynULPsteLzG+siZKLtD8= +github.com/shirou/gopsutil v2.20.5-0.20200531151128-663af789c085+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shopspring/decimal v0.0.0-20191130220710-360f2bc03045 h1:8CnFGhoe92Izugjok8nZEGYCNovJwdRFYwrEiLtG6ZQ= github.com/shopspring/decimal v0.0.0-20191130220710-360f2bc03045/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= @@ -550,7 +552,6 @@ github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIK github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spaolacci/murmur3 v1.0.1-0.20190317074736-539464a789e9/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.1 h1:qgMbHoJbPbw579P+1zVY+6n4nIFuIchaIjzZ/I/Yq8M= github.com/spf13/afero v1.2.1/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= @@ -577,8 +578,6 @@ github.com/stretchr/testify v0.0.0-20170130113145-4d4bfba8f1d1/go.mod h1:a8OnRci github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.6.0 h1:jlIyCplCJFULU/01vCkhKuTyc3OorI3bJFuw6obfgho= -github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= @@ -685,6 +684,7 @@ golang.org/x/net v0.0.0-20170324220409-6c2325251549/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -701,7 +701,7 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7 h1:AeiKBIuRw3UomYXSbLy0Mc2dDLfdtbT/IVn4keq83P0= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -742,7 +742,6 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f h1:gWF768j/LaZugp8dyS4UwsslYCYz9XgFxvlgsn0n9H8= golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -841,8 +840,8 @@ gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuv gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8= gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU= gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= -gopkg.in/olebedev/go-duktape.v3 v3.0.0-20190213234257-ec84240a7772 h1:hhsSf/5z74Ck/DJYc+R8zpq8KGm7uJvpdLRQED/IedA= -gopkg.in/olebedev/go-duktape.v3 v3.0.0-20190213234257-ec84240a7772/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns= +gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200603215123-a4a8cb9d2cbc h1:17cdygvFw3DEyNMh81Bk687W74d5pcC5qEKQICv9N6g= +gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200603215123-a4a8cb9d2cbc/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=