on master help sign in
Merge pull request #186 from urbit/fixes-etc
6605d99Fang
src/lib/constants.js+1−1
@@ -18,7 +18,7 @@ const GAS_LIMITS = {
18 SPAWN: 250000,
18 SPAWN: 250000,
19 TRANSFER: 490000,
19 TRANSFER: 490000,
20 CONFIGURE_KEYS: 100000,
20 CONFIGURE_KEYS: 100000,
21− SET_PROXY: 119000,
21+ SET_PROXY: 120000,
22 //
22 //
23 ESCAPE: 115000, //NOTE low sample size
23 ESCAPE: 115000, //NOTE low sample size
24 ADOPT: 100000, //NOTE low sample size
24 ADOPT: 100000, //NOTE low sample size
src/lib/contracts.js+1−1
@@ -9,7 +9,7 @@ const CONTRACT_ADDRESSES = {
9 ecliptic: '0x8b9f86a28921d9c705b3113a755fb979e1bd1bce',
9 ecliptic: '0x8b9f86a28921d9c705b3113a755fb979e1bd1bce',
10 azimuth: '0x308ab6a6024cf198b57e008d0ac9ad0219886579',
10 azimuth: '0x308ab6a6024cf198b57e008d0ac9ad0219886579',
11 polls: '0xf5DA85f0d285A0F88af2388DD177A221872C8971',
11 polls: '0xf5DA85f0d285A0F88af2388DD177A221872C8971',
12− //TODO delegatedSending
12+ delegatedSending: '0x3e8ca510354bc2fdbbd6150252d93105c9c27bbe',
13 },
13 },
14 MAINNET: {
14 MAINNET: {
15 ecliptic: '0x6ac07b7c4601b5ce11de8dfe6335b871c7c4dd4d',
15 ecliptic: '0x6ac07b7c4601b5ce11de8dfe6335b871c7c4dd4d',
src/store/lib/useInvitesStore.js+1−1
@@ -48,7 +48,7 @@ export default function useInvitesStore() {
48 );
48 );
49
49
50 const sentInvites = invitedPoints.length;
50 const sentInvites = invitedPoints.length;
51− const acceptedInvites = activity.filter(i => i.active).length;
51+ const acceptedInvites = activity.filter(i => !!i).length;
52
52
53 addToInvitesCache({
53 addToInvitesCache({
54 [point]: {
54 [point]: {
src/store/lib/useRekeyDateStore.js+6−2
@@ -5,7 +5,7 @@ import * as azimuth from 'azimuth-js';
5import { useNetwork } from '../network';
5import { useNetwork } from '../network';
6
6
7export default function useRekeyDateStore() {
7export default function useRekeyDateStore() {
8− const { web3 } = useNetwork();
8+ const { web3, contracts } = useNetwork();
9 const [rekeyDateCache, _setRekeyDateCache] = useState({});
9 const [rekeyDateCache, _setRekeyDateCache] = useState({});
10
10
11 const addToRekeyDateCache = useCallback(
11 const addToRekeyDateCache = useCallback(
@@ -28,10 +28,14 @@ export default function useRekeyDateStore() {
28 if (!_web3) {
28 if (!_web3) {
29 return;
29 return;
30 }
30 }
31+ const _contracts = contracts.getOrElse(null);
32+ if (!_contracts) {
33+ return;
34+ }
31
35
32 //TODO tighter search?
36 //TODO tighter search?
33 //TODO maybe move into azimuth-js?
37 //TODO maybe move into azimuth-js?
34− const logs = await azimuth.azimuth.getPastEvents('ChangedKeys', {
38+ const logs = await _contracts.azimuth.getPastEvents('ChangedKeys', {
35 fromBlock: 0,
39 fromBlock: 0,
36 toBlock: 'latest',
40 toBlock: 'latest',
37 filter: { point: [point] },
41 filter: { point: [point] },