Skip to content

Commit

Permalink
v12.12.2: fix some solana rpc issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@0xNe0x1
0xNe0x1 committed Aug 16, 2024
1 parent 9fe169a commit 0ddc18c
Show file tree
Hide file tree
Showing 11 changed files with 174 additions and 138 deletions.
6 changes: 3 additions & 3 deletions dev.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/react-dialog-stack@8"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/react-shadow-dom@5"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/js-verify-signature-web@3"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/[email protected].2"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/[email protected].7"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/[email protected].3"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/[email protected].10"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/web3-tokens@10"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/react-token-image@5"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/coinbase-wallet-sdk@3"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/[email protected]"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/[email protected]"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/web3-assets@7"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/[email protected].5"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/[email protected].6"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/@depay/[email protected]"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/qr-code-styling@1"></script>
<script crossorigin src="https://cdn.jsdelivr.net/npm/fuse.js@6"></script>
Expand Down
52 changes: 26 additions & 26 deletions dist/esm/index.bundle.js
View file

Large diffs are not rendered by default.

84 changes: 51 additions & 33 deletions dist/esm/index.solana.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29484,10 +29484,10 @@ const getConfiguration$1 = () =>{
return getWindow$1()._Web3ClientConfiguration
};

function _optionalChain$3$3(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
function _optionalChain$5$1(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
const BATCH_INTERVAL$1$1 = 10;
const CHUNK_SIZE$1$1 = 99;
const MAX_RETRY$1$1 = 3;
const MAX_RETRY$1$1 = 5;

class StaticJsonRpcBatchProvider$1 extends ethers.providers.JsonRpcProvider {

Expand Down Expand Up @@ -29515,12 +29515,12 @@ class StaticJsonRpcBatchProvider$1 extends ethers.providers.JsonRpcProvider {
// on whether it was a success or error
chunk.forEach((inflightRequest, index) => {
const payload = result[index];
if (_optionalChain$3$3([payload, 'optionalAccess', _ => _.error])) {
if (_optionalChain$5$1([payload, 'optionalAccess', _ => _.error])) {
const error = new Error(payload.error.message);
error.code = payload.error.code;
error.data = payload.error.data;
inflightRequest.reject(error);
} else if(_optionalChain$3$3([payload, 'optionalAccess', _2 => _2.result])) {
} else if(_optionalChain$5$1([payload, 'optionalAccess', _2 => _2.result])) {
inflightRequest.resolve(payload.result);
} else {
inflightRequest.reject();
Expand Down Expand Up @@ -29595,6 +29595,7 @@ class StaticJsonRpcBatchProvider$1 extends ethers.providers.JsonRpcProvider {

}

function _optionalChain$4$2(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
const getAllProviders$1 = ()=> {
if(getWindow$1()._Web3ClientProviders == undefined) {
getWindow$1()._Web3ClientProviders = {};
Expand Down Expand Up @@ -29640,17 +29641,20 @@ const setProviderEndpoints$2 = async (blockchain, endpoints, detectFastest = tru
let timeout = 900;
let before = new Date().getTime();
setTimeout(()=>resolve(timeout), timeout);
const response = await fetch(endpoint, {
method: 'POST',
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
referrer: "",
referrerPolicy: "no-referrer",
body: JSON.stringify({ method: 'net_version', id: 1, jsonrpc: '2.0' })
});
if(!response.ok) { return resolve(999) }
let response;
try {
response = await fetch(endpoint, {
method: 'POST',
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
referrer: "",
referrerPolicy: "no-referrer",
body: JSON.stringify({ method: 'net_version', id: 1, jsonrpc: '2.0' })
});
} catch (e) {}
if(!_optionalChain$4$2([response, 'optionalAccess', _ => _.ok])) { return resolve(999) }
let after = new Date().getTime();
resolve(after-before);
})
Expand Down Expand Up @@ -29705,10 +29709,10 @@ var EVM = {
setProvider: setProvider$2,
};

function _optionalChain$2$2(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
function _optionalChain$3$3(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
const BATCH_INTERVAL = 10;
const CHUNK_SIZE = 99;
const MAX_RETRY = 3;
const MAX_RETRY = 10;

class StaticJsonRpcSequentialProvider extends Connection {

Expand All @@ -29724,9 +29728,7 @@ class StaticJsonRpcSequentialProvider extends Connection {
}

handleError(error, attempt, chunk) {
if(attempt < MAX_RETRY && error && [
'Failed to fetch', 'limit reached', '504', '503', '502', '500', '429', '426', '422', '413', '409', '408', '406', '405', '404', '403', '402', '401', '400'
].some((errorType)=>error.toString().match(errorType))) {
if(attempt < MAX_RETRY) {
const index = this._endpoints.indexOf(this._endpoint)+1;
this._endpoint = index >= this._endpoints.length ? this._endpoints[0] : this._endpoints[index];
this._provider = new Connection(this._endpoint);
Expand Down Expand Up @@ -29756,7 +29758,15 @@ class StaticJsonRpcSequentialProvider extends Connection {
).then((response)=>{
if(response.ok) {
response.json().then((parsedJson)=>{
resolve(parsedJson);
if(parsedJson.find((entry)=>_optionalChain$3$3([entry, 'optionalAccess', _ => _.error]))) {
if(attempt < MAX_RETRY) {
reject('Error in batch found!');
} else {
resolve(parsedJson);
}
} else {
resolve(parsedJson);
}
}).catch(reject);
} else {
reject(`${response.status} ${response.text}`);
Expand All @@ -29774,7 +29784,7 @@ class StaticJsonRpcSequentialProvider extends Connection {
.then((result) => {
chunk.forEach((inflightRequest, index) => {
const payload = result[index];
if (_optionalChain$2$2([payload, 'optionalAccess', _ => _.error])) {
if (_optionalChain$3$3([payload, 'optionalAccess', _2 => _2.error])) {
const error = new Error(payload.error.message);
error.code = payload.error.code;
error.data = payload.error.data;
Expand Down Expand Up @@ -29831,6 +29841,7 @@ class StaticJsonRpcSequentialProvider extends Connection {
}
}

function _optionalChain$2$2(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
const getAllProviders = ()=> {
if(getWindow$1()._Web3ClientProviders == undefined) {
getWindow$1()._Web3ClientProviders = {};
Expand Down Expand Up @@ -29876,17 +29887,20 @@ const setProviderEndpoints$1 = async (blockchain, endpoints, detectFastest = tru
let timeout = 900;
let before = new Date().getTime();
setTimeout(()=>resolve(timeout), timeout);
const response = await fetch(endpoint, {
method: 'POST',
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
referrer: "",
referrerPolicy: "no-referrer",
body: JSON.stringify({ method: 'getIdentity', id: 1, jsonrpc: '2.0' })
});
if(!response.ok) { return resolve(999) }
let response;
try {
response = await fetch(endpoint, {
method: 'POST',
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
referrer: "",
referrerPolicy: "no-referrer",
body: JSON.stringify({ method: 'getIdentity', id: 1, jsonrpc: '2.0' })
});
} catch (e) {}
if(!_optionalChain$2$2([response, 'optionalAccess', _ => _.ok])) { return resolve(999) }
let after = new Date().getTime();
resolve(after-before);
})
Expand Down Expand Up @@ -33486,6 +33500,10 @@ const getPrice = async ({
amountSpecifiedIsInput,
});

if(amountCalculated.toString() == "0"){
throw('amountCalculated cant be zero!')
}

return {
price: amountCalculated.toString(),
tickArrays,
Expand Down
2 changes: 1 addition & 1 deletion dist/esm/index.solana.js.map
View file

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions dist/umd/index.bundle.js
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 0ddc18c

Please sign in to comment.