Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 2.7.0 to master (Release/2.7.x -> master) #243

Merged
merged 172 commits into from
Apr 8, 2022
Merged

Release 2.7.0 to master (Release/2.7.x -> master) #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
172 commits
Select commit Hold shift + click to select a range
9770ef1
updating develop branch
tvl83 Jan 20, 2021
f110ded
added constant and whitelisted fio.escrow
tvl83 Jan 20, 2021
eb36c20
rename file
tvl83 Jan 20, 2021
b1901b6
updated abi to include the parameter and also changed the body of the…
tvl83 Jan 24, 2021
d882a34
add const for max recordobt/newfunds content
Feb 24, 2021
67ceda7
Update newfunds and recordobt content values
Feb 24, 2021
66cd0e5
added simple body to each action that just replies with "status: ok" …
tvl83 Feb 25, 2021
748e748
forgot to add to dispatch
tvl83 Mar 1, 2021
df2a34b
fixed type of action fields
tvl83 Mar 8, 2021
3c9081e
added notes to all the actions on the basic steps required. Updated a…
tvl83 Mar 8, 2021
c1f0fd8
reorder parameters in listdomain
tvl83 Mar 8, 2021
eec124a
added FIOESCROW to whitelist to use the token transfer action.
tvl83 Mar 8, 2021
3431413
updates to fioescrow listdomain action.
tvl83 Mar 9, 2021
816ba24
updated abi
tvl83 Mar 9, 2021
cdc935d
add line to write to table and pass hash into update method so it doe…
tvl83 Mar 9, 2021
3062035
parameter name fix
tvl83 Mar 9, 2021
15b1ba6
fixes to update method
tvl83 Mar 9, 2021
5aa2374
fixed type in abi for table
tvl83 Mar 9, 2021
2411ecb
Renamed escrow const variable. added more asserts. Added functionalit…
tvl83 Mar 10, 2021
06b9f9b
spelling and formatting of JSON
tvl83 Mar 10, 2021
c57065a
added code to modify domains table to change owner.
tvl83 Mar 10, 2021
369ec4c
added another table and another action.
tvl83 Mar 11, 2021
5586bf9
updated fio.address to have another action. also updated the abi
tvl83 Mar 11, 2021
faa3588
updated actions to set holder account (sethldacct) and set marketplac…
tvl83 Mar 11, 2021
8361d90
renamed EscrowContract constant
tvl83 Mar 11, 2021
b7ef4d2
added code to xferescrow action
tvl83 Mar 11, 2021
5c9d7bf
modified listdomain action to use the xferescrow action
tvl83 Mar 11, 2021
63be9b7
listdomain successfully transfers the domain to the trusted account i…
tvl83 Mar 11, 2021
4d96aca
updated fio.address abi for xferescrow action.
tvl83 Mar 13, 2021
0939462
update to fio.token::transfer to allow the transferring between accou…
tvl83 Mar 13, 2021
4ee4ea6
formatting
tvl83 Mar 13, 2021
3b23a96
updated ABI to have proper types. buydomain and cxdomain are function…
tvl83 Mar 13, 2021
ab968b9
Completed buydomain action. The whole process start to finish is work…
tvl83 Mar 14, 2021
7e7eebc
more comments laying out the plan for the chkexplistng action.
tvl83 Mar 14, 2021
4460749
new actions to change settings in config table.
tvl83 Mar 14, 2021
d9d3964
updated abi
tvl83 Mar 14, 2021
16334c4
updated eoslib_serialize of tables.
tvl83 Mar 15, 2021
77e58fe
renamed parameter
tvl83 Mar 19, 2021
0eff6e5
some code clean up and completed setmkplstdur and setmkpwrntm
tvl83 Mar 19, 2021
1be55b6
cleaned up some code and updated the abi file for some actions.
tvl83 Mar 19, 2021
09e1ce6
updated actions to include max_fee and tpid
tvl83 Mar 20, 2021
dc0df82
removed assertion added for debugging.
tvl83 Mar 21, 2021
c2b705d
removed send_response because it's called in another action.
tvl83 Mar 21, 2021
305c9c6
Added const endpoints and a single ram increase constant until more a…
tvl83 Mar 21, 2021
e6805ed
updated abi to all have an actor parameter for ram increase and payi…
tvl83 Mar 21, 2021
32980d0
added fees and `incram` to all action calls per feedback. Right now r…
tvl83 Mar 21, 2021
843e7c9
cleaned up some comments
tvl83 Mar 21, 2021
76c962d
Updated burnexpired action in fio.address to remove listings of domai…
tvl83 Mar 21, 2021
6e35d7b
Added ebreak to config table and an action to toggle it. Updated perm…
tvl83 Mar 30, 2021
605d3b7
fixed syntax errors.
tvl83 Mar 31, 2021
9371f1a
removed fees that wont be used and added one that will be used.
tvl83 Apr 4, 2021
f5e1c77
updated abi.
tvl83 Apr 4, 2021
d68e7c0
added `date_listed` column to listing table.
tvl83 Apr 4, 2021
847789c
removed actions and consolidated set actions based on recent feedback.
tvl83 Apr 4, 2021
ecdd481
updated abi with new parameters for a couple actions
tvl83 Apr 4, 2021
70cde90
removed marketplace name and hash and owner public key from the mrkpl…
tvl83 Apr 4, 2021
bc49dda
cleaned up some code related to fees in actions that dont have fees. …
tvl83 Apr 4, 2021
f7192bc
removed everything related to holder account. Updated xferescrow acti…
tvl83 Apr 15, 2021
a55ed45
cleaned up some comments and passed new parameter to xferescrow.
tvl83 Apr 17, 2021
9b2f883
cleaned up eosio_dispatch line
tvl83 Apr 17, 2021
6c08615
FIP-22 first steps
May 11, 2021
7b81ac1
use remaining
May 11, 2021
de25df1
add some checks
May 11, 2021
4de063c
changed datatype of commission_fee to double and combined set and upd…
tvl83 May 11, 2021
738dad0
fixed a few errors
tvl83 May 11, 2021
8dac563
Merge branch 'feature/BD-2516-retire' into feature/BD-2516-retire-FIP…
May 19, 2021
2075adf
update retire, general lock update support
May 21, 2021
9009026
Merge branch 'feature/FIP-21-Staking-fio-contracts-develop-03212021' …
May 21, 2021
1e1b10c
fixed datatypes and updated abi
tvl83 May 25, 2021
b1382a7
abi update
tvl83 May 25, 2021
2d15383
abi update and fixed parameters for xferescrow in cxlistdomain. added…
tvl83 May 25, 2021
824b8b9
include updlocks, fix unassigned value bug
May 27, 2021
4d588b2
Merge branch 'feature/FIP-21-Staking-fio-contracts-develop-03212021' …
May 27, 2021
9868b68
Added a status and date_updated column. Status is used to denote if a…
tvl83 Jun 1, 2021
05740ff
use fio errors on fio.token::retire
Jun 3, 2021
c2afa1f
Merge branch 'feature/FIP-21-Staking-fio-contracts-develop-03212021' …
Jun 3, 2021
c28085d
use general_locks_table_v2
Jun 3, 2021
0120541
Merge branch 'develop' into develop
0xCasey Jun 4, 2021
70bdfa7
fixed type for parameter for the `mrkplconfig` table.
tvl83 Jun 13, 2021
3f08f8c
Merge remote-tracking branch 'origin/develop' into develop
tvl83 Jun 13, 2021
4899a83
refactor retre
Jun 15, 2021
62e9060
Merge branch 'feature/FIP-21-Staking-fio-contracts-develop-03212021' …
Jun 15, 2021
f53ccf5
added other indexes. changed type of status column.
tvl83 Aug 1, 2021
e49038c
added a default date to a domain listing. added upper bound to sale_p…
tvl83 Aug 1, 2021
0313b06
updated type in abi
tvl83 Aug 1, 2021
d11aec6
Merge branch 'develop' into feature/BD-2516-retire-FIP-21-base
adsorptionenthalpy Aug 3, 2021
bb128b5
Merge remote-tracking branch 'upstream/develop' into develop
tvl83 Sep 10, 2021
b01cac0
missed a constant in the merge
tvl83 Sep 10, 2021
d0b21ea
spelling
tvl83 Oct 11, 2021
aa2817e
adding auth to incgrewards
tvl83 Oct 11, 2021
169ac60
updated data type of max_fee. fixed typo in response string. changed …
tvl83 Oct 11, 2021
70a79f7
Merge branch 'develop' into feature/BD-2516-retire-FIP-21-base
adsorptionenthalpy Oct 15, 2021
1da1322
new action `cxburned` to cancel a listing of a domain that is being b…
tvl83 Oct 18, 2021
c102799
Merge branch 'upstream-develop' into fio-develop
tvl83 Oct 18, 2021
f6b7244
added logic to call cxburned in new version of burnexpired
tvl83 Oct 18, 2021
fc5bf89
added check in both cxburned and burnexpired to make sure the status …
tvl83 Oct 18, 2021
6242e64
fixed a few variable names
tvl83 Oct 18, 2021
1a6f565
passed the correct thing into the find method.
tvl83 Oct 19, 2021
3a2671d
fixed max_fee assertions
tvl83 Oct 20, 2021
538dd09
abi formatting
tvl83 Oct 20, 2021
eda2278
re-add xferescrow action to abi
tvl83 Oct 20, 2021
9a4cdbc
add modexpire to fio.address
tvl83 Oct 21, 2021
f14b1c6
require e_break to be 1 or 0
tvl83 Oct 22, 2021
5aa98da
Merge branch 'develop' into fio-develop
adsorptionenthalpy Oct 27, 2021
ddb1fc5
Merge branch 'develop' into feature/BD-2516-retire-FIP-21-base
adsorptionenthalpy Oct 28, 2021
ca1d09c
increase ram bump per nft
adsorptionenthalpy Nov 4, 2021
4c86c31
Merge pull request #205 from fioprotocol/feature/FIP21-staking-Rework…
ericbutz Nov 10, 2021
a8d9d98
support spec changes for retire'
adsorptionenthalpy Nov 11, 2021
30bcebc
Merge pull request #207 from fioprotocol/feature/FIP-21-staking-r2-6-…
adsorptionenthalpy Nov 12, 2021
4d0a163
Update retire to burn remaining from burnable - quantity
adsorptionenthalpy Nov 12, 2021
03fd0ce
fix assertion
adsorptionenthalpy Nov 12, 2021
898ba8f
Insufficient balance has no ,
adsorptionenthalpy Nov 12, 2021
11718ab
trx size check goes on the end
adsorptionenthalpy Nov 12, 2021
796f676
xfer domain that has expired
adsorptionenthalpy Nov 12, 2021
ff5b864
cleanup
adsorptionenthalpy Nov 12, 2021
ca6fab6
Merge branch 'develop' into feature/BD2989-nov10
adsorptionenthalpy Nov 12, 2021
78b629c
fix expression
adsorptionenthalpy Nov 12, 2021
85416cb
Correction: use AND not OR
adsorptionenthalpy Nov 16, 2021
a5b02f2
Merge branch 'feature/FIP-21-staking-r2-6-x-11102021' into feature/BD…
adsorptionenthalpy Nov 16, 2021
9d843fb
Allow retire of mainnet locks
adsorptionenthalpy Nov 16, 2021
40a5f1c
include can_transfer assertion
adsorptionenthalpy Nov 16, 2021
61b52a3
Update 404 errors
adsorptionenthalpy Nov 16, 2021
842c372
Improve logic
adsorptionenthalpy Nov 16, 2021
f741d76
Merge pull request #210 from fioprotocol/update/xfer_expired_dom2
ericbutz Nov 18, 2021
b26de4b
Merge pull request #118 from fioprotocol/feature/BD-2150
ericbutz Nov 18, 2021
f5ccbfb
Merge pull request #203 from fioprotocol/feature/BD-2912
ericbutz Nov 18, 2021
2760e75
FIP-33 ( Add $ support on chain name validation )
0xCasey Nov 22, 2021
927efba
Merge pull request #212 from fioprotocol/0xCasey-patch-1
ericbutz Nov 29, 2021
7a4c6e9
remove unused updlocks
Nov 29, 2021
9c71141
Merge pull request #208 from fioprotocol/feature/BD2989-nov10
adsorptionenthalpy Nov 29, 2021
47d8479
FIP-32 ( Increased content on newfundsreq )
Dec 13, 2021
461728b
Bug fixes
0xCasey Dec 13, 2021
63671d7
formatting fixes
0xCasey Dec 13, 2021
b1b9a99
Multiple Bug fixes
0xCasey Dec 13, 2021
deb99fe
change types causing read errors
0xCasey Dec 13, 2021
c1d5f1c
improvements to fee
0xCasey Dec 14, 2021
62edee0
modify fee value multiplication
0xCasey Dec 14, 2021
3e2a873
FIP-34
0xCasey Dec 14, 2021
8c79f50
change token_id supported length to 128
Dec 15, 2021
3173258
Merge pull request #217 from fioprotocol/feature/BD-3098
0xCasey Dec 16, 2021
7464816
Remove 300 error message
0xCasey Dec 16, 2021
001f92e
Merge pull request #215 from fioprotocol/feature/FIP-32
ericbutz Dec 16, 2021
1e273c1
changed endpoint to proper one and removed comments that were unneeded
tvl83 Dec 17, 2021
75a34e1
Merge branch 'fio-develop' of https://github.com/tvl83/fio.contracts …
tvl83 Dec 17, 2021
d863d5b
removed modexpire
tvl83 Dec 19, 2021
7e4c9c9
Merge pull request #219 from fioprotocol/release/2.6.x
0xCasey Dec 21, 2021
48b7ac7
Merge branch 'develop' into fio-develop
ericbutz Dec 21, 2021
8efcefe
Merge pull request #197 from tvl83/fio-develop
ericbutz Dec 21, 2021
e26801a
fix assertion for locks check
Dec 31, 2021
670aa3a
Merge branch 'master' into rebase/develop
0xCasey Jan 10, 2022
8b4b4fa
Merge pull request #225 from fioprotocol/rebase/develop
ericbutz Jan 10, 2022
4148374
udpate accounstaking/generalLocksTable iters
Jan 12, 2022
fdcdc2d
updates to retire
Jan 16, 2022
f79a3a7
fix negative issue
Jan 24, 2022
ebf0a9a
retire fixes
Jan 24, 2022
d9fc527
use actor string not value
Jan 24, 2022
c86e8cb
logic flaw
Jan 24, 2022
915c8b6
equation incorrect
Jan 24, 2022
abfcc0d
<=
Jan 24, 2022
23ab2ac
revert expression
Jan 25, 2022
e191e8e
Merge pull request #226 from fioprotocol/feature/BD-3133
ericbutz Jan 26, 2022
c7ff81c
Add owner lookup to allow for multiple marketplaces in the future wit…
Jan 28, 2022
b36247e
Merge pull request #228 from fioprotocol/bugfix/escrow_fix_indextable
0xCasey Jan 28, 2022
3f64008
retire fixes
Jan 31, 2022
6ff2151
Merge pull request #231 from fioprotocol/feature/BD-3227
ericbutz Feb 1, 2022
d3c6596
adjusted fioescrowram constant to 512x3, 1536.
tvl83 Feb 7, 2022
2cf1336
removed ram bump for actions that dont need it and adjusted ram incre…
tvl83 Feb 7, 2022
50e09da
Merge pull request #233 from tvl83/escrow-ram-adjust
ericbutz Feb 7, 2022
ac3af69
Update came to 2.7.0
ericbutz Feb 22, 2022
d909490
Update readme to 2.8.0
ericbutz Feb 22, 2022
8f2dd2d
Fix
ericbutz Feb 22, 2022
d9d3e29
Merge pull request #234 from fioprotocol/ericbutz-patch-1
adsorptionenthalpy Feb 22, 2022
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5)
project(fio.contracts)

set(VERSION_MAJOR 2)
set(VERSION_MINOR 6)
set(VERSION_MINOR 7)
set(VERSION_PATCH 0)
#set(VERSION_SUFFIX rc1)

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# fio.contracts

## Version : 2.6.0
## Version : 2.7.0

Smart contracts that provide some of the basic functions of the FIO blockchain

Expand Down
1 change: 1 addition & 0 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ cp contracts/fio.fee/fio.fee.abi build/contracts/fio.fee/
cp contracts/fio.request.obt/fio.request.obt.abi build/contracts/fio.request.obt/
cp contracts/fio.tpid/fio.tpid.abi build/contracts/fio.tpid/
cp contracts/fio.treasury/fio.treasury.abi build/contracts/fio.treasury/
cp contracts/fio.escrow/fio.escrow.abi build/contracts/fio.escrow/
cp contracts/fio.staking/fio.staking.abi build/contracts/fio.staking/
1 change: 1 addition & 0 deletions contracts/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ add_subdirectory(fio.fee)
add_subdirectory(fio.request.obt)
add_subdirectory(fio.tpid)
add_subdirectory(fio.treasury)
add_subdirectory(fio.escrow)
add_subdirectory(fio.staking)
Loading