Skip to content
This repository has been archived by the owner on May 2, 2022. It is now read-only.

make sure all addresses are lowercase #872

Merged
merged 1 commit into from
Nov 29, 2018
Merged

make sure all addresses are lowercase #872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions src/redux/app-reducers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@
}
}

function toLowerCaseSafe(s) {
return s ? s.toLowerCase() : s
}

const reducer = function (state = initialState, action) {
// console.log('NEW Top reducer: ', action)
switch (action.type) {
Expand Down Expand Up @@ -260,7 +264,7 @@
case 'UPDATE_ITEMS': {
return deepmerge(state, {
hashtags: {
[action.hashtagAddress]: {
[toLowerCaseSafe(action.hashtagAddress)]: {
items: action.items
}
}
Expand All @@ -269,7 +273,7 @@
case 'UPDATE_ITEM': {
return deepmerge(state, {
hashtags: {
[action.hashtagAddress]: {
[toLowerCaseSafe(action.hashtagAddress)]: {
items: {
[action.itemHash]: action.data
}
Expand All @@ -280,7 +284,7 @@
case 'UPDATE_NEWHASHTAG': {
return deepmerge(state, {
hashtags: {
[action.hashtagAddress]: action.data
[toLowerCaseSafe(action.hashtagAddress)]: action.data
}
})
}
Expand All @@ -301,7 +305,7 @@
case 'UPDATE_REPUTATION': {
return deepmerge(state, {
reputation: {
[action.address]: action.reputationsObj
[toLowerCaseSafe(action.address)]: action.reputationsObj
}
})
}
Expand All @@ -317,7 +321,7 @@
case 'ADD_VISITED_HASHTAG': {
return deepmerge(state, {
visitedHashtags: {
[action.hashtag.hashtagAddress]: action.hashtag
[toLowerCaseSafe(action.hashtag.hashtagAddress)]: action.hashtag
}
})
}
Expand Down
54 changes: 25 additions & 29 deletions src/redux/sagas/hashtag-saga.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,25 +65,27 @@
/**
* Gets hashtag from the blockchain
*/
async function getHashtagContractData(hashtagContract) {
async function getHashtagContractData(hashtagAddress) {
const hashtagContract = new web3Local.eth.Contract(simpleDeal.abi, hashtagAddress);
let deployBlock;
try {
deployBlock = parseInt(await hashtagContract.methods.deployBlock().call())
} catch (e) {
console.log('Error retrieving deployBlock from ' + hashtagContract._address, e, e.stack)
console.log('Error retrieving deployBlock from ' + hashtagAddress, e, e.stack)
}
return {
mantainerAddress: await hashtagContract.methods.payoutAddress().call(),
hashtagName: await hashtagContract.methods.hashtagName().call(),
hashtagMetadataHash: await hashtagContract.methods.hashtagMetadataHash().call(),
hashtagFee: parseInt(await hashtagContract.methods.hashtagFee().call()),
deployBlock: deployBlock || 8149489,
address: hashtagContract._address,
hashtagAddress: hashtagContract._address
address: hashtagAddress,
hashtagAddress
}
}

async function getPastItems(hashtagContract, fromBlock) {
async function getPastItems(hashtagAddress, fromBlock) {
const hashtagContract = new web3Local.eth.Contract(simpleDeal.abi, hashtagAddress);
const events = await hashtagContract.getPastEvents('NewItem', {
fromBlock,
toBlock: 'latest',
Expand Down Expand Up @@ -145,18 +147,13 @@
console.log('GET HASHTAG req', hashtagAddress)
try {
// Entrypoint, hashtagAddress
const hashtagContract = new web3Local.eth.Contract(
simpleDeal.abi,
hashtagAddress
);

yield fork(hashtagSubscription, hashtagContract)
yield fork(hashtagSubscription, hashtagAddress)

// Step 1. Call contract state:
// - hashtagName() -> hashtagName
// - hashtagMetadata() -> hashtagMetadata
// - deployBlock() -> deployBlock
const hashtagContractData = yield call(getHashtagContractData, hashtagContract)
const hashtagContractData = yield call(getHashtagContractData, hashtagAddress)
yield put({ type: 'UPDATE_NEWHASHTAG', hashtagAddress, data: hashtagContractData });
yield put({ type: 'ADD_VISITED_HASHTAG', hashtag: hashtagContractData })

Expand All @@ -173,8 +170,7 @@

// Step 2B. Get hashtag items from past events
// - getPastEvents('NewItem') -> itemHash, itemMetadataHash, itemValue, seekerAddr, seekerRep, blockNumber
console.log('deployblock: ', hashtagContractData.deployBlock)
const items = yield call(getPastItems, hashtagContract, hashtagContractData.deployBlock)
const items = yield call(getPastItems, hashtagAddress, hashtagContractData.deployBlock)
yield put({ type: 'UPDATE_NEWHASHTAG', hashtagAddress, data: { items } });

const itemsTimestamp = yield call(multipleGetBlockTime, items)
Expand All @@ -186,10 +182,13 @@
//
// Step 3C. Resolve itemMetadataHash
// - ipfs.cat(itemMetadataHash) -> seeker, avatarHash, description, publicKey

// Pass the contract object to avoid many concurrent initializations
const hashtagContract = new web3Local.eth.Contract(simpleDeal.abi, hashtagAddress);
yield all(Object.values(items).map(item => all([
call(getItemState, item, hashtagContract),
call(getItemState, item, hashtagAddress, hashtagContract),
call(getItemMetadata, item, hashtagAddress),
call(getItemRepliers, item, hashtagContract)
call(getItemRepliers, item, hashtagAddress, hashtagContract)
])))

console.log('Finished fetching items!!')
Expand All @@ -203,9 +202,8 @@
return hashtagContract.methods.readItemData(itemHash).call();
}

function* getItemState(item, hashtagContract) {
function* getItemState(item, hashtagAddress, hashtagContract) {
const { itemHash } = item;
const hashtagAddress = hashtagContract._address;
try {
const res = yield call(readItemData, itemHash, hashtagContract)
yield put({
Expand Down Expand Up @@ -247,9 +245,8 @@
return hashtagContract.methods.getItemRepliers(itemHash).call();
}

function* getItemRepliers(item, hashtagContract) {
function* getItemRepliers(item, hashtagAddress, hashtagContract) {
const { itemHash } = item;
const hashtagAddress = hashtagContract._address;
try {
const res = yield call(callGetItemRepliers, itemHash, hashtagContract)
yield put({
Expand Down Expand Up @@ -308,7 +305,8 @@
*/


function createHashtagSubscriptionChannel(hashtagContract) {
function createHashtagSubscriptionChannel(hashtagAddress) {
const hashtagContract = new web3Local.eth.Contract(simpleDeal.abi, hashtagAddress);
return eventChannel(emitter => {
// Unique place to subscribe to all hashtag relevant events
// - NewItem(owner, itemHash, itemMetadataHash, itemValue, hashtagFee, seekerRep)
Expand All @@ -322,7 +320,7 @@
else emitter(event)
})
} catch (e) {
console.error('Error creating subscription to NewItem in ' + hashtagContract._address)
console.error('Error creating subscription to NewItem in ' + hashtagAddress)
}
})

Expand Down Expand Up @@ -371,26 +369,24 @@
yield put({ type: 'UPDATE_ITEM', hashtagAddress, itemHash, data: { timestamp } });
}

function* handleItemChange(event) {
function* handleItemChange(event, hashtagAddress) {
// ItemChange(indexed itemHash, newstatus, providerAddress)
// Step 1. Store the item info
console.log('Handling ItemChange', event)
const { itemHash, newstatus, providerAddress } = event.returnValues
const { address: hashtagAddress } = event
yield put({
type: 'UPDATE_ITEM', hashtagAddress, itemHash, data: {
status: newstatus,
providerAddress,
}
});
yield call(openChat, { itemHash, itemStatus: newstatus, providerAddress })
yield call(openChat, { hashtagAddress, itemHash, itemStatus: newstatus, providerAddress })
}


function* hashtagSubscription(hashtagContract) {
const hashtagSubscriptionChannel = yield call(createHashtagSubscriptionChannel, hashtagContract)
const hashtagAddress = hashtagContract._address
function* hashtagSubscription(hashtagAddress) {
try {
const hashtagSubscriptionChannel = yield call(createHashtagSubscriptionChannel, hashtagAddress)
while (true) {
// take(END) will cause the saga to terminate by jumping to the finally block
let event = yield take(hashtagSubscriptionChannel)
Expand All @@ -403,7 +399,7 @@
yield fork(handleNewItem, event, hashtagAddress, true)
break;
case 'ItemChange':
yield fork(handleItemChange, event)
yield fork(handleItemChange, event, hashtagAddress)
break;
case 'ReplyItem':
yield fork(handleReplyItem, event, true)
Expand Down