Skip to content

Update neow3j dependency to version 3.24.0 #89

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

Open
mialbu wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Update neow3j dependency to version 3.24.0 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java'
id 'io.neow3j.gradle-plugin' version '3.21.1'
id 'io.neow3j.gradle-plugin' version '3.24.0'
id "com.github.node-gradle.node" version "7.1.0"
}

Expand All @@ -27,14 +27,14 @@ sourceSets {
}

dependencies {
implementation 'io.neow3j:devpack:3.21.1'
implementation 'io.neow3j:devpack:3.24.0'

testImplementation 'io.neow3j:devpack-test:3.21.1',
'io.neow3j:compiler:3.21.1',
testImplementation 'io.neow3j:devpack-test:3.24.0',
'io.neow3j:compiler:3.24.0',
'org.junit.jupiter:junit-jupiter:5.8.2',
'org.hamcrest:hamcrest:2.2'

deployImplementation 'io.neow3j:compiler:3.21.1'
deployImplementation 'io.neow3j:compiler:3.24.0'
}

tasks.withType(Test).configureEach {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/axlabs/neo/grantshares/bridgeadapter/BridgeAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ public void testUpdate_notAuthorized() throws Throwable {
public void testUpdate() throws Throwable {
ContractState contractState = neow3j.getContractState(bridgeAdapter.getScriptHash()).send().getContractState();
assertThat(contractState.getUpdateCounter(), is(0));
assertThat(contractState.getNef().getChecksum(), is(4081308222L));
assertThat(contractState.getNef().getChecksum(), is(834927614L));

NeoSendRawTransaction response = updateTxBuilder().signers(calledByEntry(alice)).sign().send();
assertFalse(response.hasError());
Expand Down
66 changes: 50 additions & 16 deletions src/test/java/com/axlabs/neo/grantshares/bridgeadapter/BridgeAdapterTestUsingBridgeV3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ public class BridgeAdapterTestUsingBridgeV3 {

static String bridgeAdapterHashLittleEndianHex;
static String gsGovHashLittleEndianHex;
static String gsTreasuryHashLittleEndianHex;

// region deploy configuration

Expand Down Expand Up @@ -181,6 +182,7 @@ public static void setUp() throws Throwable {
);

gsGovHashLittleEndianHex = toHexStringNoPrefix(gov.getScriptHash().toLittleEndianArray());
gsTreasuryHashLittleEndianHex = toHexStringNoPrefix(treasury.getScriptHash().toLittleEndianArray());
bridgeAdapterHashLittleEndianHex = toHexStringNoPrefix(bridgeAdapter.getScriptHash().toLittleEndianArray());

alice = ext.getAccount(ALICE);
Expand Down Expand Up @@ -506,9 +508,13 @@ public void execute_proposal_native_deposit_gas_remainder_at_limit() throws Thro
bridgeAdapterHashLittleEndianHex +
"14c01f0200ca9a3b0c14" +
bridgeAdapterHashLittleEndianHex +
"0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c01f02002d31010c14" +
"0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c14" +
gsTreasuryHashLittleEndianHex +
"14c01f02002d31010c14" +
bridgeAdapterHashLittleEndianHex +
"0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c013c00c14989b16363233ccc699c6a9a1840ab8cd1934d58214c01f0c0e63726561746550726f706f73616c0c14" +
"0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c14" +
gsTreasuryHashLittleEndianHex +
"14c013c00c14989b16363233ccc699c6a9a1840ab8cd1934d58214c01f0c0e63726561746550726f706f73616c0c14" +
gsGovHashLittleEndianHex +
"41627d5b52");
TransactionBuilder b = new TransactionBuilder(neow3j).script(proposalScript);
Expand Down Expand Up @@ -579,23 +585,31 @@ public void execute_proposal_native_deposit_gas_remainder_limit_exceeded() throw
bridgeAdapterHashLittleEndianHex +
"14c01f0200ca9a3b0c14" +
bridgeAdapterHashLittleEndianHex +
"0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c01f02" +
"0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c14" +
gsTreasuryHashLittleEndianHex +
"14c01f02" +
reverseHexString(toHexStringNoPrefix(bridgeFee.add(maxFee).add(BigInteger.ONE).toByteArray())) +
"0c14" +
bridgeAdapterHashLittleEndianHex +
"0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c013c00c14989b16363233ccc699c6a9a1840ab8cd1934d58214c01f0c0e63726561746550726f706f73616c0c14" +
"0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c14" +
gsTreasuryHashLittleEndianHex +
"14c013c00c14989b16363233ccc699c6a9a1840ab8cd1934d58214c01f0c0e63726561746550726f706f73616c0c14" +
gsGovHashLittleEndianHex +
"41627d5b52");
assertThat(toHexStringNoPrefix(proposalScript),
is("0f0c2b6e61746976655f6465706f7369745f6761735f72656d61696e6465725f6c696d69745f65786365656465641f0200ca9a3b0c140d165c9899c38bbf5991c5e47b04937258caec690c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c066272696467650c14" +
bridgeAdapterHashLittleEndianHex +
"14c01f0200ca9a3b0c14" +
bridgeAdapterHashLittleEndianHex +
"0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c01f02" +
"0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c14" +
gsTreasuryHashLittleEndianHex +
"14c01f02" +
"012d3101" +
"0c14" +
bridgeAdapterHashLittleEndianHex +
"0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c013c00c14989b16363233ccc699c6a9a1840ab8cd1934d58214c01f0c0e63726561746550726f706f73616c0c14" +
"0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c14" +
gsTreasuryHashLittleEndianHex +
"14c013c00c14989b16363233ccc699c6a9a1840ab8cd1934d58214c01f0c0e63726561746550726f706f73616c0c14" +
gsGovHashLittleEndianHex +
"41627d5b52")
);
Expand Down Expand Up @@ -651,13 +665,17 @@ public void execute_proposal_token_deposit_gas_remainder_at_limit() throws Throw
bridgeAdapterHashLittleEndianHex +
"14c01f1a0c14" +
bridgeAdapterHashLittleEndianHex +
"0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c01f02" +
"0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c0d72656c65617365546f6b656e730c14" +
gsTreasuryHashLittleEndianHex +
"14c01f02" +
// sending (bridge fee + maxFee) GAS to the adapter, so that the remainder will be exactly the
// limit. The execution should be successful in that case.
reverseHexString(toHexString(bridgeFee.add(maxFee).toByteArray())) +
"0c14" +
bridgeAdapterHashLittleEndianHex +
"0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c013c00c14c20704128f809d6f47f8596eafe0ea779538ddfa14c01f0c0e63726561746550726f706f73616c0c14" +
"0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c14" +
gsTreasuryHashLittleEndianHex +
"14c013c00c14c20704128f809d6f47f8596eafe0ea779538ddfa14c01f0c0e63726561746550726f706f73616c0c14" +
gsGovHashLittleEndianHex +
"41627d5b52"
);
Expand All @@ -666,9 +684,13 @@ public void execute_proposal_token_deposit_gas_remainder_at_limit() throws Throw
bridgeAdapterHashLittleEndianHex +
"14c01f1a0c14" +
bridgeAdapterHashLittleEndianHex +
"0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c01f02002d31010c14" +
"0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c0d72656c65617365546f6b656e730c14" +
gsTreasuryHashLittleEndianHex +
"14c01f02002d31010c14" +
bridgeAdapterHashLittleEndianHex +
"0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c013c00c14c20704128f809d6f47f8596eafe0ea779538ddfa14c01f0c0e63726561746550726f706f73616c0c14" +
"0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c14" +
gsTreasuryHashLittleEndianHex +
"14c013c00c14c20704128f809d6f47f8596eafe0ea779538ddfa14c01f0c0e63726561746550726f706f73616c0c14" +
gsGovHashLittleEndianHex +
"41627d5b52")
);
Expand Down Expand Up @@ -745,13 +767,17 @@ public void execute_proposal_token_deposit_gas_remainder_limit_exceeded() throws
bridgeAdapterHashLittleEndianHex +
"14c01f1a0c14" +
bridgeAdapterHashLittleEndianHex +
"0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c01f02" +
"0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c0d72656c65617365546f6b656e730c14" +
gsTreasuryHashLittleEndianHex +
"14c01f02" +
// sending (bridge fee + maxFee + 1) GAS to the adapter, so that the remainder will exceed
// the limit by 1. The execution should fail and the tx should abort.
reverseHexString(toHexString(bridgeFee.add(adaptersMaxFee).add(BigInteger.ONE).toByteArray())) +
"0c14" +
bridgeAdapterHashLittleEndianHex +
"0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c013c00c14c20704128f809d6f47f8596eafe0ea779538ddfa14c01f0c0e63726561746550726f706f73616c0c14" +
"0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c14" +
gsTreasuryHashLittleEndianHex +
"14c013c00c14c20704128f809d6f47f8596eafe0ea779538ddfa14c01f0c0e63726561746550726f706f73616c0c14" +
gsGovHashLittleEndianHex +
"41627d5b52"
);
Expand All @@ -760,11 +786,15 @@ public void execute_proposal_token_deposit_gas_remainder_limit_exceeded() throws
bridgeAdapterHashLittleEndianHex +
"14c01f1a0c14" +
bridgeAdapterHashLittleEndianHex +
"0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c01f02" +
"0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c0d72656c65617365546f6b656e730c14" +
gsTreasuryHashLittleEndianHex +
"14c01f02" +
"012d3101" +
"0c14" +
bridgeAdapterHashLittleEndianHex +
"0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c013c00c14c20704128f809d6f47f8596eafe0ea779538ddfa14c01f0c0e63726561746550726f706f73616c0c14" +
"0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c14" +
gsTreasuryHashLittleEndianHex +
"14c013c00c14c20704128f809d6f47f8596eafe0ea779538ddfa14c01f0c0e63726561746550726f706f73616c0c14" +
gsGovHashLittleEndianHex +
"41627d5b52")
);
Expand Down Expand Up @@ -808,9 +838,13 @@ public void execute_proposal_token_deposit_remaining_tokens() throws Throwable {
bridgeAdapterHashLittleEndianHex +
"14c01f1b0c14" +
bridgeAdapterHashLittleEndianHex +
"0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c01f02809698000c14" +
"0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c0d72656c65617365546f6b656e730c14" +
gsTreasuryHashLittleEndianHex +
"14c01f02809698000c14" +
bridgeAdapterHashLittleEndianHex +
"0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c013c00c14c20704128f809d6f47f8596eafe0ea779538ddfa14c01f0c0e63726561746550726f706f73616c0c14" +
"0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c14" +
gsTreasuryHashLittleEndianHex +
"14c013c00c14c20704128f809d6f47f8596eafe0ea779538ddfa14c01f0c0e63726561746550726f706f73616c0c14" +
gsGovHashLittleEndianHex +
"41627d5b52");

Expand Down