Update v2.1.2

Author: rlekdms

abi/prod/bridge/Xrp.abi

@@ -5,4 +5,4 @@ services:
       context: ../
       dockerfile: ./Dockerfile
     environment:
-      VERSION: v2.1.1
+      VERSION: v2.1.2

composes/docker-compose.common.yml

@@ -7,19 +7,19 @@ module.exports = {
         'bsc',
         'matic',
         "wemix",
+        'silicon',
     ],
-
+    silicon: {
+        xrpBridge: "0x83bca9503D7888F2eFcDF18cCa2E79f8Ba75d17c",
+        addressbook: "0x37CE54AFB91F3645b3e7455Cb4C5028507D6aBeB",
+        multisig: "0xCe303B5740C70fFe4477E0d21E3B35770587F3B1",
+    },
     // Bridge Addresses
     bridge_address: {
         klaytn: {
             minter: "0x917655B6C27A3D831b4193CE18ECe6bfcC806BF8",
             multisig: "0x22Bef83bABcC1169855D748D13523CA10aD87dF7",
         },
-        avax: {
-            minter: "0xE38ca00A6FD34B793012Bb9c1471Adc4E98386cF",
-            multisig: "0xfa50391705D2FA7ac47Dd211B78378825bc763e6",
-            admin: "0x009071058740276327A393B084eC447b8F0Fc6Ae",
-        },
         bsc: {
             minter: "0xE38ca00A6FD34B793012Bb9c1471Adc4E98386cF",
             multisig: "0xfa50391705D2FA7ac47Dd211B78378825bc763e6",
@@ -35,11 +35,16 @@ module.exports = {
             multisig: "0x60D85ED151CBdE337019263A54AD2fb6b495547C",
             admin: "0xC9bD6dE100b923C275e74dC75F895B50c7488eD3",
         },
+        silicon: {
+            minter: "0x065BaE5639EB5718E0F76B27967f582e4b7d63a8",
+            multisig: "0xCe303B5740C70fFe4477E0d21E3B35770587F3B1",
+            admin: "0x478172a50906CaC395F8567a8dC001c7EeCB2A0A",
+        },
         governance: {
             chain: "XRP",
-            address: "rLcxBUrZESqHnruY4fX7GQthRjDCDSAWia",
-            bytes: "0x00d73701c4123236e2d61d372052eadcc3ede48b06e617b033",
-            id: "0xfd13fd208d2a902efdd49dab8b23889bd6fac1141b9b88666c3e4e9c6612b5f1",
+            address: "rJTEBWu7u1NcJAiMQ9iEa1dbsuPyhTiW23",
+            bytes: "0x00bf70ca91c426e78c28f0fa724e679d50ac59f9378a71efbd",
+            id: "0x4f1d4170def98e5be4eb9a487615c2e39939c184839448e44096bafc42f5ee65",
         },
     }
 }

config/prod/xrp.js

@@ -152,30 +152,10 @@ String.prototype.dadd = function(w){
     return res.reverse().join('').dmove(-d);
 }
 
-String.prototype.dsub = function(w){
-    var o = dton(this.toString(), w);
-    var d = o.d, v = o.v; w = o.w;
-
-    if(v.dcomp(w) < 0){ var t = v; v = w; w = t; }
-
-    var vl = v.length, wl = w.length, l = (vl > wl ? vl : wl);
-
-    v = v.split('').reverse().join('');
-    w = w.split('').reverse().join('');
-
-    var res = [], x = 0;
-
-    for(var i = 0; i < l; i++){
-        var vi = (i < vl ? v.charCodeAt(i) - 48 : 0);
-        var wi = (i < wl ? w.charCodeAt(i) - 48 : 0);
-
-        var r = vi - wi + x;
-        if(r < 0){ x = -1; r += 10; } else x = 0;
-
-        res.push(r);
-    }
-
-    return res.reverse().join('').dmove(-d);
+String.prototype.dsub = function(v, prec = PREC) {
+    const ba = new BigNumber(this);
+    const bb = new BigNumber(String(v));
+    return ba.minus(bb).toFixed(prec).dclean();
 }
 
 String.prototype.dmul = function(w){

lib/decimal.js

@@ -142,7 +142,7 @@ class EVMValidator {
         if(config.l2[this.chainLower]) {
             let l1Chain = config.l2[this.chainLower].l1_chain
             const l1 = this.l1 = Britto.getNodeConfigBase('l1');
-            l1.rpc = config.endpoints[l1Chain].rpc[0];
+            l1.rpc = config.endpoints[l1Chain].rpc;
             l1.abi = Britto.getJSONInterface({filename: 'zkevm/PolygonValidiumEtrog'});
             l1.address = config.l2[this.chainLower].PolygonValidiumEtrog
             new Britto(l1, l1Chain).connectWeb3();

src/evm/index.js

@@ -165,9 +165,7 @@ class TonAPI {
 
             const txAddrSlice = new TupleSlice(txAddrStack.stack);
             transactionAddress = txAddrSlice.readCell().beginParse().readAddress()?.toFriendly();
-        } catch (e) {
-            console.log(e);
-        }
+        } catch (e) {}
 
         return transactionAddress;
     }
@@ -185,9 +183,7 @@ class TonAPI {
             const payload = tupleSlice.readCell().toString();
 
             data = { destination, amount, payload };
-        } catch (e) {
-            console.log(e);
-        }
+        } catch (e) {}
 
         return data;
     }
