Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Multi backend #19

Merged
merged 16 commits into from
Jul 20, 2022
Merged

Multi backend #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d9a9df6
Update contracts
cryptphil Jun 28, 2022
cfb435f
channel/asset: Asset includes ChainID
cryptphil Jun 13, 2022
08904c8
channel/funder: Adapt funder for multi-ledger assets
cryptphil Jun 29, 2022
3efd94e
Update go-perun to abstract-multiledger-test
cryptphil Jun 28, 2022
319b374
WIP: Add multi-ledger test
cryptphil Jun 28, 2022
22648e5
channel/test/simulated: Remove SimSigner
cryptphil Jun 29, 2022
9f0ed6b
WIP: Update go-perun
cryptphil Jul 4, 2022
597695d
Multi-ledger tests: Use timeout
cryptphil Jul 4, 2022
36ef401
channel/funder: Adapt to multi-ledger assets
cryptphil Jul 4, 2022
2180344
channel/adjudicator: Adapt to multi-ledger assets
cryptphil Jul 4, 2022
122462f
Add multiledger tests
cryptphil Jul 5, 2022
1102826
Satisfy linter
cryptphil Jul 15, 2022
5423268
CI: Update solc version
cryptphil Jul 15, 2022
0b3f7c3
Address Review Feedback
cryptphil Jul 18, 2022
0c5dc23
Move error handling to separate file
matthiasgeihs Jul 19, 2022
f2a0e41
Add ChainID to ContractBackend
matthiasgeihs Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
run: |
cd bindings
WD=/root
export SOLC="docker run --rm -v $(pwd):$WD -w $WD ethereum/solc:0.7.6-alpine"
export SOLC="docker run --rm -v $(pwd):$WD -w $WD ethereum/solc:0.8.15-alpine"
export ABIGEN="docker run --rm -v $(pwd):$WD -w $WD --entrypoint abigen ethereum/client-go:alltools-v1.10.18"
./generate.sh
sudo find -type f -name "*.go" -exec chmod a+r {} \;
Expand Down
72 changes: 39 additions & 33 deletions bindings/adjudicator/Adjudicator.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bindings/adjudicator/AdjudicatorBinRuntime.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bindings/assetholdererc20/AssetHolderERC20.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bindings/assetholdererc20/AssetHolderERC20BinRuntime.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bindings/assetholdereth/AssetHolderETH.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bindings/assetholdereth/AssetHolderETHBinRuntime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package assetholdereth // import "github.com/perun-network/perun-eth-backend/bindings/assetholdereth"

