cd95105 · bridge · git.iko.soy

src/lib/constants.js+1−1

compare with master

unifiedsplit

@@ -23,7 +23,7 @@ const GAS_LIMITS = {

23 SPAWN: 250000,

24 TRANSFER: 550000,

25 CONFIGURE_KEYS: 100000,

26− SET_PROXY: 120000,

26+ SET_PROXY: 130000,

27 //

28 ESCAPE: 115000, //NOTE low sample size

29 ADOPT: 100000, //NOTE low sample size

src/lib/useEthereumTransaction.js+2−1

@@ -82,7 +82,8 @@ export default function useEthereumTransaction(

82 const canSign = !initializing && constructed && isDefaultState;

83

84 const construct = useCallback(

85+ async (...args) =>

85− (...args) => setUnsignedTransaction(transactionBuilder(...args)),

86+ setUnsignedTransaction(await transactionBuilder(...args)),

86 [transactionBuilder]

87 [transactionBuilder]

87 );

88 );

88

89

src/lib/usePermissionsForPoint.js+10−3

@@ -47,9 +47,12 @@ export default function usePermissionsForPoint(address, point) {

47 const isPlanet = pointSize === azimuth.PointSize.Planet;

48 const isStar = pointSize === azimuth.PointSize.Star;

49 const isGalaxy = pointSize === azimuth.PointSize.Galaxy;

50+ const isParent = isStar || isGalaxy;

51+

52+ const isActive = details.active;

50

53

51 const isOwner = eqAddr(address, details.owner);

54 const isOwner = eqAddr(address, details.owner);

52− const isActiveOwner = isOwner && details.active;

55+ const isActiveOwner = isOwner && isActive;

53 const isManagementProxy = eqAddr(address, details.managementProxy);

56 const isManagementProxy = eqAddr(address, details.managementProxy);

54 const isSpawnProxy = eqAddr(address, details.spawnProxy);

57 const isSpawnProxy = eqAddr(address, details.spawnProxy);

55 const isVotingProxy = eqAddr(address, details.votingProxy);

58 const isVotingProxy = eqAddr(address, details.votingProxy);

@@ -62,8 +65,9 @@ export default function usePermissionsForPoint(address, point) {

62

65

63 const canManage = isOwner || isManagementProxy;

66 const canManage = isOwner || isManagementProxy;

64 const canTransfer = isOwner || isTransferProxy;

67 const canTransfer = isOwner || isTransferProxy;

65− const canSpawn = (isStar || isGalaxy) && (isOwner || isSpawnProxy);

68+ const canSpawn =

69+ isParent && (isOwner || isSpawnProxy) && details.keyRevisionNumber > 0;

66− const canVote = isGalaxy && (isOwner || isVotingProxy);

70+ const canVote = isGalaxy && isActive && (isOwner || isVotingProxy);

67

71

68 const spawnIsDelegatedSending = eqAddr(

72 const spawnIsDelegatedSending = eqAddr(

69 _contracts.delegatedSending.address,

73 _contracts.delegatedSending.address,

@@ -74,6 +78,9 @@ export default function usePermissionsForPoint(address, point) {

74 isPlanet,

78 isPlanet,

75 isStar,

79 isStar,

76 isGalaxy,

80 isGalaxy,

81+ isParent,

82+ //

83+ isActive,

77 //

84 //

78 isOwner,

85 isOwner,

79 isActiveOwner,

86 isActiveOwner,

src/views/Point.js+12−3

@@ -23,7 +23,12 @@ export default function Point() {

23

24 const point = need.point(pointCursor);

25

26+ const {

27+ isParent,

28+ isActiveOwner,

29+ canManage,

30+ canSpawn,

26− const { isActiveOwner, canManage, canSpawn } = useCurrentPermissions();

31+ } = useCurrentPermissions();

27

32

28 // fetch the invites for the current cursor

33 // fetch the invites for the current cursor

29 const { availableInvites } = useInvites(point);

34 const { availableInvites } = useInvites(point);

@@ -81,9 +86,13 @@ export default function Point() {

81 Admin

86 Admin

82 </Grid.Item>

87 </Grid.Item>

83 <Grid.Divider />

88 <Grid.Divider />

84− {canSpawn && (

89+ {isParent && (

85 <>

90 <>

91+ <Grid.Item

92+ full

93+ as={ForwardButton}

94+ disabled={!canSpawn}

86− <Grid.Item full as={ForwardButton} onClick={goIssuePoint}>

95+ onClick={goIssuePoint}>

87 Issue Point

96 Issue Point

88 </Grid.Item>

97 </Grid.Item>

89 <Grid.Divider />

98 <Grid.Divider />