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

Initial GSN support (beta) #1844

Merged
merged 79 commits into from
Aug 12, 2019
Merged

Initial GSN support (beta) #1844

Changes from 1 commit
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
2e28b70
Add base Context contract
nventuro Jul 19, 2019
f12245b
Add GSNContext and tests
nventuro Jul 22, 2019
50d596a
Add RelayHub deployment to tests
nventuro Jul 23, 2019
2b1cc85
Add RelayProvider integration, complete GSNContext tests
nventuro Jul 24, 2019
07e37ef
Switch dependency to openzeppelin-gsn-provider
nventuro Jul 25, 2019
df4f2c2
Add default txfee to provider
nventuro Jul 26, 2019
167510a
Add basic signing recipient
nventuro Jul 26, 2019
dc35dff
Sign more values
nventuro Jul 26, 2019
e52ec1a
Add comment clarifying RelayHub's msg.data
nventuro Jul 29, 2019
7363e46
Make context constructors internal
nventuro Jul 29, 2019
67e534f
Rename SigningRecipient to GSNRecipientSignedData
nventuro Jul 29, 2019
f8b97c2
Add ERC20Charge recipients
nventuro Jul 30, 2019
544a56f
Harcode RelayHub address into GSNContext
nventuro Jul 31, 2019
8b3377e
Fix Solidity linter errors
nventuro Jul 31, 2019
8a5d21b
Run server from binary, use gsn-helpers to fund it
nventuro Jul 31, 2019
dc8adcd
Migrate to published @openzeppelin/gsn-helpers
nventuro Aug 1, 2019
82ca6ab
Silence false-positive compiler warning
nventuro Aug 1, 2019
e5ca467
Use GSN helper assertions
nventuro Aug 1, 2019
6871bb7
Rename meta-tx to gsn, take out of drafts
nventuro Aug 1, 2019
108c998
Merge ERC20 charge recipients into a single one
nventuro Aug 1, 2019
5c0e49b
Rename GSNRecipients to Bouncers
nventuro Aug 1, 2019
9847c98
Add GSNBouncerUtils to decouple the bouncers from GSNRecipient
nventuro Aug 1, 2019
af81255
Add _upgradeRelayHub
nventuro Aug 1, 2019
02c8e13
Store RelayHub address using unstructored storage
nventuro Aug 1, 2019
dc9139a
Add IRelayHub
nventuro Aug 2, 2019
081ddc6
Add _withdrawDeposits to GSNRecipient
nventuro Aug 2, 2019
d5af791
Add relayHub version to recipient
nventuro Aug 2, 2019
0302cf1
Make _acceptRelayedCall and _declineRelayedCall easier to use
nventuro Aug 2, 2019
988b6f0
Rename GSNBouncerUtils to GSNBouncerBase, make it IRelayRecipient
nventuro Aug 2, 2019
ca59d08
Improve GSNBouncerBase, make pre and post sender-protected and optional
nventuro Aug 2, 2019
d10109f
Fix GSNBouncerERC20Fee, add tests
nventuro Aug 2, 2019
0ef0023
Add missing GSNBouncerSignature test
nventuro Aug 2, 2019
e3034b0
Override transferFrom in __unstable__ERC20PrimaryAdmin
nventuro Aug 2, 2019
0b3cf83
Fix gsn dependencies in package.json
spalladino Aug 2, 2019
d7d4ff1
Rhub address slot reduced by 1
spalladino Aug 2, 2019
e42d51f
Rename relay hub changed event
spalladino Aug 2, 2019
de0d458
Use released gsn-provider
spalladino Aug 2, 2019
af92387
Run relayer with short sleep of 1s instead of 100ms
spalladino Aug 2, 2019
eebd131
Merge branch 'master' of github.com:OpenZeppelin/openzeppelin-contrac…
frangio Aug 7, 2019
c57bbe6
update package-lock.json
frangio Aug 7, 2019
bcb6b6d
clear circle cache
frangio Aug 7, 2019
25f3ed7
Merge remote-tracking branch 'upstream/master' into gsn-beta
frangio Aug 7, 2019
339250e
Merge branch 'master' of github.com:OpenZeppelin/openzeppelin-contrac…
frangio Aug 8, 2019
98d422e
Merge branch 'master' of github.com:OpenZeppelin/openzeppelin-contrac…
frangio Aug 8, 2019
1108426
use optimized gsn-provider
frangio Aug 8, 2019
c493683
update to latest @openzeppelin/gsn-provider
frangio Aug 9, 2019
68de4a3
replace with gsn dev provider
frangio Aug 9, 2019
00b2818
remove relay server
frangio Aug 9, 2019
1bee370
rename arguments in approveFunction
frangio Aug 9, 2019
e69599e
fix GSNBouncerSignature test
frangio Aug 9, 2019
83eb525
change gsn txfee
frangio Aug 9, 2019
9e25a2c
initialize development provider only once
frangio Aug 9, 2019
f18f937
update RelayHub interface
frangio Aug 9, 2019
9b52cda
adapt to new IRelayHub.withdraw
frangio Aug 9, 2019
b7d3c38
Merge branch 'master' into gsn-beta
frangio Aug 9, 2019
3b9e5af
update @openzeppelin/gsn-helpers
frangio Aug 9, 2019
dc32422
update relayhub singleton address
frangio Aug 9, 2019
73798a8
fix helper name
frangio Aug 9, 2019
8a7b5be
set up gsn provider for coverage too
frangio Aug 9, 2019
944cadb
lint
frangio Aug 9, 2019
0805666
Revert "set up gsn provider for coverage too"
frangio Aug 9, 2019
5921789
remove unused code
frangio Aug 9, 2019
56c8522
add gsn provider to coverage
frangio Aug 12, 2019
79f5db1
move truffle contract options back out
frangio Aug 12, 2019
5af42ff
increase gas limit for coverage
frangio Aug 12, 2019
6bc7622
remove unreachable code
frangio Aug 12, 2019
515d40d
add more gas for GSNContext test
frangio Aug 12, 2019
0ecb521
fix test suite name
frangio Aug 12, 2019
d9cc437
rename GSNBouncerBase internal API
frangio Aug 12, 2019
768b17d
remove onlyRelayHub modifier
frangio Aug 12, 2019
4312948
add explicit inheritance
frangio Aug 12, 2019
f1716b2
remove redundant event
frangio Aug 12, 2019
f02fa1d
update name of bouncers error codes enums
frangio Aug 12, 2019
018065b
add basic docs page for gsn contracts
frangio Aug 12, 2019
2d0b43b
make gsn directory all caps
frangio Aug 12, 2019
76f03d1
Merge branch 'master' into gsn-beta
frangio Aug 12, 2019
74cbca9
add changelog entry
frangio Aug 12, 2019
f73dbb9
lint
frangio Aug 12, 2019
eaed1c4
enable test run to fail in coverage
frangio Aug 12, 2019
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
Prev Previous commit
Next Next commit
rename arguments in approveFunction
  • Loading branch information
