Skip to content

Commit 6e8898d

Browse files
committed
rebase
1 parent 80fc09a commit 6e8898d

File tree

4 files changed

+108
-5
lines changed

4 files changed

+108
-5
lines changed

target_chains/ethereum/contracts/forge-test/Entropy.t.sol

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ contract EntropyTest is Test, EntropyTestUtils, EntropyEvents {
805805
blockNumber: 1234,
806806
requester: user1,
807807
useBlockhash: false,
808-
callbackStatus: EntropyStatusConstants.CALLBACK_NOT_STARTED
808+
callbackStatus: EntropyStatusConstants.CALLBACK_NOT_STARTED,
809809
gasLimit10k: 0
810810
})
811811
);
@@ -1178,8 +1178,8 @@ contract EntropyTest is Test, EntropyTestUtils, EntropyEvents {
11781178
);
11791179
assertEq(reqAfterFailure.sequenceNumber, assignedSequenceNumber);
11801180
assertEq(
1181-
reqAfterFailure.status,
1182-
EntropyConstants.STATUS_CALLBACK_FAILED
1181+
reqAfterFailure.callbackStatus,
1182+
EntropyStatusConstants.CALLBACK_FAILED
11831183
);
11841184

11851185
// A subsequent attempt passing insufficient gas should also revert
@@ -1195,8 +1195,8 @@ contract EntropyTest is Test, EntropyTestUtils, EntropyEvents {
11951195
reqAfterFailure = random.getRequest(provider1, assignedSequenceNumber);
11961196
assertEq(reqAfterFailure.sequenceNumber, assignedSequenceNumber);
11971197
assertEq(
1198-
reqAfterFailure.status,
1199-
EntropyConstants.STATUS_CALLBACK_FAILED
1198+
reqAfterFailure.callbackStatus,
1199+
EntropyStatusConstants.CALLBACK_FAILED
12001200
);
12011201

12021202
// Calling without a gas limit should succeed

target_chains/ethereum/entropy_sdk/solidity/abis/EntropyErrors.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
"name": "InsufficientFee",
2020
"type": "error"
2121
},
22+
{
23+
"inputs": [],
24+
"name": "InsufficientGas",
25+
"type": "error"
26+
},
2227
{
2328
"inputs": [],
2429
"name": "InvalidRevealCall",

target_chains/ethereum/entropy_sdk/solidity/abis/EntropyEvents.json

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,55 @@
4848
"name": "CallbackFailed",
4949
"type": "event"
5050
},
51+
{
52+
"anonymous": false,
53+
"inputs": [
54+
{
55+
"indexed": true,
56+
"internalType": "address",
57+
"name": "provider",
58+
"type": "address"
59+
},
60+
{
61+
"indexed": true,
62+
"internalType": "address",
63+
"name": "requestor",
64+
"type": "address"
65+
},
66+
{
67+
"indexed": true,
68+
"internalType": "uint64",
69+
"name": "sequenceNumber",
70+
"type": "uint64"
71+
},
72+
{
73+
"indexed": false,
74+
"internalType": "bytes32",
75+
"name": "userRandomNumber",
76+
"type": "bytes32"
77+
},
78+
{
79+
"indexed": false,
80+
"internalType": "bytes32",
81+
"name": "providerRevelation",
82+
"type": "bytes32"
83+
},
84+
{
85+
"indexed": false,
86+
"internalType": "bytes32",
87+
"name": "randomNumber",
88+
"type": "bytes32"
89+
},
90+
{
91+
"indexed": false,
92+
"internalType": "bytes",
93+
"name": "errorCode",
94+
"type": "bytes"
95+
}
96+
],
97+
"name": "CallbackOutOfGas",
98+
"type": "event"
99+
},
51100
{
52101
"anonymous": false,
53102
"inputs": [

target_chains/ethereum/entropy_sdk/solidity/abis/IEntropy.json

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,55 @@
4848
"name": "CallbackFailed",
4949
"type": "event"
5050
},
51+
{
52+
"anonymous": false,
53+
"inputs": [
54+
{
55+
"indexed": true,
56+
"internalType": "address",
57+
"name": "provider",
58+
"type": "address"
59+
},
60+
{
61+
"indexed": true,
62+
"internalType": "address",
63+
"name": "requestor",
64+
"type": "address"
65+
},
66+
{
67+
"indexed": true,
68+
"internalType": "uint64",
69+
"name": "sequenceNumber",
70+
"type": "uint64"
71+
},
72+
{
73+
"indexed": false,
74+
"internalType": "bytes32",
75+
"name": "userRandomNumber",
76+
"type": "bytes32"
77+
},
78+
{
79+
"indexed": false,
80+
"internalType": "bytes32",
81+
"name": "providerRevelation",
82+
"type": "bytes32"
83+
},
84+
{
85+
"indexed": false,
86+
"internalType": "bytes32",
87+
"name": "randomNumber",
88+
"type": "bytes32"
89+
},
90+
{
91+
"indexed": false,
92+
"internalType": "bytes",
93+
"name": "errorCode",
94+
"type": "bytes"
95+
}
96+
],
97+
"name": "CallbackOutOfGas",
98+
"type": "event"
99+
},
51100
{
52101
"anonymous": false,
53102
"inputs": [

0 commit comments

Comments
 (0)