Skip to content

Qubic Bridge SC in develop. testnet #231

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.

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

Open
wants to merge 30 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
005fc68
Latest qubic bridge sc in develop. testnet
anarojoagusti Dec 5, 2024
c65a135
Adding the SC to contract_def.h
anarojoagusti Dec 9, 2024
a48c299
Refactored EthBridge SC adding logging mechanism using EthBridgeLogge…
anarojoagusti Dec 9, 2024
7ba4573
Changes in refundOrder and transferToContract procedures including lo…
anarojoagusti Dec 9, 2024
23fd7a0
Logging system errors solved after compiling qubic.sln - using locals
anarojoagusti Dec 9, 2024
f61a528
CALL functions modified
anarojoagusti Dec 10, 2024
abaf09f
testnet configs
krypdkat Feb 7, 2024
faf085c
Replaced '\0' with 0 in all logs to align with guidelines. Moved alll…
anarojoagusti Dec 11, 2024
ca428e7
Added logging for important events: admin address changes, new manage…
anarojoagusti Dec 11, 2024
6b6b144
Procedures tranferToContract, completeOrder and refundOrder are modif…
anarojoagusti Dec 11, 2024
b0cfb0d
Looger for tokens and admin/managers added
anarojoagusti Dec 11, 2024
c2dd11c
Looger for tokens and admin/managers added
anarojoagusti Dec 11, 2024
c2c7e64
Updated core for bridge develop branch
anarojoagusti Dec 12, 2024
243785c
Merge branch 'main' into testnets/2024-12-05-bridge-develop
anarojoagusti Dec 12, 2024
6ab598e
init gtest for ethbridge
anarojoagusti Dec 16, 2024
f7bb90a
Merge branch 'testnets/2024-12-05-bridge-develop' of https://github.c…
anarojoagusti Dec 16, 2024
471d0eb
ETHBRIDGEChecker and tests created. New readable function 'getAdminID…
anarojoagusti Dec 17, 2024
4680440
state admin set to default value
anarojoagusti Dec 17, 2024
82a2ee7
contract_def.h modified to add ethbridge sc functions and procedures.…
anarojoagusti Dec 17, 2024
821913f
orders and managers arrays modified to solve hashmap compiling errors…
anarojoagusti Dec 18, 2024
4f06849
Reimplemented getAdminID to return the state admin value
anarojoagusti Dec 18, 2024
ff61874
Contract ethBridge gtests done
anarojoagusti Dec 23, 2024
6602735
Contract ethBridge gtests minor errors solved
anarojoagusti Dec 23, 2024
38a1372
Contract ethBridge gtests completed
anarojoagusti Dec 23, 2024
1a2b05d
cleaning sc
anarojoagusti Dec 23, 2024
836342c
Merge branch 'main' into testnets/2024-12-05-bridge-develop
anarojoagusti Jan 2, 2025
2d4d662
Access modifier of EthBridge data changed from private to protected. …
anarojoagusti Jan 13, 2025
470570f
erge branch 'testnets/2024-12-05-bridge-develop' of https://github.co…
anarojoagusti Jan 13, 2025
d6ee028
contract_ethbridge and the ethbrigde contract added to the vcxproject…
anarojoagusti Jan 13, 2025
a046627
AddManager now checks if that id address is already set as manager be…
anarojoagusti Jan 14, 2025
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
12 changes: 12 additions & 0 deletions src/contract_core/contract_def.h
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,16 @@ struct __FunctionOrProcedureBeginEndGuard
#define CONTRACT_STATE2_TYPE QVAULT2
#include "contracts/QVAULT.h"

#undef CONTRACT_INDEX
#undef CONTRACT_STATE_TYPE
#undef CONTRACT_STATE2_TYPE

#define ETHBRIDGE_CONTRACT_INDEX 11
#define CONTRACT_INDEX ETHBRIDGE_CONTRACT_INDEX
#define CONTRACT_STATE_TYPE ETHBRIDGE
#define CONTRACT_STATE2_TYPE ETHBRIDGE2
#include "contracts/EthBridge.h"

#define MAX_CONTRACT_ITERATION_DURATION 0 // In milliseconds, must be above 0; for now set to 0 to disable timeout, because a rollback mechanism needs to be implemented to properly handle timeout

#undef INITIALIZE
Expand Down Expand Up @@ -214,6 +224,7 @@ constexpr struct ContractDescription
{"CCF", 127, 10000, sizeof(CCF)}, // proposal in epoch 125, IPO in 126, construction and first use in 127
{"QEARN", 137, 10000, sizeof(QEARN)}, // proposal in epoch 135, IPO in 136, construction in 137 / first donation after END_EPOCH, first round in epoch 138
{"QVAULT", 138, 10000, sizeof(IPO)}, // proposal in epoch 136, IPO in 137, construction and first use in 138
{"BRIDGE", 136, 10000, sizeof(ETHBRIDGE)}, // proposal in epoch 136, IPO in 137, construction and first use in 138
};

constexpr unsigned int contractCount = sizeof(contractDescriptions) / sizeof(contractDescriptions[0]);
Expand Down Expand Up @@ -300,4 +311,5 @@ static void initializeContracts()
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(CCF);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QEARN);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QVAULT);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(ETHBRIDGE);
}
Loading