Skip to content

Commit

Permalink
fix: comments from anton
Browse files Browse the repository at this point in the history
  • Loading branch information
@ibrizsabin
ibrizsabin committed Jun 18, 2024
1 parent 38e1a19 commit c71f4f7
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 29 deletions.
2 changes: 1 addition & 1 deletion contracts/evm/lib/openzeppelin-contracts-upgradeable
Submodule openzeppelin-contracts-upgradeable updated 611 files
74 changes: 51 additions & 23 deletions contracts/sui/xcall/sources/main.move
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ module xcall::main {
use sui::versioned::{Self, Versioned};

use sui::address::{Self};
use sui::package::UpgradeCap;


const ENotOneTimeWitness: u64 = 0;
Expand All @@ -48,6 +49,8 @@ module xcall::main {
const ERollbackNotEnabled:u64 = 10;
const EInfallible:u64 = 11;
const EInvalidAccess:u64 =12;
const EInvalidMsgCode:u64 =13;
const EDataTooBig:u64=14;

const MAX_DATA_SIZE: u64 = 2048;
const CURRENT_VERSION: u64 = 1;
Expand Down Expand Up @@ -109,7 +112,7 @@ module xcall::main {
self.create_id_cap(ctx)
}

entry public fun configure_nid(self:&mut Storage,admin:&AdminCap, net_id:String,ctx: &mut TxContext){
entry public fun configure_nid(self:&mut Storage,owner:&UpgradeCap, net_id:String,ctx: &mut TxContext){
if(!(net_id == b"".to_string())){
xcall_state::set_net_id(self,net_id);
}
Expand Down Expand Up @@ -145,15 +148,13 @@ module xcall::main {
)
}

entry public fun get_fee(self:&mut Storage, net_id:String, rollback:bool):u64{
let mut fee = xcall_state::get_protocol_fee(self);
let connection = xcall_state::get_connection(self,net_id);
fee = fee + get_connection_fee(self, connection, net_id, rollback);
fee
}

entry public fun get_fee_sources(self:&Storage, net_id:String, rollback:bool, sources:vector<String>):u64{
entry public fun get_fee(self:&Storage, net_id:String, rollback:bool, sources:Option<vector<String>>):u64{
let mut fee = xcall_state::get_protocol_fee(self);
let mut sources= sources.get_with_default(vector::empty<String>());
if (sources.is_empty()){
let connection = xcall_state::get_connection(self,net_id);
sources.push_back(connection);
};

if(isReply(self,net_id,sources) && !rollback){
return 0
Expand Down Expand Up @@ -214,7 +215,7 @@ module xcall::main {

let msg = message_request::encode(&cs_request);

assert!(vector::length(&msg) <= MAX_DATA_SIZE, EInvalidReply);
assert!(vector::length(&msg) <= MAX_DATA_SIZE, EDataTooBig);

let fee = if(isReply(self,to.net_id(),envelope::sources(&envelope))){
xcall_state::remove_reply_state(self);
Expand Down Expand Up @@ -287,6 +288,7 @@ module xcall::main {
xcall_state::set_protocol_fee(self,fee);
}


entry fun set_protocol_fee_handler(self:&mut Storage,admin:&AdminCap,fee_handler:address){
self.enforce_version(CURRENT_VERSION);
xcall_state::set_protocol_fee_handler(self,fee_handler);
Expand All @@ -297,9 +299,29 @@ module xcall::main {
let to = network_address::from_string(to);
let from= network_address::create(xcall_state::get_net_id(self),utils::id_to_hex_string(&object::id(idCap)));

let remaining = send_call_inner(self,fee,from,to,envelope,ctx);
let mut remaining = send_call_inner(self,fee,from,to,envelope,ctx);
let protocol_fee= remaining.split(self.get_protocol_fee(),ctx);
let fee_handler=self.get_protocol_fee_handler();
transfer::public_transfer(protocol_fee,fee_handler);
transfer::public_transfer(remaining, ctx.sender());
}

entry fun send_call_ua(self:&mut Storage,fee: Coin<SUI>,to:String,envelope_bytes:vector<u8>,ctx: &mut TxContext){
let envelope=envelope::decode(&envelope_bytes);
if (envelope.msg_type() == call_message_rollback::msg_type()){
abort EInvalidMsgType
};
let to = network_address::from_string(to);
let from= network_address::create(xcall_state::get_net_id(self),utils::address_to_hex_string(&ctx.sender()));

let mut remaining = send_call_inner(self,fee,from,to,envelope,ctx);
let protocol_fee= remaining.split(self.get_protocol_fee(),ctx);
let fee_handler=self.get_protocol_fee_handler();
transfer::public_transfer(protocol_fee,fee_handler);
transfer::public_transfer(remaining, ctx.sender());
}




public fun handle_message(self:&mut Storage,
Expand All @@ -319,6 +341,7 @@ module xcall::main {

handle_result(self, cap, payload, ctx);
} else {
abort EInvalidMsgCode
}
}

Expand Down Expand Up @@ -363,21 +386,19 @@ module xcall::main {
let message = message_result::message(&cs_message_result);

assert!(xcall_state::has_rollback(self, sequence_no), ENoRollback);
let rollback = xcall_state::get_rollback(self, sequence_no);

let rollback = xcall_state::get_rollback(self, sequence_no);
let sources = rollback_data::sources(&rollback);
let to = rollback_data::to(&rollback);

let source = cap.connection_id();

let source_valid = is_valid_source(self, to, source, sources);

assert!(source_valid, EInvalidSource);

if(vector::length(&sources) > 1){
let key = hash::keccak256(&payload);
xcall_state::save_pending_responses(self, key, source);
let i = 0;

if(!xcall_state::check_pending_responses(self, key, sources)) return;

xcall_state::remove_pending_responses(self, key, sources);
Expand All @@ -386,25 +407,23 @@ module xcall::main {

if (code == message_result::success()) {
xcall_state::remove_rollback(self, sequence_no);

if (vector::length(&message) > 0) {
let msg = message_request::decode(&message);
handle_reply(self,&rollback, &msg, ctx);
};

xcall_state::set_successful_responses(self, sequence_no);
} else {
let mut_rollback = xcall_state::get_mut_rollback(self, sequence_no);
rollback_data::enable_rollback(mut_rollback);
//std::debug::print(&rollback_data::enabled(mut_rollback));
event::emit(RollbackMessage{sn:sequence_no, dapp: utils::id_to_hex_string(&rollback_data::from(&rollback)), data: rollback.rollback() });
};
}

fun handle_reply(self:&mut Storage, rollback:&RollbackData, reply: &CSMessageRequest, ctx: &mut TxContext){
//std::debug::print(&rollback_data::to(rollback));
//std::debug::print(&message_request::from_nid(reply) );
assert!(rollback_data::to(rollback) == message_request::from_nid(reply), EInvalidReply);

let req_id = get_next_req_id(self);
assert!(rollback_data::to(rollback) == message_request::from_nid(reply), EInvalidReply);

let from = reply.from();
let to = reply.to();
Expand All @@ -423,17 +442,19 @@ module xcall::main {

public fun execute_call(self:&mut Storage,cap:&IDCap,request_id:u128,data:vector<u8>,ctx: &mut TxContext):ExecuteTicket{
self.enforce_version(CURRENT_VERSION);

let proxy_request = xcall_state::get_proxy_request(self, request_id);
let from = message_request::from(proxy_request);
let to = message_request::to(proxy_request);
let sn = message_request::sn(proxy_request);
let msg_type = message_request::msg_type(proxy_request);
let msg_data_hash=message_request::data(proxy_request);
let protocols = message_request::protocols(proxy_request);

let data_hash = hash::keccak256(&data);

assert!(msg_data_hash == data_hash, EDataMismatch);
assert!(to==utils::id_to_hex_string(&xcall_state::get_id_cap_id(cap)),EInvalidAccess);

if(msg_type==call_message_rollback::msg_type()){
xcall_state::set_reply_state(self, *proxy_request);
};
Expand Down Expand Up @@ -461,8 +482,10 @@ module xcall::main {
if(msg_type==persistent_message::msg_type() && !success){
abort 0x01
};

xcall_state::remove_proxy_request(self, request_id);
xcall_state::remove_reply_state(self);

let mut message = vector::empty<u8>();
let code= if(success){1}else{0};
let err_msg = if(success){string::utf8(b"success")}else{string::utf8(b"unknown error")};
Expand Down Expand Up @@ -530,8 +553,7 @@ module xcall::main {
xcall_state::get_successful_responses(self, sn);
}

entry fun migrate(self: &mut Storage, a: &AdminCap) {
assert!(xcall_state::get_admin(self) == object::id(a), ENotAdmin);
entry fun migrate(self: &mut Storage, owner:&UpgradeCap) {
assert!(xcall_state::get_version(self) < CURRENT_VERSION, ENotUpgrade);
xcall_state::set_version(self, CURRENT_VERSION);
}
Expand All @@ -543,6 +565,12 @@ module xcall::main {
scenario.next_tx(admin);
scenario
}
#[test_only]
public fun configure_nid_test(self:&mut Storage,owner:&AdminCap, net_id:String,ctx: &mut TxContext){
if(!(net_id == b"".to_string())){
xcall_state::set_net_id(self,net_id);
}
}


}
17 changes: 17 additions & 0 deletions contracts/sui/xcall/sources/utils.move
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ module xcall::xcall_utils {
use sui::coin::{Self};
use std::string::{Self, String};
use sui::hex;
use sui::bcs::{Self};

public fun are_equal<Element>(a1:&vector<Element>,a2:&vector<Element>): bool {

Expand All @@ -32,6 +33,22 @@ module xcall::xcall_utils {
prefix
}

public fun address_to_hex_string(address:&address): String {
let bytes = bcs::to_bytes(address);
let hex_bytes = hex::encode(bytes);
string::utf8(hex_bytes)
}

public fun address_from_hex_string(str: &String): address {
let mut modified_str = str;
if(string::length(str) == 66 ){
modified_str = &str.sub_string(2, 66);
};
let bytes = modified_str.bytes();
let hex_bytes = hex::decode(*bytes);
bcs::peel_address(&mut bcs::new(hex_bytes))
}

public fun id_from_hex_string(str: &String): ID {
let encoded = format_sui_address(str);
let bytes = encoded.bytes();
Expand Down
12 changes: 7 additions & 5 deletions contracts/sui/xcall/tests/xcall_test.move
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ module xcall::xcall_tests {
use xcall::cs_message::{Self};
use xcall::centralized_entry;
use xcall::xcall_utils as utils;
use sui::package::UpgradeCap;

#[test_only]
fun setup_test(admin:address):Scenario {
Expand Down Expand Up @@ -43,8 +44,8 @@ module xcall::xcall_tests {
let scenario = &mut scenario_val;
{
let mut storage = test_scenario::take_shared<Storage>(scenario);
let adminCap = scenario.take_from_sender<AdminCap>();
main::configure_nid(&mut storage, &adminCap,nid, scenario.ctx());
let adminCap = scenario.take_from_sender<AdminCap>();
main::configure_nid_test(&mut storage, &adminCap,nid, scenario.ctx());
test_scenario::return_shared(storage);
scenario.return_to_sender(adminCap);
};
Expand Down Expand Up @@ -218,8 +219,8 @@ scenario = setup_connection(scenario, string::utf8(b"icon"), admin);

let data = b"data";
let rollback_data = b"rollback";

let sources = vector[string::utf8(b"centralized-1")];
// since we are registering 2 connections take_from_sender returns latest one.
let sources = vector[string::utf8(b"centralized-2")];
let destinations = vector[string::utf8(b"icon")];
let fee = coin::mint_for_testing<SUI>(100, scenario.ctx());

Expand Down Expand Up @@ -318,7 +319,7 @@ scenario = setup_connection(scenario, string::utf8(b"icon"), admin);
let data = b"data";
let rollback_data = b"rollback";

let sources = vector[string::utf8(b"centralized-1")];
let sources = vector[string::utf8(b"centralized-2")];
let destinations = vector[string::utf8(b"icon")];
let fee = coin::mint_for_testing<SUI>(100, scenario.ctx());

Expand All @@ -330,6 +331,7 @@ scenario = setup_connection(scenario, string::utf8(b"icon"), admin);
let message = cs_message::encode(&cs_message::new(cs_message::result_code(), message_result::encode(&response)));
let from_nid = string::utf8(b"icon");
let conn_cap = test_scenario::take_from_sender<ConnCap>(&scenario);
std::debug::print(&conn_cap);

main::handle_message(&mut storage,&conn_cap,from_nid,message,scenario.ctx());

Expand Down

0 comments on commit c71f4f7

Please sign in to comment.