// AssetHolderETHBinRuntime is the runtime part of the compiled bytecode used for deploying new contracts.
var AssetHolderETHBinRuntime = "6080604052600436106100555760003560e01c80631de26e161461005a5780634ed4283c1461006f57806353c2ed8e1461008f578063ae9ee18c146100ba578063d945af1d146100e7578063fc79a66d14610114575b600080fd5b61006d610068366004610af3565b610134565b005b34801561007b57600080fd5b5061006d61008a366004610b14565b6101ac565b34801561009b57600080fd5b506100a461034e565b6040516100b19190610b99565b60405180910390f35b3480156100c657600080fd5b506100da6100d5366004610a64565b61035d565b6040516100b19190610db5565b3480156100f357600080fd5b50610107610102366004610a64565b61036f565b6040516100b19190610bad565b34801561012057600080fd5b5061006d61012f366004610a7c565b610384565b61013e82826105a1565b60008281526020819052604090205461015790826105c4565b60008381526020819052604090205561017082826105c0565b817fcd2fe07293de5928c5df9505b65a8d6506f8668dfe81af09090920687edc48a9826040516101a09190610db5565b60405180910390a25050565b823560009081526001602052604090205460ff166101e55760405162461bcd60e51b81526004016101dc90610ccb565b60405180910390fd5b61024d836040516020016101f99190610d69565b60408051601f198184030181526020601f860181900481028401810190925284835291908590859081908401838280828437600092019190915250610248925050506040870160208801610a48565b610625565b6102695760405162461bcd60e51b81526004016101dc90610c94565b600061028584356102806040870160208801610a48565b610660565b600081815260208190526040902054909150606085013511156102ba5760405162461bcd60e51b81526004016101dc90610cf8565b6102c5848484610693565b6000818152602081905260409020546102e2906060860135610698565b6000828152602081905260409020556102fc8484846106da565b807fd0b6e7d0170f56c62f87de6a8a47a0ccf41c86ffb5084d399d8eb62e823f2a81606086018035906103329060408901610a48565b604051610340929190610bb8565b60405180910390a250505050565b6002546001600160a01b031681565b60006020819052908152604090205481565b60016020526000908152604090205460ff1681565b6002546001600160a01b031633146103ae5760405162461bcd60e51b81526004016101dc90610d24565b8281146103cd5760405162461bcd60e51b81526004016101dc90610c06565b60008581526001602052604090205460ff16156103fc5760405162461bcd60e51b81526004016101dc90610c4f565b600085815260208190526040812080549082905590808567ffffffffffffffff8111801561042957600080fd5b50604051908082528060200260200182016040528015610453578160200160208202803683370190505b50905060005b868110156104fa5760006104888a8a8a8581811061047357fe5b90506020020160208101906102809190610a48565b90508083838151811061049757fe5b6020026020010181815250506104c860008083815260200190815260200160002054866105c490919063ffffffff16565b94506104ef8787848181106104d957fe5b90506020020135856105c490919063ffffffff16565b935050600101610459565b508183106105545760005b868110156105525785858281811061051957fe5b9050602002013560008084848151811061052f57fe5b602090810291909101810151825281019190915260400160002055600101610505565b505b6000888152600160208190526040808320805460ff19169092179091555189917fef898d6cd3395b6dfe67a3c1923e5c726c1b154e979fb0a25a9c41d0093168b891a25050505050505050565b8034146105c05760405162461bcd60e51b81526004016101dc90610bcf565b5050565b60008282018381101561061e576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b600080610638858051906020012061072c565b90506000610646828661077d565b6001600160a01b0390811690851614925050509392505050565b60008282604051602001610675929190610bb8565b60405160208183030381529060405280519060200120905092915050565b505050565b600061061e83836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250610968565b6106ea6060840160408501610a48565b6001600160a01b03166108fc84606001359081150290604051600060405180830381858888f19350505050158015610726573d6000803e3d6000fd5b50505050565b604080517f19457468657265756d205369676e6564204d6573736167653a0a333200000000602080830191909152603c8083019490945282518083039094018452605c909101909152815191012090565b600081516041146107d5576040805162461bcd60e51b815260206004820152601f60248201527f45434453413a20696e76616c6964207369676e6174757265206c656e67746800604482015290519081900360640190fd5b60208201516040830151606084015160001a7f7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a08211156108465760405162461bcd60e51b8152600401808060200182810382526022815260200180610dd76022913960400191505060405180910390fd5b8060ff16601b1415801561085e57508060ff16601c14155b1561089a5760405162461bcd60e51b8152600401808060200182810382526022815260200180610df96022913960400191505060405180910390fd5b600060018783868660405160008152602001604052604051808581526020018460ff1681526020018381526020018281526020019450505050506020604051602081039080840390855afa1580156108f6573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b03811661095e576040805162461bcd60e51b815260206004820152601860248201527f45434453413a20696e76616c6964207369676e61747572650000000000000000604482015290519081900360640190fd5b9695505050505050565b600081848411156109f75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b838110156109bc5781810151838201526020016109a4565b50505050905090810190601f1680156109e95780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b60008083601f840112610a10578182fd5b50813567ffffffffffffffff811115610a27578182fd5b6020830191508360208083028501011115610a4157600080fd5b9250929050565b600060208284031215610a59578081fd5b813561061e81610dbe565b600060208284031215610a75578081fd5b5035919050565b600080600080600060608688031215610a93578081fd5b85359450602086013567ffffffffffffffff80821115610ab1578283fd5b610abd89838a016109ff565b90965094506040880135915080821115610ad5578283fd5b50610ae2888289016109ff565b969995985093965092949392505050565b60008060408385031215610b05578182fd5b50508035926020909101359150565b600080600083850360a0811215610b29578384fd5b6080811215610b36578384fd5b50839250608084013567ffffffffffffffff80821115610b54578384fd5b818601915086601f830112610b67578384fd5b813581811115610b75578485fd5b876020828501011115610b86578485fd5b6020830194508093505050509250925092565b6001600160a01b0391909116815260200190565b901515815260200190565b9182526001600160a01b0316602082015260400190565b6020808252601f908201527f77726f6e6720616d6f756e74206f662045544820666f72206465706f73697400604082015260600190565b60208082526029908201527f7061727469636970616e7473206c656e6774682073686f756c6420657175616c6040820152682062616c616e63657360b81b606082015260800190565b60208082526025908201527f747279696e6720746f2073657420616c726561647920736574746c6564206368604082015264185b9b995b60da1b606082015260800190565b6020808252601d908201527f7369676e617475726520766572696669636174696f6e206661696c6564000000604082015260600190565b60208082526013908201527218da185b9b995b081b9bdd081cd95d1d1b1959606a1b604082015260600190565b602080825260129082015271696e73756666696369656e742066756e647360701b604082015260600190565b60208082526025908201527f63616e206f6e6c792062652063616c6c6564206279207468652061646a75646960408201526431b0ba37b960d91b606082015260800190565b81358152608081016020830135610d7f81610dbe565b6001600160a01b039081166020840152604084013590610d9e82610dbe565b166040830152606092830135929091019190915290565b90815260200190565b6001600160a01b0381168114610dd357600080fd5b5056fe45434453413a20696e76616c6964207369676e6174757265202773272076616c756545434453413a20696e76616c6964207369676e6174757265202776272076616c7565a2646970667358221220e505c52fddf1f01bcdc24aed9acbce73904dc75050e922c1189b968cfaa3f6f064736f6c63430007060033"
var AssetHolderETHBinRuntime = "6080604052600436106100555760003560e01c80631de26e161461005a5780634ed4283c1461006f57806353c2ed8e1461008f578063ae9ee18c146100cc578063d945af1d14610107578063fc79a66d14610147575b600080fd5b61006d610068366004610c01565b610167565b005b34801561007b57600080fd5b5061006d61008a366004610c23565b6101d7565b34801561009b57600080fd5b506002546100af906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b3480156100d857600080fd5b506100f96100e7366004610cae565b60006020819052908152604090205481565b6040519081526020016100c3565b34801561011357600080fd5b50610137610122366004610cae565b60016020526000908152604090205460ff1681565b60405190151581526020016100c3565b34801561015357600080fd5b5061006d610162366004610d0c565b6103ef565b61017182826106fe565b60008281526020819052604090205461018a9082610751565b600083815260208190526040902055817fcd2fe07293de5928c5df9505b65a8d6506f8668dfe81af09090920687edc48a9826040516101cb91815260200190565b60405180910390a25050565b823560009081526001602052604090205460ff166102325760405162461bcd60e51b815260206004820152601360248201527218da185b9b995b081b9bdd081cd95d1d1b1959606a1b60448201526064015b60405180910390fd5b61029a836040516020016102469190610d9b565b60408051601f198184030181526020601f860181900481028401810190925284835291908590859081908401838280828437600092019190915250610295925050506040870160208801610de7565b610764565b6102e65760405162461bcd60e51b815260206004820152601d60248201527f7369676e617475726520766572696669636174696f6e206661696c65640000006044820152606401610229565b600061030284356102fd6040870160208801610de7565b6107ed565b6000818152602081905260409020549091506060850135111561035c5760405162461bcd60e51b8152602060048201526012602482015271696e73756666696369656e742066756e647360701b6044820152606401610229565b600081815260208190526040902054610379906060860135610832565b60008281526020819052604090205561039384848461083e565b807fd0b6e7d0170f56c62f87de6a8a47a0ccf41c86ffb5084d399d8eb62e823f2a81606086018035906103c99060408901610de7565b604080519283526001600160a01b0390911660208301520160405180910390a250505050565b6002546001600160a01b031633146104575760405162461bcd60e51b815260206004820152602560248201527f63616e206f6e6c792062652063616c6c6564206279207468652061646a75646960448201526431b0ba37b960d91b6064820152608401610229565b8281146104b85760405162461bcd60e51b815260206004820152602960248201527f7061727469636970616e7473206c656e6774682073686f756c6420657175616c6044820152682062616c616e63657360b81b6064820152608401610229565b60008581526001602052604090205460ff16156105255760405162461bcd60e51b815260206004820152602560248201527f747279696e6720746f2073657420616c726561647920736574746c6564206368604482015264185b9b995b60da1b6064820152608401610229565b600085815260208190526040812080549082905590808567ffffffffffffffff81111561055457610554610e04565b60405190808252806020026020018201604052801561057d578160200160208202803683370190505b50905060005b868110156106415760006105b88a8a8a858181106105a3576105a3610e1a565b90506020020160208101906102fd9190610de7565b9050808383815181106105cd576105cd610e1a565b6020026020010181815250506105fe600080838152602001908152602001600020548661075190919063ffffffff16565b945061062b87878481811061061557610615610e1a565b905060200201358561075190919063ffffffff16565b935050808061063990610e46565b915050610583565b508183106106b15760005b868110156106af5785858281811061066657610666610e1a565b9050602002013560008084848151811061068257610682610e1a565b602002602001015181526020019081526020016000208190555080806106a790610e46565b91505061064c565b505b6000888152600160208190526040808320805460ff19169092179091555189917fef898d6cd3395b6dfe67a3c1923e5c726c1b154e979fb0a25a9c41d0093168b891a25050505050505050565b80341461074d5760405162461bcd60e51b815260206004820152601f60248201527f77726f6e6720616d6f756e74206f662045544820666f72206465706f736974006044820152606401610229565b5050565b600061075d8284610e5f565b9392505050565b6000806107c585805190602001206040517f19457468657265756d205369676e6564204d6573736167653a0a3332000000006020820152603c8101829052600090605c01604051602081830303815290604052805190602001209050919050565b905060006107d38286610890565b6001600160a01b0390811690851614925050509392505050565b600082826040516020016108149291909182526001600160a01b0316602082015260400190565b60405160208183030381529060405280519060200120905092915050565b600061075d8284610e77565b61084e6060840160408501610de7565b6001600160a01b03166108fc84606001359081150290604051600060405180830381858888f1935050505015801561088a573d6000803e3d6000fd5b50505050565b600080600061089f85856108b4565b915091506108ac81610922565b509392505050565b60008082516041036108ea5760208301516040840151606085015160001a6108de87828585610adb565b9450945050505061091b565b82516040036109135760208301516040840151610908868383610bc8565b93509350505061091b565b506000905060025b9250929050565b600081600481111561093657610936610e8e565b0361093e5750565b600181600481111561095257610952610e8e565b0361099f5760405162461bcd60e51b815260206004820152601860248201527f45434453413a20696e76616c6964207369676e617475726500000000000000006044820152606401610229565b60028160048111156109b3576109b3610e8e565b03610a005760405162461bcd60e51b815260206004820152601f60248201527f45434453413a20696e76616c6964207369676e6174757265206c656e677468006044820152606401610229565b6003816004811115610a1457610a14610e8e565b03610a6c5760405162461bcd60e51b815260206004820152602260248201527f45434453413a20696e76616c6964207369676e6174757265202773272076616c604482015261756560f01b6064820152608401610229565b6004816004811115610a8057610a80610e8e565b03610ad85760405162461bcd60e51b815260206004820152602260248201527f45434453413a20696e76616c6964207369676e6174757265202776272076616c604482015261756560f01b6064820152608401610229565b50565b6000807f7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a0831115610b125750600090506003610bbf565b8460ff16601b14158015610b2a57508460ff16601c14155b15610b3b5750600090506004610bbf565b6040805160008082526020820180845289905260ff881692820192909252606081018690526080810185905260019060a0016020604051602081039080840390855afa158015610b8f573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b038116610bb857600060019250925050610bbf565b9150600090505b94509492505050565b6000806001600160ff1b03831681610be560ff86901c601b610e5f565b9050610bf387828885610adb565b935093505050935093915050565b60008060408385031215610c1457600080fd5b50508035926020909101359150565b600080600083850360a0811215610c3957600080fd5b6080811215610c4757600080fd5b50839250608084013567ffffffffffffffff80821115610c6657600080fd5b818601915086601f830112610c7a57600080fd5b813581811115610c8957600080fd5b876020828501011115610c9b57600080fd5b6020830194508093505050509250925092565b600060208284031215610cc057600080fd5b5035919050565b60008083601f840112610cd957600080fd5b50813567ffffffffffffffff811115610cf157600080fd5b6020830191508360208260051b850101111561091b57600080fd5b600080600080600060608688031215610d2457600080fd5b85359450602086013567ffffffffffffffff80821115610d4357600080fd5b610d4f89838a01610cc7565b90965094506040880135915080821115610d6857600080fd5b50610d7588828901610cc7565b969995985093965092949392505050565b6001600160a01b0381168114610ad857600080fd5b81358152608081016020830135610db181610d86565b6001600160a01b039081166020840152604084013590610dd082610d86565b166040830152606092830135929091019190915290565b600060208284031215610df957600080fd5b813561075d81610d86565b634e487b7160e01b600052604160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b600060018201610e5857610e58610e30565b5060010190565b60008219821115610e7257610e72610e30565b500190565b600082821015610e8957610e89610e30565b500390565b634e487b7160e01b600052602160045260246000fdfea2646970667358221220df92b0589592e9d602db203fd2c442c58a0361e07939b2d86fba6fd1e84ae1bd64736f6c634300080e0033"
2 changes: 1 addition & 1 deletion bindings/contracts
Open in desktop
Submodule contracts updated 28 files
+10 −24 .github/workflows/ci.yml
+7 −2 .solcover.js
+1 −1 .solhint.json
+1 −0 NOTICE
+14 −10 contracts/Adjudicator.sol
+1 −1 contracts/App.sol
+2 −16 contracts/Array.sol
+4 −3 contracts/AssetHolder.sol
+12 −12 contracts/AssetHolderERC20.sol
+3 −3 contracts/AssetHolderETH.sol
+31 −2 contracts/Channel.sol
+1 −1 contracts/Migrations.sol
+2 −1 contracts/PerunToken.sol
+1 −1 contracts/SafeMath64.sol
+2 −2 contracts/Sig.sol
+1 −1 contracts/TrivialApp.sol
+2 −3 package.json
+13 −5 src/lib/web3.ts
+56 −20 src/test/Adjudicator.ts
+4 −4 src/test/AssetHolder.ts
+1 −1 src/test/AssetHolderERC20.ts
+1 −1 src/test/AssetHolderETH.ts
+37 −13 src/test/Channel.ts
+1 −1 src/test/Setup.ts
+2 −2 truffle-config.js
+1 −1 tsconfig.json
+1 −1 vendor/openzeppelin-contracts
+3,691 −4,018 yarn.lock
2 changes: 1 addition & 1 deletion bindings/generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set -e
ABIGEN="${ABIGEN-abigen}"
SOLC="${SOLC-solc}"

echo 'Please ensure that solc v0.7.6+ and abigen v1.10.18+ are installed.'
echo 'Please ensure that solc v0.8.15+ and abigen v1.10.18+ are installed.'

if ! $ABIGEN --version
then
Expand Down
Loading