added 3 tables categories, categories_proposals, and proposals the sa…

[eoliveros]

…me as zapd.

Copied the mainnet proposals screen. Not complete. It's not sending email notifications at the moment. Not sure how we sending the rebates, needs clarification.

[eoliveros]

submitted changes. But still need to figure certain things.

[djpnewton]

Also we need to remove the 'wallet_address' field from the Users table and just have one wallet address for the user defined from the recovery words

[eoliveros]

Also we need to remove the 'wallet_address' field from the Users table and just have one wallet address for the user defined from the recovery words

Does that mean the user will only be using one wallet_address? ie. their merchant_app seed would be the same as the seed thats being stored in merchat_server?

[djpnewton]

Also we need to remove the 'wallet_address' field from the Users table and just have one wallet address for the user defined from the recovery words

Does that mean the user will only be using one wallet_address? ie. their merchant_app seed would be the same as the seed thats being stored in merchat_server?

yes

[eoliveros]

Also we need to remove the 'wallet_address' field from the Users table and just have one wallet address for the user defined from the recovery words

Does that mean the user will only be using one wallet_address? ie. their merchant_app seed would be the same as the seed thats being stored in merchat_server?

yes

I'm going to need a version of the merchant app that recognizes the qrcode. At the moment, when scan using the merchant app, its giving me invalid qrcode.

Also need to do do the following to get user.wallet_address out of the db. Currently, seeing the following:

    @classmethod
    def update_wallet_address(cls, session, user):
        if user.wallet_address:
            # update txs
            limit = 100
            oldest_txid = None
            txs = []
            while True:
                have_tx = False
                txs = blockchain_transactions(logger, app.config["NODE_ADDRESS"], user.wallet_address, limit, oldest_txid)
                for tx in txs:
                    oldest_txid = tx["id"]
                    have_tx = MerchantTx.exists(db.session, user, oldest_txid)
                    if have_tx:
                        break
                    if tx["type"] == 4 and tx["assetId"] == app.config["ASSET_ID"]:
                        amount_nzd = apply_merchant_rate(tx['amount'], user, app.config, use_fixed_fee=False)
                        date = datetime.datetime.fromtimestamp(tx['timestamp'] / 1000)
                        session.add(MerchantTx(user, date, user.wallet_address, tx['amount'], amount_nzd, tx['id'], tx['direction'], tx['attachment']))
                if have_tx or len(txs) < limit:
                    break
            session.commit()

Which appears to being used in the MerchantTxModelView.

    @expose("/update")
    def update(self):
        if not current_user.wallet_address:
            flash('Account does not have wallet address set')
        else:
            MerchantTx.update_wallet_address(db.session, current_user)
            flash('Updated')
        return redirect('./')

need to figure a way to remove the user.wallet_address without getting affected.

Actually, this appears for updating. The question is whether its being left black then updated or if its being updated by something before it gets through this process.

[eoliveros]

did a test by creating new account and new wallet. and it looks like when scanning the qrcode this is setting the wallet_address in the "User" table. Still investigating to see what could be writing this "User".wallet_address and change it somehow.

[eoliveros]

I can't see what's writing the "User".wallet_address, its leading me to believe that this is being triggered by the merchant app, rather that the merchant server. If thats true, all I need to do is to remove the rebate_address on the "information" column on the "User" table.

but since we are have to generate the wallet_address from the seed and put it in the "User" table, need more trying to figure out how to do that.

[eoliveros]

done the following:
Seeds table now has a wallet_address field. This is populated when the wallet_seed is added on_model_change. User.wallet_address is then populated by calling:

db.session.query(User).filter(User.id == model.user_id).update({User.wallet_address: model.wallet_address})

after_model_change.

So this meant that we don't necessarily need to scan the api-key qrcode to populate the User.wallet_address. Not sure, what else the api-key qrcode does or if the function that does it, does other things apart from populating the User.wallet_address field.

The User.wallet_address field is also used for the MerchantTx. Looks like its populating the table with the transactions for the merchant. So I need to look at and see if I can make this into looking at moving it away from the User.wallet_address to Seeds.wallet_address,etc......

[eoliveros]

noticed something funky with the emrchant app.

the amount of zap that you send when placing the nzd value is weird. currently the server is setup for the customer_rate of 8%. getting the following:

NZD    ZAP(cents)
1          109
2          218
3          327
4          436
5          546

NZD * 100 + (customer_rate + transaction_fee)