Browse Source
Merge pull request #223 from hermeznetwork/feature/eth-remove-ERC777
Feature/eth remove erc777feature/sql-semaphore1
Eduard S
4 years ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 1744 additions and 2425 deletions
Unified View
Diff Options
-
+1 -0cli/node/cfg.example.toml
-
+4 -3config/config.go
-
+2 -2coordinator/coordinator_test.go
-
+7 -0eth/.env.example
-
+62 -0eth/README.md
-
+48 -68eth/auction.go
-
+15 -22eth/auction_test.go
-
+10 -4eth/client.go
-
+3 -11eth/contracts/README.md
-
+53 -32eth/contracts/auction/HermezAuctionProtocol.go
-
+0 -19eth/contracts/erc20.sol
-
+0 -274eth/contracts/erc20/erc20.go
-
+0 -1696eth/contracts/erc777/ERC777.go
-
+35 -35eth/contracts/hermez/Hermez.go
-
+1163 -0eth/contracts/tokenHEZ/HEZ.go
-
+2 -23eth/contracts/withdrawdelayer/WithdrawalDelayer.go
-
+4 -2eth/ethereum.go
-
+3 -3eth/ethereum_test.go
-
+91 -0eth/helpers.go
-
+66 -29eth/main_test.go
-
+58 -85eth/rollup.go
-
+57 -84eth/rollup_test.go
-
+13 -13eth/wdelayer_test.go
-
+1 -0go.mod
-
+1 -0go.sum
-
+5 -2node/node.go
-
+1 -1synchronizer/synchronizer_test.go
-
+31 -9test/ethclient.go
-
+8 -8test/ethclient_test.go
@ -0,0 +1,7 @@ |
|||||
|
GENESIS_BLOCK=97 |
||||
|
AUCTION="0x038B86d9d8FAFdd0a02ebd1A476432877b0107C8" |
||||
|
AUCTION_TEST="0xEcc0a6dbC0bb4D51E4F84A315a9e5B0438cAD4f0" |
||||
|
TOKENHEZ="0xf4e77E5Da47AC3125140c470c71cBca77B5c638c" |
||||
|
HERMEZ="0xD6C850aeBFDC46D7F4c207e445cC0d6B0919BDBe" |
||||
|
WDELAYER="0x500D1d6A4c7D8Ae28240b47c8FCde034D827fD5e" |
||||
|
WDELAYER_TEST="0x1d80315fac6aBd3EfeEbE97dEc44461ba7556160" |
||||
@ -0,0 +1,62 @@ |
|||||
|
Test Ethclient - Contracts |
||||
|
|
||||
|
## Contracts |
||||
|
|
||||
|
The first step is to clone the github repository where the contracts are located: |
||||
|
|
||||
|
`git clone https://github.com/hermeznetwork/contracts.git` |
||||
|
|
||||
|
While the prepared deployment is not found to master, branch in repository must be changed: |
||||
|
|
||||
|
`git checkout feature/ethclient-test-deployment` |
||||
|
|
||||
|
Now, install the dependencies: |
||||
|
|
||||
|
``` |
||||
|
cd contracts/ |
||||
|
yarn install |
||||
|
``` |
||||
|
|
||||
|
Go to where the deployment scripts for the test are found: |
||||
|
|
||||
|
`cd scripts/ethclient-deployment/` |
||||
|
|
||||
|
Now, a bash script (which uses gnome-terminal) has to be run to do the deployment: |
||||
|
`./test-deploy.sh` |
||||
|
|
||||
|
This bash file follows these steps: |
||||
|
- `npx builder node`: a local blockchain to do our tests |
||||
|
- `npx buidler run --network localhost test-deployment.js`: run the deployment on the local blockchain |
||||
|
|
||||
|
Alternatively you can run the two previous commands manually in different terminals. |
||||
|
|
||||
|
An output file necessary for the next step is obtained: `deploy-output`. |
||||
|
|
||||
|
> The files that appear in `hermez-node/eth/contracts` must be generated from the same contract that we deploy in this step |
||||
|
|
||||
|
## Ethclient Test |
||||
|
|
||||
|
Different environment variables are necessary to run this test. |
||||
|
They must be taken from the output file of the previous step. |
||||
|
|
||||
|
They can be provided by file called `.env`: |
||||
|
|
||||
|
``` |
||||
|
GENESIS_BLOCK=97 |
||||
|
AUCTION="0x038B86d9d8FAFdd0a02ebd1A476432877b0107C8" |
||||
|
AUCTION_TEST="0xEcc0a6dbC0bb4D51E4F84A315a9e5B0438cAD4f0" |
||||
|
TOKENHEZ="0xf4e77E5Da47AC3125140c470c71cBca77B5c638c" |
||||
|
HERMEZ="0xD6C850aeBFDC46D7F4c207e445cC0d6B0919BDBe" |
||||
|
WDELAYER="0x500D1d6A4c7D8Ae28240b47c8FCde034D827fD5e" |
||||
|
WDELAYER_TEST="0x1d80315fac6aBd3EfeEbE97dEc44461ba7556160" |
||||
|
``` |
||||
|
|
||||
|
> An example is found in `hermez-node/eth/.env.example` |
||||
|
|
||||
|
And then run test from `hermez-node/eth/`: |
||||
|
|
||||
|
`INTEGRATION=1 go test` |
||||
|
|
||||
|
Or they can be provided as a parameter in the command that runs the test: |
||||
|
|
||||
|
`INTEGRATION=1 GENESIS_BLOCK=97 AUCTION="0x038B86d9d8FAFdd0a02ebd1A476432877b0107C8" AUCTION_TEST="0xEcc0a6dbC0bb4D51E4F84A315a9e5B0438cAD4f0" TOKENHEZ="0xf4e77E5Da47AC3125140c470c71cBca77B5c638c" HERMEZ="0xD6C850aeBFDC46D7F4c207e445cC0d6B0919BDBe" WDELAYER="0x500D1d6A4c7D8Ae28240b47c8FCde034D827fD5e" WDELAYER_TEST="0x1d80315fac6aBd3EfeEbE97dEc44461ba7556160" go test` |
||||
+ 53
- 32
eth/contracts/auction/HermezAuctionProtocol.go
File diff suppressed because it is too large
View File
@ -1,19 +0,0 @@ |
|||||
pragma solidity ^0.7.0; |
|
||||
|
|
||||
contract ERC20 { |
|
||||
string public constant name = ""; |
|
||||
string public constant symbol = ""; |
|
||||
uint8 public constant decimals = 0; |
|
||||
|
|
||||
/* |
|
||||
function totalSupply() public constant returns (uint); |
|
||||
function balanceOf(address tokenOwner) public constant returns (uint balance); |
|
||||
function allowance(address tokenOwner, address spender) public constant returns (uint remaining); |
|
||||
function transfer(address to, uint tokens) public returns (bool success); |
|
||||
function approve(address spender, uint tokens) public returns (bool success); |
|
||||
function transferFrom(address from, address to, uint tokens) public returns (bool success); |
|
||||
|
|
||||
event Transfer(address indexed from, address indexed to, uint tokens); |
|
||||
event Approval(address indexed tokenOwner, address indexed spender, uint tokens); |
|
||||
*/ |
|
||||
} |
|
||||
@ -1,274 +0,0 @@ |
|||||
// Code generated - DO NOT EDIT.
|
|
||||
// This file is a generated binding and any manual changes will be lost.
|
|
||||
|
|
||||
package erc20 |
|
||||
|
|
||||
import ( |
|
||||
"math/big" |
|
||||
"strings" |
|
||||
|
|
||||
ethereum "github.com/ethereum/go-ethereum" |
|
||||
"github.com/ethereum/go-ethereum/accounts/abi" |
|
||||
"github.com/ethereum/go-ethereum/accounts/abi/bind" |
|
||||
"github.com/ethereum/go-ethereum/common" |
|
||||
"github.com/ethereum/go-ethereum/core/types" |
|
||||
"github.com/ethereum/go-ethereum/event" |
|
||||
) |
|
||||
|
|
||||
// Reference imports to suppress errors if they are not otherwise used.
|
|
||||
var ( |
|
||||
_ = big.NewInt |
|
||||
_ = strings.NewReader |
|
||||
_ = ethereum.NotFound |
|
||||
_ = bind.Bind |
|
||||
_ = common.Big1 |
|
||||
_ = types.BloomLookup |
|
||||
_ = event.NewSubscription |
|
||||
) |
|
||||
|
|
||||
// ERC20ABI is the input ABI used to generate the binding from.
|
|
||||
const ERC20ABI = "[{\"inputs\":[],\"name\":\"decimals\",\"outputs\":[{\"internalType\":\"uint8\",\"name\":\"\",\"type\":\"uint8\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"name\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"symbol\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]" |
|
||||
|
|
||||
// ERC20FuncSigs maps the 4-byte function signature to its string representation.
|
|
||||
var ERC20FuncSigs = map[string]string{ |
|
||||
"313ce567": "decimals()", |
|
||||
"06fdde03": "name()", |
|
||||
"95d89b41": "symbol()", |
|
||||
} |
|
||||
|
|
||||
// ERC20Bin is the compiled bytecode used for deploying new contracts.
|
|
||||
var ERC20Bin = "0x608060405234801561001057600080fd5b50610123806100206000396000f3fe6080604052348015600f57600080fd5b5060043610603c5760003560e01c806306fdde03146041578063313ce5671460b957806395d89b41146041575b600080fd5b604760d5565b6040805160208082528351818301528351919283929083019185019080838360005b83811015607f5781810151838201526020016069565b50505050905090810190601f16801560ab5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b60bf60e8565b6040805160ff9092168252519081900360200190f35b6040518060200160405280600081525081565b60008156fea26469706673582212209717f9f3c7b4f090e7741b44c5cb9425a26b593410462c0f4c2c0c0879db648d64736f6c63430007010033" |
|
||||
|
|
||||
// DeployERC20 deploys a new Ethereum contract, binding an instance of ERC20 to it.
|
|
||||
func DeployERC20(auth *bind.TransactOpts, backend bind.ContractBackend) (common.Address, *types.Transaction, *ERC20, error) { |
|
||||
parsed, err := abi.JSON(strings.NewReader(ERC20ABI)) |
|
||||
if err != nil { |
|
||||
return common.Address{}, nil, nil, err |
|
||||
} |
|
||||
|
|
||||
address, tx, contract, err := bind.DeployContract(auth, parsed, common.FromHex(ERC20Bin), backend) |
|
||||
if err != nil { |
|
||||
return common.Address{}, nil, nil, err |
|
||||
} |
|
||||
return address, tx, &ERC20{ERC20Caller: ERC20Caller{contract: contract}, ERC20Transactor: ERC20Transactor{contract: contract}, ERC20Filterer: ERC20Filterer{contract: contract}}, nil |
|
||||
} |
|
||||
|
|
||||
// ERC20 is an auto generated Go binding around an Ethereum contract.
|
|
||||
type ERC20 struct { |
|
||||
ERC20Caller // Read-only binding to the contract
|
|
||||
ERC20Transactor // Write-only binding to the contract
|
|
||||
ERC20Filterer // Log filterer for contract events
|
|
||||
} |
|
||||
|
|
||||
// ERC20Caller is an auto generated read-only Go binding around an Ethereum contract.
|
|
||||
type ERC20Caller struct { |
|
||||
contract *bind.BoundContract // Generic contract wrapper for the low level calls
|
|
||||
} |
|
||||
|
|
||||
// ERC20Transactor is an auto generated write-only Go binding around an Ethereum contract.
|
|
||||
type ERC20Transactor struct { |
|
||||
contract *bind.BoundContract // Generic contract wrapper for the low level calls
|
|
||||
} |
|
||||
|
|
||||
// ERC20Filterer is an auto generated log filtering Go binding around an Ethereum contract events.
|
|
||||
type ERC20Filterer struct { |
|
||||
contract *bind.BoundContract // Generic contract wrapper for the low level calls
|
|
||||
} |
|
||||
|
|
||||
// ERC20Session is an auto generated Go binding around an Ethereum contract,
|
|
||||
// with pre-set call and transact options.
|
|
||||
type ERC20Session struct { |
|
||||
Contract *ERC20 // Generic contract binding to set the session for
|
|
||||
CallOpts bind.CallOpts // Call options to use throughout this session
|
|
||||
TransactOpts bind.TransactOpts // Transaction auth options to use throughout this session
|
|
||||
} |
|
||||
|
|
||||
// ERC20CallerSession is an auto generated read-only Go binding around an Ethereum contract,
|
|
||||
// with pre-set call options.
|
|
||||
type ERC20CallerSession struct { |
|
||||
Contract *ERC20Caller // Generic contract caller binding to set the session for
|
|
||||
CallOpts bind.CallOpts // Call options to use throughout this session
|
|
||||
} |
|
||||
|
|
||||
// ERC20TransactorSession is an auto generated write-only Go binding around an Ethereum contract,
|
|
||||
// with pre-set transact options.
|
|
||||
type ERC20TransactorSession struct { |
|
||||
Contract *ERC20Transactor // Generic contract transactor binding to set the session for
|
|
||||
TransactOpts bind.TransactOpts // Transaction auth options to use throughout this session
|
|
||||
} |
|
||||
|
|
||||
// ERC20Raw is an auto generated low-level Go binding around an Ethereum contract.
|
|
||||
type ERC20Raw struct { |
|
||||
Contract *ERC20 // Generic contract binding to access the raw methods on
|
|
||||
} |
|
||||
|
|
||||
// ERC20CallerRaw is an auto generated low-level read-only Go binding around an Ethereum contract.
|
|
||||
type ERC20CallerRaw struct { |
|
||||
Contract *ERC20Caller // Generic read-only contract binding to access the raw methods on
|
|
||||
} |
|
||||
|
|
||||
// ERC20TransactorRaw is an auto generated low-level write-only Go binding around an Ethereum contract.
|
|
||||
type ERC20TransactorRaw struct { |
|
||||
Contract *ERC20Transactor // Generic write-only contract binding to access the raw methods on
|
|
||||
} |
|
||||
|
|
||||
// NewERC20 creates a new instance of ERC20, bound to a specific deployed contract.
|
|
||||
func NewERC20(address common.Address, backend bind.ContractBackend) (*ERC20, error) { |
|
||||
contract, err := bindERC20(address, backend, backend, backend) |
|
||||
if err != nil { |
|
||||
return nil, err |
|
||||
} |
|
||||
return &ERC20{ERC20Caller: ERC20Caller{contract: contract}, ERC20Transactor: ERC20Transactor{contract: contract}, ERC20Filterer: ERC20Filterer{contract: contract}}, nil |
|
||||
} |
|
||||
|
|
||||
// NewERC20Caller creates a new read-only instance of ERC20, bound to a specific deployed contract.
|
|
||||
func NewERC20Caller(address common.Address, caller bind.ContractCaller) (*ERC20Caller, error) { |
|
||||
contract, err := bindERC20(address, caller, nil, nil) |
|
||||
if err != nil { |
|
||||
return nil, err |
|
||||
} |
|
||||
return &ERC20Caller{contract: contract}, nil |
|
||||
} |
|
||||
|
|
||||
// NewERC20Transactor creates a new write-only instance of ERC20, bound to a specific deployed contract.
|
|
||||
func NewERC20Transactor(address common.Address, transactor bind.ContractTransactor) (*ERC20Transactor, error) { |
|
||||
contract, err := bindERC20(address, nil, transactor, nil) |
|
||||
if err != nil { |
|
||||
return nil, err |
|
||||
} |
|
||||
return &ERC20Transactor{contract: contract}, nil |
|
||||
} |
|
||||
|
|
||||
// NewERC20Filterer creates a new log filterer instance of ERC20, bound to a specific deployed contract.
|
|
||||
func NewERC20Filterer(address common.Address, filterer bind.ContractFilterer) (*ERC20Filterer, error) { |
|
||||
contract, err := bindERC20(address, nil, nil, filterer) |
|
||||
if err != nil { |
|
||||
return nil, err |
|
||||
} |
|
||||
return &ERC20Filterer{contract: contract}, nil |
|
||||
} |
|
||||
|
|
||||
// bindERC20 binds a generic wrapper to an already deployed contract.
|
|
||||
func bindERC20(address common.Address, caller bind.ContractCaller, transactor bind.ContractTransactor, filterer bind.ContractFilterer) (*bind.BoundContract, error) { |
|
||||
parsed, err := abi.JSON(strings.NewReader(ERC20ABI)) |
|
||||
if err != nil { |
|
||||
return nil, err |
|
||||
} |
|
||||
return bind.NewBoundContract(address, parsed, caller, transactor, filterer), nil |
|
||||
} |
|
||||
|
|
||||
// Call invokes the (constant) contract method with params as input values and
|
|
||||
// sets the output to result. The result type might be a single field for simple
|
|
||||
// returns, a slice of interfaces for anonymous returns and a struct for named
|
|
||||
// returns.
|
|
||||
func (_ERC20 *ERC20Raw) Call(opts *bind.CallOpts, result interface{}, method string, params ...interface{}) error { |
|
||||
return _ERC20.Contract.ERC20Caller.contract.Call(opts, result, method, params...) |
|
||||
} |
|
||||
|
|
||||
// Transfer initiates a plain transaction to move funds to the contract, calling
|
|
||||
// its default method if one is available.
|
|
||||
func (_ERC20 *ERC20Raw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) { |
|
||||
return _ERC20.Contract.ERC20Transactor.contract.Transfer(opts) |
|
||||
} |
|
||||
|
|
||||
// Transact invokes the (paid) contract method with params as input values.
|
|
||||
func (_ERC20 *ERC20Raw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) { |
|
||||
return _ERC20.Contract.ERC20Transactor.contract.Transact(opts, method, params...) |
|
||||
} |
|
||||
|
|
||||
// Call invokes the (constant) contract method with params as input values and
|
|
||||
// sets the output to result. The result type might be a single field for simple
|
|
||||
// returns, a slice of interfaces for anonymous returns and a struct for named
|
|
||||
// returns.
|
|
||||
func (_ERC20 *ERC20CallerRaw) Call(opts *bind.CallOpts, result interface{}, method string, params ...interface{}) error { |
|
||||
return _ERC20.Contract.contract.Call(opts, result, method, params...) |
|
||||
} |
|
||||
|
|
||||
// Transfer initiates a plain transaction to move funds to the contract, calling
|
|
||||
// its default method if one is available.
|
|
||||
func (_ERC20 *ERC20TransactorRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) { |
|
||||
return _ERC20.Contract.contract.Transfer(opts) |
|
||||
} |
|
||||
|
|
||||
// Transact invokes the (paid) contract method with params as input values.
|
|
||||
func (_ERC20 *ERC20TransactorRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) { |
|
||||
return _ERC20.Contract.contract.Transact(opts, method, params...) |
|
||||
} |
|
||||
|
|
||||
// Decimals is a free data retrieval call binding the contract method 0x313ce567.
|
|
||||
//
|
|
||||
// Solidity: function decimals() view returns(uint8)
|
|
||||
func (_ERC20 *ERC20Caller) Decimals(opts *bind.CallOpts) (uint8, error) { |
|
||||
var ( |
|
||||
ret0 = new(uint8) |
|
||||
) |
|
||||
out := ret0 |
|
||||
err := _ERC20.contract.Call(opts, out, "decimals") |
|
||||
return *ret0, err |
|
||||
} |
|
||||
|
|
||||
// Decimals is a free data retrieval call binding the contract method 0x313ce567.
|
|
||||
//
|
|
||||
// Solidity: function decimals() view returns(uint8)
|
|
||||
func (_ERC20 *ERC20Session) Decimals() (uint8, error) { |
|
||||
return _ERC20.Contract.Decimals(&_ERC20.CallOpts) |
|
||||
} |
|
||||
|
|
||||
// Decimals is a free data retrieval call binding the contract method 0x313ce567.
|
|
||||
//
|
|
||||
// Solidity: function decimals() view returns(uint8)
|
|
||||
func (_ERC20 *ERC20CallerSession) Decimals() (uint8, error) { |
|
||||
return _ERC20.Contract.Decimals(&_ERC20.CallOpts) |
|
||||
} |
|
||||
|
|
||||
// Name is a free data retrieval call binding the contract method 0x06fdde03.
|
|
||||
//
|
|
||||
// Solidity: function name() view returns(string)
|
|
||||
func (_ERC20 *ERC20Caller) Name(opts *bind.CallOpts) (string, error) { |
|
||||
var ( |
|
||||
ret0 = new(string) |
|
||||
) |
|
||||
out := ret0 |
|
||||
err := _ERC20.contract.Call(opts, out, "name") |
|
||||
return *ret0, err |
|
||||
} |
|
||||
|
|
||||
// Name is a free data retrieval call binding the contract method 0x06fdde03.
|
|
||||
//
|
|
||||
// Solidity: function name() view returns(string)
|
|
||||
func (_ERC20 *ERC20Session) Name() (string, error) { |
|
||||
return _ERC20.Contract.Name(&_ERC20.CallOpts) |
|
||||
} |
|
||||
|
|
||||
// Name is a free data retrieval call binding the contract method 0x06fdde03.
|
|
||||
//
|
|
||||
// Solidity: function name() view returns(string)
|
|
||||
func (_ERC20 *ERC20CallerSession) Name() (string, error) { |
|
||||
return _ERC20.Contract.Name(&_ERC20.CallOpts) |
|
||||
} |
|
||||
|
|
||||
// Symbol is a free data retrieval call binding the contract method 0x95d89b41.
|
|
||||
//
|
|
||||
// Solidity: function symbol() view returns(string)
|
|
||||
func (_ERC20 *ERC20Caller) Symbol(opts *bind.CallOpts) (string, error) { |
|
||||
var ( |
|
||||
ret0 = new(string) |
|
||||
) |
|
||||
out := ret0 |
|
||||
err := _ERC20.contract.Call(opts, out, "symbol") |
|
||||
return *ret0, err |
|
||||
} |
|
||||
|
|
||||
// Symbol is a free data retrieval call binding the contract method 0x95d89b41.
|
|
||||
//
|
|
||||
// Solidity: function symbol() view returns(string)
|
|
||||
func (_ERC20 *ERC20Session) Symbol() (string, error) { |
|
||||
return _ERC20.Contract.Symbol(&_ERC20.CallOpts) |
|
||||
} |
|
||||
|
|
||||
// Symbol is a free data retrieval call binding the contract method 0x95d89b41.
|
|
||||
//
|
|
||||
// Solidity: function symbol() view returns(string)
|
|
||||
func (_ERC20 *ERC20CallerSession) Symbol() (string, error) { |
|
||||
return _ERC20.Contract.Symbol(&_ERC20.CallOpts) |
|
||||
} |
|
||||