@frangio
frangio committed Aug 9, 2019
commit 1bee3705bdc7c82f2b217cb999f81898c1f2b4bd
6 changes: 3 additions & 3 deletions test/gsn/GSNBouncerSignature.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ contract('GSNBouncerSignature', function ([_, signer, other]) {
await web3.eth.sign(
web3.utils.soliditySha3(
// the nonce is not signed
data.relay_address, data.from, data.encodedFunctionCall, data.txfee, data.gas_price, data.gas_limit
data.relayerAddress, data.from, data.encodedFunctionCall, data.txFee, data.gasPrice, data.gas
), signer
)
);
Expand All @@ -45,7 +45,7 @@ contract('GSNBouncerSignature', function ([_, signer, other]) {
await web3.eth.sign(
web3.utils.soliditySha3(
// eslint-disable-next-line max-len
data.relay_address, data.from, data.encodedFunctionCall, data.txfee, data.gas_price, data.gas_limit, data.nonce, data.relay_hub_address, this.recipient.address
data.relayerAddress, data.from, data.encodedFunctionCall, data.txFee, data.gasPrice, data.gas, data.nonce, data.relayHubAddress, data.to
), signer
)
);
Expand All @@ -61,7 +61,7 @@ contract('GSNBouncerSignature', function ([_, signer, other]) {
await web3.eth.sign(
web3.utils.soliditySha3(
// eslint-disable-next-line max-len
data.relay_address, data.from, data.encodedFunctionCall, data.txfee, data.gas_price, data.gas_limit, data.nonce, data.relay_hub_address, this.recipient.address
data.relay_address, data.from, data.encodedFunctionCall, data.txfee, data.gasPrice, data.gas, data.nonce, data.relayHubAddress, data.to
), other
)
);
Expand Down