tx · 61Ugg3z9sEYP74ELdkP4JTk42NJrLNhnEiq29rFuqaXq

3N6LHjfGb6Fgcy7YsVcNxGyPTj49XbQAijq:  -0.01300000 Waves

2023.03.10 12:12 [2483780] smart account 3N6LHjfGb6Fgcy7YsVcNxGyPTj49XbQAijq > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "61Ugg3z9sEYP74ELdkP4JTk42NJrLNhnEiq29rFuqaXq",
    "fee": 1300000,
    "feeAssetId": null,
    "timestamp": 1678439547556,
    "version": 2,
    "chainId": 84,
    "sender": "3N6LHjfGb6Fgcy7YsVcNxGyPTj49XbQAijq",
    "senderPublicKey": "2u2wYYcVBQv43Cc71zkhHPPitkqgg6dqTZ3nUMvYJ1uq",
    "proofs": [
        "4DFwBHEYsCmWcHyJUGsSWVVxSKNZLYExrdefEeUPGM4FRhS9xEcExeuPPRhNKzRBfg4dTW5ReJ4Tm5aWJTAbFBHC"
    ],
    "script": "base64:BgIXCAISBQoDAQgIEgUKAwEICBIDCgEIEgAXAANTRVACAl9fAAhmZWVTY2FsZQkAtgIBAIDC1y8BD2dldFN0cmluZ09yRmFpbAEDa2V5CQETdmFsdWVPckVycm9yTWVzc2FnZQIJAJ0IAgUEdGhpcwUDa2V5CQCsAgICFU5vIGRhdGEgZm9yIHRoaXMua2V5PQUDa2V5AAxwb29sRGlzYWJsZWQJAAIBAg1Qb29sIGRpc2FibGVkAAxwb29sTm90RXhpc3QJAAIBAhFQb29sIGlzIG5vdCBleGlzdAAOc2xpcHBhZ2VUb29CaWcJAAIBAhNTbGlwcGFnZSBpcyB0b28gYmlnARNrZXlNYW5hZ2VyUHVibGljS2V5AAIUJXNfX21hbmFnZXJQdWJsaWNLZXkBGmtleVBlbmRpbmdNYW5hZ2VyUHVibGljS2V5AAIbJXNfX3BlbmRpbmdNYW5hZ2VyUHVibGljS2V5AQJmYwACEyVzX19mYWN0b3J5Q29udHJhY3QAD2ZhY3RvcnlDb250cmFjdAkBEUBleHRyTmF0aXZlKDEwNjIpAQkBD2dldFN0cmluZ09yRmFpbAEJAQJmYwABC3Byb3RvY29sRmVlAAkAuQkCCQDMCAICAiVzCQDMCAICC3Byb3RvY29sRmVlBQNuaWwFA1NFUAEHcG9vbEZlZQAJALkJAgkAzAgCAgIlcwkAzAgCAgdwb29sRmVlBQNuaWwFA1NFUAEaZ2V0U3RyaW5nT3JGYWlsRnJvbUFkZHJlc3MCB2FkZHJlc3MDa2V5CQETdmFsdWVPckVycm9yTWVzc2FnZQIJAJ0IAgUHYWRkcmVzcwUDa2V5CQC5CQIJAMwIAgIKbWFuZGF0b3J5IAkAzAgCCQClCAEFB2FkZHJlc3MJAMwIAgIBLgkAzAgCBQNrZXkJAMwIAgIPIGlzIG5vdCBkZWZpbmVkBQNuaWwCAAAWa2V5RmVlQ29sbGVjdG9yQWRkcmVzcwIXJXNfX2ZlZUNvbGxlY3RvckFkZHJlc3MAE2ZlZUNvbGxlY3RvckFkZHJlc3MJARFAZXh0ck5hdGl2ZSgxMDYyKQEJARpnZXRTdHJpbmdPckZhaWxGcm9tQWRkcmVzcwIFD2ZhY3RvcnlDb250cmFjdAUWa2V5RmVlQ29sbGVjdG9yQWRkcmVzcwEFYXNJbnQBA3ZhbAQHJG1hdGNoMAUDdmFsAwkAAQIFByRtYXRjaDACA0ludAQGdmFsSW50BQckbWF0Y2gwBQZ2YWxJbnQJAAIBAhVmYWlsIHRvIGNhc3QgaW50byBJbnQBFWRhdGFNYXBwaW5nUG9vbEFzc2V0cwIWaW50ZXJuYWxBbW91bnRBc3NldFN0chVpbnRlcm5hbFByaWNlQXNzZXRTdHIJALkJAgkAzAgCAgQlZCVkCQDMCAIJAKQDAQUWaW50ZXJuYWxBbW91bnRBc3NldFN0cgkAzAgCCQCkAwEFFWludGVybmFsUHJpY2VBc3NldFN0cgUDbmlsBQNTRVABFm1hbmFnZXJQdWJsaWNLZXlPclVuaXQABAckbWF0Y2gwCQCiCAEJARNrZXlNYW5hZ2VyUHVibGljS2V5AAMJAAECBQckbWF0Y2gwAgZTdHJpbmcEAXMFByRtYXRjaDAJANkEAQUBcwMJAAECBQckbWF0Y2gwAgRVbml0BQR1bml0CQACAQILTWF0Y2ggZXJyb3IBHXBlbmRpbmdNYW5hZ2VyUHVibGljS2V5T3JVbml0AAQHJG1hdGNoMAkAoggBCQEaa2V5UGVuZGluZ01hbmFnZXJQdWJsaWNLZXkAAwkAAQIFByRtYXRjaDACBlN0cmluZwQBcwUHJG1hdGNoMAkA2QQBBQFzAwkAAQIFByRtYXRjaDACBFVuaXQFBHVuaXQJAAIBAgtNYXRjaCBlcnJvcgEJaXNNYW5hZ2VyAQFpBAckbWF0Y2gwCQEWbWFuYWdlclB1YmxpY0tleU9yVW5pdAADCQABAgUHJG1hdGNoMAIKQnl0ZVZlY3RvcgQCcGsFByRtYXRjaDAJAAACCAUBaQ9jYWxsZXJQdWJsaWNLZXkFAnBrAwkAAQIFByRtYXRjaDACBFVuaXQJAAACCAUBaQZjYWxsZXIFBHRoaXMJAAIBAgtNYXRjaCBlcnJvcgELbXVzdE1hbmFnZXIBAWkDCQEJaXNNYW5hZ2VyAQUBaQYJAAIBAhFwZXJtaXNzaW9uIGRlbmllZAENZ2V0QWNjQmFsYW5jZQEHYXNzZXRJZAMJAAACBQdhc3NldElkAgVXQVZFUwgJAO8HAQUEdGhpcwlhdmFpbGFibGUJAPAHAgUEdGhpcwkA2QQBBQdhc3NldElkASBnZXRQb29sQWRkcmVzc0FuZENoZWNrUG9vbFN0YXR1cwIHYXNzZXRJbghhc3NldE91dAQMbHBOb25SZXZlcnNlCgABQAkA/AcEBQ9mYWN0b3J5Q29udHJhY3QCIGdldExwQXNzZXRGcm9tUG9vbEFzc2V0c1JFQURPTkxZCQDMCAIFB2Fzc2V0SW4JAMwIAgUIYXNzZXRPdXQFA25pbAUDbmlsAwkAAQIFAUACBlN0cmluZwUBQAUEdW5pdAQJbHBSZXZlcnNlCgABQAkA/AcEBQ9mYWN0b3J5Q29udHJhY3QCIGdldExwQXNzZXRGcm9tUG9vbEFzc2V0c1JFQURPTkxZCQDMCAIFCGFzc2V0T3V0CQDMCAIFB2Fzc2V0SW4FA25pbAUDbmlsAwkAAQIFAUACBlN0cmluZwUBQAUEdW5pdAQLJHQwMjUzMzI5OTIDCQECIT0CBQxscE5vblJldmVyc2UFBHVuaXQEBHBvb2wKAAFACQD8BwQFD2ZhY3RvcnlDb250cmFjdAIhZ2V0UG9vbEFkZHJlc3NGcm9tTHBBc3NldFJFQURPTkxZCQDMCAIJAQV2YWx1ZQEFDGxwTm9uUmV2ZXJzZQUDbmlsBQNuaWwDCQABAgUBQAIGU3RyaW5nBQFACQACAQkArAICCQADAQUBQAIbIGNvdWxkbid0IGJlIGNhc3QgdG8gU3RyaW5nCQCUCgIHBQRwb29sAwkBAiE9AgUJbHBSZXZlcnNlBQR1bml0BARwb29sCgABQAkA/AcEBQ9mYWN0b3J5Q29udHJhY3QCIWdldFBvb2xBZGRyZXNzRnJvbUxwQXNzZXRSRUFET05MWQkAzAgCCQEFdmFsdWUBBQlscFJldmVyc2UFA25pbAUDbmlsAwkAAQIFAUACBlN0cmluZwUBQAkAAgEJAKwCAgkAAwEFAUACGyBjb3VsZG4ndCBiZSBjYXN0IHRvIFN0cmluZwkAlAoCBgUEcG9vbAUMcG9vbE5vdEV4aXN0BAlpc1JldmVyc2UIBQskdDAyNTMzMjk5MgJfMQQEcG9vbAgFCyR0MDI1MzMyOTkyAl8yBApwb29sU3RhdHVzCgABQAkA/AcEBQ9mYWN0b3J5Q29udHJhY3QCFWdldFBvb2xTdGF0dXNSRUFET05MWQkAzAgCBQRwb29sBQNuaWwFA25pbAMJAAECBQFAAgNJbnQFAUAJAAIBCQCsAgIJAAMBBQFAAhggY291bGRuJ3QgYmUgY2FzdCB0byBJbnQEBWNoZWNrAwkAAAIFCnBvb2xTdGF0dXMAAQYFDHBvb2xEaXNhYmxlZAMJAAACBQVjaGVjawUFY2hlY2sEB3Bvb2xBZHIJARFAZXh0ck5hdGl2ZSgxMDYyKQEJAQt2YWx1ZU9yRWxzZQIFBHBvb2wCAAkAlAoCBQdwb29sQWRyBQlpc1JldmVyc2UJAAIBAiRTdHJpY3QgdmFsdWUgaXMgbm90IGVxdWFsIHRvIGl0c2VsZi4EAWkBFXN3YXBDYWxjdWxhdGVSRUFET05MWQMIYW1vdW50SW4HYXNzZXRJbghhc3NldE91dAQFcHJGZWUJAQV2YWx1ZQEJAJ8IAQkBC3Byb3RvY29sRmVlAAQVZmVlUHJvdG9jb2xBbW91bnRDYWxjCQC8AgMJALYCAQUIYW1vdW50SW4JALYCAQUFcHJGZWUFCGZlZVNjYWxlBAVwbEZlZQkBBXZhbHVlAQkAnwgBCQEHcG9vbEZlZQAEEWZlZVBvb2xBbW91bnRDYWxjCQC8AgMJALYCAQUIYW1vdW50SW4JALYCAQUFcGxGZWUFCGZlZVNjYWxlBBFmZWVQcm90b2NvbEFtb3VudAMJAAACCQCgAwEFFWZlZVByb3RvY29sQW1vdW50Q2FsYwAACQC2AgEAAQUVZmVlUHJvdG9jb2xBbW91bnRDYWxjBA1mZWVQb29sQW1vdW50AwkAAAIJAKADAQURZmVlUG9vbEFtb3VudENhbGMAAAkAtgIBAAEFEWZlZVBvb2xBbW91bnRDYWxjBA1jbGVhbkFtb3VudEluCQC4AgIJALgCAgkAtgIBBQhhbW91bnRJbgURZmVlUHJvdG9jb2xBbW91bnQFDWZlZVBvb2xBbW91bnQECyR0MDM5ODA0MDU4CQEgZ2V0UG9vbEFkZHJlc3NBbmRDaGVja1Bvb2xTdGF0dXMCBQdhc3NldEluBQhhc3NldE91dAQHcG9vbEFkcggFCyR0MDM5ODA0MDU4Al8xBAlpc1JldmVyc2UIBQskdDAzOTgwNDA1OAJfMgQDcmVzCgABQAkA/AcEBQdwb29sQWRyAiFjYWxjdWxhdGVBbW91bnRPdXRGb3JTd2FwUkVBRE9OTFkJAMwIAgkAoAMBBQ1jbGVhbkFtb3VudEluCQDMCAIFCWlzUmV2ZXJzZQkAzAgCCQCgAwEFDWZlZVBvb2xBbW91bnQFA25pbAUDbmlsAwkAAQIFAUACA0ludAUBQAkAAgEJAKwCAgkAAwEFAUACGCBjb3VsZG4ndCBiZSBjYXN0IHRvIEludAkAlAoCBQNuaWwFA3JlcwFpAQRzd2FwAwxhbW91bnRPdXRNaW4LYXNzZXRPdXRSYXcJYWRkcmVzc1RvBAhhc3NldE91dAMJAAACBQthc3NldE91dFJhdwIAAgVXQVZFUwULYXNzZXRPdXRSYXcEA3BtdAkBBXZhbHVlAQkAkQMCCAUBaQhwYXltZW50cwAABAdhc3NldEluAwkAAAIIBQNwbXQHYXNzZXRJZAUEdW5pdAIFV0FWRVMJANgEAQkBBXZhbHVlAQgFA3BtdAdhc3NldElkBAhhbW91bnRJbgkBBXZhbHVlAQgFA3BtdAZhbW91bnQEBXByRmVlCQEFdmFsdWUBCQCfCAEJAQtwcm90b2NvbEZlZQAEFWZlZVByb3RvY29sQW1vdW50Q2FsYwkAvAIDCQC2AgEFCGFtb3VudEluCQC2AgEFBXByRmVlBQhmZWVTY2FsZQQFcGxGZWUJAQV2YWx1ZQEJAJ8IAQkBB3Bvb2xGZWUABBFmZWVQb29sQW1vdW50Q2FsYwkAvAIDCQC2AgEFCGFtb3VudEluCQC2AgEFBXBsRmVlBQhmZWVTY2FsZQQRZmVlUHJvdG9jb2xBbW91bnQDCQAAAgkAoAMBBRVmZWVQcm90b2NvbEFtb3VudENhbGMAAAkAtgIBAAEFFWZlZVByb3RvY29sQW1vdW50Q2FsYwQNZmVlUG9vbEFtb3VudAMJAAACCQCgAwEFEWZlZVBvb2xBbW91bnRDYWxjAAAJALYCAQABBRFmZWVQb29sQW1vdW50Q2FsYwQNY2xlYW5BbW91bnRJbgkAuAICCQC4AgIJALYCAQUIYW1vdW50SW4FEWZlZVByb3RvY29sQW1vdW50BQ1mZWVQb29sQW1vdW50BAZjaGVja3MJAMwIAgMJAAACCQCQAwEIBQFpCHBheW1lbnRzAAEGCQACAQIeZXhhY3RseSAxIHBheW1lbnQgYXJlIGV4cGVjdGVkBQNuaWwDCQAAAgUGY2hlY2tzBQZjaGVja3MECyR0MDUyNjA1MzM4CQEgZ2V0UG9vbEFkZHJlc3NBbmRDaGVja1Bvb2xTdGF0dXMCBQdhc3NldEluBQhhc3NldE91dAQHcG9vbEFkcggFCyR0MDUyNjA1MzM4Al8xBAlpc1JldmVyc2UIBQskdDA1MjYwNTMzOAJfMgQWYXNzZXRJbkF0dGFjaGVkUGF5bWVudAMJAAACBQdhc3NldEluAgVXQVZFUwUEdW5pdAkA2QQBBQdhc3NldEluBAt0b3RhbEdldFJhdwoAAUAJAPwHBAUHcG9vbEFkcgImY2FsY3VsYXRlQW1vdW50T3V0Rm9yU3dhcEFuZFNlbmRUb2tlbnMJAMwIAgkAoAMBBQ1jbGVhbkFtb3VudEluCQDMCAIFCWlzUmV2ZXJzZQkAzAgCBQxhbW91bnRPdXRNaW4JAMwIAgUJYWRkcmVzc1RvCQDMCAIJAKADAQUNZmVlUG9vbEFtb3VudAUDbmlsCQDMCAIJAQ9BdHRhY2hlZFBheW1lbnQCBRZhc3NldEluQXR0YWNoZWRQYXltZW50CQCgAwEFDWNsZWFuQW1vdW50SW4FA25pbAMJAAECBQFAAgNJbnQFAUAJAAIBCQCsAgIJAAMBBQFAAhggY291bGRuJ3QgYmUgY2FzdCB0byBJbnQJAJQKAgkAzAgCCQEOU2NyaXB0VHJhbnNmZXIDBRNmZWVDb2xsZWN0b3JBZGRyZXNzCQCgAwEFEWZlZVByb3RvY29sQW1vdW50BRZhc3NldEluQXR0YWNoZWRQYXltZW50CQDMCAIJAQ5TY3JpcHRUcmFuc2ZlcgMFB3Bvb2xBZHIJAKADAQUNZmVlUG9vbEFtb3VudAUWYXNzZXRJbkF0dGFjaGVkUGF5bWVudAUDbmlsBQt0b3RhbEdldFJhdwkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgFpAQpzZXRNYW5hZ2VyARdwZW5kaW5nTWFuYWdlclB1YmxpY0tleQQLY2hlY2tDYWxsZXIJAQttdXN0TWFuYWdlcgEFAWkDCQAAAgULY2hlY2tDYWxsZXIFC2NoZWNrQ2FsbGVyBBVjaGVja01hbmFnZXJQdWJsaWNLZXkJANkEAQUXcGVuZGluZ01hbmFnZXJQdWJsaWNLZXkDCQAAAgUVY2hlY2tNYW5hZ2VyUHVibGljS2V5BRVjaGVja01hbmFnZXJQdWJsaWNLZXkJAMwIAgkBC1N0cmluZ0VudHJ5AgkBGmtleVBlbmRpbmdNYW5hZ2VyUHVibGljS2V5AAUXcGVuZGluZ01hbmFnZXJQdWJsaWNLZXkFA25pbAkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgFpAQ5jb25maXJtTWFuYWdlcgAEAnBtCQEdcGVuZGluZ01hbmFnZXJQdWJsaWNLZXlPclVuaXQABAVoYXNQTQMJAQlpc0RlZmluZWQBBQJwbQYJAAIBAhJubyBwZW5kaW5nIG1hbmFnZXIDCQAAAgUFaGFzUE0FBWhhc1BNBAdjaGVja1BNAwkAAAIIBQFpD2NhbGxlclB1YmxpY0tleQkBBXZhbHVlAQUCcG0GCQACAQIbeW91IGFyZSBub3QgcGVuZGluZyBtYW5hZ2VyAwkAAAIFB2NoZWNrUE0FB2NoZWNrUE0JAMwIAgkBC1N0cmluZ0VudHJ5AgkBE2tleU1hbmFnZXJQdWJsaWNLZXkACQDYBAEJAQV2YWx1ZQEFAnBtCQDMCAIJAQtEZWxldGVFbnRyeQEJARprZXlQZW5kaW5nTWFuYWdlclB1YmxpY0tleQAFA25pbAkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgkAAgECJFN0cmljdCB2YWx1ZSBpcyBub3QgZXF1YWwgdG8gaXRzZWxmLgECdHgBBnZlcmlmeQAED3RhcmdldFB1YmxpY0tleQQHJG1hdGNoMAkBFm1hbmFnZXJQdWJsaWNLZXlPclVuaXQAAwkAAQIFByRtYXRjaDACCkJ5dGVWZWN0b3IEAnBrBQckbWF0Y2gwBQJwawMJAAECBQckbWF0Y2gwAgRVbml0CAUCdHgPc2VuZGVyUHVibGljS2V5CQACAQILTWF0Y2ggZXJyb3IJAPQDAwgFAnR4CWJvZHlCeXRlcwkAkQMCCAUCdHgGcHJvb2ZzAAAFD3RhcmdldFB1YmxpY0tleVf/3mw=",
    "height": 2483780,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: 9imWsuzCkLEoifysiyrct7UqCtvntWuTP4nggovRb5kg
