git.iko.soy/bridge
on master help sign in
Merge branch 'mino' into feat/indigo-login
commit65f9c7f2d1b11972af357f5a5542322e98d0197a authorMatt Condon (shrugs) <mattgcondon@gmail.com> dateMon 8 Jul 2019, 17:45 (7 years ago) parentd2ad64e6605d99
4 files changed+9−5
compare with master
unifiedsplit
src/lib/constants.js+1−1 src/lib/contracts.js+1−1 src/store/lib/useInvitesStore.js+1−1 src/store/lib/useRekeyDateStore.js+6−2
src/lib/constants.js+1−1
@@ -18,7 +18,7 @@ const GAS_LIMITS = {
1818 SPAWN: 250000,
1919 TRANSFER: 490000,
2020 CONFIGURE_KEYS: 100000,
21− SET_PROXY: 119000,
21+ SET_PROXY: 120000,
2222 //
2323 ESCAPE: 115000, //NOTE low sample size
2424 ADOPT: 100000, //NOTE low sample size
src/lib/contracts.js+1−1
@@ -9,7 +9,7 @@ const CONTRACT_ADDRESSES = {
99 ecliptic: '0x8b9f86a28921d9c705b3113a755fb979e1bd1bce',
1010 azimuth: '0x308ab6a6024cf198b57e008d0ac9ad0219886579',
1111 polls: '0xf5DA85f0d285A0F88af2388DD177A221872C8971',
12− //TODO delegatedSending
12+ delegatedSending: '0x3e8ca510354bc2fdbbd6150252d93105c9c27bbe',
1313 },
1414 MAINNET: {
1515 ecliptic: '0x6ac07b7c4601b5ce11de8dfe6335b871c7c4dd4d',
src/store/lib/useInvitesStore.js+1−1
@@ -48,7 +48,7 @@ export default function useInvitesStore() {
4848 );
4949
5050 const sentInvites = invitedPoints.length;
51− const acceptedInvites = activity.filter(i => i.active).length;
51+ const acceptedInvites = activity.filter(i => !!i).length;
5252
5353 addToInvitesCache({
5454 [point]: {
src/store/lib/useRekeyDateStore.js+6−2
@@ -5,7 +5,7 @@ import * as azimuth from 'azimuth-js';
55import { useNetwork } from '../network';
66
77export default function useRekeyDateStore() {
8− const { web3 } = useNetwork();
8+ const { web3, contracts } = useNetwork();
99 const [rekeyDateCache, _setRekeyDateCache] = useState({});
1010
1111 const addToRekeyDateCache = useCallback(
@@ -28,10 +28,14 @@ export default function useRekeyDateStore() {
2828 if (!_web3) {
2929 return;
3030 }
31+ const _contracts = contracts.getOrElse(null);
32+ if (!_contracts) {
33+ return;
34+ }
3135
3236 //TODO tighter search?
3337 //TODO maybe move into azimuth-js?
34− const logs = await azimuth.azimuth.getPastEvents('ChangedKeys', {
38+ const logs = await _contracts.azimuth.getPastEvents('ChangedKeys', {
3539 fromBlock: 0,
3640 toBlock: 'latest',
3741 filter: { point: [point] },