@@ -217,9 +213,7 @@ class TonAPI {
             }
 
             config = { required, confirmation, confirmedValidators };
-        } catch (e) {
-            console.log(e);
-        }
+        } catch (e) {}
 
         return config;
     }

src/ton/utils/ton.api.js

@@ -409,9 +409,7 @@ class TONLayer1Validator {
                 let opCode = null
                 try {
                     opCode = "0x"+slice.readUint(32).toString('hex'); // BN return
-                } catch (e) {
-                    console.log(e);
-                }
+                } catch (e) {}
                 if(!opCode || opCode !== "0x7362d09c") continue;
 
                 let obj = {};
@@ -575,6 +573,12 @@ class TONLayer1Validator {
         await valid(params, chainIds, this.orbitHub);
 
         async function valid(data, chainIds, orbitHubAddress) {
+            let sender = Britto.getRandomPkAddress();
+            if(!sender || !sender.pk || !sender.address){
+                logger.ton_layer_1.error("Cannot Generate account");
+                return;
+            }
+
             let fromChainId = chainIds[data.fromChain];
             let toChainId = chainIds[data.toChain];
             if(!fromChainId || !toChainId){

src/ton_layer_1/index.js

@@ -167,9 +167,7 @@ class TonAPI {
 
             const txAddrSlice = new TupleSlice(txAddrStack.stack);
             transactionAddress = txAddrSlice.readCell().beginParse().readAddress()?.toFriendly();
-        } catch (e) {
-            console.log(e);
-        }
+        } catch (e) {}
 
         return transactionAddress;
     }
@@ -187,9 +185,7 @@ class TonAPI {
             const payload = tupleSlice.readCell().toString();
 
             data = { destination, amount, payload };
-        } catch (e) {
-            console.log(e);
-        }
+        } catch (e) {}
 
         return data;
     }
@@ -219,9 +215,7 @@ class TonAPI {
             }
 
             config = { required, confirmation, confirmedValidators };
-        } catch (e) {
-            console.log(e);
-        }
+        } catch (e) {}
 
         return config;
     }

src/ton_layer_1/utils/ton.api.js

@@ -492,6 +492,14 @@ class XRPValidator {
         return parseInt(data) <= 4294967295;
     }
 
+    async checkValidSuggestion(suggestIndex, dataIndex) {
+        let suggestion = await xrpBridge.contract.methods.getSuggestion(0, suggestIndex).call().catch(e => {return;});
+        if(suggestion && parseInt(suggestion.fee) !== 0 && parseInt(suggestion.swapIndex) === parseInt(dataIndex)) {
+            return suggestion;
+        }
+        return;
+    }
+
     async getSuggestRelay() {
         this.intervalClear(this.intervals.getSuggestRelay);
 
@@ -539,8 +547,16 @@ class XRPValidator {
 
         let suggestion = await xrpBridge.contract.methods.getSuggestion(0, data.suggestIndex).call().catch(e => {return;});
         if (!suggestion || parseInt(suggestion.fee) === 0 || parseInt(suggestion.swapIndex) !== parseInt(data.dataIndex)){
-            logger.xrp.error('validateTransactionSuggested error: invalid suggestion');
-            return;
+            let validSuggestion
+            for(let i = data.suggestIndex - 1; i >= 0; i--) {
+                validSuggestion = this.checkValidSuggestion(i, dataIndex);
+            }
+            if(validSuggestion) {
+                suggestion = validSuggestion
+            } else {
+                logger.xrp.error('validateTransactionSuggested error: invalid suggestion');
+                return;
+            }
         }
 
         let validators = await xrpBridge.multisig.contract.methods.getOwners().call();