status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

change dynamicbytes to be more dynamic 

![more dynamicer](https://tenor.com/view/more-cowbell-cowbell-snl-reaction-mrw-gif-14076918.gif)
This commit is contained in:
emizzle 2020-09-10 10:36:27 +10:00 committed by Iuri Matias
parent 2c7dd929ad
commit 2a36bcc762
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/status/ens.nim
View File

@ -154,7 +154,7 @@ proc registerUsername*(username:string, address: EthAddress, pubKey: string, pas
let let
register = Register(label: label, account: address, x: x, y: y) register = Register(label: label, account: address, x: x, y: y)
registerAbiEncoded = ensUsernamesContract.methods["register"].encodeAbi(register) registerAbiEncoded = ensUsernamesContract.methods["register"].encodeAbi(register)
approveAndCallObj = ApproveAndCall(to: ensUsernamesContract.address, value: price, data: DynamicBytes[100].fromHex(registerAbiEncoded)) approveAndCallObj = ApproveAndCall[132](to: ensUsernamesContract.address, value: price, data: DynamicBytes[132].fromHex(registerAbiEncoded))
approveAndCallAbiEncoded = sntContract.methods["approveAndCall"].encodeAbi(approveAndCallObj) approveAndCallAbiEncoded = sntContract.methods["approveAndCall"].encodeAbi(approveAndCallObj)
let payload = %* { let payload = %* {

4
src/status/libstatus/coder.nim
View File

@ -37,10 +37,10 @@ type
x*: FixedBytes[32] x*: FixedBytes[32]
y*: FixedBytes[32] y*: FixedBytes[32]
ApproveAndCall* = object ApproveAndCall*[N: static[int]] = object
to*: EthAddress to*: EthAddress
value*: Stuint[256] value*: Stuint[256]
data*: DynamicBytes[100] data*: DynamicBytes[N]
Transfer* = object Transfer* = object
to*: EthAddress to*: EthAddress

8
src/status/stickers.nim
View File

@ -41,18 +41,18 @@ proc init*(self: StickersModel) =
var evArgs = StickerArgs(e) var evArgs = StickerArgs(e)
self.addStickerToRecent(evArgs.sticker, evArgs.save) self.addStickerToRecent(evArgs.sticker, evArgs.save)
proc buildTransaction(self: StickersModel, packId: Uint256, address: EthAddress, price: Uint256, approveAndCall: var ApproveAndCall, sntContract: var Contract, gas = "", gasPrice = ""): EthSend = proc buildTransaction(self: StickersModel, packId: Uint256, address: EthAddress, price: Uint256, approveAndCall: var ApproveAndCall[100], sntContract: var Contract, gas = "", gasPrice = ""): EthSend =
sntContract = status_contracts.getContract("snt") sntContract = status_contracts.getContract("snt")
let let
stickerMktContract = status_contracts.getContract("sticker-market") stickerMktContract = status_contracts.getContract("sticker-market")
buyToken = BuyToken(packId: packId, address: address, price: price) buyToken = BuyToken(packId: packId, address: address, price: price)
buyTxAbiEncoded = stickerMktContract.methods["buyToken"].encodeAbi(buyToken) buyTxAbiEncoded = stickerMktContract.methods["buyToken"].encodeAbi(buyToken)
approveAndCall = ApproveAndCall(to: stickerMktContract.address, value: price, data: DynamicBytes[100].fromHex(buyTxAbiEncoded)) approveAndCall = ApproveAndCall[100](to: stickerMktContract.address, value: price, data: DynamicBytes[100].fromHex(buyTxAbiEncoded))
transactions.buildTokenTransaction(address, sntContract.address, gas, gasPrice) transactions.buildTokenTransaction(address, sntContract.address, gas, gasPrice)
proc estimateGas*(self: StickersModel, packId: int, address: string, price: string): int = proc estimateGas*(self: StickersModel, packId: int, address: string, price: string): int =
var var
approveAndCall: ApproveAndCall approveAndCall: ApproveAndCall[100]
sntContract = status_contracts.getContract("snt") sntContract = status_contracts.getContract("snt")
tx = self.buildTransaction( tx = self.buildTransaction(
packId.u256, packId.u256,
@ -70,7 +70,7 @@ proc estimateGas*(self: StickersModel, packId: int, address: string, price: stri
proc buyPack*(self: StickersModel, packId: int, address, price, gas, gasPrice, password: string): string = proc buyPack*(self: StickersModel, packId: int, address, price, gas, gasPrice, password: string): string =
var var
sntContract: Contract sntContract: Contract
approveAndCall: ApproveAndCall approveAndCall: ApproveAndCall[100]
tx = self.buildTransaction( tx = self.buildTransaction(
packId.u256, packId.u256,
parseAddress(address), parseAddress(address),