Next: 6E7AJAL9JMV4gZg7a6XTZ5rDXmhx3wGLr2XpbPSi7f7f

Diff: 
Old
New
Differences
160
160
 
    let poolAdr = $t039804058._1
161
161
 
    let isReverse = $t039804058._2
162
162
 
    let res = {
163
-
        let @ = invoke(poolAdr, "calculateAmountOutForSwapREADONLY", [toInt(cleanAmountIn), isReverse], nil)
163
+
        let @ = invoke(poolAdr, "calculateAmountOutForSwapREADONLY", [toInt(cleanAmountIn), isReverse, toInt(feePoolAmount)], nil)
164
164
 
        if ($isInstanceOf(@, "Int"))
165
165
 
            then @
166
166
 
            else throw(($getType(@) + " couldn't be cast to Int"))
171
171
 
172
172
 
173
173
 
@Callable(i)
174
-
func swap (amountOutMin,assetOut,addressTo) = {
174
+
func swap (amountOutMin,assetOutRaw,addressTo) = {
175
+
    let assetOut = if ((assetOutRaw == ""))
176
+
        then "WAVES"
177
+
        else assetOutRaw
175
178
 
    let pmt = value(i.payments[0])
176
179
 
    let assetIn = if ((pmt.assetId == unit))
177
180
 
        then "WAVES"
193
196
 
        else throw("exactly 1 payment are expected")]
194
197
 
    if ((checks == checks))
195
198
 
        then {
196
-
            let $t051645242 = getPoolAddressAndCheckPoolStatus(assetIn, assetOut)
197
-
            let poolAdr = $t051645242._1
198
-
            let isReverse = $t051645242._2
199
+
            let $t052605338 = getPoolAddressAndCheckPoolStatus(assetIn, assetOut)
200
+
            let poolAdr = $t052605338._1
201
+
            let isReverse = $t052605338._2
199
202
 
            let assetInAttachedPayment = if ((assetIn == "WAVES"))
200
203
 
                then unit
201
204
 
                else fromBase58String(assetIn)
202
205
 
            let totalGetRaw = {
203
-
                let @ = invoke(poolAdr, "calculateAmountOutForSwapAndSendTokens", [toInt(cleanAmountIn), isReverse, amountOutMin, addressTo], [AttachedPayment(assetInAttachedPayment, toInt(cleanAmountIn))])
206
+
                let @ = invoke(poolAdr, "calculateAmountOutForSwapAndSendTokens", [toInt(cleanAmountIn), isReverse, amountOutMin, addressTo, toInt(feePoolAmount)], [AttachedPayment(assetInAttachedPayment, toInt(cleanAmountIn))])
204
207
 
                if ($isInstanceOf(@, "Int"))
205
208
 
                    then @
206
209
 
                    else throw(($getType(@) + " couldn't be cast to Int"))
Full: 
Old
New
Differences
1
1
 
{-# STDLIB_VERSION 6 #-}
2
2
 
{-# SCRIPT_TYPE ACCOUNT #-}
3
3
 
{-# CONTENT_TYPE DAPP #-}
4
4
 
let SEP = "__"
5
5
 
6
6
 
let feeScale = toBigInt(100000000)
7
7
 
8
8
 
func getStringOrFail (key) = valueOrErrorMessage(getString(this, key), ("No data for this.key=" + key))
9
9
 
10
10
 
11
11
 
let poolDisabled = throw("Pool disabled")
12
12
 
13
13
 
let poolNotExist = throw("Pool is not exist")
14
14
 
15
15
 
let slippageTooBig = throw("Slippage is too big")
16
16
 
17
17
 
func keyManagerPublicKey () = "%s__managerPublicKey"
18
18
 
19
19
 
20
20
 
func keyPendingManagerPublicKey () = "%s__pendingManagerPublicKey"
21
21
 
22
22
 
23
23
 
func fc () = "%s__factoryContract"
24
24
 
25
25
 
26
26
 
let factoryContract = addressFromStringValue(getStringOrFail(fc()))
27
27
 
28
28
 
func protocolFee () = makeString(["%s", "protocolFee"], SEP)
29
29
 
30
30
 
31
31
 
func poolFee () = makeString(["%s", "poolFee"], SEP)
32
32
 
33
33
 
34
34
 
func getStringOrFailFromAddress (address,key) = valueOrErrorMessage(getString(address, key), makeString(["mandatory ", toString(address), ".", key, " is not defined"], ""))
35
35
 
36
36
 
37
37
 
let keyFeeCollectorAddress = "%s__feeCollectorAddress"
38
38
 
39
39
 
let feeCollectorAddress = addressFromStringValue(getStringOrFailFromAddress(factoryContract, keyFeeCollectorAddress))
40
40
 
41
41
 
func asInt (val) = match val {
42
42
 
    case valInt: Int => 
43
43
 
        valInt
44
44
 
    case _ => 
45
45
 
        throw("fail to cast into Int")
46
46
 
}
47
47
 
48
48
 
49
49
 
func dataMappingPoolAssets (internalAmountAssetStr,internalPriceAssetStr) = makeString(["%d%d", toString(internalAmountAssetStr), toString(internalPriceAssetStr)], SEP)
50
50
 
51
51
 
52
52
 
func managerPublicKeyOrUnit () = match getString(keyManagerPublicKey()) {
53
53
 
    case s: String => 
54
54
 
        fromBase58String(s)
55
55
 
    case _: Unit => 
56
56
 
        unit
57
57
 
    case _ => 
58
58
 
        throw("Match error")
59
59
 
}
60
60
 
61
61
 
62
62
 
func pendingManagerPublicKeyOrUnit () = match getString(keyPendingManagerPublicKey()) {
63
63
 
    case s: String => 
64
64
 
        fromBase58String(s)
65
65
 
    case _: Unit => 
66
66
 
        unit
67
67
 
    case _ => 
68
68
 
        throw("Match error")
69
69
 
}
70
70
 
71
71
 
72
72
 
func isManager (i) = match managerPublicKeyOrUnit() {
73
73
 
    case pk: ByteVector => 
74
74
 
        (i.callerPublicKey == pk)
75
75
 
    case _: Unit => 
76
76
 
        (i.caller == this)
77
77
 
    case _ => 
78
78
 
        throw("Match error")
79
79
 
}
80
80
 
81
81
 
82
82
 
func mustManager (i) = if (isManager(i))
83
83
 
    then true
84
84
 
    else throw("permission denied")
85
85
 
86
86
 
87
87
 
func getAccBalance (assetId) = if ((assetId == "WAVES"))
88
88
 
    then wavesBalance(this).available
89
89
 
    else assetBalance(this, fromBase58String(assetId))
90
90
 
91
91
 
92
92
 
func getPoolAddressAndCheckPoolStatus (assetIn,assetOut) = {
93
93
 
    let lpNonReverse = {
94
94
 
        let @ = invoke(factoryContract, "getLpAssetFromPoolAssetsREADONLY", [assetIn, assetOut], nil)
95
95
 
        if ($isInstanceOf(@, "String"))
96
96
 
            then @
97
97
 
            else unit
98
98
 
        }
99
99
 
    let lpReverse = {
100
100
 
        let @ = invoke(factoryContract, "getLpAssetFromPoolAssetsREADONLY", [assetOut, assetIn], nil)
101
101
 
        if ($isInstanceOf(@, "String"))
102
102
 
            then @
103
103
 
            else unit
104
104
 
        }
105
105
 
    let $t025332992 = if ((lpNonReverse != unit))
106
106
 
        then {
107
107
 
            let pool = {
108
108
 
                let @ = invoke(factoryContract, "getPoolAddressFromLpAssetREADONLY", [value(lpNonReverse)], nil)
109
109
 
                if ($isInstanceOf(@, "String"))
110
110
 
                    then @
111
111
 
                    else throw(($getType(@) + " couldn't be cast to String"))
112
112
 
                }
113
113
 
            $Tuple2(false, pool)
114
114
 
            }
115
115
 
        else if ((lpReverse != unit))
116
116
 
            then {
117
117
 
                let pool = {
118
118
 
                    let @ = invoke(factoryContract, "getPoolAddressFromLpAssetREADONLY", [value(lpReverse)], nil)
119
119
 
                    if ($isInstanceOf(@, "String"))
120
120
 
                        then @
121
121
 
                        else throw(($getType(@) + " couldn't be cast to String"))
122
122
 
                    }
123
123
 
                $Tuple2(true, pool)
124
124
 
                }
125
125
 
            else poolNotExist
126
126
 
    let isReverse = $t025332992._1
127
127
 
    let pool = $t025332992._2
128
128
 
    let poolStatus = {
129
129
 
        let @ = invoke(factoryContract, "getPoolStatusREADONLY", [pool], nil)
130
130
 
        if ($isInstanceOf(@, "Int"))
131
131
 
            then @
132
132
 
            else throw(($getType(@) + " couldn't be cast to Int"))
133
133
 
        }
134
134
 
    let check = if ((poolStatus == 1))
135
135
 
        then true
136
136
 
        else poolDisabled
137
137
 
    if ((check == check))
138
138
 
        then {
139
139
 
            let poolAdr = addressFromStringValue(valueOrElse(pool, ""))
140
140
 
            $Tuple2(poolAdr, isReverse)
141
141
 
            }
142
142
 
        else throw("Strict value is not equal to itself.")
143
143
 
    }
144
144
 
145
145
 
146
146
 
@Callable(i)
147
147
 
func swapCalculateREADONLY (amountIn,assetIn,assetOut) = {
148
148
 
    let prFee = value(getInteger(protocolFee()))
149
149
 
    let feeProtocolAmountCalc = fraction(toBigInt(amountIn), toBigInt(prFee), feeScale)
150
150
 
    let plFee = value(getInteger(poolFee()))
151
151
 
    let feePoolAmountCalc = fraction(toBigInt(amountIn), toBigInt(plFee), feeScale)
152
152
 
    let feeProtocolAmount = if ((toInt(feeProtocolAmountCalc) == 0))
153
153
 
        then toBigInt(1)
154
154
 
        else feeProtocolAmountCalc
155
155
 
    let feePoolAmount = if ((toInt(feePoolAmountCalc) == 0))
156
156
 
        then toBigInt(1)
157
157
 
        else feePoolAmountCalc
158
158
 
    let cleanAmountIn = ((toBigInt(amountIn) - feeProtocolAmount) - feePoolAmount)
159
159
 
    let $t039804058 = getPoolAddressAndCheckPoolStatus(assetIn, assetOut)
160
160
 
    let poolAdr = $t039804058._1
161
161
 
    let isReverse = $t039804058._2
162
162
 
    let res = {
163
-
        let @ = invoke(poolAdr, "calculateAmountOutForSwapREADONLY", [toInt(cleanAmountIn), isReverse], nil)
163
+
        let @ = invoke(poolAdr, "calculateAmountOutForSwapREADONLY", [toInt(cleanAmountIn), isReverse, toInt(feePoolAmount)], nil)
164
164
 
        if ($isInstanceOf(@, "Int"))
165
165
 
            then @
166
166
 
            else throw(($getType(@) + " couldn't be cast to Int"))
167
167
 
        }
168
168
 
    $Tuple2(nil, res)
169
169
 
    }
170
170
 
171
171
 
172
172
 
173
173
 
@Callable(i)
174
-
func swap (amountOutMin,assetOut,addressTo) = {
174
+
func swap (amountOutMin,assetOutRaw,addressTo) = {
175
+
    let assetOut = if ((assetOutRaw == ""))
176
+
        then "WAVES"
177
+
        else assetOutRaw
175
178
 
    let pmt = value(i.payments[0])
176
179
 
    let assetIn = if ((pmt.assetId == unit))
177
180
 
        then "WAVES"
178
181
 
        else toBase58String(value(pmt.assetId))
179
182
 
    let amountIn = value(pmt.amount)
180
183
 
    let prFee = value(getInteger(protocolFee()))
181
184
 
    let feeProtocolAmountCalc = fraction(toBigInt(amountIn), toBigInt(prFee), feeScale)
182
185
 
    let plFee = value(getInteger(poolFee()))
183
186
 
    let feePoolAmountCalc = fraction(toBigInt(amountIn), toBigInt(plFee), feeScale)
184
187
 
    let feeProtocolAmount = if ((toInt(feeProtocolAmountCalc) == 0))
185
188
 
        then toBigInt(1)
186
189
 
        else feeProtocolAmountCalc
187
190
 
    let feePoolAmount = if ((toInt(feePoolAmountCalc) == 0))
188
191
 
        then toBigInt(1)
189
192
 
        else feePoolAmountCalc
190
193
 
    let cleanAmountIn = ((toBigInt(amountIn) - feeProtocolAmount) - feePoolAmount)
191
194
 
    let checks = [if ((size(i.payments) == 1))
192
195
 
        then true
193
196
 
        else throw("exactly 1 payment are expected")]
194
197
 
    if ((checks == checks))
195
198
 
        then {
196
-
            let $t051645242 = getPoolAddressAndCheckPoolStatus(assetIn, assetOut)
197
-
            let poolAdr = $t051645242._1
198
-
            let isReverse = $t051645242._2
199
+
            let $t052605338 = getPoolAddressAndCheckPoolStatus(assetIn, assetOut)
200
+
            let poolAdr = $t052605338._1
201
+
            let isReverse = $t052605338._2
199
202
 
            let assetInAttachedPayment = if ((assetIn == "WAVES"))
200
203
 
                then unit
201
204
 
                else fromBase58String(assetIn)
202
205
 
            let totalGetRaw = {
203
-
                let @ = invoke(poolAdr, "calculateAmountOutForSwapAndSendTokens", [toInt(cleanAmountIn), isReverse, amountOutMin, addressTo], [AttachedPayment(assetInAttachedPayment, toInt(cleanAmountIn))])
206
+
                let @ = invoke(poolAdr, "calculateAmountOutForSwapAndSendTokens", [toInt(cleanAmountIn), isReverse, amountOutMin, addressTo, toInt(feePoolAmount)], [AttachedPayment(assetInAttachedPayment, toInt(cleanAmountIn))])
204
207
 
                if ($isInstanceOf(@, "Int"))
205
208
 
                    then @
206
209
 
                    else throw(($getType(@) + " couldn't be cast to Int"))
207
210
 
                }
208
211
 
            $Tuple2([ScriptTransfer(feeCollectorAddress, toInt(feeProtocolAmount), assetInAttachedPayment), ScriptTransfer(poolAdr, toInt(feePoolAmount), assetInAttachedPayment)], totalGetRaw)
209
212
 
            }
210
213
 
        else throw("Strict value is not equal to itself.")
211
214
 
    }
212
215
 
213
216
 
214
217
 
215
218
 
@Callable(i)
216
219
 
func setManager (pendingManagerPublicKey) = {
217
220
 
    let checkCaller = mustManager(i)
218
221
 
    if ((checkCaller == checkCaller))
219
222
 
        then {
220
223
 
            let checkManagerPublicKey = fromBase58String(pendingManagerPublicKey)
221
224
 
            if ((checkManagerPublicKey == checkManagerPublicKey))
222
225
 
                then [StringEntry(keyPendingManagerPublicKey(), pendingManagerPublicKey)]
223
226
 
                else throw("Strict value is not equal to itself.")
224
227
 
            }
225
228
 
        else throw("Strict value is not equal to itself.")
226
229
 
    }
227
230
 
228
231
 
229
232
 
230
233
 
@Callable(i)
231
234
 
func confirmManager () = {
232
235
 
    let pm = pendingManagerPublicKeyOrUnit()
233
236
 
    let hasPM = if (isDefined(pm))
234
237
 
        then true
235
238
 
        else throw("no pending manager")
236
239
 
    if ((hasPM == hasPM))
237
240
 
        then {
238
241
 
            let checkPM = if ((i.callerPublicKey == value(pm)))
239
242
 
                then true
240
243
 
                else throw("you are not pending manager")
241
244
 
            if ((checkPM == checkPM))
242
245
 
                then [StringEntry(keyManagerPublicKey(), toBase58String(value(pm))), DeleteEntry(keyPendingManagerPublicKey())]
243
246
 
                else throw("Strict value is not equal to itself.")
244
247
 
            }
245
248
 
        else throw("Strict value is not equal to itself.")
246
249
 
    }
247
250
 
248
251
 
249
252
 
@Verifier(tx)
250
253
 
func verify () = {
251
254
 
    let targetPublicKey =     match managerPublicKeyOrUnit() {
252
255
 
        case pk: ByteVector => 
253
256
 
            pk
254
257
 
        case _: Unit => 
255
258
 
            tx.senderPublicKey
256
259
 
        case _ => 
257
260
 
            throw("Match error")
258
261
 
    }
259
262
 
    sigVerify(tx.bodyBytes, tx.proofs[0], targetPublicKey)
260
263
 
    }
261
264
 

github/deemru/w8io/026f985 
38.43 ms ◑