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

Feature/xdai #1464

Closed
wants to merge 63 commits into from
Closed

Feature/xdai #1464

Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
524ec8b
upgrade proxy kit version
hexyls Oct 28, 2020
274fa6d
enable proxy upgrades
hexyls Oct 30, 2020
efda6b0
Merge branch 'master' into feature/support-native-ether
altbee Oct 30, 2020
aca44e0
Merge branch 'master' into feature/support-native-ether
pimato Oct 31, 2020
07c88d0
preserve default token ordering
hexyls Nov 1, 2020
162d156
add ether to funding dropdown
hexyls Nov 2, 2020
0345a9a
add upgrade proxy component
hexyls Nov 2, 2020
116165a
update createMarket method
hexyls Nov 2, 2020
a766f4a
remove weth abi
hexyls Nov 3, 2020
bb3c835
prevent early proxy upgrade message
hexyls Nov 3, 2020
ae21bdb
disable create market button if proxy is not deployed or it needs an …
hexyls Nov 3, 2020
88d1a98
add proxy upgrade button states
hexyls Nov 3, 2020
1f9187f
handle native ether in fetchAccountBalance
hexyls Nov 3, 2020
459735e
Merge branch 'master' into feature/support-native-ether
pimato Nov 3, 2020
5933fdc
monkey patch cpk to fix transaction encoding
hexyls Nov 4, 2020
763ced0
add useCpkProxy and use RemoteData
hexyls Nov 5, 2020
fa821dc
enable native eth funding on existing markets
hexyls Nov 5, 2020
f566ae0
make update proxy message user friendly
hexyls Nov 5, 2020
d63af51
update proxy message and lock file
hexyls Nov 5, 2020
7a97f40
update cpk to v2.2.0-alpha.1
hexyls Nov 6, 2020
d506fd3
Merge branch 'master' into feature/support-native-ether
hexyls Nov 6, 2020
941f05a
enable native ether for buys
hexyls Nov 6, 2020
89f62ad
add extra gas for deploy + upgrade proxy
hexyls Nov 9, 2020
e1c008a
Merge branch 'master' into feature/support-native-ether
hexyls Nov 9, 2020
3b24389
Merge branch 'master' into feature/support-native-ether
pimato Nov 10, 2020
8f56b54
Merge branch 'master' into feature/support-native-ether
hexyls Dec 1, 2020
a61d80b
update lockfile
hexyls Dec 1, 2020
915234b
add sokol contracts
hexyls Dec 8, 2020
eaf03a8
Merge branch 'master' into feature/support-native-ether
hexyls Dec 9, 2020
1435de0
return encodeMultiSendCallData and fix some conditionals
hexyls Dec 9, 2020
9b2606d
rename to pseudoNativeAssetAddress
hexyls Dec 9, 2020
d8c1fee
add getWrapToken
hexyls Dec 9, 2020
2d849e7
add getTargetSafeImplementation
hexyls Dec 9, 2020
e00c7ef
remove value amount if safeApp
hexyls Dec 10, 2020
85b187f
replace getToken with getWrapToken
hexyls Dec 10, 2020
e7b2c28
update useTokens hook
hexyls Dec 10, 2020
360cd83
update gas values for native asset txs
hexyls Dec 10, 2020
0ee4c41
fix missed conditional
hexyls Dec 10, 2020
89c8063
use transaction v2 for single transaction
hexyls Dec 10, 2020
311dfec
generalise UpgradeProxy and fix disabled buttons
hexyls Dec 10, 2020
e261236
Merge branch 'master' into feature/support-native-ether
hexyls Dec 11, 2020
e7ad346
update mainnet contracts
hexyls Dec 11, 2020
dccaba6
moar gas for create tx
hexyls Dec 11, 2020
c1f7c0e
fix approval in addFunding
hexyls Dec 11, 2020
65f8fd8
update contracts
hexyls Dec 14, 2020
09ea8fc
Merge branch 'master' into feature/sokol
hexyls Dec 14, 2020
272831f
update arbitration address
hexyls Dec 15, 2020
3de3e6d
Merge branch 'master' into feature/support-native-ether
hexyls Dec 15, 2020
959eccf
fix bad merge
hexyls Dec 15, 2020
953ab0a
replace UpgradeProxy component
hexyls Dec 15, 2020
4019de1
update contract
hexyls Dec 16, 2020
3762293
update realitio timeout
hexyls Dec 16, 2020
becea7e
update contracts
hexyls Dec 17, 2020
855f58f
Merge branch 'master' into feature/xdai
hexyls Dec 17, 2020
fa2b6aa
Merge branch 'master' into feature/support-native-ether
hexyls Dec 20, 2020
44a7a85
Merge branch 'master' into feature/support-native-ether
hexyls Dec 21, 2020
49e7b44
add sokol details
hexyls Dec 21, 2020
a8d5125
Merge branch 'master' into feature/support-native-ether
hexyls Dec 21, 2020
c2cb0d7
lowercase WSPOA address
hexyls Dec 21, 2020
de33e9e
Merge branch 'master' into feature/xdai
hexyls Dec 21, 2020
3067ff4
Merge branch 'feature/support-native-ether' into feature/xdai
hexyls Dec 22, 2020
b193019
native xdai
hexyls Dec 22, 2020
bd96fa5
Merge branch 'master' into feature/xdai
pimato Jan 4, 2021
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
lowercase WSPOA address
  • Loading branch information
@hexyls
hexyls committed Dec 21, 2020
commit c2cb0d756c9a392316931ec09c7a9650795e8164
2 changes: 1 addition & 1 deletion app/src/util/networks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ export const knownTokens: { [name in KnownToken]: KnownTokenData } = {
symbol: 'WSPOA',
decimals: 18,
addresses: {
[networkIds.SOKOL]: '0xc655c6D80ac92d75fBF4F40e95280aEb855B1E87',
[networkIds.SOKOL]: '0xc655c6d80ac92d75fbf4f40e95280aeb855b1e87',
},
order: 1,
},
Expand Down