Skip to content

Commit

Permalink
Ndev 3380 compasability for iterative trx (#456)
Browse files Browse the repository at this point in the history
  • Loading branch information
@kristinaNikolaevaa
kristinaNikolaevaa authored Jan 31, 2025
1 parent ee31716 commit c387bd9
Show file tree
Hide file tree
Showing 9 changed files with 726 additions and 59 deletions.
2 changes: 1 addition & 1 deletion contracts/common/StorageSoliditySource.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ contract Storage {
return msg.sender.balance;
}

function storeSumOfNumbers(uint256 num1, uint256 num2) public view returns (uint256) {
function storeSumOfNumbers(uint256 num1, uint256 num2) public view returns (uint256) {
if (number == 101) {
num1 = 0;
}
Expand Down
175 changes: 154 additions & 21 deletions contracts/precompiled/CallSolanaCaller.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,18 @@ pragma solidity >=0.7.0 <0.9.0;
pragma abicoder v2;

import "../external/neon-evm/call_solana.sol";

import "../common/StorageSoliditySource.sol";

contract CallSolanaCaller {
CallSolana constant _callSolana =
CallSolana(0xFF00000000000000000000000000000000000006);
struct Data {
uint256 value1;
uint256 value2;
}
mapping(uint256 => Data) public dataMap;
uint256 public numberToStore;

CallSolana constant _callSolana = CallSolana(0xFF00000000000000000000000000000000000006);
struct ExecuteArgs {
uint64 lamports;
bytes instruction;
Expand All @@ -17,73 +24,199 @@ contract CallSolanaCaller {
bytes instruction;
}


event LogBytes(bytes32 value);
event LogStr(string value);
event LogInt(uint value);
event LogAddress(address value);
event LogData(bytes32 program, bytes value);

function getNeonAddress(address addr) public returns (bytes32){
function getNeonAddress(address addr) public returns (bytes32) {
bytes32 solanaAddr = _callSolana.getNeonAddress(addr);
return solanaAddr;
}

function execute(uint64 lamports, bytes calldata instruction) public {
bytes32 returnData = bytes32(_callSolana.execute(lamports, instruction));
numberToStore = 190;
bytes32 returnData = bytes32(
_callSolana.execute(lamports, instruction)
);
emit LogBytes(returnData);
}


function executeInIterativeMode(
uint256 actionsNumber,
uint64 lamports,
bytes calldata instruction
) public {
doIterativeActions(actionsNumber);
execute(lamports, instruction);
}

function solanaCallBeforeActionWithMatrix(
uint[][] memory a,
uint64 lamports,
bytes calldata instruction
) public {
// Matrix matrixContract = new Matrix();
execute(lamports, instruction);
uint sum = sumMatrixElements(a);
emit LogInt(sum);
}

function execute_with_get_return_data(uint64 lamports, bytes calldata instruction) public {
function solanaCallAfterActionWithMatrix(
uint[][] memory a,
uint64 lamports,
bytes calldata instruction
) public {
uint sum = sumMatrixElements(a);
execute(lamports, instruction);
emit LogInt(sum);
}

function solanaCallInsideActionWithMatrix(
uint[][] memory a,
uint64 lamports,
bytes calldata instruction
) public {
numberToStore = 18;
uint sum = 0;
for (uint i = 0; i < a.length; i++) {
for (uint j = 0; j < a[i].length; j++) {
if (i == a.length / 2) {
execute(lamports, instruction);
}
sum += a[i][j];
}
}
emit LogInt(sum);
}


function batchExecuteInIterativeMode(
uint256 actionsNumber,
ExecuteArgs[] memory _args
) public {
doIterativeActions(actionsNumber);
batchExecute(_args);
}

function sendTokensAndExecuteInIterativeMode(
uint256 actionsNumber,
uint64 lamports,
bytes calldata instruction
) public payable {
executeInIterativeMode(actionsNumber, lamports, instruction);
}

function doIterativeActions(uint actionsNumber) public {
// some actions to make the call iterative
for (uint256 i = 0; i < actionsNumber; i++) {
Data memory newData = Data({value1: 1, value2: 2});
dataMap[i] = newData;
}
}

function deployStorageAndCallSolana(
uint64 lamports,
bytes calldata instruction
) public {
Storage storageContract = new Storage();
storageContract.store(10);
require(storageContract.retrieve() == 10);
execute(lamports, instruction);
emit LogAddress(address(storageContract));
}

function executeWithGetReturnData(
uint64 lamports,
bytes calldata instruction
) public {
_callSolana.execute(lamports, instruction);
(bytes32 program, bytes memory returnData) = _callSolana.getReturnData();
(bytes32 program, bytes memory returnData) = _callSolana
.getReturnData();
emit LogData(program, returnData);
}

function batchExecute(ExecuteArgs[] memory _args) public {
for(uint i = 0; i < _args.length; i++) {
for (uint i = 0; i < _args.length; i++) {
_callSolana.execute(_args[i].lamports, _args[i].instruction);
}
(bytes32 program, bytes memory returnData) = _callSolana.getReturnData();
(bytes32 program, bytes memory returnData) = _callSolana
.getReturnData();
emit LogData(program, returnData);
}

function getPayer() public returns (bytes32){
function getPayer() public returns (bytes32) {
bytes32 payer = _callSolana.getPayer();
return payer;
}

function createResource(bytes32 salt, uint64 space, uint64 lamports, bytes32 owner) external returns (bytes32){
bytes32 resource = _callSolana.createResource(salt, space, lamports, owner);
function createResource(
bytes32 salt,
uint64 space,
uint64 lamports,
bytes32 owner
) external returns (bytes32) {
bytes32 resource = _callSolana.createResource(
salt,
space,
lamports,
owner
);
return resource;
}

function getResourceAddress(bytes32 salt) external returns (bytes32){
function getResourceAddress(bytes32 salt) external returns (bytes32) {
bytes32 resource = _callSolana.getResourceAddress(salt);
return resource;
}

function getSolanaPDA(bytes32 program_id, bytes memory seeds) external returns (bytes32){
function getSolanaPDA(
bytes32 program_id,
bytes memory seeds
) external returns (bytes32) {
bytes32 pda = _callSolana.getSolanaPDA(program_id, seeds);
return pda;
}

function getExtAuthority(bytes32 salt) external returns (bytes32){
function getExtAuthority(bytes32 salt) external returns (bytes32) {
bytes32 authority = _callSolana.getExtAuthority(salt);
return authority;
}

function executeWithSeed(uint64 lamports, bytes32 salt, bytes calldata instruction) public {
bytes32 returnData = bytes32(_callSolana.executeWithSeed(lamports, salt, instruction));
function executeWithSeed(
uint64 lamports,
bytes32 salt,
bytes calldata instruction
) public {
bytes32 returnData = bytes32(
_callSolana.executeWithSeed(lamports, salt, instruction)
);
emit LogBytes(returnData);
}

function getReturnData() public returns (bytes32, bytes memory){
function getReturnData() public returns (bytes32, bytes memory) {
return _callSolana.getReturnData();
}

function batchExecuteWithSeed(ExecuteWithSeedArgs[] memory _args) public {
for(uint i = 0; i < _args.length; i++) {
_callSolana.executeWithSeed(_args[i].lamports, _args[i].salt, _args[i].instruction);
for (uint i = 0; i < _args.length; i++) {
_callSolana.executeWithSeed(
_args[i].lamports,
_args[i].salt,
_args[i].instruction
);
}
}

function sumMatrixElements(uint[][] memory a) public pure returns (uint) {
uint sum = 0;
for (uint i = 0; i < a.length; i++) {
for (uint j = 0; j < a[i].length; j++) {
sum += a[i][j];
}
}
return sum;
}
}
}
Loading

0 comments on commit c387bd9

Please sign in to comment.